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

Merged from revision: 7217

Browse Source 
Bugfixes (by anv)
- fix: ambient sounds weren't played after loading game in tactical,
- fix: AI with a lot of APs would stop moving around during combat.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2014-05-19 18:51:43 +00:00
parent 6f253e7e49
commit f05dfc0b1e
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SaveLoadGame.cpp
+3
View File
@@ -4666,6 +4666,9 @@ BOOLEAN LoadSavedGame( int ubSavedGameID )
LoadGameFilePosition( FileGetPos( hFile ), "Strategic Events" ); LoadGameFilePosition( FileGetPos( hFile ), "Strategic Events" );
#endif #endif
// anv: we need to rebuild ambient sounds now, as those added when loading tileset are removed
// in LoadStrategicEventsFromSavedGame
HandleNewSectorAmbience( gTilesets[ giCurrentTilesetID ].ubAmbientID );
uiRelEndPerc += 0; uiRelEndPerc += 0;
SetRelativeStartAndEndPercentage( 0, uiRelStartPerc, uiRelEndPerc, L"Laptop Info" ); SetRelativeStartAndEndPercentage( 0, uiRelStartPerc, uiRelEndPerc, L"Laptop Info" );
TacticalAI/Movement.cpp
+2 -1
View File
@@ -450,7 +450,8 @@ INT32 InternalGoAsFarAsPossibleTowards(SOLDIERTYPE *pSoldier, INT32 sDesGrid, IN
INT32 sOrigin; INT32 sOrigin;
UINT16 usMaxDist; UINT16 usMaxDist;
UINT8 ubDirection,ubDirsLeft,ubDirChecked[8],fFound = FALSE; UINT8 ubDirection,ubDirsLeft,ubDirChecked[8],fFound = FALSE;
INT8 bAPsLeft, fPathFlags; // anv: changed to INT16 since Soldier->bActionPoints are INT16 too
INT16 bAPsLeft, fPathFlags;
//DBrot: More Rooms //DBrot: More Rooms
//UINT8 ubRoomRequired = 0, ubTempRoom; //UINT8 ubRoomRequired = 0, ubTempRoom;
UINT16 usRoomRequired = 0, usTempRoom; UINT16 usRoomRequired = 0, usTempRoom;