zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-11 07:11:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

EDUKE32_STANDALONE guard some HoloDuke behavior in CON_IFCANSEE and remove a branch from GAMEARRAY_BITMAP processing in CON_SETARRAY

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@6818 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2018-04-06 01:43:12 +00:00
parent bcd5e48c8c
commit 260fb278d9
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/duke3d/src/gameexec.cpp
View file

@ -1453,6 +1453,7 @@ skip_check:
// select sprite for monster to target // select sprite for monster to target
// if holoduke is on, let them target holoduke first. // if holoduke is on, let them target holoduke first.
// //
#ifndef EDUKE32_STANDALONE
if (pPlayer->holoduke_on >= 0) if (pPlayer->holoduke_on >= 0)
{ {
pSprite = (uspritetype *)&sprite[pPlayer->holoduke_on]; pSprite = (uspritetype *)&sprite[pPlayer->holoduke_on];
@ -1466,7 +1467,7 @@ skip_check:
pSprite = (uspritetype *)&sprite[pPlayer->i]; pSprite = (uspritetype *)&sprite[pPlayer->i];
} }
} }
#endif
// can they see player, (or player's holoduke) // can they see player, (or player's holoduke)
tw = cansee(vm.pSprite->x,vm.pSprite->y,vm.pSprite->z-(krand()&((47<<8))),vm.pSprite->sectnum, tw = cansee(vm.pSprite->x,vm.pSprite->y,vm.pSprite->z-(krand()&((47<<8))),vm.pSprite->sectnum,
pSprite->x,pSprite->y,pSprite->z-(24<<8),pSprite->sectnum); pSprite->x,pSprite->y,pSprite->z-(24<<8),pSprite->sectnum);
@ -4520,12 +4521,13 @@ finish_qsprintf:
case GAMEARRAY_UINT16: ((uint16_t *) aGameArrays[tw].pValues)[arrayIndex] = newValue; break; case GAMEARRAY_UINT16: ((uint16_t *) aGameArrays[tw].pValues)[arrayIndex] = newValue; break;
case GAMEARRAY_UINT8: ((int8_t *) aGameArrays[tw].pValues)[arrayIndex] = newValue; break; case GAMEARRAY_UINT8: ((int8_t *) aGameArrays[tw].pValues)[arrayIndex] = newValue; break;
case GAMEARRAY_BITMAP: case GAMEARRAY_BITMAP:
if (newValue) {
((uint8_t *)aGameArrays[tw].pValues)[arrayIndex >> 3] |= (1 << (arrayIndex & 7)); uint32_t const mask = (1 << (arrayIndex & 7));
else uint8_t & value = ((uint8_t *)aGameArrays[tw].pValues)[arrayIndex >> 3];
((uint8_t *)aGameArrays[tw].pValues)[arrayIndex >> 3] &= ~(1 << (arrayIndex & 7)); value = (value & ~mask) | (-!!newValue & mask);
break; break;
} }
}
continue; continue;
} }