From af626df86bd50541b2cb1521f5bc8b68898fdf13 Mon Sep 17 00:00:00 2001 From: helixhorned Date: Tue, 7 Aug 2012 13:08:57 +0000 Subject: [PATCH] Fix slimers not disappearing on dnmonsters cheat, display 2nd 'on' state. git-svn-id: https://svn.eduke32.com/eduke32@2867 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/actors.c | 2 +- polymer/eduke32/source/game.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/polymer/eduke32/source/actors.c b/polymer/eduke32/source/actors.c index 7c7175678..f5b025bad 100644 --- a/polymer/eduke32/source/actors.c +++ b/polymer/eduke32/source/actors.c @@ -3983,7 +3983,7 @@ ACTOR_STATIC void G_MoveActors(void) // case GREENSLIME+7: // #ifndef VOLUMEONE - if (g_netServer && (!g_netServer && ud.multimode < 2)) + if (!g_netServer && ud.multimode < 2) { if (g_noEnemies == 1) { diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index a5446e9ea..2234c159d 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -7338,12 +7338,12 @@ FOUNDCHEAT: case CHEAT_MONSTERS: { - const char *s[] = { "On", "Off" }; + const char *s[] = { "On", "Off", "On (2)" }; if (++g_noEnemies == 3) g_noEnemies = 0; - Bsprintf(ScriptQuotes[QUOTE_RESERVED4], "Monsters: %s", s[g_noEnemies & 1]); + Bsprintf(ScriptQuotes[QUOTE_RESERVED4], "Monsters: %s", s[g_noEnemies]); P_DoQuote(QUOTE_RESERVED4,g_player[myconnectindex].ps); end_cheat();