zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-14 11:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- tabified MoveDude

Browse source 
# Conflicts:
#	source/games/blood/src/actor.cpp
This commit is contained in:
Christoph Oelckers 2020-12-05 10:40:13 +01:00
parent 8c01c363a9
commit 29c2e68270
1 changed files with 70 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
source/games/blood/src/actor.cpp
View file

@ -5109,7 +5109,8 @@ void MoveDude(DBloodActor *actor)
{ {
#ifdef NOONE_EXTENSIONS #ifdef NOONE_EXTENSIONS
// look for palette in data2 of marker. If value <= 0, use default ones. // look for palette in data2 of marker. If value <= 0, use default ones.
if (gModernMap) { if (gModernMap)
{
pPlayer->nWaterPal = 0; pPlayer->nWaterPal = 0;
auto pUpper = getUpperLink(nSector); auto pUpper = getUpperLink(nSector);
if (pUpper && pUpper->hasX()) pPlayer->nWaterPal = pUpper->x().data2; if (pUpper && pUpper->hasX()) pPlayer->nWaterPal = pUpper->x().data2;
@ -5324,6 +5325,12 @@ void MoveDude(DBloodActor *actor)
} }
} }
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
int MoveMissile(spritetype *pSprite) int MoveMissile(spritetype *pSprite)
{ {
int nXSprite = pSprite->extra; int nXSprite = pSprite->extra;