X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fsv_minigames.qh;h=eb6825ed600e52ad46df1c47af15717d3a10229d;hb=c741e6b3f012aa525f23e1df30d1d933b383fbc5;hp=43b392f743a843caf5ecf26be5996be40a431536;hpb=32ca966802c45c4c231210c2d8776bc3f4135dc2;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/minigames/sv_minigames.qh b/qcsrc/common/minigames/sv_minigames.qh index 43b392f74..eb6825ed6 100644 --- a/qcsrc/common/minigames/sv_minigames.qh +++ b/qcsrc/common/minigames/sv_minigames.qh @@ -44,22 +44,21 @@ entity minigame_find_player(entity client); entity minigame_sessions; -bool minigame_SendEntity(entity to, int sf); +bool minigame_SendEntity(entity this, entity to, int sf); -void RegisterMinigames(); -const int MINIGAMES_MAX = 24; -entity MINIGAMES[MINIGAMES_MAX], MINIGAMES_first, MINIGAMES_last; -int MINIGAMES_COUNT; +REGISTRY(Minigames, BITS(3)) +#define Minigames_from(i) _Minigames_from(i, NULL) +REGISTER_REGISTRY(Minigames) +REGISTRY_CHECK(Minigames) #define REGISTER_MINIGAME(name,nicename) \ - REGISTER(RegisterMinigames, MINIGAME, MINIGAMES, MINIGAMES_COUNT, name, m_id, spawn()); \ + REGISTER(Minigames, MINIGAME, name, m_id, new(minigame_descriptor)); \ int name##_server_event(entity, string, ...); \ REGISTER_INIT_POST(MINIGAME, name) { \ - this.classname = "minigame_descriptor"; \ + make_pure(this); \ this.netname = strzone(strtolower(#name)); \ this.message = nicename; \ this.minigame_event = name##_server_event; \ } \ REGISTER_INIT(MINIGAME, name) -REGISTER_REGISTRY(RegisterMinigames) #endif