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

Improved Game Settings (by Arynn)

Browse Source 
- fixed corruption of ja2.set
- ja2.set will no be saved to ja2_settings.ini
- a few more minor game setting fixes and error tracings


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2844 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2009-05-12 11:52:35 +00:00
parent c9117c2939
commit 2e99cbe784
31 changed files with 827 additions and 1575 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/Overhead.cpp
+5 -5
View File
@@ -5729,7 +5729,7 @@ void ExitCombatMode( )
EndTopMessage( );
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, L"Exit combat mode");// arynn : add forced turn mode
ScreenMsg( FONT_MCOLOR_LTYELLOW, MSG_INTERFACE, pMessageStrings[ MSG_FTM_EXIT_COMBAT ] );// ary-05/05/2009 : add forced turn mode
// OK, we have exited combat mode.....
// Reset some flags for no aps to move, etc
@@ -5749,7 +5749,7 @@ void ExitCombatMode( )
{
pSoldier->AdjustNoAPToFinishMove( FALSE );
// arynn : fix lower ready weapons
// ary-05/05/2009 : fix lower ready weapons
//previously "ready weapon" state was being dropped in a couple of cases
//the fix involves bypassing the reset animation state for the various "ready weapon" types
//since this is a reset animation function, we should be VERY specific about when and what we dont reset
@@ -5762,7 +5762,7 @@ void ExitCombatMode( )
))
{
pSoldier->SoldierGotoStationaryStance( );
}// arynn : fix lower ready weapon end_if
}
}
//Cancel pending events
@@ -6099,9 +6099,9 @@ BOOLEAN CheckForEndOfCombatMode( BOOLEAN fIncrementTurnsNotSeen )
// If we have reach a point where a cons. number of turns gone by....
//if ( gTacticalStatus.bConsNumTurnsNotSeen > 1 )
// arynn : add forced turn mode : note : no forced turn mode option for Multi Player
// ary-05/05/2009 : add forced turn mode : note : no forced turn mode option for Multi Player
if ( is_networked ) gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ] = FALSE;
if ( gTacticalStatus.bConsNumTurnsNotSeen > 1 && !gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ])// arynn : add forced turn mode
if ( gTacticalStatus.bConsNumTurnsNotSeen > 1 && !gGameSettings.fOptions[ TOPTION_TOGGLE_TURN_MODE ])
{
if(is_networked && !getReal)//hayden