From c0146744b7af018a73c29c7df9d57c523841da89 Mon Sep 17 00:00:00 2001
From: LJ Sonic <lamr@free.fr>
Date: Sat, 28 Oct 2023 14:46:10 +0200
Subject: [PATCH] Normalise 2.3-related TODO comments
---
src/deh_lua.c | 6 ++++--
src/g_game.c | 2 +-
src/g_input.c | 2 +-
src/lua_maplib.c | 12 +-----------
src/lua_playerlib.c | 2 +-
src/p_mobj.c | 6 +++---
src/p_saveg.h | 2 +-
7 files changed, 12 insertions(+), 20 deletions(-)
diff --git a/src/deh_lua.c b/src/deh_lua.c
index 7188d25e36..e596e166fb 100644
--- a/src/deh_lua.c
+++ b/src/deh_lua.c
@@ -297,7 +297,8 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
CacheAndPushConstant(L, word, (lua_Integer)PF_FULLSTASIS);
return 1;
}
- else if (fastcmp(p, "USEDOWN")) // Remove case when 2.3 nears release...
+ // TODO: 2.3: Delete this alias
+ else if (fastcmp(p, "USEDOWN"))
{
CacheAndPushConstant(L, word, (lua_Integer)PF_SPINDOWN);
return 1;
@@ -583,7 +584,8 @@ static int ScanConstants(lua_State *L, boolean mathlib, const char *word)
return 0;
}
- if (fastcmp(word, "BT_USE")) // Remove case when 2.3 nears release...
+ // TODO: 2.3: Delete this alias
+ if (fastcmp(word, "BT_USE"))
{
CacheAndPushConstant(L, word, (lua_Integer)BT_SPIN);
return 1;
diff --git a/src/g_game.c b/src/g_game.c
index 962c2fd149..438428b90d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4347,7 +4347,7 @@ void G_LoadGameSettings(void)
}
#define GAMEDATA_ID 0x86E4A27C // Change every major version, as usual
-#define COMPAT_GAMEDATA_ID 0xFCAFE211 // Can be removed entirely for 2.3
+#define COMPAT_GAMEDATA_ID 0xFCAFE211 // TODO: 2.3: Delete
// G_LoadGameData
// Loads the main data file, which stores information such as emblems found, etc.
diff --git a/src/g_input.c b/src/g_input.c
index 97c0505a3c..8b50563313 100644
--- a/src/g_input.c
+++ b/src/g_input.c
@@ -1002,7 +1002,7 @@ static void setcontrol(INT32 (*gc)[2])
INT32 player = ((void*)gc == (void*)&gamecontrolbis ? 1 : 0);
boolean nestedoverride = false;
- // Update me for 2.3
+ // TODO: 2.3: Delete the "use" alias
namectrl = (stricmp(COM_Argv(1), "use")) ? COM_Argv(1) : "spin";
for (numctrl = 0; numctrl < NUM_GAMECONTROLS && stricmp(namectrl, gamecontrolname[numctrl]);
diff --git a/src/lua_maplib.c b/src/lua_maplib.c
index efa2edf20b..588a6b4e6c 100644
--- a/src/lua_maplib.c
+++ b/src/lua_maplib.c
@@ -1043,17 +1043,7 @@ static int line_get(lua_State *L)
lua_pushinteger(L, line->special);
return 1;
case line_tag:
- // HELLO
- // THIS IS LJ SONIC
- // HOW IS YOUR DAY?
- // BY THE WAY WHEN 2.3 OR 3.0 OR 4.0 OR SRB3 OR SRB4 OR WHATEVER IS OUT
- // YOU SHOULD REMEMBER TO CHANGE THIS SO IT ALWAYS RETURNS A UNSIGNED VALUE
- // HAVE A NICE DAY
- //
- //
- //
- //
- // you are ugly
+ // TODO: 2.3: Always return a unsigned value
lua_pushinteger(L, Tag_FGet(&line->tags));
return 1;
case line_taglist:
diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c
index ac829d0c4d..66d9c009b1 100644
--- a/src/lua_playerlib.c
+++ b/src/lua_playerlib.c
@@ -407,7 +407,7 @@ static int player_get(lua_State *L)
case player_realmo:
LUA_PushUserdata(L, plr->mo, META_MOBJ);
break;
- // Kept for backward-compatibility
+ // TODO: 2.3: Kept for backward-compatibility
// Should be fixed to work like "realmo" later
case player_mo:
if (plr->spectator)
diff --git a/src/p_mobj.c b/src/p_mobj.c
index a81845918b..1ec46d5289 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -10571,14 +10571,14 @@ static fixed_t P_DefaultMobjShadowScale (mobj_t *thing)
case MT_EXPLOSIONRING:
case MT_SCATTERRING:
case MT_GRENADERING:
-
+
case MT_BOUNCEPICKUP:
case MT_RAILPICKUP:
case MT_AUTOPICKUP:
case MT_EXPLODEPICKUP:
case MT_SCATTERPICKUP:
case MT_GRENADEPICKUP:
-
+
case MT_REDRING:
case MT_THROWNBOUNCE:
case MT_THROWNINFINITY:
@@ -13319,7 +13319,7 @@ static boolean P_SetupSpawnedMapThing(mapthing_t *mthing, mobj_t *mobj, boolean
return true;
}
-// Pre-UDMF backwards compatibility stuff. Remove for 2.3
+// TODO: 2.3: Delete (Pre-UDMF backwards compatibility stuff)
static void P_SetAmbush(mapthing_t *mthing, mobj_t *mobj)
{
if (mobj->type == MT_NIGHTSBUMPER
diff --git a/src/p_saveg.h b/src/p_saveg.h
index 73fcfd5836..545008e7ef 100644
--- a/src/p_saveg.h
+++ b/src/p_saveg.h
@@ -18,7 +18,7 @@
#pragma interface
#endif
-#define NEWSKINSAVES (INT16_MAX) // Purely for backwards compatibility, remove this for 2.3
+#define NEWSKINSAVES (INT16_MAX) // TODO: 2.3: Delete (Purely for backwards compatibility)
// Persistent storage/archiving.
// These are the load / save game routines.
--
GitLab