]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
make it compile
authorFruitieX <fruitiex@gmail.com>
Wed, 15 Dec 2010 12:08:39 +0000 (14:08 +0200)
committerFruitieX <fruitiex@gmail.com>
Wed, 15 Dec 2010 12:08:39 +0000 (14:08 +0200)
qcsrc/client/hud.qc
qcsrc/server/domination.qc

index a8d82dd76a9d0e6b23d85a0e171268bd65c298d8..c796f4cc751734404b05c01c40846a94dead334e 100644 (file)
@@ -4813,11 +4813,11 @@ void HUD_Mod_Dom(vector myPos, vector mySize)
        float row, column;
        for(i=0; i<teams_count; ++i)
        {
-               vector pos, size;
+               vector pos, itemSize;
                pos = myPos + eX * column * mySize_x*(1/columns) + eY * row * mySize_y*(1/rows);
-               size = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows);
+               itemSize = eX * mySize_x*(1/columns) + eY * mySize_y*(1/rows);
 
-               DrawDomItem(pos, size, aspect_ratio, layout, i);
+               DrawDomItem(pos, itemSize, aspect_ratio, layout, i);
 
                ++row;
                if(row >= rows)
index 2b6650b3d310ee3e8f514c30b58c8c37936a28ef..74c5edaddb188cbf12a1f63d7980fd4501b16862 100644 (file)
@@ -371,12 +371,12 @@ void dom_controlpoint_setup()
                self.wait = 5;
 
        float points, waittime;
-       if (g_domination_point_rate)
-               points = g_domination_point_rate;
+       if (autocvar_g_domination_point_rate)
+               points = autocvar_g_domination_point_rate;
        else
                points = self.frags;
-       if (g_domination_point_amt)
-               waittime = g_domination_point_amt;
+       if (autocvar_g_domination_point_amt)
+               waittime = autocvar_g_domination_point_amt;
        else
                waittime = self.wait;
 
@@ -722,8 +722,5 @@ void dom_init()
        precache_model("models/domination/dom_unclaimed.md3");
        precache_sound("domination/claim.wav");
        InitializeEntity(world, dom_delayedinit, INITPRIO_GAMETYPE);
-
-       g_domination_point_rate = cvar("g_domination_point_rate");
-       g_domination_point_amt = cvar("g_domination_point_amt");
 };