zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-01-14 11:50:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed RR weapon clearing in E2L2 and RRRA E1L3.

Browse source
This commit is contained in:
Christoph Oelckers 2021-05-02 10:37:20 +02:00
parent 1798380f23
commit 9bc210fe35
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
source/games/duke/src/premap.cpp
View file

@ -658,7 +658,6 @@ void prelevel_common(int g)
p->SlotWin = 0; p->SlotWin = 0;
enemysizecheat = 0; enemysizecheat = 0;
p->MamaEnd = 0; p->MamaEnd = 0;
mamaspawn_count = 15;
banjosound = 0; banjosound = 0;
RRRA_ExitedLevel = 0; RRRA_ExitedLevel = 0;
@ -672,6 +671,18 @@ void prelevel_common(int g)
fakebubba_spawn = 0; fakebubba_spawn = 0;
RRRA_ExitedLevel = 0; RRRA_ExitedLevel = 0;
mamaspawn_count = 15; mamaspawn_count = 15;
/* todo
if (ud.level_number != 3 || ud.volume_number != 0) {
if (ud.level_number == 2 && ud.volume_number == 1)
mamaspawn_count = 10;
else if (ud.level_number == 6 && ud.volume_number == 1)
mamaspawn_count = 15;
else if (ud.level_number == 4 && ud.volume_number == 1)
ps[myconnectindex].moonshine_amount = 0;
} else
mamaspawn_count = 5;
*/
BellTime = 0; BellTime = 0;
BellSprite = nullptr; BellSprite = nullptr;
@ -831,12 +842,6 @@ static int LoadTheMap(MapRecord *mi, struct player_struct *p, int gamemode)
SECRET_SetMapName(mi->DisplayName(), mi->name); SECRET_SetMapName(mi->DisplayName(), mi->name);
STAT_NewLevel(mi->fileName); STAT_NewLevel(mi->fileName);
if (isRR() && !isRRRA() && mi->levelNumber == makelevelnum(1, 1))
{
for (int i = PISTOL_WEAPON; i < MAX_WEAPONS; i++)
ps[0].ammo_amount[i] = 0;
ps[0].gotweapon.Clear(KNEE_WEAPON);
}
p->angle.ang = buildang(lbang); p->angle.ang = buildang(lbang);
memset(gotpic, 0, sizeof(gotpic)); memset(gotpic, 0, sizeof(gotpic));
@ -844,16 +849,6 @@ static int LoadTheMap(MapRecord *mi, struct player_struct *p, int gamemode)
if (isRR()) prelevel_r(gamemode); if (isRR()) prelevel_r(gamemode);
else prelevel_d(gamemode); else prelevel_d(gamemode);
if (isRRRA() && mi->levelNumber == makelevelnum(0, 2))
{
for (int i = PISTOL_WEAPON; i < MAX_WEAPONS; i++)
ps[0].ammo_amount[i] = 0;
ps[0].gotweapon.Clear(KNEE_WEAPON);
ps[0].gotweapon.Set(SLINGBLADE_WEAPON);
ps[0].ammo_amount[SLINGBLADE_WEAPON] = 1;
ps[0].curr_weapon = SLINGBLADE_WEAPON;
}
allignwarpelevators(); allignwarpelevators();
resetpspritevars(gamemode); resetpspritevars(gamemode);