1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Updates / Fixes by Arynn

Browse Source 
- Fixed: Mercs randomly drop aimed weapons automatically under some weird circumstances 
- Fixed: Merc are now a little more "talkactive"
- Update: New option screen with "Next" and "Prev" button. This allows "unlimited" of options in the option screen
- New: New "Forced turn base mode" option in the option screen and also available via keyboard shortcut (CTRL+ALT+SHIFT+T) in tactical.
This forces the game to go in turn based mode when there are enemies in the sector.

INFO: There is a new STI Graphic (OPTIONSCREENADDONS2.sti) which is needed for the updated option screen.
You can download the file from http://ja2.h758491.serverkompetenz.net/Wanne/NewOptionScreen/OPTIONSCREENADDONS2.sti
Put this file in your Data\Interface folder. If I build a new release I will upload the file to SVN GameDir and then remove it from my private download folder.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2610 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-02-28 09:16:25 +00:00
parent a64a66bdf3
commit c4e483539f
18 changed files with 619 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Turn Based Input.cpp
+25 -4
View File
@@ -205,6 +205,7 @@ void ToggleWireFrame();
void RefreshSoldier();
void ChangeSoldiersBodyType( UINT8 ubBodyType, BOOLEAN fCreateNewPalette );
void TeleportSelectedSoldier();
void ToggleTurnMode();// arynn : add forced turn mode
void ToggleTreeTops();
void ToggleZBuffer();
void TogglePlanningMode();
@@ -3662,9 +3663,16 @@ void GetKeyboardInput( UINT32 *puiNewEvent )
ToggleTreeTops();
break;
case 'T':
//resort Team by ubID
SortSquadByID(MercPtrs[gusSelectedSoldier]->bTeam);
case 'T':
if ( fCtrl && fShift && fAlt && !is_networked)// arynn : add forced turn mode
{
ToggleTurnMode();
}
else
{
//resort Team by ubID
SortSquadByID(MercPtrs[gusSelectedSoldier]->bTeam);
}
break;
case '=':
@@ -4519,7 +4527,20 @@ void TeleportSelectedSoldier()
}
}
void ToggleTurnMode()// arynn : add forced turn mode
{
if ( !gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] )
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Forced Turn Mode" );
gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = TRUE;
EnterCombatMode( OUR_TEAM ); // arynn : randomize ? i'm leaving this for now due to "i made the call, i get dibs"
}
else
{
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Normal turn mode");
gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = FALSE;
}
}// arynn : add forced turn mode
void ToggleTreeTops()
{