"Rocket Flying" mutator: also affect the Mine Layer

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

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index a20c31dd63e18ee5d133bf46dc62b970b1414e8d..b074164a5f5dbd90d0750b56e1e78a214cc37ecf 100644 (file)
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -181,6 +181,7 @@ void GameLogClose()
 vector PL_VIEW_OFS;
 vector PL_MIN;
 vector PL_MAX;
 vector PL_VIEW_OFS;
 vector PL_MIN;
 vector PL_MAX;

+vector PL_HEAD;

 vector PL_CROUCH_VIEW_OFS;
 vector PL_CROUCH_MIN;
 vector PL_CROUCH_MAX;
 vector PL_CROUCH_VIEW_OFS;
 vector PL_CROUCH_MIN;
 vector PL_CROUCH_MAX;


@@ -191,6 +192,7 @@ void relocate_spawnpoint()
     PL_VIEW_OFS                             = stov(cvar_string("sv_player_viewoffset"));
     PL_MIN                                  = stov(cvar_string("sv_player_mins"));
     PL_MAX                                  = stov(cvar_string("sv_player_maxs"));
     PL_VIEW_OFS                             = stov(cvar_string("sv_player_viewoffset"));
     PL_MIN                                  = stov(cvar_string("sv_player_mins"));
     PL_MAX                                  = stov(cvar_string("sv_player_maxs"));

+    PL_HEAD                                 = stov(cvar_string("sv_player_headsize"));

     PL_CROUCH_VIEW_OFS                      = stov(cvar_string("sv_player_crouch_viewoffset"));
     PL_CROUCH_MIN                           = stov(cvar_string("sv_player_crouch_mins"));
     PL_CROUCH_MAX                           = stov(cvar_string("sv_player_crouch_maxs"));
     PL_CROUCH_VIEW_OFS                      = stov(cvar_string("sv_player_crouch_viewoffset"));
     PL_CROUCH_MIN                           = stov(cvar_string("sv_player_crouch_mins"));
     PL_CROUCH_MAX                           = stov(cvar_string("sv_player_crouch_maxs"));


@@ -1182,7 +1184,7 @@ void readlevelcvars(void)
                MUTATOR_ADD(mutator_nix);
        if(cvar("g_dodging"))
                MUTATOR_ADD(mutator_dodging);
                MUTATOR_ADD(mutator_nix);
        if(cvar("g_dodging"))
                MUTATOR_ADD(mutator_dodging);

-       if(cvar("g_rocket_flying") || (cvar("g_balance_rocketlauncher_detonatedelay") == 0 && stof(cvar_defstring("g_balance_rocketlauncher_detonatedelay")) != 0))
+       if(cvar("g_rocket_flying"))

                MUTATOR_ADD(mutator_rocketflying);
 
     g_bugrigs = cvar("g_bugrigs");
                MUTATOR_ADD(mutator_rocketflying);
 
     g_bugrigs = cvar("g_bugrigs");


@@ -2276,9 +2278,11 @@ string getrankings()
         return strcat("Records for ", map, ":\n", s);
 }
 
         return strcat("Records for ", map, ":\n", s);
 }
 

-const float LADDER_FIRSTPOINT = 100;
-const float LADDER_CNT = 10; // position X still gives LADDER_FIRSTPOINT/X points
-const float LADDER_SIZE = 30; // ladder shows the top X players
+#define LADDER_FIRSTPOINT 100
+#define LADDER_CNT 10
+       // position X still gives LADDER_FIRSTPOINT/X points
+#define LADDER_SIZE 30
+       // ladder shows the top X players

 string top_uids[LADDER_SIZE];
 float top_scores[LADDER_SIZE];
 string getladder()
 string top_uids[LADDER_SIZE];
 float top_scores[LADDER_SIZE];
 string getladder()


@@ -2420,11 +2424,12 @@ string getladder()
     {
        s = strcat(s, "+-----");
     }
     {
        s = strcat(s, "+-----");
     }

-    if(LADDER_CNT > 9)
-           for (i = 1; i <= LADDER_CNT - 9; ++i)
-           {
-               s = strcat(s, "+------");
-           }
+#if LADDER_CNT > 9
+    for (i = 1; i <= LADDER_CNT - 9; ++i)
+    {
+       s = strcat(s, "+------");
+    }
+#endif

 
     s = strcat(s, "+--------------+--------------------\n");
 
 
     s = strcat(s, "+--------------+--------------------\n");
 


@@ -2440,11 +2445,12 @@ string getladder()
        {
            s = strcat(s, strpad(4, argv(j)), "^3| ^7"); // 1st, 2nd, 3rd etc cnt
        }
        {
            s = strcat(s, strpad(4, argv(j)), "^3| ^7"); // 1st, 2nd, 3rd etc cnt
        }

-       if(LADDER_CNT > 9)
-               for (j = 10; j <= LADDER_CNT; ++j)
-               {
-                   s = strcat(s, strpad(4, argv(j)), " ^3| ^7"); // 1st, 2nd, 3rd etc cnt
-               }
+#if LADDER_CNT > 9
+       for (j = 10; j <= LADDER_CNT; ++j)
+       {
+           s = strcat(s, strpad(4, argv(j)), " ^3| ^7"); // 1st, 2nd, 3rd etc cnt
+       }
+#endif

 
        s = strcat(s, strpad(13, argv(0)), "^3| ^7"); // speed award cnt
        s = strcat(s, uid2name(top_uids[i]), "\n"); // name
 
        s = strcat(s, strpad(13, argv(0)), "^3| ^7"); // speed award cnt
        s = strcat(s, uid2name(top_uids[i]), "\n"); // name