attempted merge at 1.77 back into trunk... Oh MY GOD

plugins/include/amxconst.inc

@@ -312,3 +312,11 @@ enum LibType
 	LibType_Library,
 	LibType_Class
 };
+
+enum AdminProp
+{
+	AdminProp_Auth = 0,
+	AdminProp_Password,
+	AdminProp_Access,
+	AdminProp_Flags
+};

plugins/include/amxmisc.inc

@@ -310,3 +310,19 @@ stock constraint_offset(low, high, seed, offset)
 	
 	return 0;	// Makes the compiler happy -_-
 }
+
+/* Returns true if the user has ANY of the provided flags
+ * false if they have none 
+ */
+stock has_flag(id, const flags[]) 
+{
+	return (get_user_flags(id) & read_flags(flags));
+}
+/* Returns true if the user has ALL of the provided flags
+ * false otherwise
+ */
+stock has_all_flags(id, const flags[]) 
+{
+	new FlagsNumber=read_flags(flags);
+	return ((get_user_flags(id) & FlagsNumber)==FlagsNumber);
+}

plugins/include/amxmodx.inc

@@ -239,7 +239,7 @@ native user_has_weapon(index,weapon,setweapon=-1);
 
 /* Returns id of currently carried weapon. Gets also 
 * ammount of ammo in clip and backpack. */
-native get_user_weapon(index,&clip,&ammo);
+native get_user_weapon(index,&clip=0,&ammo=0);
 
 /* Gets ammo and clip from current weapon. */
 native get_user_ammo(index,weapon,&clip,&ammo);
@@ -474,14 +474,18 @@ native get_user_flags(index,id=0);
 native remove_user_flags(index,flags=-1,id=0);
 
 /* Registers function which will be called from client console. 
+ * Set FlagManager to 1 to make FlagManager always include this command
+ * Set FlagManager to 0 to make FlagManager never include this command
  * Returns the command ID.
  */
-native register_clcmd(const client_cmd[],const function[],flags=-1, const info[]="");
+native register_clcmd(const client_cmd[],const function[],flags=-1, const info[]="", FlagManager=-1);
 
 /* Registers function which will be called from any console. 
+ * Set FlagManager to 1 to make FlagManager always include this command
+ * Set FlagManager to 0 to make FlagManager never include this command
  * Returns the command ID.
  */
-native register_concmd(const cmd[],const function[],flags=-1, const info[]="");
+native register_concmd(const cmd[],const function[],flags=-1, const info[]="", FlagManager=-1);
 
 /* Registers function which will be called from server console. 
  * Returns the command ID.
@@ -609,7 +613,7 @@ native is_plugin_loaded(const name[]);
  * Note: the [...] portion should not be used, and is only for backward compatibility.
  * Use index of -1 to use the calling plugin's ID.
  */
-native get_plugin(index,filename[],len1,name[],len2,version[],len3,author[],len4,status[],len5,...);
+native get_plugin(index,filename[]="",len1=0,name[]="",len2=0,version[]="",len3=0,author[]="",len4=0,status[]="",len5=0,...);
 
 /* Returns number of all loaded plugins. */
 native get_pluginsnum();
@@ -826,7 +830,8 @@ native menu_destroy(menu);
 
 //Gets info about a player's menu.  Returns 1 if the player is viewing a menu.
 //menu will be >0 for a valid oldmenu.  newmenu will be != -1 for a valid newmenu.
-native player_menu_info(id, &menu, &newmenu);
+//As of 1.77, there is an optional page parameter.
+native player_menu_info(id, &menu, &newmenu, &menupage=0);
 
 //adds a blank line to a menu.
 //if slot is nonzero (default), the blank line will increase
@@ -1080,6 +1085,7 @@ native set_pcvar_num(pcvar, num);
 native Float:get_pcvar_float(pcvar);
 native set_pcvar_float(pcvar, Float:num);
 native get_pcvar_string(pcvar, string[], maxlen);
+native set_pcvar_string(pcvar, const string[]);
 
 /**
  * Sets a whole array to a certain value.
@@ -1092,5 +1098,29 @@ native arrayset(array[], value, size);
  */
 native get_weaponid(const name[]);
 
+/**
+ * Adds an admin to the dynamic admin storage
+ * for lookup at a later time
+ */
+native admins_push(const AuthData[], const Password[], Access, Flags);
+
+/**
+ * Gets the number of admins in the dynamic admin
+ * storage list
+ */
+native admins_num();
+
+/**
+ * Gets information about a dynamically stored admin
+ * Use the enum AdminProp
+ * Returns an integer value: AdminProp_Access, AdminProp_Flags
+ * Sets the buffer string: AdminProp_Auth, AdminProp_Password
+ */
+native admins_lookup(num, AdminProp:Property, Buffer[]="", BufferSize=0);
+
+/**
+ * Clears the list of dynamically stored admins
+ */
+native admins_flush();
 // Keep this always at the bottom of this file
 #include <message_stocks>

plugins/include/dodconst.inc

@@ -24,6 +24,27 @@
 
 #define DODMAX_WEAPONS		46 // 5 slots for custom weapons
 
+// DoD Weapon Types
+enum
+{
+	DODWT_PRIMARY = 0,
+	DODWT_SECONDARY,
+	DODWT_MELEE,
+	DODWT_GRENADE, 
+	DODWT_OTHER
+};
+
+// Ammo Channels
+#define AMMO_SMG 1 		// thompson, greasegun, sten, mp40
+#define AMMO_ALTRIFLE 2 	// carbine, k43, mg34
+#define AMMO_RIFLE 3 		// garand, enfield, scoped enfield, k98, scoped k98
+#define AMMO_PISTOL 4 		// colt, webley, luger
+#define AMMO_SPRING 5 		// springfield
+#define AMMO_HEAVY 6 		// bar, bren, stg44, fg42, scoped fg42
+#define AMMO_MG42 7    		// mg42
+#define AMMO_30CAL 8 		// 30cal
+#define AMMO_GREN 9 		// grenades (should be all 3 types)
+#define AMMO_ROCKET 13 		// bazooka, piat, panzerschreck
 enum { 
 	PS_NOPRONE =0,
 	PS_PRONE,

plugins/include/dodfun.inc

@@ -23,6 +23,9 @@
 /* Function is called after grenade throw */
 forward grenade_throw(index,greindex,wId);
 
+/* Function is called after a rocket is shot */
+forward rocket_shoot(index,rocketindex,wId);
+
 /* Example: for full stamina use dod_player_stamina(1,STAMINA_SET,100,100) */
 /* value is from 0 - 100 */
 native dod_set_stamina(index,set=STAMINA_SET,minvalue=0,maxvalue=100);

plugins/include/dodx.inc

@@ -53,6 +53,44 @@ forward dod_client_changeclass(id, class, oldclass);
 /* This Forward is called when a player spawns */
 forward dod_client_spawn(id);
 
+/* This will be called whenever a player scopes or unscopes
+value = 1 scope up
+value = 0 scope down */
+forward dod_client_scope(id, value);
+
+/* This will be called whenever a player drops a weapon 
+weapon is weapon dropped or picked up 
+value = 1 picked up
+value = 0 dropped */
+forward dod_client_weaponpickup(id, weapon, value);
+
+/* Called whenever the the player goes to or comes from prone position 
+value = 1 going down
+value = 0 getting up */
+forward dod_client_prone(id, value);
+
+/* This will be called whenever a player switches a weapon */
+forward dod_client_weaponswitch(id, wpnew, wpnold);
+
+/* Forward for when a grenade explodes and its location */
+forward dod_grenade_explosion(id, pos[3], wpnid);
+
+/* Forward for when a rocket explodes and its location */
+forward dod_rocket_explosion(id, pos[3], wpnid);
+
+/* Forward for when a player picks up a object */
+forward dod_client_objectpickup(id, objid, pos[3], value);
+
+/* Forward for when a users stamina decreases */
+forward dod_client_stamina(id, stamina);
+
+/* We want to get just the weapon of whichever type that the player is on him 
+Use DODWT_* in dodconst.inc for type */
+native dod_weapon_type(id, type);
+
+/* This native will change the position of a weapon within the users slots and its ammo ammount */
+native dod_set_weaponlist(id, wpnID, slot, dropslot, totalrds);
+
 /* Sets the model for a player */
 native dod_set_model(id, const model[]);
 
@@ -102,7 +140,7 @@ native dod_get_map_info( info );
 
 /* Returns id of currently carried weapon. Gets also 
 * ammount of ammo in clip and backpack. */
-native dod_get_user_weapon(index,&clip,&ammo);
+native dod_get_user_weapon(index,&clip=0,&ammo=0);
 
 /* Returns team score */
 native dod_get_team_score(teamId);

plugins/include/float.inc

@@ -176,4 +176,38 @@ stock bool:operator!(Float:oper)
 /* forbidden operations */
 forward operator%(Float:oper1, Float:oper2);
 forward operator%(Float:oper1, oper2);
-forward operator%(oper1, Float:oper2);
+forward operator%(oper1, Float:oper2);
+
+
+stock Float:floatmin(Float:ValueA, Float:ValueB)
+{
+	if (ValueA<=ValueB)
+	{
+		return ValueA;
+	}
+	
+	return ValueB;
+}
+
+stock Float:floatmax(Float:ValueA, Float:ValueB)
+{
+	if (ValueA>=ValueB)
+	{
+		return ValueA;
+	}
+	
+	return ValueB;
+}
+stock Float:floatclamp(Float:Value, Float:MinValue, Float:MaxValue)
+{
+	if (Value<=MinValue)
+	{
+		return MinValue;
+	}
+	if (Value>=MaxValue)
+	{
+		return MaxValue;
+	}
+	
+	return Value;
+}

plugins/include/hlsdk_const.inc

@@ -466,3 +466,16 @@
 #define HLW_SNARK			15
 #define HLW_SUIT			31
 #define HLW_ALLWEAPONS			(~(1<<HLW_SUIT))
+
+
+#define FEV_NOTHOST		(1<<0)	// Skip local host for event send.
+#define FEV_RELIABLE	(1<<1)	// Send the event reliably.  You must specify the origin and angles 
+								// for this to work correctly on the server for anything
+								// that depends on the event origin/angles.  I.e., the origin/angles are not
+								// taken from the invoking edict for reliable events.
+#define FEV_GLOBAL		(1<<2)	// Don't restrict to PAS/PVS, send this event to _everybody_ on the server ( useful for stopping CHAN_STATIC
+								//  sounds started by client event when client is not in PVS anymore ( hwguy in TFC e.g. ).
+#define FEV_UPDATE		(1<<3)	// If this client already has one of these events in its queue, just update the event instead of sending it as a duplicate
+#define	FEV_HOSTONLY	(1<<4)	// Only send to entity specified as the invoker
+#define FEV_SERVER		(1<<5)	// Only send if the event was created on the server.
+#define FEV_CLIENT		(1<<6)	// Only issue event client side ( from shared code )

plugins/include/message_const.inc

@@ -23,15 +23,64 @@
 #define MSG_ONE_UNRELIABLE          8        // Send to one client, but don't put in reliable stream, put in unreliable datagram (could be dropped)
 #define	MSG_SPEC                    9        // Sends to all spectator proxies
 
-/* Message types for message_begin() */
-#define SVC_TEMPENTITY              23
-#define SVC_INTERMISSION            30
-#define SVC_CDTRACK                 32
-#define SVC_WEAPONANIM              35
-#define SVC_ROOMTYPE                37
-#define SVC_ADDANGLE                38       // [vec3] add this angle to the view angle
-#define SVC_NEWUSERMSG              39
-#define	SVC_HLTV                    50
+/* Hardcoded message types for message_begin() 
+ * Look in the actual HLSDK for details!
+ */
+#define SVC_NOP						1
+#define SVC_DISCONNECT				2
+#define SVC_EVENT					3
+#define SVC_VERSION					4
+#define SVC_SETVIEW					5
+#define SVC_SOUND					6
+#define SVC_TIME					7
+#define SVC_PRINT					8
+#define SVC_STUFFTEXT				9
+#define SVC_SETANGLE				10
+#define SVC_SERVERINFO				11
+#define SVC_LIGHTSTYLE				12
+#define SVC_UPDATEUSERINFO			13
+#define SVC_DELTADESCRIPTION		14
+#define SVC_CLIENTDATA				15
+#define SVC_STOPSOUND				16
+#define SVC_PINGS					17
+#define SVC_PARTICLE				18
+#define SVC_DAMAGE					19
+#define SVC_SPAWNSTATIC				20
+#define SVC_EVENT_RELIABLE			21
+#define SVC_SPAWNBASELINE			22
+#define SVC_TEMPENTITY				23
+#define SVC_SETPAUSE				24
+#define SVC_SIGNONNUM				25
+#define SVC_CENTERPRINT				26
+#define SVC_KILLEDMONSTER			27
+#define SVC_FOUNDSECRET				28
+#define SVC_SPAWNSTATICSOUND		29
+#define SVC_INTERMISSION			30
+#define SVC_FINALE					31
+#define SVC_CDTRACK					32
+#define SVC_RESTORE					33
+#define SVC_CUTSCENE				34
+#define SVC_WEAPONANIM				35
+#define SVC_DECALNAME				36
+#define SVC_ROOMTYPE				37
+#define SVC_ADDANGLE				38
+#define SVC_NEWUSERMSG				39
+#define SVC_PACKETENTITIES			40
+#define SVC_DELTAPACKETENTITIES		41
+#define SVC_CHOKE					42
+#define SVC_RESOURCELIST			43
+#define SVC_NEWMOVEVARS				44
+#define SVC_RESOURCEREQUEST			45
+#define SVC_CUSTOMIZATION			46
+#define SVC_CROSSHAIRANGLE			47
+#define SVC_SOUNDFADE				48
+#define SVC_FILETXFERFAILED			49
+#define SVC_HLTV					50
+#define SVC_DIRECTOR				51
+#define SVC_VOICEINIT				52
+#define SVC_VOICEDATA				53
+#define SVC_SENDEXTRAINFO			54
+#define SVC_TIMESCALE				55
 
 /* Message flags for set_msg_block() */
 #define BLOCK_NOT                   0
@@ -323,8 +372,6 @@ enum
 // write_coord(position.z)
 // write_short(model index)
 // write_byte(scale / 10)
-// write_byte(size)
-// write_byte(brightness)
 
 #define TE_BEAMRING                 24       // Connect a beam ring to two entities
 // write_byte(TE_BEAMRING)
@@ -364,6 +411,7 @@ enum
 // write_byte(red)
 // write_byte(green)
 // write_byte(blue)
+// write_byte(brightness)
 // write_byte(life in 10's)
 // write_byte(decay rate in 10's)
 
@@ -649,7 +697,7 @@ enum
 
 #define TE_PLAYERSPRITES            121      // Sprites emit from a player's bounding box (ONLY use for players!)
 // write_byte(TE_PLAYERSPRITES)
-// write_short(playernum)
+// write_byte(playernum)
 // write_short(sprite modelindex)
 // write_byte(count)
 // write_byte(variance) (0 = no variance in size) (10 = 10% variance in size)
@@ -719,3 +767,35 @@ enum
 // write_byte(life * 10)
 // write_byte(color) this is an index into an array of color vectors in the engine. (0 - )
 // write_byte(length * 10)
+
+// From hltv.h from the HLSDK, these are used in conjunction with SVC_DIRECTOR
+// sub commands of svc_director:
+#define DRC_CMD_NONE				0	// NULL director command
+#define DRC_CMD_START				1	// start director mode
+#define DRC_CMD_EVENT				2	// informs about director command
+#define DRC_CMD_MODE				3	// switches camera modes
+#define DRC_CMD_CAMERA				4	// sets camera registers
+#define DRC_CMD_TIMESCALE			5	// sets time scale
+#define DRC_CMD_MESSAGE				6	// send HUD centerprint
+#define DRC_CMD_SOUND				7	// plays a particular sound
+#define DRC_CMD_STATUS				8	// status info about broadcast
+#define DRC_CMD_BANNER				9	// banner file name for HLTV gui
+#define	DRC_CMD_FADE				10	// send screen fade command
+#define DRC_CMD_SHAKE				11	// send screen shake command
+#define DRC_CMD_STUFFTEXT			12	// like the normal svc_stufftext but as director command
+
+#define DRC_CMD_LAST				12
+
+// HLTV_EVENT event flags
+#define DRC_FLAG_PRIO_MASK		0x0F	// priorities between 0 and 15 (15 most important)
+#define DRC_FLAG_SIDE			(1<<4)	// 
+#define DRC_FLAG_DRAMATIC		(1<<5)	// is a dramatic scene
+#define DRC_FLAG_SLOWMOTION		(1<<6)  // would look good in SloMo
+#define DRC_FLAG_FACEPLAYER		(1<<7)  // player is doning something (reload/defuse bomb etc)
+#define DRC_FLAG_INTRO			(1<<8)	// is a introduction scene
+#define DRC_FLAG_FINAL			(1<<9)	// is a final scene
+#define DRC_FLAG_NO_RANDOM		(1<<10)	// don't randomize event data
+
+
+#define MAX_DIRECTOR_CMD_PARAMETERS		4
+#define MAX_DIRECTOR_CMD_STRING			128

plugins/include/tfcx.inc

@@ -133,3 +133,13 @@ native tfc_setweaponammo(index, value);
  * Use the TFC_GOALITEM_* constants to determine the owning team.
  */
 native tfc_get_user_goalitem(index, &team);
+
+/* Returns 1 if the player is a spy and is currently feigning death */
+native tfc_is_user_feigning(index);
+
+/* Returns 1 if the two teams are allies, 0 otherwise 
+ * Note: Team must be 1->4
+ *       Team 0 will always return 0
+ *       Any other team will result in an error
+ */
+native tfc_is_team_ally(TeamA,TeamB);

plugins/include/tsfun.inc

@@ -67,7 +67,7 @@ native ts_getuserslots( index );
 native ts_setuserslots( index, slots );
 
 native ts_getuserstate( index );
-native ts_getuserwpn( index,&clip,&ammo,&mode,&extra );
+native ts_getuserwpn( index,&clip=0,&ammo=0,&mode=0,&extra=0 );
 native ts_getuserspace( index );
 
 native ts_getuserkillflags(killer);