X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qc;h=ac0bc8f6338fd0ae04a47ae8c4684701114788f7;hb=c045b87696a4fb7c1537b058cafaef23213c35bc;hp=a67a4e4239a79882c7da59b0bfeac8a3ca903211;hpb=0a51a35ab4cfaff9b2e349331b68f074f6152f8b;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index a67a4e423..ac0bc8f63 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -534,7 +534,7 @@ void GetCvars_handleString(string thisname, float f, .string field, string name)
 		}
 	}
 	else
-		stuffcmd(self, strcat("sendcvar ", name, "\n"));
+		stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n"));
 }
 void GetCvars_handleString_Fixup(string thisname, float f, .string field, string name, string(string) func)
 {
@@ -562,7 +562,7 @@ void GetCvars_handleFloat(string thisname, float f, .float field, string name)
 			self.field = stof(argv(f + 1));
 	}
 	else
-		stuffcmd(self, strcat("sendcvar ", name, "\n"));
+		stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n"));
 }
 void GetCvars_handleFloatOnce(string thisname, float f, .float field, string name)
 {
@@ -584,7 +584,7 @@ void GetCvars_handleFloatOnce(string thisname, float f, .float field, string nam
 	else
 	{
 		if(!self.field)
-			stuffcmd(self, strcat("sendcvar ", name, "\n"));
+			stuffcmd(self, strcat("cl_cmd sendcvar ", name, "\n"));
 	}
 }
 string W_FixWeaponOrder_ForceComplete(string s);
@@ -825,20 +825,30 @@ float g_pickup_fuel_jetpack;
 float g_pickup_fuel_max;
 float g_pickup_armorsmall;
 float g_pickup_armorsmall_max;
+float g_pickup_armorsmall_anyway;
 float g_pickup_armormedium;
 float g_pickup_armormedium_max;
+float g_pickup_armormedium_anyway;
 float g_pickup_armorbig;
 float g_pickup_armorbig_max;
+float g_pickup_armorbig_anyway;
 float g_pickup_armorlarge;
 float g_pickup_armorlarge_max;
+float g_pickup_armorlarge_anyway;
 float g_pickup_healthsmall;
 float g_pickup_healthsmall_max;
+float g_pickup_healthsmall_anyway;
 float g_pickup_healthmedium;
 float g_pickup_healthmedium_max;
+float g_pickup_healthmedium_anyway;
 float g_pickup_healthlarge;
 float g_pickup_healthlarge_max;
+float g_pickup_healthlarge_anyway;
 float g_pickup_healthmega;
 float g_pickup_healthmega_max;
+float g_pickup_healthmega_anyway;
+float g_pickup_ammo_anyway;
+float g_pickup_weapons_anyway;
 float g_weaponarena;
 float g_weaponarena_random;
 string g_weaponarena_list;
@@ -1262,20 +1272,31 @@ void readlevelcvars(void)
 	g_pickup_fuel_max = cvar("g_pickup_fuel_max");
 	g_pickup_armorsmall = cvar("g_pickup_armorsmall");
 	g_pickup_armorsmall_max = cvar("g_pickup_armorsmall_max");
+	g_pickup_armorsmall_anyway = cvar("g_pickup_armorsmall_anyway");
 	g_pickup_armormedium = cvar("g_pickup_armormedium");
 	g_pickup_armormedium_max = cvar("g_pickup_armormedium_max");
+	g_pickup_armormedium_anyway = cvar("g_pickup_armormedium_anyway");
 	g_pickup_armorbig = cvar("g_pickup_armorbig");
 	g_pickup_armorbig_max = cvar("g_pickup_armorbig_max");
+	g_pickup_armorbig_anyway = cvar("g_pickup_armorbig_anyway");
 	g_pickup_armorlarge = cvar("g_pickup_armorlarge");
 	g_pickup_armorlarge_max = cvar("g_pickup_armorlarge_max");
+	g_pickup_armorlarge_anyway = cvar("g_pickup_armorlarge_anyway");
 	g_pickup_healthsmall = cvar("g_pickup_healthsmall");
 	g_pickup_healthsmall_max = cvar("g_pickup_healthsmall_max");
+	g_pickup_healthsmall_anyway = cvar("g_pickup_healthsmall_anyway");
 	g_pickup_healthmedium = cvar("g_pickup_healthmedium");
 	g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
+	g_pickup_healthmedium_anyway = cvar("g_pickup_healthmedium_anyway");
 	g_pickup_healthlarge = cvar("g_pickup_healthlarge");
 	g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
+	g_pickup_healthlarge_anyway = cvar("g_pickup_healthlarge_anyway");
 	g_pickup_healthmega = cvar("g_pickup_healthmega");
 	g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
+	g_pickup_healthmega_anyway = cvar("g_pickup_healthmega_anyway");
+
+	g_pickup_ammo_anyway = cvar("g_pickup_ammo_anyway");
+	g_pickup_weapons_anyway = cvar("g_pickup_weapons_anyway");
 
 	g_pinata = cvar("g_pinata");
 
@@ -1583,6 +1604,7 @@ void precache()
         precache_all_playermodels("models/player/*.dpm");
         precache_all_playermodels("models/player/*.md3");
         precache_all_playermodels("models/player/*.psk");
+        precache_all_playermodels("models/player/*.iqm");
     }
 
     if (cvar("sv_defaultcharacter"))
@@ -1894,6 +1916,13 @@ void adaptor_think2use()
     activator = a;
 }
 
+void adaptor_think2use_hittype_splash() // for timed projectile detonation
+{
+	if not(self.flags & FL_ONGROUND) // if onground, we ARE touching something, but HITTYPE_SPLASH is to be networked if the damage causing projectile is not touching ANYTHING
+		self.projectiledeathtype |= HITTYPE_SPLASH;
+	adaptor_think2use();
+}
+
 // deferred dropping
 void DropToFloor_Handler()
 {
@@ -2325,7 +2354,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
 			{
 				// center
 				vecs_y = 0;
-				vecs_z -= 4;
+				vecs_z -= 2;
 			}
 			else
 			{
@@ -2338,7 +2367,7 @@ vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter
 			{
 				// center
 				vecs_y = 0;
-				vecs_z -= 4;
+				vecs_z -= 2;
 			}
 			else
 			{
@@ -2376,7 +2405,7 @@ vector shotorg_adjust(vector vecs, float y_is_right, float visual)
 		else
 		{
 			vecs_y = 0;
-			vecs_z -= 4;
+			vecs_z -= 2;
 		}
 	}
 	else if ((s = cvar_string("g_shootfromfixedorigin")) != "")