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

Fix rex animation speed

Browse source
This commit is contained in:
nukeykt 2019-11-16 22:29:18 +09:00 committed by Christoph Oelckers
parent e65d2ef4f4
commit 6da91a4c1f
1 changed files with 28 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
source/exhumed/src/rex.cpp
View file

@ -72,24 +72,23 @@ int BuildRex(short nSprite, int x, int y, int z, short nSector, short nAngle, in
sprite[nSprite].x = x; sprite[nSprite].x = x;
sprite[nSprite].y = y; sprite[nSprite].y = y;
sprite[nSprite].cstat = 0x101;
sprite[nSprite].z = z; sprite[nSprite].z = z;
sprite[nSprite].cstat = 0x101; sprite[nSprite].cstat = 0x101;
sprite[nSprite].shade = -12;
sprite[nSprite].clipdist = 80; sprite[nSprite].clipdist = 80;
sprite[nSprite].xvel = 0; sprite[nSprite].shade = -12;
sprite[nSprite].yvel = 0;
sprite[nSprite].zvel = 0;
sprite[nSprite].xrepeat = 64; sprite[nSprite].xrepeat = 64;
sprite[nSprite].yrepeat = 64; sprite[nSprite].yrepeat = 64;
sprite[nSprite].picnum = 1;
sprite[nSprite].pal = sector[sprite[nSprite].sectnum].ceilingpal; sprite[nSprite].pal = sector[sprite[nSprite].sectnum].ceilingpal;
sprite[nSprite].xoffset = 0; sprite[nSprite].xoffset = 0;
sprite[nSprite].yoffset = 0; sprite[nSprite].yoffset = 0;
sprite[nSprite].ang = nAngle; sprite[nSprite].ang = nAngle;
sprite[nSprite].picnum = 1; sprite[nSprite].xvel = 0;
sprite[nSprite].hitag = 0; sprite[nSprite].yvel = 0;
sprite[nSprite].zvel = 0;
sprite[nSprite].lotag = runlist_HeadRun() + 1; sprite[nSprite].lotag = runlist_HeadRun() + 1;
sprite[nSprite].extra = -1; sprite[nSprite].extra = -1;
sprite[nSprite].hitag = 0;
GrabTimeSlot(3); GrabTimeSlot(3);
@ -198,10 +197,8 @@ void FuncRex(int a, int nDamage, int nRun)
} }
// moves the mouth open and closed as it's idle? // moves the mouth open and closed as it's idle?
do while (--ecx != -1)
{ {
ecx--;
seq_MoveSequence(nSprite, nSeq, RexList[nRex].field_2); seq_MoveSequence(nSprite, nSeq, RexList[nRex].field_2);
RexList[nRex].field_2++; RexList[nRex].field_2++;
@ -210,16 +207,12 @@ void FuncRex(int a, int nDamage, int nRun)
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
var_1C = 1; var_1C = 1;
} }
} while (ecx != -1); }
int nFlag = FrameFlag[SeqBase[nSeq] + RexList[nRex].field_2]; int nFlag = FrameFlag[SeqBase[nSeq] + RexList[nRex].field_2];
short nTarget = RexList[nRex].nTarget; short nTarget = RexList[nRex].nTarget;
if (nAction > 7) {
return;
}
switch (nAction) switch (nAction)
{ {
default: default:
@ -252,7 +245,7 @@ void FuncRex(int a, int nDamage, int nRun)
RexList[nRex].nAction = 1; RexList[nRex].nAction = 1;
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
sprite[nSprite].xvel = Sin(sprite[nSprite].ang + 512) >> 2; sprite[nSprite].xvel = Cos(sprite[nSprite].ang) >> 2;
sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2; sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2;
D3PlayFX(StaticSound[kSound48], nSprite); D3PlayFX(StaticSound[kSound48], nSprite);
@ -302,18 +295,9 @@ void FuncRex(int a, int nDamage, int nRun)
int nVal = MoveCreatureWithCaution(nSprite); int nVal = MoveCreatureWithCaution(nSprite);
if ((nVal & 0xC000) == 0x8000) switch ((nVal & 0xC000))
{
sprite[nSprite].ang = (sprite[nSprite].ang + 256) & kAngleMask;
sprite[nSprite].xvel = Sin(sprite[nSprite].ang + 512) >> 2;
sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2;
RexList[nRex].nAction = 1;
RexList[nRex].field_2 = 0;
nAction = 1;
break;
}
else if ((nVal & 0xC000) == 0xC000)
{ {
case 0xc000:
if ((nVal & 0x3FFF) == nTarget) if ((nVal & 0x3FFF) == nTarget)
{ {
PlotCourseToSprite(nSprite, nTarget); PlotCourseToSprite(nSprite, nTarget);
@ -321,19 +305,16 @@ void FuncRex(int a, int nDamage, int nRun)
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
break; break;
} }
else fallthrough__;
{ case 0x8000:
sprite[nSprite].ang = (sprite[nSprite].ang + 256) & kAngleMask; sprite[nSprite].ang = (sprite[nSprite].ang + 256) & kAngleMask;
sprite[nSprite].xvel = Sin(sprite[nSprite].ang + 512) >> 2; sprite[nSprite].xvel = Cos(sprite[nSprite].ang) >> 2;
sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2; sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2;
RexList[nRex].nAction = 1; RexList[nRex].nAction = 1;
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
nAction = 1; nAction = 1;
break; break;
}
} }
break;
} }
case 2: case 2:
@ -343,26 +324,25 @@ void FuncRex(int a, int nDamage, int nRun)
{ {
PlotCourseToSprite(nSprite, nTarget); PlotCourseToSprite(nSprite, nTarget);
sprite[nSprite].xvel = Sin(sprite[nSprite].ang + 512) >> 1; sprite[nSprite].xvel = Cos(sprite[nSprite].ang) >> 1;
sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 1; sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 1;
int nVal = MoveCreatureWithCaution(nSprite); int nVal = MoveCreatureWithCaution(nSprite);
if ((nVal & 0x0C000) == 0x8000) switch(nVal & 0x0C000)
{ {
case 0x8000:
SetQuake(nSprite, 25); SetQuake(nSprite, 25);
RexList[nRex].field_A = 60; RexList[nRex].field_A = 60;
sprite[nSprite].ang = (sprite[nSprite].ang + 256) & kAngleMask; sprite[nSprite].ang = (sprite[nSprite].ang + 256) & kAngleMask;
sprite[nSprite].xvel = Sin(sprite[nSprite].ang + 512) >> 2; sprite[nSprite].xvel = Cos(sprite[nSprite].ang) >> 2;
sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2; sprite[nSprite].yvel = Sin(sprite[nSprite].ang) >> 2;
RexList[nRex].nAction = 1; RexList[nRex].nAction = 1;
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
nAction = 1; nAction = 1;
break; break;
} case 0xc000:
else if ((nVal & 0x0C000) == 0x0C000)
{
RexList[nRex].nAction = 3; RexList[nRex].nAction = 3;
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
@ -374,7 +354,7 @@ void FuncRex(int a, int nDamage, int nRun)
runlist_DamageEnemy(nSprite2, nSprite, 15); runlist_DamageEnemy(nSprite2, nSprite, 15);
int ebx = Sin(nAngle + 512) * 15; int ebx = Cos(nAngle) * 15;
int edx = Sin(nAngle) * 15; int edx = Sin(nAngle) * 15;
if (sprite[nSprite2].statnum == 100) if (sprite[nSprite2].statnum == 100)
@ -393,6 +373,7 @@ void FuncRex(int a, int nDamage, int nRun)
} }
RexList[nRex].field_A >>= 2; RexList[nRex].field_A >>= 2;
return;
} }
} }
else else
@ -400,9 +381,8 @@ void FuncRex(int a, int nDamage, int nRun)
RexList[nRex].nAction = 1; RexList[nRex].nAction = 1;
RexList[nRex].field_2 = 0; RexList[nRex].field_2 = 0;
RexList[nRex].field_A = 90; RexList[nRex].field_A = 90;
return;
} }
return;
} }
case 3: case 3: