1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Space Viking's many mercs changes plus numerous generic bug fixes

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
SpaceViking
2009-01-15 01:26:13 +00:00
parent f64f58fbf8
commit f26095d86f
138 changed files with 3493 additions and 3265 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gameloop.cpp
+8 -5
View File
@@ -99,10 +99,14 @@ BOOLEAN InitializeGame(void)
is_client = FALSE;
is_server = FALSE;
// Set up the debugging topics
//
// Turn off all the flags
ClearAllDebugTopics();
//
// Now turn on the ones we are interested in watching
RegisterJA2DebugTopic( TOPIC_JA2OPPLIST, "Reg" );
//RegisterJA2DebugTopic( TOPIC_MEMORY_MANAGER, "Reg" );
RegisterJA2DebugTopic( TOPIC_JA2INTERRUPT, "Reg" );
// Snap: Read options from an INI file in the default of custom Data directory
// Moved this up because some settings are used during other inits
@@ -329,11 +333,10 @@ void GameLoop(void)
}
//DebugMsg (TOPIC_JA2,DBG_LEVEL_3,"GameLoop: screen changed");
AssertNotNIL (GameScreens[guiCurrentScreen].HandleScreen);
uiOldScreen = (*(GameScreens[guiCurrentScreen].HandleScreen))();
// if the screen has chnaged
// if the screen has changed
if( uiOldScreen != guiCurrentScreen )
{
HandleNewScreenChange( uiOldScreen, guiCurrentScreen );