From: Samual <samual@xonotic.org>
Date: Mon, 2 Apr 2012 06:58:00 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/mutator_ctf
X-Git-Tag: xonotic-v0.7.0~240^2~99
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=05fb311552c975dd88c475fdba312c361c95bacf;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/mutator_ctf

Conflicts:
	qcsrc/server/mutators/base.qh
---

05fb311552c975dd88c475fdba312c361c95bacf
diff --cc qcsrc/server/mutators/base.qh
index a8828f8c6,236e311b6..cd9c36fa0
--- a/qcsrc/server/mutators/base.qh
+++ b/qcsrc/server/mutators/base.qh
@@@ -206,30 -206,9 +206,37 @@@ MUTATOR_HOOKABLE(SetModname)
  	// OUT
  	string modname; // name of the mutator/mod if it warrants showing as such in the server browser
  
+ MUTATOR_HOOKABLE(SetWeaponreplace);
+ 	// IN
+ 		entity self; // map entity
+ 		entity other; // weapon info
+ 	// IN+OUT
+ 		string ret_string;
++
 +MUTATOR_HOOKABLE(PortalTeleport);
 +	// called whenever a player goes through a portal gun teleport
 +	// allows you to strip a player of an item if they go through the teleporter to help prevent cheating
 +	// INPUT
 +	entity self;
 +	
 +MUTATOR_HOOKABLE(HelpMePing);
 +	// called whenever a player uses impulse 33 (help me) in cl_impulse.qc
 +	// normally help me ping uses self.waypointsprite_attachedforcarrier,
 +	// but if your mutator uses something different then you can handle it
 +	// in a special manner using this hook
 +	// INPUT
 +	entity self; // the player who pressed impulse 33
 +	
 +MUTATOR_HOOKABLE(VehicleEnter);
 +	// called when a player enters a vehicle
 +	// allows mutators to set special settings in this event
 +	// INPUT
 +	entity other; // the player
 +	entity self; // the vehicle
 +	
 +MUTATOR_HOOKABLE(VehicleExit);
 +	// called when a player exits a vehicle
 +	// allows mutators to set special settings in this event
 +	// INPUT
 +	entity other; // the player
 +	entity self; // the vehicle
diff --cc qcsrc/server/mutators/mutators.qh
index debdae989,4e7d9a651..7c797848a
--- a/qcsrc/server/mutators/mutators.qh
+++ b/qcsrc/server/mutators/mutators.qh
@@@ -1,15 -1,14 +1,15 @@@
  MUTATOR_DECLARATION(gamemode_keyhunt);
  MUTATOR_DECLARATION(gamemode_freezetag);
  MUTATOR_DECLARATION(gamemode_keepaway);
 +MUTATOR_DECLARATION(gamemode_ctf);
  MUTATOR_DECLARATION(gamemode_nexball);
  
+ MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_invincibleprojectiles);
+ MUTATOR_DECLARATION(mutator_new_toys);
  MUTATOR_DECLARATION(mutator_nix);
- MUTATOR_DECLARATION(mutator_dodging);
  MUTATOR_DECLARATION(mutator_rocketflying);
- MUTATOR_DECLARATION(mutator_vampire);
- MUTATOR_DECLARATION(mutator_spawn_near_teammate);
  MUTATOR_DECLARATION(mutator_spawn_near_teammate);
+ MUTATOR_DECLARATION(mutator_vampire);
  
  MUTATOR_DECLARATION(sandbox);
diff --cc qcsrc/server/progs.src
index c20090022,1890eddd9..a0afb040c
--- a/qcsrc/server/progs.src
+++ b/qcsrc/server/progs.src
@@@ -206,12 -205,12 +206,13 @@@ playerstats.q
  ../common/explosion_equation.qc
  
  mutators/base.qc
 -mutators/gamemode_nexball.qc
 -mutators/gamemode_keyhunt.qc
 +mutators/gamemode_ctf.qc
  mutators/gamemode_freezetag.qc
 +mutators/gamemode_keyhunt.qc
  mutators/gamemode_keepaway.qc
 +mutators/gamemode_nexball.qc
  mutators/mutator_invincibleproj.qc
+ mutators/mutator_new_toys.qc
  mutators/mutator_nix.qc
  mutators/mutator_dodging.qc
  mutators/mutator_rocketflying.qc