Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / command / cmd.qh

diff --git a/qcsrc/server/command/cmd.qh b/qcsrc/server/command/cmd.qh
index f7693a33b139765deb9320aef80fbb1b59ae877e..45d1f7584cef1663b5d6909d67714092360eaea5 100644 (file)
--- a/qcsrc/server/command/cmd.qh
+++ b/qcsrc/server/command/cmd.qh
@@ -1,12 +1,19 @@
 // =================================================
 //  Declarations for server side networked commands
-//  Last updated: December 14th, 2011
+//  Last updated: December 26th, 2011
 // =================================================
 
 .float cmd_floodtime;
 .float cmd_floodcount;
-.float checkfail;
 .float lms_spectate_warning;
+.float checkfail;
+
+// number of monsters spawned with mobspawn command
+float totalspawned;
 
 string MapVote_Suggest(string m);
-//void MapVote_SendPicture(float id)
+
+entity spawnmonster(string monster, float mnster, entity spawnedby, entity own, vector orig, float respwn, float moveflag);
+
+// used by common/command/generic.qc:GenericCommand_dumpcommands to list all commands into a .txt file
+void ClientCommand_macro_write_aliases(float fh);