Merge branch 'master' into terencehill/hud_fixes

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / miscfunctions.qc

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 77239e7b14654eb477aced8d08245280da7dfd3b..65d38c8aa90ec3bb672e3edab877bf61d5422a4e 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -237,8 +237,8 @@ string formatmessage(string msg)
                        break; // too many replacements
 
                n = n - 1;
-               p1 = strstr(msg, "%", p); // NOTE: this destroys msg as it's a tempstring!
-               p2 = strstr(msg, "\\", p); // NOTE: this destroys msg as it's a tempstring!
+               p1 = strstrofs(msg, "%", p); // NOTE: this destroys msg as it's a tempstring!
+               p2 = strstrofs(msg, "\\", p); // NOTE: this destroys msg as it's a tempstring!
 
                if (p1 < 0)
                        p1 = p2;
@@ -410,8 +410,8 @@ REPLICATE(cvar_g_xonoticversion, string, "g_xonoticversion");
 /**
  * @param f -1: cleanup, 0: request, 1: receive
  */
-void GetCvars(int f)
-{SELFPARAM();
+void GetCvars(entity this, int f)
+{
        string s = string_null;
 
        if (f > 0)
@@ -754,7 +754,7 @@ void precache_playermodels(string s)
 }
 
 void precache()
-{SELFPARAM();
+{
     // gamemode related things
 
     // Precache all player models if desired