Merge branch 'master' into Mario/bulldozer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / minigames / minigame / all.qh

diff --git a/qcsrc/common/minigames/minigame/all.qh b/qcsrc/common/minigames/minigame/all.qh
index a63d3335fe47ce91e90c6b156cb2c38f9b0125f7..f552db98b5f4208ecd104537d785bcdfa4cbfa86 100644 (file)
--- a/qcsrc/common/minigames/minigame/all.qh
+++ b/qcsrc/common/minigames/minigame/all.qh
@@ -47,7 +47,7 @@ used as send flags for minigame entities:
 * MINIG_SF_UPDATE
        A miscellaneous update, can be safely used if the entity has just a few fields
 * MINIG_SF_CUSTOM
-       Starting value for custom flags, since there are bit-wise flags, 
+       Starting value for custom flags, since there are bit-wise flags,
        the following values shall be MINIG_SF_CUSTOM*2, MINIG_SF_CUSTOM*4 and MINIG_SF_CUSTOM*8.
 * MINIG_SF_MAX
        Maximum flag value that will be networked
@@ -63,25 +63,18 @@ that .owner is set to the minigame session entity and .minigame_autoclean is tru
 
 #include "nmm.qc"
 #include "ttt.qc"
+#include "c4.qc"
 #include "pong.qc"
-
-/**
- * Registration:
- *     MINIGAME(id,"Name")
- *             id    (QuakeC symbol) Game identifier, used to find the functions explained above
- *             "Name"(String)        Human readable name for the game, shown in the UI
- */
-#define REGISTERED_MINIGAMES \
-       MINIGAME(nmm, "Nine Men's Morris") \
-       MINIGAME(ttt, "Tic Tac Toe") \
-       MINIGAME(pong, "Pong") \
-       /*empty line*/
+#include "ps.qc"
+#include "pp.qc"
+#include "snake.qc"
+#include "bd.qc"
 
 /**
  * Set up automatic entity read/write functionality
  * To ensure that everything is handled automatically, spawn on the server using msle_spawn
  * Syntax:
- *     MSLE(classname,Field...) \ 
+ *     MSLE(classname,Field...) \
  *             classname: Identifier used to recognize the type of the entity
  *                        (must be set as .classname on the sent entities)
  *             Field... : List of FIELD calls
@@ -108,4 +101,4 @@ that .owner is set to the minigame session entity and .minigame_autoclean is tru
        MSLE(pong_paddle,FIELD(MINIG_SF_CREATE,Byte,team) FIELD(MINIG_SF_CREATE,Float,pong_length) FIELD(MINIG_SF_UPDATE,Vector2D,origin)) \
        MSLE(pong_ball,FIELD(MINIG_SF_CREATE,Float,pong_length) FIELD(PONG_SF_BALLTEAM,Byte,team) FIELD(MINIG_SF_UPDATE, Vector2D, velocity) FIELD(MINIG_SF_UPDATE, Vector2D, origin)) \
        MSLE(pong_ai, FIELD(MINIG_SF_CREATE,Byte,team) FIELD(PONG_SF_PLAYERSCORE, Long, pong_score)) \
-       /*empty line*/ 
+       /*empty line*/