Temporary workaround for tempstring offset console spam in Xonotic.

Check if garbage collection is enabled before calling PRVM_GetString when handling OP_STORE_S or OP_STOREP_S

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12540 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/prvm_execprogram.h b/prvm_execprogram.h
index 256676e9bad58331d972bd2a2eadfc8c0deedbab..a6c45c98c47379dbada45e3111ef193b43626aa7 100644 (file)
--- a/prvm_execprogram.h
+++ b/prvm_execprogram.h
@@ -1,3 +1,4 @@
+extern cvar_t prvm_garbagecollection_enable;
 // NEED to reset startst after calling this! startst may or may not be clobbered!
 #define ADVANCE_PROFILE_BEFORE_JUMP() \
        prog->xfunction->profile += (st - startst); \
@@ -289,7 +290,8 @@
                                // against a certain sort of repeated migration to earlier
                                // points in the scan that could otherwise result in the string
                                // being freed for being unused
-                               PRVM_GetString(prog, OPA->_int);
+                               if(prvm_garbagecollection_enable.integer)
+                                       PRVM_GetString(prog, OPA->_int);
                                OPB->_int = OPA->_int;
                        DISPATCH_OPCODE();
                        HANDLE_OPCODE(OP_STORE_V):
@@ -338,7 +340,8 @@
                                // against a certain sort of repeated migration to earlier
                                // points in the scan that could otherwise result in the string
                                // being freed for being unused
-                               PRVM_GetString(prog, OPA->_int);
+                               if(prvm_garbagecollection_enable.integer)
+                                       PRVM_GetString(prog, OPA->_int);
                                ptr = (prvm_eval_t *)(cached_edictsfields + OPB->_int);
                                ptr->_int = OPA->_int;
                                DISPATCH_OPCODE();