eater -> predator, because that's a more correct word

[voretournament/voretournament.git] / data / qcsrc / client / Main.qc

diff --git a/data/qcsrc/client/Main.qc b/data/qcsrc/client/Main.qc
index 245323c387c448124359578ffcaec37b64a176b9..5b5a22174724361fcc93144a7e6b4c2abca939f6 100644 (file)
--- a/data/qcsrc/client/Main.qc
+++ b/data/qcsrc/client/Main.qc
@@ -88,6 +88,8 @@ void CSQC_Init(void)
        registercmd("-button3");\r
        registercmd("+button4");\r
        registercmd("-button4");\r
        registercmd("-button3");\r
        registercmd("+button4");\r
        registercmd("-button4");\r

+       registercmd("+button6");\r
+       registercmd("-button6");\r

        registercmd("+showaccuracy");registercmd("-showaccuracy");\r
 \r
 #ifndef CAMERATEST\r
        registercmd("+showaccuracy");registercmd("-showaccuracy");\r
 \r
 #ifndef CAMERATEST\r


@@ -387,6 +389,12 @@ float CSQC_ConsoleCommand(string strMessage)
        } else if(strCmd == "-button3") { // secondary\r
                button_attack2 = 0;\r
                return false;\r
        } else if(strCmd == "-button3") { // secondary\r
                button_attack2 = 0;\r
                return false;\r

+       } else if(strCmd == "+button6") { // secondary\r
+               button_jetpack = 1;\r
+               return false;\r
+       } else if(strCmd == "-button6") { // secondary\r
+               button_jetpack = 0;\r
+               return false;\r

        } else if(strCmd == "+showscores") {\r
                sb_showscores = true;\r
                return true;\r
        } else if(strCmd == "+showscores") {\r
                sb_showscores = true;\r
                return true;\r


@@ -933,17 +941,8 @@ void CSQC_Ent_Remove()
 \r
 void Gamemode_Init()\r
 {\r
 \r
 void Gamemode_Init()\r
 {\r

-       if(gametype == GAME_ONSLAUGHT) {\r
+       if(gametype == GAME_ONSLAUGHT)\r

                print(strcat("Using ", minimapname, " as minimap.\n"));\r
                print(strcat("Using ", minimapname, " as minimap.\n"));\r

-               precache_pic("gfx/ons-cp-neutral.tga");\r
-               precache_pic("gfx/ons-cp-red.tga");\r
-               precache_pic("gfx/ons-cp-blue.tga");\r
-               precache_pic("gfx/ons-frame.tga");\r
-               precache_pic("gfx/ons-frame-team.tga");\r
-       } else if(gametype == GAME_KEYHUNT) {\r
-               precache_pic("gfx/sb_key_carrying");\r
-               precache_pic("gfx/sb_key_carrying_outline");\r
-       }\r

 \r
        if not(isdemo())\r
        {\r
 \r
        if not(isdemo())\r
        {\r


@@ -1211,7 +1210,7 @@ void Net_ReadOtherPLReport()
        if not(playerslots[e])\r
                return;\r
        playerslots[e].plhealth = ph;\r
        if not(playerslots[e])\r
                return;\r
        playerslots[e].plhealth = ph;\r

-       playerslots[e].pleater = pn;\r
+       playerslots[e].plpredator = pn;\r

 }\r
 \r
 void Net_VoteDialog(float highlight) {\r
 }\r
 \r
 void Net_VoteDialog(float highlight) {\r