zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: R_InitColormaps was broken since the resource file code rewrite.

Browse source 
SVN r1778 (trunk)
This commit is contained in:
Christoph Oelckers 2009-08-30 20:47:43 +00:00
parent ba28749df7
commit 75920f2ed0
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
docs/rh-log.txt
View file

@ -1,4 +1,5 @@
August 29, 2009 (Changes by Graf Zahl) August 29, 2009 (Changes by Graf Zahl)
- fixed: R_InitColormaps was broken since the resource file code rewrite.
- fixed: WIF_STAFF2_KICKBACK did not work anymore because it depended on conditions - fixed: WIF_STAFF2_KICKBACK did not work anymore because it depended on conditions
that were changed some time ago. that were changed some time ago.
- fixed: The damage inflictor for a rail attack was the shooter, not the puff. - fixed: The damage inflictor for a rail attack was the shooter, not the puff.

5
src/r_data.cpp
View file

@ -153,12 +153,13 @@ void R_InitColormaps ()
{ {
char name[9]; char name[9];
name[8] = 0; name[8] = 0;
Wads.GetLumpName (name, ns_colormaps); Wads.GetLumpName (name, i);
if (Wads.CheckNumForName (name, ns_colormaps) == (int)i) if (Wads.CheckNumForName (name, ns_colormaps) == (int)i)
{ {
strncpy(cm.name, name, 8); strncpy(cm.name, name, 8);
cm.blend = 0; cm.blend = 0;
cm.lump = i;
fakecmaps.Push(cm); fakecmaps.Push(cm);
} }
} }
@ -241,7 +242,7 @@ DWORD R_ColormapNumForName (const char *name)
{ {
if (strnicmp (name, "COLORMAP", 8)) if (strnicmp (name, "COLORMAP", 8))
{ // COLORMAP always returns 0 { // COLORMAP always returns 0
for(int i=fakecmaps.Size()-1; i > 0; i++) for(int i=fakecmaps.Size()-1; i > 0; i--)
{ {
if (!strnicmp(name, fakecmaps[i].name, 8)) if (!strnicmp(name, fakecmaps[i].name, 8))
{ {