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

* Use the PIELIGHT union instead of a cast to call pie_SetFogColour 

This should prevent a compile error on MSVC
Patch originally by per, who at the time couldn't connect to svn.gna.org (and at this time isn't in IRC)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2900 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-11-28 21:06:45 +00:00
parent f9ae505dec
commit 091deaf4e8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/game.c
View File

@ -2444,6 +2444,8 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
if (saveGameVersion >= VERSION_15)//V21
{
PIELIGHT colour;
offWorldKeepLists = saveGameData.offWorldKeepLists;
setRubbleTile(saveGameData.RubbleTile);
setUnderwaterTile(saveGameData.WaterTile);
@ -2477,7 +2479,8 @@ BOOL loadGame(const char *pGameToLoad, BOOL keepObjects, BOOL freeMem, BOOL User
fogStatus = saveGameData.fogState;
fogStatus &= FOG_FLAGS;
}
pie_SetFogColour((PIELIGHT)saveGameData.fogColour);
colour.argb = saveGameData.fogColour;
pie_SetFogColour(colour);
}
if (saveGameVersion >= VERSION_19)//V21
{
@ -4648,6 +4651,8 @@ bool gameLoadV(PHYSFS_file* fileHandle, unsigned int version)
if (version >= VERSION_15)
{
PIELIGHT colour;
offWorldKeepLists = saveGameData.offWorldKeepLists;
setRubbleTile(saveGameData.RubbleTile);
setUnderwaterTile(saveGameData.WaterTile);
@ -4681,7 +4686,8 @@ bool gameLoadV(PHYSFS_file* fileHandle, unsigned int version)
fogStatus = saveGameData.fogState;
fogStatus &= FOG_FLAGS;
}
pie_SetFogColour((PIELIGHT)saveGameData.fogColour);
colour.argb = saveGameData.fogColour;
pie_SetFogColour(colour);
}
if (version >= VERSION_17)