Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skirmish game fix: 

Don't RemapPlayerNumber() for droids, they are a different kind of a beast.  This maps the droids correctly now.

Fixes ticket:1119

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8606 4a71c877-e1ca-e34f-864e-861f7616d084
master
Buginator 2009-12-05 06:48:18 +00:00 committed by Git SVN Gateway
parent 86302cf060
commit dda96a7059
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/game.c
View File

@ -2580,7 +2580,7 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
PLAYERSTATS playerStats;
game = saveGameData.sGame;
productionPlayer= selectedPlayer;
productionPlayer = selectedPlayer = saveGameData.savePlayer;
bMultiPlayer = saveGameData.multiPlayer;
cmdDroidMultiExpBoost(true);
@ -4706,7 +4706,7 @@ bool gameLoadV(PHYSFS_file* fileHandle, unsigned int version)
PLAYERSTATS playerStats;
bMultiPlayer = saveGameData.multiPlayer;
productionPlayer = selectedPlayer;
productionPlayer = selectedPlayer = saveGameData.savePlayer;
game = saveGameData.sGame;
cmdDroidMultiExpBoost(true);
@ -6087,9 +6087,6 @@ BOOL loadSaveDroidV11(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD
endian_udword(&psSaveDroid->asWeaps[i].lastFired);
}
// Give it to the correct player
psSaveDroid->player = RemapPlayerNumber(psSaveDroid->player);
// Here's a check that will allow us to load up save games on the playstation from the PC
// - It will skip data from any players after MAX_PLAYERS
if (psSaveDroid->player >= MAX_PLAYERS)
@ -6242,9 +6239,6 @@ BOOL loadSaveDroidV19(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD
endian_udword(&psSaveDroid->asWeaps[i].lastFired);
}
// Give it to the correct player
psSaveDroid->player = RemapPlayerNumber(psSaveDroid->player);
// Here's a check that will allow us to load up save games on the playstation from the PC
// - It will skip data from any players after MAX_PLAYERS
if (psSaveDroid->player >= MAX_PLAYERS)
@ -6406,9 +6400,6 @@ BOOL loadSaveDroidV(char *pFileData, UDWORD filesize, UDWORD numDroids, UDWORD v
endian_udword(&psSaveDroid->asWeaps[i].lastFired);
}
// Give it to the correct player
psSaveDroid->player = RemapPlayerNumber(psSaveDroid->player);
// Here's a check that will allow us to load up save games on the playstation from the PC
// - It will skip data from any players after MAX_PLAYERS
if (psSaveDroid->player >= MAX_PLAYERS)