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

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
+2 -2
View File
@@ -387,7 +387,7 @@ INT32 FAR PASCAL WindowProcedure(HWND hWindow, UINT16 Message, WPARAM wParam, LP
break;
case FALSE: // We are suspending direct draw
if (iScreenMode == 0)//hayden
if (iScreenMode == 0)
{
#ifdef JA2
// pause the JA2 Global clock
@@ -1183,4 +1183,4 @@ void ProcessJa2CommandLineBeforeInitialization(CHAR8 *pCommandLine)
}
MemFree(pCopy);
}
}