- Fixed Tixa problem: When playing Realistic you could go down to underground level where crepitus are

o When loading such a buggy savegame, we will fix it automatically

- Simplified (reworked) IF-conditions with crepitus

- new define in luaglobal.h: LUA_GAME_INIT_NEW_GAME, LUA_GAME_INIT_NPCS.
o So we can select if we want to use lua script (GameInit.lua) or the hardcoded JA2 stuff

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2011-06-06 19:04:56 +00:00
parent bfbe6b0311
commit 75b4d43964
9 changed files with 117 additions and 17 deletions
+19 -5
View File
@@ -5027,6 +5027,25 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
CancelAllPendingBRPurchaseOrders();
}
// WANNE: THis should fix the bug with initializing problem in GameInit.lua on startup, in which we could meet crepitus in Tixa underground map
if(guiCurrentSaveGameVersion < FIXED_CREPITUS_IN_REALISTIC_GAME_MODE)
{
if ( gGameOptions.ubGameStyle == STYLE_SCIFI && gGameExternalOptions.fEnableCrepitus )
{
// Nothing to do here
}
else
{ //not scifi, so use alternate map in Tixa's b1 level that doesn't have the stairs going down to the caves.
UNDERGROUND_SECTORINFO *pSector;
pSector = FindUnderGroundSector( 9, 10, 1 ); //j9_b1
if( pSector )
{
pSector->uiFlags |= SF_USE_ALTERNATE_MAP;
}
}
}
// ---------------------------------------------------------------------------
//if the world is loaded, apply the temp files to the loaded map
if( SaveGameHeader.fWorldLoaded || guiCurrentSaveGameVersion < 50 )
@@ -5319,11 +5338,6 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
}
BOOLEAN SaveMercProfiles( HWFILE hFile )
{
UINT16 cnt;