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

chore(glue): move glue event initalization from ui to glue

Browse Source
This commit is contained in:
fallenoak 2025-10-07 10:05:26 -05:00
parent 8afda7c775
commit 84cc18d904
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
6 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/client/Client.cpp
View File

@ -8,6 +8,7 @@
#include "console/Screen.hpp" #include "console/Screen.hpp"
#include "db/Db.hpp" #include "db/Db.hpp"
#include "glue/CGlueMgr.hpp" #include "glue/CGlueMgr.hpp"
#include "glue/GlueScript.hpp"
#include "gx/Screen.hpp" #include "gx/Screen.hpp"
#include "gx/Texture.hpp" #include "gx/Texture.hpp"
#include "model/Model2.hpp" #include "model/Model2.hpp"

1
src/glue/CGlueMgr.cpp
View File

@ -7,6 +7,7 @@
#include "glue/CCharacterSelection.hpp" #include "glue/CCharacterSelection.hpp"
#include "glue/Character.hpp" #include "glue/Character.hpp"
#include "glue/CRealmList.hpp" #include "glue/CRealmList.hpp"
#include "glue/GlueScript.hpp"
#include "gx/Coordinate.hpp" #include "gx/Coordinate.hpp"
#include "gx/Device.hpp" #include "gx/Device.hpp"
#include "gx/LoadingScreen.hpp" #include "gx/LoadingScreen.hpp"

47
src/glue/GlueScript.cpp Normal file
View File

@ -0,0 +1,47 @@
#include "glue/GlueScript.hpp"
const char* g_glueScriptEvents[41];
void GlueScriptEventsInitialize() {
g_glueScriptEvents[0] = "SET_GLUE_SCREEN";
g_glueScriptEvents[1] = "START_GLUE_MUSIC";
g_glueScriptEvents[2] = "DISCONNECTED_FROM_SERVER";
g_glueScriptEvents[3] = "OPEN_STATUS_DIALOG";
g_glueScriptEvents[4] = "UPDATE_STATUS_DIALOG";
g_glueScriptEvents[5] = "CLOSE_STATUS_DIALOG";
g_glueScriptEvents[6] = "ADDON_LIST_UPDATE";
g_glueScriptEvents[7] = "CHARACTER_LIST_UPDATE";
g_glueScriptEvents[8] = "UPDATE_SELECTED_CHARACTER";
g_glueScriptEvents[9] = "OPEN_REALM_LIST";
g_glueScriptEvents[10] = "GET_PREFERRED_REALM_INFO";
g_glueScriptEvents[11] = "UPDATE_SELECTED_RACE";
g_glueScriptEvents[12] = "SELECT_LAST_CHARACTER";
g_glueScriptEvents[13] = "SELECT_FIRST_CHARACTER";
g_glueScriptEvents[14] = "GLUE_SCREENSHOT_SUCCEEDED";
g_glueScriptEvents[15] = "GLUE_SCREENSHOT_FAILED";
g_glueScriptEvents[16] = "PATCH_UPDATE_PROGRESS";
g_glueScriptEvents[17] = "PATCH_DOWNLOADED";
g_glueScriptEvents[18] = "SUGGEST_REALM";
g_glueScriptEvents[19] = "SUGGEST_REALM_WRONG_PVP";
g_glueScriptEvents[20] = "SUGGEST_REALM_WRONG_CATEGORY";
g_glueScriptEvents[21] = "SHOW_SERVER_ALERT";
g_glueScriptEvents[22] = "FRAMES_LOADED";
g_glueScriptEvents[23] = "FORCE_RENAME_CHARACTER";
g_glueScriptEvents[24] = "FORCE_DECLINE_CHARACTER";
g_glueScriptEvents[25] = "SHOW_SURVEY_NOTIFICATION";
g_glueScriptEvents[26] = "PLAYER_ENTER_PIN";
g_glueScriptEvents[27] = "CLIENT_ACCOUNT_MISMATCH";
g_glueScriptEvents[28] = "PLAYER_ENTER_MATRIX";
g_glueScriptEvents[29] = "SCANDLL_ERROR";
g_glueScriptEvents[30] = "SCANDLL_DOWNLOADING";
g_glueScriptEvents[31] = "SCANDLL_FINISHED";
g_glueScriptEvents[32] = "SERVER_SPLIT_NOTICE";
g_glueScriptEvents[33] = "TIMER_ALERT";
g_glueScriptEvents[34] = "ACCOUNT_MESSAGES_AVAILABLE";
g_glueScriptEvents[35] = "ACCOUNT_MESSAGES_HEADERS_LOADED";
g_glueScriptEvents[36] = "ACCOUNT_MESSAGES_BODY_LOADED";
g_glueScriptEvents[37] = "CLIENT_TRIAL";
g_glueScriptEvents[38] = "PLAYER_ENTER_TOKEN";
g_glueScriptEvents[39] = "GAME_ACCOUNTS_UPDATED";
g_glueScriptEvents[40] = "CLIENT_CONVERTED";
}

8
src/glue/GlueScript.hpp Normal file
View File

@ -0,0 +1,8 @@
#ifndef GLUE_GLUE_SCRIPT_HPP
#define GLUE_GLUE_SCRIPT_HPP
extern const char* g_glueScriptEvents[41];
void GlueScriptEventsInitialize();
#endif

45
src/ui/FrameScript.cpp
View File

@ -11,7 +11,6 @@
#include <storm/String.hpp> #include <storm/String.hpp>
#include <tempest/Vector.hpp> #include <tempest/Vector.hpp>
const char* g_glueScriptEvents[41];
const char* g_scriptEvents[722]; const char* g_scriptEvents[722];
int32_t g_glueFrameScriptGenders[] = { int32_t g_glueFrameScriptGenders[] = {
@ -873,50 +872,6 @@ void FrameScript_UnregisterScriptEvent(FrameScript_Object* object, FrameScript_E
} }
} }
void GlueScriptEventsInitialize() {
g_glueScriptEvents[0] = "SET_GLUE_SCREEN";
g_glueScriptEvents[1] = "START_GLUE_MUSIC";
g_glueScriptEvents[2] = "DISCONNECTED_FROM_SERVER";
g_glueScriptEvents[3] = "OPEN_STATUS_DIALOG";
g_glueScriptEvents[4] = "UPDATE_STATUS_DIALOG";
g_glueScriptEvents[5] = "CLOSE_STATUS_DIALOG";
g_glueScriptEvents[6] = "ADDON_LIST_UPDATE";
g_glueScriptEvents[7] = "CHARACTER_LIST_UPDATE";
g_glueScriptEvents[8] = "UPDATE_SELECTED_CHARACTER";
g_glueScriptEvents[9] = "OPEN_REALM_LIST";
g_glueScriptEvents[10] = "GET_PREFERRED_REALM_INFO";
g_glueScriptEvents[11] = "UPDATE_SELECTED_RACE";
g_glueScriptEvents[12] = "SELECT_LAST_CHARACTER";
g_glueScriptEvents[13] = "SELECT_FIRST_CHARACTER";
g_glueScriptEvents[14] = "GLUE_SCREENSHOT_SUCCEEDED";
g_glueScriptEvents[15] = "GLUE_SCREENSHOT_FAILED";
g_glueScriptEvents[16] = "PATCH_UPDATE_PROGRESS";
g_glueScriptEvents[17] = "PATCH_DOWNLOADED";
g_glueScriptEvents[18] = "SUGGEST_REALM";
g_glueScriptEvents[19] = "SUGGEST_REALM_WRONG_PVP";
g_glueScriptEvents[20] = "SUGGEST_REALM_WRONG_CATEGORY";
g_glueScriptEvents[21] = "SHOW_SERVER_ALERT";
g_glueScriptEvents[22] = "FRAMES_LOADED";
g_glueScriptEvents[23] = "FORCE_RENAME_CHARACTER";
g_glueScriptEvents[24] = "FORCE_DECLINE_CHARACTER";
g_glueScriptEvents[25] = "SHOW_SURVEY_NOTIFICATION";
g_glueScriptEvents[26] = "PLAYER_ENTER_PIN";
g_glueScriptEvents[27] = "CLIENT_ACCOUNT_MISMATCH";
g_glueScriptEvents[28] = "PLAYER_ENTER_MATRIX";
g_glueScriptEvents[29] = "SCANDLL_ERROR";
g_glueScriptEvents[30] = "SCANDLL_DOWNLOADING";
g_glueScriptEvents[31] = "SCANDLL_FINISHED";
g_glueScriptEvents[32] = "SERVER_SPLIT_NOTICE";
g_glueScriptEvents[33] = "TIMER_ALERT";
g_glueScriptEvents[34] = "ACCOUNT_MESSAGES_AVAILABLE";
g_glueScriptEvents[35] = "ACCOUNT_MESSAGES_HEADERS_LOADED";
g_glueScriptEvents[36] = "ACCOUNT_MESSAGES_BODY_LOADED";
g_glueScriptEvents[37] = "CLIENT_TRIAL";
g_glueScriptEvents[38] = "PLAYER_ENTER_TOKEN";
g_glueScriptEvents[39] = "GAME_ACCOUNTS_UPDATED";
g_glueScriptEvents[40] = "CLIENT_CONVERTED";
}
void ScriptEventsInitialize() { void ScriptEventsInitialize() {
g_scriptEvents[0] = "UNIT_PET"; g_scriptEvents[0] = "UNIT_PET";
g_scriptEvents[2] = "UNIT_PET"; g_scriptEvents[2] = "UNIT_PET";

3
src/ui/FrameScript.hpp
View File

@ -42,7 +42,6 @@ class FrameScript_EventObject : public TSHashObject<FrameScript_EventObject, HAS
}; };
extern int32_t g_glueFrameScriptGenders[UNITSEX_LAST]; extern int32_t g_glueFrameScriptGenders[UNITSEX_LAST];
extern const char* g_glueScriptEvents[41];
extern const char* g_scriptEvents[722]; extern const char* g_scriptEvents[722];
namespace FrameScript { namespace FrameScript {
@ -102,8 +101,6 @@ void FrameScript_SignalEvent(uint32_t index, const char* format, ...);
void FrameScript_UnregisterScriptEvent(FrameScript_Object* object, FrameScript_EventObject* event); void FrameScript_UnregisterScriptEvent(FrameScript_Object* object, FrameScript_EventObject* event);
void GlueScriptEventsInitialize();
void ScriptEventsInitialize(); void ScriptEventsInitialize();
#endif #endif