zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-22 19:41:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

- formatting only.

Browse source
This commit is contained in:
Christoph Oelckers 2021-10-03 17:42:40 +02:00
parent 239faad4c5
commit ab41ac9e05
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/games/blood/src/nnexts.cpp
View file

@ -6394,11 +6394,13 @@ void useIncDecGen(XSPRITE* pXSource, short objType, int objIndex) {
} }
spritetype* pSource = &sprite[pXSource->reference]; spritetype* pSource = &sprite[pXSource->reference];
if (pXSource->data2 < pXSource->data3) { if (pXSource->data2 < pXSource->data3)
{
data = ClipRange(data, pXSource->data2, pXSource->data3); data = ClipRange(data, pXSource->data2, pXSource->data3);
if ((data += pXSource->data4) >= pXSource->data3) { if ((data += pXSource->data4) >= pXSource->data3)
switch (pSource->flags) { {
switch (pSource->flags)
{
case kModernTypeFlag0: case kModernTypeFlag0:
case kModernTypeFlag1: case kModernTypeFlag1:
if (data > pXSource->data3) data = pXSource->data3; if (data > pXSource->data3) data = pXSource->data3;
@ -6416,11 +6418,14 @@ void useIncDecGen(XSPRITE* pXSource, short objType, int objIndex) {
} }
} }
} else if (pXSource->data2 > pXSource->data3) { }
else if (pXSource->data2 > pXSource->data3)
{
data = ClipRange(data, pXSource->data3, pXSource->data2); data = ClipRange(data, pXSource->data3, pXSource->data2);
if ((data -= pXSource->data4) <= pXSource->data3) { if ((data -= pXSource->data4) <= pXSource->data3)
switch (pSource->flags) { {
switch (pSource->flags)
{
case kModernTypeFlag0: case kModernTypeFlag0:
case kModernTypeFlag1: case kModernTypeFlag1:
if (data < pXSource->data3) data = pXSource->data3; if (data < pXSource->data3) data = pXSource->data3;
@ -6438,11 +6443,9 @@ void useIncDecGen(XSPRITE* pXSource, short objType, int objIndex) {
} }
} }
} }
pXSource->sysData1 = data; pXSource->sysData1 = data;
setDataValueOfObject(objType, objIndex, dataIndex, data); setDataValueOfObject(objType, objIndex, dataIndex, data);
} }
} }
@ -7218,13 +7221,16 @@ int getDataFieldOfObject(int objType, int objIndex, DBloodActor* actor, int data
} }
bool setDataValueOfObject(int objType, int objIndex, int dataIndex, int value) { bool setDataValueOfObject(int objType, int objIndex, int dataIndex, int value) {
switch (objType) { switch (objType)
case OBJ_SPRITE: { {
case OBJ_SPRITE:
{
XSPRITE* pXSprite = &xsprite[sprite[objIndex].extra]; XSPRITE* pXSprite = &xsprite[sprite[objIndex].extra];
// exceptions // exceptions
if (IsDudeSprite(&sprite[objIndex]) && pXSprite->health <= 0) return true; if (IsDudeSprite(&sprite[objIndex]) && pXSprite->health <= 0) return true;
switch (sprite[objIndex].type) { switch (sprite[objIndex].type)
{
case kThingBloodBits: case kThingBloodBits:
case kThingBloodChunks: case kThingBloodChunks:
case kThingZombieHead: case kThingZombieHead:
@ -7232,7 +7238,8 @@ bool setDataValueOfObject(int objType, int objIndex, int dataIndex, int value) {
break; break;
} }
switch (dataIndex) { switch (dataIndex)
{
case 1: case 1:
xsprite[sprite[objIndex].extra].data1 = value; xsprite[sprite[objIndex].extra].data1 = value;
switch (sprite[objIndex].type) { switch (sprite[objIndex].type) {