X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ft_items.qc;h=3151d7cdb1c86fb696128d439ef6a38213cff553;hp=5585806ddeeb1a66b6d24407925e6531f2b6c3f9;hb=2f215c603bf1b4dd44b9d166180f535c88602e9f;hpb=0327a004d488178f9c8711a15342fbd362d5d6ba

diff --git a/qcsrc/common/t_items.qc b/qcsrc/common/t_items.qc
index 5585806dde..3151d7cdb1 100644
--- a/qcsrc/common/t_items.qc
+++ b/qcsrc/common/t_items.qc
@@ -510,7 +510,7 @@ void Item_Respawn (entity this)
 	sound(this, CH_TRIGGER, this.itemdef.m_respawnsound, VOL_BASE, ATTEN_NORM);	// play respawn sound
 	setorigin(this, this.origin);
 
-    if (Item_ItemsTime_Allow(this.itemdef) || this.weapons & WEPSET_SUPERWEAPONS)
+    if (Item_ItemsTime_Allow(this.itemdef) || (this.weapons & WEPSET_SUPERWEAPONS))
 	{
 		float t = Item_ItemsTime_UpdateTime(this, 0);
 		Item_ItemsTime_SetTime(this, t);
@@ -538,7 +538,6 @@ void Item_RespawnCountdown (entity this)
 		this.count += 1;
 		if(this.count == 1)
 		{
-			MUTATOR_CALLHOOK(Item_RespawnCountdown, string_null, '0 0 0');
 			do {
 				{
 					entity wi = Weapons_from(this.weapon);
@@ -557,10 +556,11 @@ void Item_RespawnCountdown (entity this)
 					}
 				}
 			} while (0);
+			bool mutator_returnvalue = MUTATOR_CALLHOOK(Item_RespawnCountdown, this);
             if(this.waypointsprite_attached)
             {
                 GameItem def = this.itemdef;
-                if (Item_ItemsTime_SpectatorOnly(def))
+                if (Item_ItemsTime_SpectatorOnly(def) && !mutator_returnvalue)
                     WaypointSprite_UpdateRule(this.waypointsprite_attached, 0, SPRITERULE_SPECTATOR);
                 WaypointSprite_UpdateBuildFinished(this.waypointsprite_attached, time + ITEM_RESPAWN_TICKS);
             }
@@ -595,15 +595,18 @@ void Item_RespawnThink(entity this)
 void Item_ScheduleRespawnIn(entity e, float t)
 {
 	// if the respawn time is longer than 10 seconds, show a waypoint, otherwise, just respawn normally
-	if ((Item_ItemsTime_Allow(e.itemdef) || e.weapons & WEPSET_SUPERWEAPONS) && (t - ITEM_RESPAWN_TICKS) > 0)
+	if ((Item_ItemsTime_Allow(e.itemdef) || (e.weapons & WEPSET_SUPERWEAPONS) || MUTATOR_CALLHOOK(Item_ScheduleRespawn, e, t)) && (t - ITEM_RESPAWN_TICKS) > 0)
 	{
 		setthink(e, Item_RespawnCountdown);
 		e.nextthink = time + max(0, t - ITEM_RESPAWN_TICKS);
 		e.scheduledrespawntime = e.nextthink + ITEM_RESPAWN_TICKS;
 		e.count = 0;
-		t = Item_ItemsTime_UpdateTime(e, e.scheduledrespawntime);
-		Item_ItemsTime_SetTime(e, t);
-		Item_ItemsTime_SetTimesForAllPlayers();
+		if(Item_ItemsTime_Allow(e.itemdef) || (e.weapons & WEPSET_SUPERWEAPONS))
+		{
+			t = Item_ItemsTime_UpdateTime(e, e.scheduledrespawntime);
+			Item_ItemsTime_SetTime(e, t);
+			Item_ItemsTime_SetTimesForAllPlayers();
+		}
 	}
 	else
 	{
@@ -611,6 +614,13 @@ void Item_ScheduleRespawnIn(entity e, float t)
 		e.nextthink = time;
 		e.scheduledrespawntime = time + t;
 		e.wait = time + t;
+
+		if(Item_ItemsTime_Allow(e.itemdef) || (e.weapons & WEPSET_SUPERWEAPONS))
+		{
+			t = Item_ItemsTime_UpdateTime(e, e.scheduledrespawntime);
+			Item_ItemsTime_SetTime(e, t);
+			Item_ItemsTime_SetTimesForAllPlayers();
+		}
 	}
 }
 
@@ -628,7 +638,7 @@ void Item_ScheduleRespawn(entity e)
 void Item_ScheduleInitialRespawn(entity e)
 {
 	Item_Show(e, 0);
-	Item_ScheduleRespawnIn(e, game_starttime - time + ((e.respawntimestart) ? e.respawntimestart : ITEM_RESPAWNTIME_INITIAL(e)));
+	Item_ScheduleRespawnIn(e, max(0, game_starttime - time) + ((e.respawntimestart) ? e.respawntimestart : ITEM_RESPAWNTIME_INITIAL(e)));
 }
 
 float Item_GiveAmmoTo(entity item, entity player, .float ammotype, float ammomax, float mode)
@@ -874,7 +884,7 @@ LABEL(pickup)
 				}
 			});
 			e = RandomSelection_chosen_ent;
-
+			Item_Show(e, 1); // reset its state so it is visible (extra sendflags doesn't matter, this happens anyway)
 		}
 		else
 			e = this;
@@ -1354,9 +1364,8 @@ spawnfunc(item_rockets)
 
 spawnfunc(item_bullets)
 {
-	if(!weaponswapping)
-	if(autocvar_sv_q3acompat_machineshotgunswap)
-	if(this.classname != "droppedweapon")
+	if(!weaponswapping && autocvar_sv_q3acompat_machineshotgunswap && 
+	   (this.classname != "droppedweapon"))
 	{
 		weaponswapping = true;
 		spawnfunc_item_shells(this);
@@ -1379,9 +1388,8 @@ spawnfunc(item_plasma)
 
 spawnfunc(item_shells)
 {
-	if(!weaponswapping)
-	if(autocvar_sv_q3acompat_machineshotgunswap)
-	if(this.classname != "droppedweapon")
+	if(!weaponswapping && autocvar_sv_q3acompat_machineshotgunswap &&
+	   (this.classname != "droppedweapon"))
 	{
 		weaponswapping = true;
 		spawnfunc_item_bullets(this);
@@ -1463,10 +1471,9 @@ void target_items_use(entity this, entity actor, entity trigger)
 		return;
 	}
 
-	if (!IS_PLAYER(actor))
-		return;
-	if(IS_DEAD(actor))
+	if (!IS_PLAYER(actor) || IS_DEAD(actor))
 		return;
+
 	if(trigger.solid == SOLID_TRIGGER)
 	{
 		EXACTTRIGGER_TOUCH(this, trigger);
@@ -1483,7 +1490,7 @@ void target_items_use(entity this, entity actor, entity trigger)
 
 spawnfunc(target_items)
 {
-	int n, j;
+	int n;
 	string s;
 
 	this.use = target_items_use;
@@ -1501,7 +1508,7 @@ spawnfunc(target_items)
 	}
 	else
 	{
-		for(j = 0; j < n; ++j)
+		for(int j = 0; j < n; ++j)
 		{
 			if     (argv(j) == "unlimited_ammo")         this.items |= IT_UNLIMITED_AMMO;
 			else if(argv(j) == "unlimited_weapon_ammo")  this.items |= IT_UNLIMITED_WEAPON_AMMO;
@@ -1585,7 +1592,7 @@ spawnfunc(target_items)
 	//print(this.netname, "\n");
 
 	n = tokenize_console(this.netname);
-	for(j = 0; j < n; ++j)
+	for(int j = 0; j < n; ++j)
 	{
 		FOREACH(Weapons, it != WEP_Null && W_UndeprecateName(argv(j)) == it.netname, {
             it.wr_init(it);
@@ -1910,7 +1917,11 @@ float GiveItems(entity e, float beginarg, float endarg)
 		{
 			.entity weaponentity = weaponentities[slot];
 			if(_switchweapon & BIT(slot))
-				W_SwitchWeapon_Force(e, w_getbestweapon(e, weaponentity), weaponentity);
+			{
+				Weapon wep = w_getbestweapon(e, weaponentity);
+				if(wep != e.(weaponentity).m_switchweapon)
+					W_SwitchWeapon_Force(e, wep, weaponentity);
+			}
 		}
 	}