zdoom
/
raze-gles
mirror of https://github.com/ZDoom/raze-gles.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add FURY checks for some EDUKE32_STANDALONE stuff 

git-svn-id: https://svn.eduke32.com/eduke32@7911 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-08-07 22:44:12 +00:00 committed by Christoph Oelckers
parent 2307160c4a
commit 4e0325e0d4
2 changed files with 63 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

85
source/duke3d/src/gameexec.cpp
View File

@ -719,9 +719,9 @@ dead:
int angDiff = vm.pSprite->ang; int angDiff = vm.pSprite->ang;
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (badguyp && vm.pSprite->picnum != ROTATEGUN) if (badguyp && (FURY || vm.pSprite->picnum != ROTATEGUN))
{ {
if ((vm.pSprite->picnum == DRONE || vm.pSprite->picnum == COMMANDER) && vm.pSprite->extra > 0) if (!FURY && (vm.pSprite->picnum == DRONE || vm.pSprite->picnum == COMMANDER) && vm.pSprite->extra > 0)
{ {
if (vm.pSprite->picnum == COMMANDER) if (vm.pSprite->picnum == COMMANDER)
{ {
@ -763,7 +763,7 @@ dead:
} }
} }
} }
else if (vm.pSprite->picnum != ORGANTIC) else if ((FURY && badguyp) || vm.pSprite->picnum != ORGANTIC)
#else #else
if (badguyp) if (badguyp)
{ {
@ -807,7 +807,7 @@ dead:
} }
else else
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (vm.pSprite->picnum != DRONE && vm.pSprite->picnum != SHARK && vm.pSprite->picnum != COMMANDER) if (FURY || (vm.pSprite->picnum != DRONE && vm.pSprite->picnum != SHARK && vm.pSprite->picnum != COMMANDER))
#endif #endif
{ {
if (vm.pPlayer->actorsqu == vm.spriteNum) if (vm.pPlayer->actorsqu == vm.spriteNum)
@ -1030,7 +1030,7 @@ static void VM_Fall(int const spriteNum, spritetype * const pSprite)
// I'm guessing this DRONE check is from a beta version of the game // I'm guessing this DRONE check is from a beta version of the game
// where they crashed into the ground when killed // where they crashed into the ground when killed
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (!(pSprite->picnum == APLAYER && pSprite->extra > 0) && pSprite->pal != 1 && pSprite->picnum != DRONE) if (!FURY && !(pSprite->picnum == APLAYER && pSprite->extra > 0) && pSprite->pal != 1 && pSprite->picnum != DRONE)
{ {
A_DoGuts(spriteNum,JIBS6,15); A_DoGuts(spriteNum,JIBS6,15);
A_PlaySound(SQUISHED,spriteNum); A_PlaySound(SQUISHED,spriteNum);
@ -2998,7 +2998,7 @@ badindex:
// if holoduke is on, let them target holoduke first. // if holoduke is on, let them target holoduke first.
// //
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (vm.pPlayer->holoduke_on >= 0) if (!FURY && vm.pPlayer->holoduke_on >= 0)
{ {
pSprite = (uspriteptr_t)&sprite[vm.pPlayer->holoduke_on]; pSprite = (uspriteptr_t)&sprite[vm.pPlayer->holoduke_on];
tw = cansee(vm.pSprite->x, vm.pSprite->y, vm.pSprite->z - (krand() & (ZOFFSET5 - 1)), vm.pSprite->sectnum, pSprite->x, pSprite->y, tw = cansee(vm.pSprite->x, vm.pSprite->y, vm.pSprite->z - (krand() & (ZOFFSET5 - 1)), vm.pSprite->sectnum, pSprite->x, pSprite->y,
@ -3283,7 +3283,8 @@ badindex:
vInstruction(CON_LOTSOFGLASS): vInstruction(CON_LOTSOFGLASS):
insptr++; insptr++;
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
A_SpawnGlass(vm.spriteNum, *insptr++); if (!FURY)
A_SpawnGlass(vm.spriteNum, *insptr++);
#else #else
insptr++; insptr++;
#endif #endif
@ -3293,9 +3294,12 @@ badindex:
insptr++; insptr++;
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
int const wallNum = Gv_GetVar(*insptr++); if (!FURY)
int const numShards = Gv_GetVar(*insptr++); {
A_SpawnWallGlass(vm.spriteNum, wallNum, numShards); int const wallNum = Gv_GetVar(*insptr++);
int const numShards = Gv_GetVar(*insptr++);
A_SpawnWallGlass(vm.spriteNum, wallNum, numShards);
}
#else #else
Gv_GetVar(*insptr++); Gv_GetVar(*insptr++);
Gv_GetVar(*insptr++); Gv_GetVar(*insptr++);
@ -3307,9 +3311,12 @@ badindex:
insptr++; insptr++;
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
int const wallNum = Gv_GetVar(*insptr++); if (!FURY)
int const numShards = Gv_GetVar(*insptr++); {
A_SpawnRandomGlass(vm.spriteNum, wallNum, numShards); int const wallNum = Gv_GetVar(*insptr++);
int const numShards = Gv_GetVar(*insptr++);
A_SpawnRandomGlass(vm.spriteNum, wallNum, numShards);
}
#else #else
Gv_GetVar(*insptr++); Gv_GetVar(*insptr++);
Gv_GetVar(*insptr++); Gv_GetVar(*insptr++);
@ -3321,9 +3328,12 @@ badindex:
insptr++; insptr++;
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
int const sectNum = Gv_GetVar(*insptr++); if (!FURY)
int const numShards = Gv_GetVar(*insptr++); {
A_SpawnCeilingGlass(vm.spriteNum, sectNum, numShards); int const sectNum = Gv_GetVar(*insptr++);
int const numShards = Gv_GetVar(*insptr++);
A_SpawnCeilingGlass(vm.spriteNum, sectNum, numShards);
}
#else #else
Gv_GetVar(*insptr++); Gv_GetVar(*insptr++);
Gv_GetVar(*insptr++); Gv_GetVar(*insptr++);
@ -3359,7 +3369,7 @@ badindex:
int newHealth = sprite[vm.pPlayer->i].extra; int newHealth = sprite[vm.pPlayer->i].extra;
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if (vm.pSprite->picnum == ATOMICHEALTH) if (!FURY && vm.pSprite->picnum == ATOMICHEALTH)
{ {
if (newHealth > 0) if (newHealth > 0)
newHealth += *insptr; newHealth += *insptr;
@ -3391,7 +3401,7 @@ badindex:
if (*insptr > 0) if (*insptr > 0)
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
if ((newHealth - *insptr) < (vm.pPlayer->max_player_health >> 2) && newHealth >= (vm.pPlayer->max_player_health >> 2)) if (!FURY && (newHealth - *insptr) < (vm.pPlayer->max_player_health >> 2) && newHealth >= (vm.pPlayer->max_player_health >> 2))
A_PlaySound(DUKE_GOTHEALTHATLOW, vm.pPlayer->i); A_PlaySound(DUKE_GOTHEALTHATLOW, vm.pPlayer->i);
#endif #endif
vm.pPlayer->last_extra = newHealth; vm.pPlayer->last_extra = newHealth;
@ -4780,21 +4790,24 @@ badindex:
insptr++; insptr++;
{ {
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
int debrisTile = *insptr++; if (!FURY)
{
int debrisTile = *insptr++;
if ((unsigned)vm.pSprite->sectnum < MAXSECTORS) if ((unsigned)vm.pSprite->sectnum < MAXSECTORS)
for (native_t cnt = (*insptr) - 1; cnt >= 0; cnt--) for (native_t cnt = (*insptr) - 1; cnt >= 0; cnt--)
{ {
int const tileOffset = (vm.pSprite->picnum == BLIMP && debrisTile == SCRAP1) ? 0 : (krand() % 3); int const tileOffset = (vm.pSprite->picnum == BLIMP && debrisTile == SCRAP1) ? 0 : (krand() % 3);
int const spriteNum = A_InsertSprite(vm.pSprite->sectnum, vm.pSprite->x + (krand() & 255) - 128, int const spriteNum = A_InsertSprite(
vm.pSprite->y + (krand() & 255) - 128, vm.pSprite->z - (8 << 8) - (krand() & 8191), vm.pSprite->sectnum, vm.pSprite->x + (krand() & 255) - 128, vm.pSprite->y + (krand() & 255) - 128,
debrisTile + tileOffset, vm.pSprite->shade, 32 + (krand() & 15), 32 + (krand() & 15), vm.pSprite->z - (8 << 8) - (krand() & 8191), debrisTile + tileOffset, vm.pSprite->shade, 32 + (krand() & 15),
krand() & 2047, (krand() & 127) + 32, -(krand() & 2047), vm.spriteNum, 5); 32 + (krand() & 15), krand() & 2047, (krand() & 127) + 32, -(krand() & 2047), vm.spriteNum, 5);
sprite[spriteNum].yvel = (vm.pSprite->picnum == BLIMP && debrisTile == SCRAP1) ? g_blimpSpawnItems[cnt % 14] : -1; sprite[spriteNum].yvel = (vm.pSprite->picnum == BLIMP && debrisTile == SCRAP1) ? g_blimpSpawnItems[cnt % 14] : -1;
sprite[spriteNum].pal = vm.pSprite->pal; sprite[spriteNum].pal = vm.pSprite->pal;
} }
}
#else #else
insptr++; insptr++;
#endif #endif
@ -4932,7 +4945,8 @@ badindex:
vInstruction(CON_GUTS): vInstruction(CON_GUTS):
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
A_DoGuts(vm.spriteNum, insptr[1], insptr[2]); if (!FURY)
A_DoGuts(vm.spriteNum, insptr[1], insptr[2]);
#endif #endif
insptr += 3; insptr += 3;
dispatch(); dispatch();
@ -6177,9 +6191,12 @@ badindex:
case PODFEM1__STATIC: case PODFEM1__STATIC:
case NAKED1__STATIC: case NAKED1__STATIC:
case STATUE__STATIC: case STATUE__STATIC:
if (vm.pSprite->yvel) if (!FURY)
G_OperateRespawns(vm.pSprite->yvel); {
break; if (vm.pSprite->yvel)
G_OperateRespawns(vm.pSprite->yvel);
break;
}
#endif #endif
default: default:
if (vm.pSprite->hitag >= 0) if (vm.pSprite->hitag >= 0)

21
source/duke3d/src/sounds.cpp
View File

@ -185,7 +185,7 @@ void S_MenuSound(void)
PISTOL_RICOCHET, PISTOL_BODYHIT, PISTOL_FIRE, SHOTGUN_FIRE, BOS1_WALK, RPG_EXPLODE, PISTOL_RICOCHET, PISTOL_BODYHIT, PISTOL_FIRE, SHOTGUN_FIRE, BOS1_WALK, RPG_EXPLODE,
PIPEBOMB_BOUNCE, PIPEBOMB_EXPLODE, NITEVISION_ONOFF, RPG_SHOOT, SELECT_WEAPON, PIPEBOMB_BOUNCE, PIPEBOMB_EXPLODE, NITEVISION_ONOFF, RPG_SHOOT, SELECT_WEAPON,
}; };
int s = VM_OnEventWithReturn(EVENT_OPENMENUSOUND, g_player[screenpeek].ps->i, screenpeek, menusnds[SoundNum++ % ARRAY_SIZE(menusnds)]); int s = VM_OnEventWithReturn(EVENT_OPENMENUSOUND, g_player[screenpeek].ps->i, screenpeek, FURY ? -1 : menusnds[SoundNum++ % ARRAY_SIZE(menusnds)]);
#else #else
int s = VM_OnEventWithReturn(EVENT_OPENMENUSOUND, g_player[screenpeek].ps->i, screenpeek, -1); int s = VM_OnEventWithReturn(EVENT_OPENMENUSOUND, g_player[screenpeek].ps->i, screenpeek, -1);
#endif #endif
@ -593,15 +593,18 @@ sound_further_processing:
sndist += sndist>>5; sndist += sndist>>5;
#ifndef EDUKE32_STANDALONE #ifndef EDUKE32_STANDALONE
switch (DYNAMICSOUNDMAP(soundNum)) if (!FURY)
{ {
case PIPEBOMB_EXPLODE__STATIC: switch (DYNAMICSOUNDMAP(soundNum))
case LASERTRIP_EXPLODE__STATIC: {
case RPG_EXPLODE__STATIC: case PIPEBOMB_EXPLODE__STATIC:
explosion = true; case LASERTRIP_EXPLODE__STATIC:
if (sndist > 6144) case RPG_EXPLODE__STATIC:
sndist = 6144; explosion = true;
break; if (sndist > 6144)
sndist = 6144;
break;
}
} }
#endif #endif