completed q2r. removed some debug messages from quake2 and added a comment to G_LINKENTITY section. added cast for a cvar intptr_t->int in q3a code.

thecybermind · thecybermind · commit 3b91e4e0ba24 · 2025-12-31T02:06:21.000+02:00
diff --git a/src/game_q2r.cpp b/src/game_q2r.cpp
@@ -16,20 +16,190 @@ Created By:
 #include "version.h"
 #include "game.h"
 
+#include "util.h"
 #include "main.h"
 
+// pointer to start of item list
+static gitem_t* s_itemlist = nullptr;
+
+// ignore G_INFO_VALUEFORKEY if inside GAME_CLIENT_USERINFO_CHANGED
+static bool s_in_client_userinfo_changed = false;
+
+
+// find entity by userinfo pointer
+gentity_t* FindEntityByUserinfo(const char* userinfo) {
+    int i = 0;
+    gentity_t* ent = nullptr;
+    while (i < g_numgents) {
+        ent = ENT_FROM_NUM(i);
+        i++;
+
+        if (!ent->client || !ent->inuse)
+            continue;
+        // gi.Info_ValueForKey(ent->client->pers.userinfo, "fov", val, sizeof(val));
+        if (ent->client->pers.userinfo == userinfo)
+            return ent;
+    }
+
+    return nullptr;
+}
+
+
+// find item in s_itemlist by classname
+gitem_t* FindItemByClassname(const char* classname) {
+    if (!s_itemlist)
+        return nullptr;
+
+    // skip the first blank entry
+    gitem_t* item = s_itemlist + 1;
+    while (item->classname) {
+        if (!strcmp(item->classname, classname))
+            return item;
+        item++;
+    }
+
+    return nullptr;
+}
+
 
 intptr_t GAME_vmMain(intptr_t cmd, intptr_t* args) {
+    // this is called to give the mod level-placed entity info at the start of the map
+    // unfortunately, stripper may modify weapons if it gets loaded AFTER rocketmod. no real way to fix this
+    // also, don't do this if rocketmod_enabled is 0
+    if (cmd == GAME_SPAWN_ENTITIES && QMM_GETINTCVAR(PLID, "rocketmod_enabled")) {
+        // change spawn objects:
+        // weapon_* -> weapon_rocketlauncher
+        // ammo_* -> ammo_rockets
+
+        // if entstring is null or empty, cancel
+        const char* entstring = (const char*)(args[1]);
+        if (!entstring || !*entstring)
+            QMM_RET_IGNORED(0);
+
+        std::vector<std::string> tokenlist = tokenlist_from_entstring(entstring);
+
+        // the next token is the entity's classname
+        bool is_classname = false;
+        int weapons = 0;
+        int ammo = 0;
+
+        for (auto& token : tokenlist) {
+            // if this is the value string for a "classname" key, check it
+            if (is_classname) {
+                is_classname = false;
+
+                // if its a weapon entity, make it a rocket launcher
+                if (token.substr(0, 7) == "weapon_") {
+                    token = "weapon_rocketlauncher";
+                    weapons++;
+                }
+                // if its an ammo entity, make it a rocket ammo pack
+                else if (token.substr(0, 5) == "ammo_") {
+                    token = "ammo_rockets";
+                    ammo++;
+                }
+            }
+            // if this token is "classname", then the next token is the actual class name
+            else if (token == "classname") {
+                is_classname = true;
+            }
+        }
+
+        entstring = entstring_from_tokenlist(tokenlist);
+        args[1] = (intptr_t)entstring;
+    }
+
+    // we use G_INFO_VALUEFORKEY with a key of "fov" to determine if a user has respawned. but that is also checked
+    // inside ClientUserinfoChanged. so we set a flag to ignore it in GAME_CLIENT_USERINFO_CHANGED and clear in _Post
+    if (cmd == GAME_CLIENT_USERINFO_CHANGED) {
+        s_in_client_userinfo_changed = true;
+    }
+
     QMM_RET_IGNORED(0);
 }
 
 
 intptr_t GAME_syscall(intptr_t cmd, intptr_t* args) {
+    // this is called with "fov" as key in PutClientInServer after initialization and before ChangeWeapon.
+    // this is also called in ClientUserinfoChanged but we ignore that one
+    if (cmd == G_INFO_VALUEFORKEY && !s_in_client_userinfo_changed && QMM_GETINTCVAR(PLID, "rocketmod_enabled")) {
+        // pointer to rocket launcher item
+        static gitem_t* item_rocketlauncher = nullptr;
+
+        // gi.Info_ValueForKey(ent->client->pers.userinfo, "fov", val, sizeof(val));
+        const char* userinfo = (const char*)args[0];
+        const char* key = (const char*)args[1];
+
+        // skip if key is not "fov"
+        if (strcmp(key, "fov") != 0)
+            QMM_RET_IGNORED(0);
+
+        // we need to check each entity to see which has this userinfo string
+        gentity_t* ent = FindEntityByUserinfo(userinfo);
+
+        // make sure ent is not null and it is in use
+        if (!ent || !ent->inuse || !ent->client)
+            QMM_RET_IGNORED(0);
+
+        // make sure ent is a player
+        if (strcmp(ent->classname, "player") != 0)
+            QMM_RET_IGNORED(0);
+
+        // most everything after this references the client persistant data, so get a shortcut
+        client_persistant_t* pers = &ent->client->pers;
+
+        // make sure client is not a spectator
+        if (pers->spectator)
+            QMM_RET_IGNORED(0);
+
+        // find the rocketlauncher item based on first spawned player's blaster:
+        // the item list starts and ends with empty gitem_t objects, so grab a valid pointer to a blaster,
+        // and scan back to the beginning null entry. then use FindItemByClassname to find items in the list
+        if (!item_rocketlauncher) {
+            gitem_t* item_weapon = pers->weapon;
+            if (item_weapon) {
+                gitem_t* item = item_weapon;
+                // go back to the beginning of the item list
+                while (item->classname)
+                    item--;
+                // save for lookups
+                s_itemlist = item;
+                // look up item
+                item_rocketlauncher = FindItemByClassname("weapon_rocketlauncher");
+            }
+        }
+
+        // still couldn't find rocketlauncher item, cancel
+        if (!item_rocketlauncher) {
+            QMM_RET_IGNORED(0);
+        }
+
+        // remove everything from inventory
+        pers->inventory.fill(0);
+        // set inventory count for rocket launcher to 1
+        pers->inventory[IT_WEAPON_RLAUNCHER] = 1;
+        // set weapon to rocket launcher gitem_t
+        pers->weapon = item_rocketlauncher;
+        // set ammo to cvar (cap at max)
+        int start_ammo = (int)QMM_GETINTCVAR(PLID, "rocketmod_ammo");
+        if (start_ammo > pers->max_ammo[AMMO_ROCKETS])
+            start_ammo = pers->max_ammo[AMMO_ROCKETS];
+        pers->inventory[IT_AMMO_ROCKETS] = start_ammo;
+        // give chainfist if gauntlet cvar is enabled
+        if (QMM_GETINTCVAR(PLID, "rocketmod_gauntlet"))
+            pers->inventory[IT_WEAPON_CHAINFIST] = 1;
+    }
     QMM_RET_IGNORED(0);
 }
 
 
 intptr_t GAME_vmMain_Post(intptr_t cmd, intptr_t* args) {
+    // we use G_INFO_VALUEFORKEY with a key of "fov" to determine if a user has respawned. but that is also checked
+    // inside ClientUserinfoChanged. so we set a flag to ignore it in GAME_CLIENT_USERINFO_CHANGED and clear in _Post
+    if (cmd == GAME_CLIENT_USERINFO_CHANGED) {
+        s_in_client_userinfo_changed = false;
+    }
+
     QMM_RET_IGNORED(0);
 }
 
diff --git a/src/game_q3a.cpp b/src/game_q3a.cpp
@@ -44,7 +44,7 @@ intptr_t GAME_syscall(intptr_t cmd, intptr_t* args) {
 				client->ps.stats[STAT_WEAPONS] |= 1 << WP_GAUNTLET;
 
 			// give rockets and clear machinegun ammo
-			client->ps.ammo[WP_ROCKET_LAUNCHER] = QMM_GETINTCVAR(PLID, "rocketmod_ammo");
+			client->ps.ammo[WP_ROCKET_LAUNCHER] = (int)QMM_GETINTCVAR(PLID, "rocketmod_ammo");
 			if (client->ps.ammo[WP_ROCKET_LAUNCHER] <= 0)
 				client->ps.ammo[WP_ROCKET_LAUNCHER] = 10;
 			client->ps.ammo[WP_MACHINEGUN] = 0;
diff --git a/src/game_quake2.cpp b/src/game_quake2.cpp
@@ -56,8 +56,6 @@ intptr_t GAME_vmMain(intptr_t cmd, intptr_t* args) {
 
         std::vector<std::string> tokenlist = tokenlist_from_entstring(entstring);
 
-        QMM_WRITEQMMLOG(PLID, QMM_VARARGS(PLID, "%d tokens loaded from engine\n", tokenlist.size()), QMMLOG_DEBUG);
-
         // the next token is the entity's classname
         bool is_classname = false;
         int weapons = 0;
@@ -85,9 +83,6 @@ intptr_t GAME_vmMain(intptr_t cmd, intptr_t* args) {
             }
         }
 
-        QMM_WRITEQMMLOG(PLID, QMM_VARARGS(PLID, "%d weapons set to rocket launcher\n", weapons), QMMLOG_DEBUG);
-        QMM_WRITEQMMLOG(PLID, QMM_VARARGS(PLID, "%d ammo set to rockets\n", ammo), QMMLOG_DEBUG);
-
         entstring = entstring_from_tokenlist(tokenlist);
         args[1] = (intptr_t)entstring;
     }
@@ -107,6 +102,9 @@ intptr_t GAME_vmMain_Post(intptr_t cmd, intptr_t* args) {
 
 
 intptr_t GAME_syscall_Post(intptr_t cmd, intptr_t* args) {
+    // this is called near the end of PutClientInServer (respawn) and before ChangeWeapon().
+    // this is also called in ClientThink regularly, so we check a few things to verify that this is a
+    // respawn event and not during a regular Think
     if (cmd == G_LINKENTITY && QMM_GETINTCVAR(PLID, "rocketmod_enabled")) {
         // pointer to rocket launcher item
         static gitem_t* item_rocketlauncher = nullptr;
@@ -177,7 +175,7 @@ intptr_t GAME_syscall_Post(intptr_t cmd, intptr_t* args) {
         // set weapon to rocket launcher gitem_t
         pers->weapon = item_rocketlauncher;
         // set ammo to cvar (cap at max)
-        int start_ammo = QMM_GETINTCVAR(PLID, "rocketmod_ammo");
+        int start_ammo = (int)QMM_GETINTCVAR(PLID, "rocketmod_ammo");
         if (start_ammo > pers->max_rockets)
             start_ammo = pers->max_rockets;
         pers->inventory[item_index_rockets] = start_ammo;
