RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 00:02:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge 4a102c6ace into caf628145d

Browse Source
This commit is contained in:
Tristan 'Natrist' Cormier 2026-01-26 13:03:45 +01:00 committed by GitHub
commit 0ffa52cf9b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/glue/CGlueMgr.cpp
View File

@ -46,6 +46,7 @@ float CGlueMgr::m_aspect;
bool CGlueMgr::m_authenticated; bool CGlueMgr::m_authenticated;
const CharacterSelectionDisplay* CGlueMgr::m_characterInfo; const CharacterSelectionDisplay* CGlueMgr::m_characterInfo;
int32_t CGlueMgr::m_clientKickReason; int32_t CGlueMgr::m_clientKickReason;
int32_t CGlueMgr::m_contestAccepted = 1; // TODO
char CGlueMgr::m_currentScreen[64]; char CGlueMgr::m_currentScreen[64];
EffectDeath* CGlueMgr::m_deathEffect; EffectDeath* CGlueMgr::m_deathEffect;
int32_t CGlueMgr::m_disconnectPending; int32_t CGlueMgr::m_disconnectPending;

1
src/glue/CGlueMgr.hpp
View File

@ -41,6 +41,7 @@ class CGlueMgr {
static bool m_authenticated; static bool m_authenticated;
static const CharacterSelectionDisplay* m_characterInfo; static const CharacterSelectionDisplay* m_characterInfo;
static int32_t m_clientKickReason; static int32_t m_clientKickReason;
static int32_t m_contestAccepted;
static char m_currentScreen[]; static char m_currentScreen[];
static EffectDeath* m_deathEffect; static EffectDeath* m_deathEffect;
static int32_t m_disconnectPending; static int32_t m_disconnectPending;

9
src/glue/GlueScript.cpp
View File

@ -222,7 +222,14 @@ int32_t Script_ShowContestNotice(lua_State* L) {
} }
int32_t Script_ContestAccepted(lua_State* L) { int32_t Script_ContestAccepted(lua_State* L) {
WHOA_UNIMPLEMENTED(0); if (CGlueMgr::m_contestAccepted) {
lua_pushnumber(L, 1.0);
}
else {
lua_pushnil(L);
}
return 1;
} }
int32_t Script_AcceptContest(lua_State* L) { int32_t Script_AcceptContest(lua_State* L) {