From: FruitieX <fruitiex@gmail.com>
Date: Wed, 15 Dec 2010 12:08:39 +0000 (+0200)
Subject: make it compile
X-Git-Tag: xonotic-v0.5.0~348^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a1a688aaa702dbebef8c8d7f9dadcd43d7cf1332;p=xonotic%2Fxonotic-data.pk3dir.git

make it compile
---

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index a8d82dd76..c796f4cc7 100644
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -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)
diff --git a/qcsrc/server/domination.qc b/qcsrc/server/domination.qc
index 2b6650b3d..74c5edadd 100644
--- a/qcsrc/server/domination.qc
+++ b/qcsrc/server/domination.qc
@@ -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");
 };