X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fserver%2Ft_quake3.qc;h=d55c8cbd636878105d0a4cfffc4fe4d40d8f9049;hb=0ee74987765518ffed584a790f90607c3f3f8e71;hp=f2a1138d82e71ebcd5d9f644a8494645c92bea08;hpb=3ec964f96486cbe7f8e39a2d1badcc361370fafb;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index f2a1138d8..d55c8cbd6 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -14,17 +14,17 @@ void spawnfunc_ammo_bullets()        { spawnfunc_item_bullets();        }
 // GL -> Mortar
 void spawnfunc_ammo_grenades()       { spawnfunc_item_rockets();        }
 
-// LG -> Electro
-void spawnfunc_weapon_lightning()    { spawnfunc_weapon_electro();      }
+// LG -> Lightning
+//void spawnfunc_weapon_lightning()    { spawnfunc_weapon_electro();      }
 void spawnfunc_ammo_lightning()      { spawnfunc_item_cells();          }
 
 // Plasma -> Hagar
 void spawnfunc_weapon_plasmagun()    { spawnfunc_weapon_hagar();        }
 void spawnfunc_ammo_cells()          { spawnfunc_item_rockets();        }
 
-// Rail -> Rifle
-void spawnfunc_weapon_railgun()      { spawnfunc_weapon_rifle();  }
-void spawnfunc_ammo_slugs()          { spawnfunc_item_bullets();        }
+// Rail -> Nex
+void spawnfunc_weapon_railgun()      { spawnfunc_weapon_nex();          }
+void spawnfunc_ammo_slugs()          { spawnfunc_item_cells();          }
 
 // BFG -> Crylink
 void spawnfunc_weapon_bfg()          { spawnfunc_weapon_crylink();      }
@@ -72,11 +72,11 @@ void target_give_init()
 	entity targ;
 	for (targ = world; (targ = find(targ, targetname, self.target)); ) {
 		if (targ.classname == "weapon_rocketlauncher") {
-			self.ammo_rockets += targ.count * autocvar_g_balance_rocketlauncher_ammo;
+			self.ammo_rockets += targ.count * WEP_CVAR(devastator, ammo);
 			self.netname = "rocketlauncher";
 		}
 		else if (targ.classname == "weapon_plasmagun") {
-			self.ammo_rockets += targ.count * autocvar_g_balance_hagar_primary_ammo;
+			self.ammo_rockets += targ.count * WEP_CVAR_PRI(hagar, ammo); // WEAPONTODO
 			if(self.netname == "")
 				self.netname = "hagar";
 			else
@@ -90,7 +90,7 @@ void target_give_init()
 				self.netname = strcat(self.netname, " crylink");
 		}
 		else if (targ.classname == "weapon_grenadelauncher") {
-			self.ammo_rockets += targ.count * autocvar_g_balance_grenadelauncher_primary_ammo;
+			self.ammo_rockets += targ.count * autocvar_g_balance_mortar_primary_ammo; // WEAPONTODO
 			if(self.netname == "")
 				self.netname = "grenadelauncher";
 			else
@@ -122,12 +122,8 @@ void spawnfunc_target_give()
 //void spawnfunc_item_health_mega()  /* handled in t_items.qc */
 //void spawnfunc_item_invis()        /* not supported */
 //void spawnfunc_item_regen()        /* not supported */
-void spawnfunc_team_CTF_redflag()    { spawnfunc_item_flag_team1();    }
-void spawnfunc_team_CTF_blueflag()   { spawnfunc_item_flag_team2();    }
-void spawnfunc_team_CTF_redplayer()  { spawnfunc_info_player_team1();  }
-void spawnfunc_team_CTF_blueplayer() { spawnfunc_info_player_team2();  }
-void spawnfunc_team_CTF_redspawn()   { spawnfunc_info_player_team1();  }
-void spawnfunc_team_CTF_bluespawn()  { spawnfunc_info_player_team2();  }
+
+// CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
 
 void spawnfunc_item_flight()         { spawnfunc_item_jetpack();       }
 
@@ -142,11 +138,11 @@ float DoesQ3ARemoveThisEntity()
 	// Q3 style filters (DO NOT USE, THIS IS COMPAT ONLY)
 
 	if(self.notq3a)
-		if(!teams_matter || g_tdm || g_ctf)
+		if(!teamplay || g_tdm || g_ctf)
 			return 1;
 
 	if(self.notta)
-		if not(!teams_matter || g_tdm || g_ctf)
+		if (!(!teamplay || g_tdm || g_ctf))
 			return 1;
 
 	if(self.notsingle)
@@ -154,22 +150,20 @@ float DoesQ3ARemoveThisEntity()
 			return 1;
 
 	if(self.notteam)
-		if(teams_matter)
+		if(teamplay)
 			return 1;
 
 	if(self.notfree)
-		if(!teams_matter)
+		if(!teamplay)
 			return 1;
 
 	if(self.gametype)
 	{
 		string gametypename;
-		// static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"};
+		// static char *gametypeNames[] = {"ffa", "tournament", "single", "team", "ctf", "oneflag", "obelisk", "harvester", "teamtournament"}
 		gametypename = "ffa";
-		if(teams_matter)
+		if(teamplay)
 			gametypename = "team";
-		if(g_arena)
-			gametypename = "tournament";
 		if(g_ctf)
 			gametypename = "ctf";
 		if(maxclients == 1)