zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Savegames stored the global fixed light levels when saving a player.

Browse source 
SVN r1893 (trunk)
This commit is contained in:
Christoph Oelckers 2009-10-02 09:21:37 +00:00
parent 59d932b972
commit 4add2809a3
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/rh-log.txt
View file

@ -1,3 +1,6 @@
October 2, 2009 (Changes by Graf Zahl)
- fixed: Savegames stored the global fixed light levels when saving a player.
October 1, 2009 (Changes by Graf Zahl) October 1, 2009 (Changes by Graf Zahl)
- Fixed some GCC warnings. - Fixed some GCC warnings.
- fixed: The BossCube could be blocked by floors and ceiling resulting - fixed: The BossCube could be blocked by floors and ceiling resulting

12
src/p_user.cpp
View file

@ -2514,19 +2514,25 @@ void player_t::Serialize (FArchive &arc)
int fixedmap; int fixedmap;
arc << fixedmap; arc << fixedmap;
fixedcolormap = NOFIXEDCOLORMAP; fixedcolormap = NOFIXEDCOLORMAP;
fixedlightlev = -1; fixedlightlevel = -1;
if (fixedmap >= NUMCOLORMAPS) if (fixedmap >= NUMCOLORMAPS)
{ {
fixedcolormap = fixedmap - NUMCOLORMAPS; fixedcolormap = fixedmap - NUMCOLORMAPS;
} }
else if (fixedmap > 0) else if (fixedmap > 0)
{ {
fixedlightlev = fixedmap; fixedlightlevel = fixedmap;
} }
} }
else if (SaveVersion < 1893)
{
int ll;
arc << fixedcolormap << ll;
fixedlightlevel = ll;
}
else else
{ {
arc << fixedcolormap << fixedlightlev; arc << fixedcolormap << fixedlightlevel;
} }
arc << morphTics arc << morphTics
<< MorphedPlayerClass << MorphedPlayerClass

2
src/r_things.cpp
View file

@ -1857,7 +1857,7 @@ void R_DrawRemainingPlayerSprites()
DTA_RenderStyle, vis->RenderStyle, DTA_RenderStyle, vis->RenderStyle,
DTA_FillColor, vis->FillColor, DTA_FillColor, vis->FillColor,
DTA_SpecialColormap, special, DTA_SpecialColormap, special,
DTA_ColorOverlay, overlay, DTA_ColorOverlay, overlay.d,
DTA_ColormapStyle, usecolormapstyle ? &colormapstyle : NULL, DTA_ColormapStyle, usecolormapstyle ? &colormapstyle : NULL,
TAG_DONE); TAG_DONE);
} }