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

- fixed some bugs.

Browse source
This commit is contained in:
Christoph Oelckers 2020-05-15 00:32:11 +02:00
parent cba4f0616b
commit 1fd0c279d7
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
source/games/duke/src/actors_d.cpp
View file

@ -287,10 +287,16 @@ SKIPWALLCHECK:
if (isWorldTour()) if (isWorldTour())
{ {
if (sprite[s->owner].picnum == APLAYER && sj->picnum == APLAYER && ud.coop != 0 && ud.ffire == 0 && s->owner != j) if (sprite[s->owner].picnum == APLAYER && sj->picnum == APLAYER && ud.coop != 0 && ud.ffire == 0 && s->owner != j)
{
j = nextj;
continue; continue;
}
if (s->picnum == FLAMETHROWERFLAME && ((sprite[s->owner].picnum == FIREFLY && sj->picnum == FIREFLY) || (sprite[s->owner].picnum == BOSS5 && sj->picnum == BOSS5))) if (s->picnum == FLAMETHROWERFLAME && ((sprite[s->owner].picnum == FIREFLY && sj->picnum == FIREFLY) || (sprite[s->owner].picnum == BOSS5 && sj->picnum == BOSS5)))
{
j = nextj;
continue; continue;
}
} }
if (x == 0 || x >= 5 || AFLAMABLE(sj->picnum)) if (x == 0 || x >= 5 || AFLAMABLE(sj->picnum))

1
source/games/duke/src/gameexec.cpp
View file

@ -506,7 +506,6 @@ int parse(void)
insptr++; insptr++;
if (!S_CheckSoundPlaying(g_i, *insptr++)) if (!S_CheckSoundPlaying(g_i, *insptr++))
A_PlaySound(*(insptr - 1), g_i); A_PlaySound(*(insptr - 1), g_i);
insptr++;
break; break;
case concmd_stopsound: case concmd_stopsound:
insptr++; insptr++;

13
source/games/duke/src/zz_gameexec.cpp
View file

@ -483,18 +483,6 @@ void VM_Execute(native_t loop)
A_PlaySound(ambientlotag[vm.pSprite->ang], vm.spriteNum); A_PlaySound(ambientlotag[vm.pSprite->ang], vm.spriteNum);
continue; continue;
case concmd_soundonce:
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
{
CON_ERRPRINTF("invalid sound %d\n", (int32_t)*insptr++);
continue;
}
if (!S_CheckSoundPlaying(vm.spriteNum, *insptr++))
A_PlaySound(*(insptr - 1), vm.spriteNum);
continue;
case concmd_stopsound: case concmd_stopsound:
if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS)) if (EDUKE32_PREDICT_FALSE((unsigned)*(++insptr) >= MAXSOUNDS))
{ {
@ -654,6 +642,7 @@ void VM_Execute(native_t loop)
ud.eog = 1; ud.eog = 1;
continue; continue;
case concmd_soundonce:
case concmd_isdrunk: case concmd_isdrunk:
case concmd_strafeleft: case concmd_strafeleft:
case concmd_straferight: case concmd_straferight: