zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-30 13:21:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Change fix in 6e9576b871 to be outside of donewgame() in case player is loading a map from the command line.

Browse source
This commit is contained in:
Mitchell Richters 2020-09-26 09:16:57 +10:00
parent 6e9576b871
commit 362fda4378
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -165,8 +165,6 @@ void loadscreen_r(MapRecord* rec, CompletionFunc func);
void GameInterface::NextLevel(MapRecord* map, int skill) void GameInterface::NextLevel(MapRecord* map, int skill)
{ {
if (skill != -1) ud.player_skill = skill + 1;
#if 0 #if 0
// Loading is so fast on modern system so that this only serves as an irritant, not an asset. // Loading is so fast on modern system so that this only serves as an irritant, not an asset.
auto loadscreen = isRR() ? loadscreen_r : loadscreen_d; auto loadscreen = isRR() ? loadscreen_r : loadscreen_d;
@ -191,6 +189,7 @@ void GameInterface::NewGame(MapRecord* map, int skill)
ps[0].last_extra = max_player_health; ps[0].last_extra = max_player_health;
resetweapons(0); resetweapons(0);
resetinventory(0); resetinventory(0);
if (skill != -1) skill = skill + 1;
startnewgame(map, skill); startnewgame(map, skill);
} }

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

@ -765,7 +765,7 @@ void donewgame(MapRecord* map, int sk)
show_shareware = 26 * 34; show_shareware = 26 * 34;
//ud.nextLevel = map; //ud.nextLevel = map;
ud.player_skill = sk != -1 ? sk + 1 : sk; ud.player_skill = sk;
ud.secretlevel = 0; ud.secretlevel = 0;
ud.from_bonus = 0; ud.from_bonus = 0;
@ -990,6 +990,7 @@ void enterlevel(MapRecord *mi, int gamemode)
void startnewgame(MapRecord* map, int skill) void startnewgame(MapRecord* map, int skill)
{ {
ud.player_skill = skill;
ud.m_respawn_monsters = (skill == 4); ud.m_respawn_monsters = (skill == 4);
ud.m_monsters_off = ud.monsters_off = 0; ud.m_monsters_off = ud.monsters_off = 0;
ud.m_respawn_items = 0; ud.m_respawn_items = 0;