zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-04 07:20:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

- copied some changes to kill count management from DukeGDX.

Browse source
This commit is contained in:
Christoph Oelckers 2020-07-27 20:53:31 +02:00
parent 8a92ecb70c
commit ecdc92e6b9
7 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2445,6 +2445,7 @@ static void greenslime(int i)
int k = EGS(sprite[i].sectnum, sprite[i].x, sprite[i].y, sprite[i].z, GLASSPIECES + (j % 3), -32, 36, 36, krand() & 2047, 32 + (krand() & 63), 1024 - (krand() & 1023), i, 5); int k = EGS(sprite[i].sectnum, sprite[i].x, sprite[i].y, sprite[i].z, GLASSPIECES + (j % 3), -32, 36, 36, krand() & 2047, 32 + (krand() & 63), 1024 - (krand() & 1023), i, 5);
sprite[k].pal = 1; sprite[k].pal = 1;
} }
ps[p].actors_killed++;
S_PlayActorSound(GLASS_BREAKING, i); S_PlayActorSound(GLASS_BREAKING, i);
deletesprite(i); deletesprite(i);
} }
@ -2575,7 +2576,6 @@ static void greenslime(int i)
{ {
S_PlayActorSound(SLIM_DYING, i); S_PlayActorSound(SLIM_DYING, i);
ps[p].actors_killed++;
if (ps[p].somethingonplayer == i) if (ps[p].somethingonplayer == i)
ps[p].somethingonplayer = -1; ps[p].somethingonplayer = -1;
@ -2584,6 +2584,7 @@ static void greenslime(int i)
S_PlayActorSound(SOMETHINGFROZE, i); t[0] = -5; t[3] = 0; S_PlayActorSound(SOMETHINGFROZE, i); t[0] = -5; t[3] = 0;
return; return;
} }
ps[p].actors_killed++;
if ((krand() & 255) < 32) if ((krand() & 255) < 32)
{ {

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

@ -284,5 +284,6 @@ int TILE_CROSSHAIR;
int TILE_BIGORBIT1; int TILE_BIGORBIT1;
int TILE_HURTRAIL; int TILE_HURTRAIL;
int TILE_FLOORPLASMA; int TILE_FLOORPLASMA;
int TILE_EGG;
END_DUKE_NS END_DUKE_NS

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

@ -281,6 +281,7 @@ void initactorflags_d()
TILE_BIGORBIT1 = BIGORBIT1; TILE_BIGORBIT1 = BIGORBIT1;
TILE_HURTRAIL = HURTRAIL; TILE_HURTRAIL = HURTRAIL;
TILE_FLOORPLASMA = FLOORPLASMA; TILE_FLOORPLASMA = FLOORPLASMA;
TILE_EGG = EGG;
} }

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

@ -251,6 +251,7 @@ void initactorflags_r()
TILE_BIGORBIT1 = BIGORBIT1; TILE_BIGORBIT1 = BIGORBIT1;
TILE_HURTRAIL = HURTRAIL; TILE_HURTRAIL = HURTRAIL;
TILE_FLOORPLASMA = FLOORPLASMA; TILE_FLOORPLASMA = FLOORPLASMA;
TILE_EGG = EGG;
PHEIGHT = PHEIGHT_RR; PHEIGHT = PHEIGHT_RR;
} }

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

@ -439,7 +439,16 @@ int ParseState::parse(void)
insptr++; insptr++;
if (g_sp->picnum == TILE_APLAYER) if (g_sp->picnum == TILE_APLAYER)
g_sp->pal = ps[g_sp->yvel].palookup; g_sp->pal = ps[g_sp->yvel].palookup;
else g_sp->pal = hittype[g_i].tempang; else
{
// Copied from DukeGDX.
if (g_sp->picnum == TILE_EGG && hittype[g_i].temp_data[5] == TILE_EGG + 2 && g_sp->pal == 1)
{
ps[connecthead].max_actors_killed++; //revive the egg
hittype[g_i].temp_data[5] = 0;
}
g_sp->pal = hittype[g_i].tempang;
}
hittype[g_i].tempang = 0; hittype[g_i].tempang = 0;
break; break;
case concmd_tossweapon: case concmd_tossweapon:

1
source/games/duke/src/names.h
View file

@ -54,6 +54,7 @@ extern int TILE_CROSSHAIR;
extern int TILE_BIGORBIT1; extern int TILE_BIGORBIT1;
extern int TILE_HURTRAIL; extern int TILE_HURTRAIL;
extern int TILE_FLOORPLASMA; extern int TILE_FLOORPLASMA;
extern int TILE_EGG;

5
source/games/duke/src/spawn_d.cpp
View file

@ -1164,8 +1164,11 @@ int spawn_d(int j, int pn)
} }
else else
{ {
if(sp->picnum == EGG) if (sp->picnum == EGG)
{
sp->clipdist = 24; sp->clipdist = 24;
ps[connecthead].max_actors_killed++;
}
sp->cstat = 257|(krand()&4); sp->cstat = 257|(krand()&4);
changespritestat(i,2); changespritestat(i,2);
} }