From 259d51bec0ce77e1188bf72bb998955ff57be2dd Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 14 Oct 2016 07:40:38 +0000 Subject: [PATCH] Replace all "g_scriptVersion == 14" with "g_scriptVersion >= 14". git-svn-id: https://svn.eduke32.com/eduke32@5892 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/duke3d.h | 2 +- polymer/eduke32/source/gamedef.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index 8a481ff53..fd3d50a73 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -47,7 +47,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #define HEAD2 APPNAME #define VOLUMEALL (g_Shareware == 0) -#define PLUTOPAK (g_scriptVersion == 14) +#define PLUTOPAK (g_scriptVersion >= 14) #define VOLUMEONE (g_Shareware == 1) // increase by 3, because atomic GRP adds 1, and Shareware adds 2 diff --git a/polymer/eduke32/source/gamedef.c b/polymer/eduke32/source/gamedef.c index a96678eee..6efa0d2ac 100644 --- a/polymer/eduke32/source/gamedef.c +++ b/polymer/eduke32/source/gamedef.c @@ -2301,7 +2301,7 @@ void G_DoGameStartup(const int32_t *params) if (g_scriptVersion >= 11) g_playerFriction = params[j++]; - if (g_scriptVersion == 14) + if (g_scriptVersion >= 14) g_spriteGravity = params[j++]; if (g_scriptVersion >= 11) @@ -2328,14 +2328,14 @@ void G_DoGameStartup(const int32_t *params) { g_player[0].ps->max_ammo_amount[FREEZE_WEAPON] = params[j++]; - if (g_scriptVersion == 14) + if (g_scriptVersion >= 14) g_player[0].ps->max_ammo_amount[GROW_WEAPON] = params[j++]; g_damageCameras = params[j++]; g_numFreezeBounces = params[j++]; g_freezerSelfDamage = params[j++]; - if (g_scriptVersion == 14) + if (g_scriptVersion >= 14) { g_deleteQueueSize = clamp(params[j++], 0, 1024); g_tripbombLaserMode = params[j++];