X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fminigames%2Fcl_minigames.qh;h=a0f6195d1232f6ec6ca994d4514de840b099c58a;hb=34e7f534e2015466228eb3a78c9857741b736dca;hp=e3c7df18f34f778c58f1ba6d911d4711a6367d7e;hpb=f72821fdcebe3ca01181a99727a06198de65ea08;p=xonotic%2Fxonotic-data.pk3dir.git diff --git a/qcsrc/common/minigames/cl_minigames.qh b/qcsrc/common/minigames/cl_minigames.qh index e3c7df18f..a0f6195d1 100644 --- a/qcsrc/common/minigames/cl_minigames.qh +++ b/qcsrc/common/minigames/cl_minigames.qh @@ -1,5 +1,4 @@ -#ifndef CL_MINIGAMES_H -#define CL_MINIGAMES_H +#pragma once // Get a square in the center of the avaliable area // \note macro to pass by reference pos and mySize @@ -85,12 +84,6 @@ entity active_minigame; // minigame_player representing this client entity minigame_self; -// Whethere there's an active minigame -float minigame_isactive() -{ - return active_minigame != world; -} - // Execute a minigame command #define minigame_cmd(...) minigame_cmd_workaround(0,__VA_ARGS__) void minigame_cmd_workaround(float dummy, string...cmdargc); @@ -100,14 +93,14 @@ void minigame_cmd_workaround(float dummy, string...cmdargc); void minigame_prompt(); float HUD_MinigameMenu_IsOpened(); -void HUD_MinigameMenu_Close(); -float HUD_Minigame_Showpanels(); +void HUD_MinigameMenu_Close(entity this, entity actor, entity trigger); + // Adds a game-specific entry to the menu void HUD_MinigameMenu_CustomEntry(entity parent, string message, string event_arg); #define FOREACH_MINIGAME_ENTITY(entityvar) \ - entityvar=world; \ + entityvar=NULL; \ while( (entityvar = findentity(entityvar,owner,active_minigame)) ) @@ -128,5 +121,3 @@ REGISTRY_CHECK(Minigames) this.minigame_event = name##_client_event; \ } \ REGISTER_INIT(MINIGAME_##name) - -#endif