zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- merge fixes.

Browse source 
Why does that freaking merger always delete the namespace markers...?
This commit is contained in:
Christoph Oelckers 2020-01-02 19:11:09 +01:00
parent 2e085b559f
commit 4571ba74c2
4 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/blood/src/gib.cpp
View file

@ -528,3 +528,4 @@ void gibPrecache(void)
} }
} }
} }
END_BLD_NS

2
source/blood/src/gib.h
View file

@ -75,4 +75,4 @@ void GibSprite(spritetype *pSprite, GIBTYPE nGibType, CGibPosition *pPos, CGibVe
//void GibFX(int nWall, GIBFX * pGFX, int a3, int a4, int a5, int a6, CGibVelocity * pVel); //void GibFX(int nWall, GIBFX * pGFX, int a3, int a4, int a5, int a6, CGibVelocity * pVel);
void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel); void GibWall(int nWall, GIBTYPE nGibType, CGibVelocity *pVel);
void gibPrecache(void); void gibPrecache(void);
END_BLD_NS

3
source/blood/src/qav.cpp
View file

@ -155,4 +155,5 @@ void QAV::Precache(void)
tilePrecacheTile(frames[i].tiles[j].picnum, 0); tilePrecacheTile(frames[i].tiles[j].picnum, 0);
} }
} }
} }
END_BLD_NS

2
source/blood/src/screen.cpp
View file

@ -119,7 +119,7 @@ void scrLoadPLUs(void)
for (int i = kUserPLUStart; i < MAXPALOOKUPS; i++) { for (int i = kUserPLUStart; i < MAXPALOOKUPS; i++) {
DICTNODE* pPlu = gSysRes.Lookup(i, "PLU"); DICTNODE* pPlu = gSysRes.Lookup(i, "PLU");
if (!pPlu) continue; if (!pPlu) continue;
else if (pPlu->size / 256 != 64) { consoleSysMsg("Incorrect filesize of PLU#%d", i); } else if (pPlu->Size() / 256 != 64) { consoleSysMsg("Incorrect filesize of PLU#%d", i); }
else palookup[i] = (char*)gSysRes.Lock(pPlu); else palookup[i] = (char*)gSysRes.Lock(pPlu);
} }