From fd85c536ff1409668b847b47981cebe09b9c6657 Mon Sep 17 00:00:00 2001 From: ZTsukei Date: Wed, 9 Aug 2017 23:44:29 -0400 Subject: [PATCH] v1.3.19 ------- Moved the Lakitu respawn code so that it isn't console-only. --- src/doomdef.h | 10 +++++----- src/g_game.c | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/doomdef.h b/src/doomdef.h index e2411439..29b1ac4d 100644 --- a/src/doomdef.h +++ b/src/doomdef.h @@ -143,16 +143,16 @@ extern FILE *logstream; #define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3 #ifdef DEVELOP #define VERSION 103 // Game version -#define SUBVERSION 18 // more precise version number +#define SUBVERSION 19 // more precise version number #define VERSIONSTRING "Development EXE" -#define VERSIONSTRINGW "v1.3.18" +#define VERSIONSTRINGW "v1.3.19" // most interface strings are ignored in development mode. // we use comprevision and compbranch instead. #else #define VERSION 103 // Game version -#define SUBVERSION 18 // more precise version number -#define VERSIONSTRING "DevEXE v1.3.18" -#define VERSIONSTRINGW L"v1.3.18" +#define SUBVERSION 19 // more precise version number +#define VERSIONSTRING "DevEXE v1.3.19" +#define VERSIONSTRINGW L"v1.3.19" // Hey! If you change this, add 1 to the MODVERSION below! // Otherwise we can't force updates! #endif diff --git a/src/g_game.c b/src/g_game.c index 0070b82e..b2f10b00 100644 --- a/src/g_game.c +++ b/src/g_game.c @@ -2332,10 +2332,12 @@ void G_PlayerReborn(INT32 player) S_ChangeMusic(mapmusname, mapmusflags, true); if (p->laps == (unsigned)(cv_numlaps.value - 1)) S_SpeedMusic(1.2f); - p->kartstuff[k_lakitu] = 64; // Lakitu Spawner } } + if (leveltime > 157) + p->kartstuff[k_lakitu] = 64; // Lakitu Spawner + if (gametype == GT_COOP) P_FindEmerald(); // scan for emeralds to hunt for