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

Duke3d: add some labels for the different GREENSLIME states

Browse source
This commit is contained in:
Richard C. Gobeille 2020-06-11 08:48:33 -07:00 committed by Christoph Oelckers
parent 5574f0bd74
commit 54d9a1a711
1 changed files with 38 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
source/duke3d/src/actors.cpp
View file

@ -4676,13 +4676,27 @@ ACTOR_STATIC void G_MoveActors(void)
} }
} }
if (pData[0] == -5) // FROZEN enum
{
GREENSLIME_FROZEN = -5,
GREENSLIME_ONPLAYER,
GREENSLIME_DEAD, // set but not checked anywhere...
GREENSLIME_EATINGACTOR,
GREENSLIME_DONEEATING,
GREENSLIME_ONFLOOR,
GREENSLIME_TOCEILING,
GREENSLIME_ONCEILING,
GREENSLIME_TOFLOOR,
};
if (pData[0] == GREENSLIME_FROZEN)
{ {
pData[3]++; pData[3]++;
if (pData[3] > 280) if (pData[3] > 280)
{ {
pSprite->pal = 0; pSprite->pal = 0;
pData[0] = pData[3] = 0; pData[0] = GREENSLIME_ONFLOOR;
pData[3] = 0;
goto next_sprite; goto next_sprite;
} }
A_Fall(spriteNum); A_Fall(spriteNum);
@ -4725,12 +4739,12 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite->cstat = (playerDist < 1596) ? 0 : 257; pSprite->cstat = (playerDist < 1596) ? 0 : 257;
if (pData[0] == -4 && pPlayer->somethingonplayer == spriteNum) //On the player if (pData[0] == GREENSLIME_ONPLAYER && pPlayer->somethingonplayer == spriteNum)
{ {
if (sprite[pPlayer->i].extra < 1) if (sprite[pPlayer->i].extra < 1)
{ {
pPlayer->somethingonplayer = -1; pPlayer->somethingonplayer = -1;
pData[0] = 0; pData[0] = GREENSLIME_DONEEATING;
goto next_sprite; goto next_sprite;
} }
@ -4761,7 +4775,7 @@ ACTOR_STATIC void G_MoveActors(void)
} }
P_AddKills(pPlayer, 1); P_AddKills(pPlayer, 1);
pData[0] = -3; pData[0] = GREENSLIME_DEAD;
if (pPlayer->somethingonplayer == spriteNum) if (pPlayer->somethingonplayer == spriteNum)
pPlayer->somethingonplayer = -1; pPlayer->somethingonplayer = -1;
@ -4819,11 +4833,13 @@ ACTOR_STATIC void G_MoveActors(void)
if (pPlayer->somethingonplayer == -1) if (pPlayer->somethingonplayer == -1)
{ {
pPlayer->somethingonplayer = spriteNum; pPlayer->somethingonplayer = spriteNum;
if (pData[0] == 3 || pData[0] == 2) // Falling downward
if (pData[0] == GREENSLIME_TOFLOOR || pData[0] == GREENSLIME_ONCEILING) // Falling downward
pData[2] = (12 << 8); pData[2] = (12 << 8);
else else
pData[2] = -(13 << 8); // Climbing up player pData[2] = -(13 << 8); // Climbing up player
pData[0] = -4;
pData[0] = GREENSLIME_ONPLAYER;
} }
} }
@ -4838,7 +4854,7 @@ ACTOR_STATIC void G_MoveActors(void)
if (damageTile == FREEZEBLAST) if (damageTile == FREEZEBLAST)
{ {
A_PlaySound(SOMETHINGFROZE, spriteNum); A_PlaySound(SOMETHINGFROZE, spriteNum);
pData[0] = -5; pData[0] = GREENSLIME_FROZEN;
pData[3] = 0; pData[3] = 0;
goto next_sprite; goto next_sprite;
} }
@ -4858,20 +4874,17 @@ ACTOR_STATIC void G_MoveActors(void)
spriteNum, 5); spriteNum, 5);
sprite[j].pal = 6; sprite[j].pal = 6;
} }
pData[0] = -3; pData[0] = GREENSLIME_DEAD;
DELETE_SPRITE_AND_CONTINUE(spriteNum); DELETE_SPRITE_AND_CONTINUE(spriteNum);
} }
// All weap // All weap
if (pData[0] == -1) //Shrinking down if (pData[0] == GREENSLIME_DONEEATING)
{ {
A_Fall(spriteNum); A_Fall(spriteNum);
pSprite->cstat &= 65535-8; pSprite->cstat &= 65535-8;
pSprite->picnum = GREENSLIME+4; pSprite->picnum = GREENSLIME+4;
// if(s->yrepeat > 62)
// A_DoGuts(s,JIBS6,5,myconnectindex);
if (pSprite->xrepeat > 32) pSprite->xrepeat -= krand()&7; if (pSprite->xrepeat > 32) pSprite->xrepeat -= krand()&7;
if (pSprite->yrepeat > 16) pSprite->yrepeat -= krand()&7; if (pSprite->yrepeat > 16) pSprite->yrepeat -= krand()&7;
else else
@ -4879,14 +4892,14 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite->xrepeat = 40; pSprite->xrepeat = 40;
pSprite->yrepeat = 16; pSprite->yrepeat = 16;
pData[5] = -1; pData[5] = -1;
pData[0] = 0; pData[0] = GREENSLIME_ONFLOOR;
} }
goto next_sprite; goto next_sprite;
} }
else if (pData[0] != -2) A_GetZLimits(spriteNum); else if (pData[0] != GREENSLIME_EATINGACTOR) A_GetZLimits(spriteNum);
if (pData[0] == -2) //On top of somebody if (pData[0] == GREENSLIME_EATINGACTOR) //On top of somebody
{ {
A_Fall(spriteNum); A_Fall(spriteNum);
sprite[pData[5]].xvel = 0; sprite[pData[5]].xvel = 0;
@ -4906,7 +4919,7 @@ ACTOR_STATIC void G_MoveActors(void)
pSprite->xrepeat += 4; pSprite->xrepeat += 4;
else else
{ {
pData[0] = -1; pData[0] = GREENSLIME_DONEEATING;
playerDist = ldist(pSprite, &sprite[pData[5]]); playerDist = ldist(pSprite, &sprite[pData[5]]);
if (playerDist < 768) if (playerDist < 768)
@ -4934,7 +4947,7 @@ ACTOR_STATIC void G_MoveActors(void)
if (ldist(pSprite, &sprite[j]) < 768 && (klabs(pSprite->z - sprite[j].z) < 8192)) // Gulp them if (ldist(pSprite, &sprite[j]) < 768 && (klabs(pSprite->z - sprite[j].z) < 8192)) // Gulp them
{ {
pData[5] = j; pData[5] = j;
pData[0] = -2; pData[0] = GREENSLIME_EATINGACTOR;
pData[1] = 0; pData[1] = 0;
goto next_sprite; goto next_sprite;
} }
@ -4944,14 +4957,14 @@ ACTOR_STATIC void G_MoveActors(void)
//Moving on the ground or ceiling //Moving on the ground or ceiling
if (pData[0] == 0 || pData[0] == 2) if (pData[0] == GREENSLIME_ONFLOOR || pData[0] == GREENSLIME_ONCEILING)
{ {
pSprite->picnum = GREENSLIME; pSprite->picnum = GREENSLIME;
if ((krand()&511) == 0) if ((krand()&511) == 0)
A_PlaySound(SLIM_ROAM,spriteNum); A_PlaySound(SLIM_ROAM,spriteNum);
if (pData[0]==2) if (pData[0]==GREENSLIME_ONCEILING)
{ {
pSprite->zvel = 0; pSprite->zvel = 0;
pSprite->cstat &= (65535-8); pSprite->cstat &= (65535-8);
@ -4959,7 +4972,7 @@ ACTOR_STATIC void G_MoveActors(void)
if ((sector[sectNum].ceilingstat&1) || (actor[spriteNum].ceilingz+6144) < pSprite->z) if ((sector[sectNum].ceilingstat&1) || (actor[spriteNum].ceilingz+6144) < pSprite->z)
{ {
pSprite->z += 2048; pSprite->z += 2048;
pData[0] = 3; pData[0] = GREENSLIME_TOFLOOR;
goto next_sprite; goto next_sprite;
} }
} }
@ -4998,7 +5011,7 @@ ACTOR_STATIC void G_MoveActors(void)
} }
if (pData[0]==1) if (pData[0]==GREENSLIME_TOCEILING)
{ {
pSprite->picnum = GREENSLIME; pSprite->picnum = GREENSLIME;
if (pSprite->yrepeat < 40) pSprite->yrepeat+=8; if (pSprite->yrepeat < 40) pSprite->yrepeat+=8;
@ -5010,11 +5023,11 @@ ACTOR_STATIC void G_MoveActors(void)
{ {
pSprite->z = actor[spriteNum].ceilingz+4096; pSprite->z = actor[spriteNum].ceilingz+4096;
pSprite->xvel = 0; pSprite->xvel = 0;
pData[0] = 2; pData[0] = GREENSLIME_ONCEILING;
} }
} }
if (pData[0]==3) if (pData[0]==GREENSLIME_TOFLOOR)
{ {
pSprite->picnum = GREENSLIME+1; pSprite->picnum = GREENSLIME+1;
@ -5034,7 +5047,7 @@ ACTOR_STATIC void G_MoveActors(void)
if (pSprite->z > actor[spriteNum].floorz-2048) if (pSprite->z > actor[spriteNum].floorz-2048)
{ {
pSprite->z = actor[spriteNum].floorz-2048; pSprite->z = actor[spriteNum].floorz-2048;
pData[0] = 0; pData[0] = GREENSLIME_ONFLOOR;
pSprite->xvel = 0; pSprite->xvel = 0;
} }
} }