Rename CWorld -> CModeMgr (g_world -> g_modeMgr, ActiveGameMode.{h,cpp} -> ModeMgr.{h,cpp}) and WorldScene -> CWorld (WorldScene.h -> World.h), as in DHXJ. Pure rename, codegen unchanged (707/707 functions identical with includers).

This commit is contained in:
ragnarok-clanker 2026-10-29 12:27:01 +01:00
commit d9580bfeda
33 changed files with 144 additions and 144 deletions

View file

@ -1,5 +1,5 @@
#include "Client/ModeBaseEvents.h"
#include "Client/Mode/ActiveGameMode.h"
#include "Client/Mode/ModeMgr.h"
#include "Contents/Configuration/ServiceConfiguration.h"
#include "Contents/Party/AdventurerAgencyMgr.h"
#include "Contents/UserData/AccountLinkedUserDataMgr.h"
@ -12,20 +12,20 @@
int ModeBaseEvents::Send(int event, const char* text, int, int, int) {
if (event == 2) {
g_accountLinkedUserDataMgr->Save(this->emotions, this->script, this->persistenceAccountId, this->renderSystem, this->token16, this->work);
if (g_world.state != 1) {
if (g_world.gameMode) {
g_world.gameMode->running = 0;
if (g_modeMgr.state != 1) {
if (g_modeMgr.gameMode) {
g_modeMgr.gameMode->running = 0;
}
} else if (g_world.gameMode) {
} else if (g_modeMgr.gameMode) {
g_characterLinkedUserDataMgr->Save(this->characterSave, this->token16, this->work);
if (g_world.state != 1) {
if (g_world.gameMode) {
g_world.gameMode->running = 0;
if (g_modeMgr.state != 1) {
if (g_modeMgr.gameMode) {
g_modeMgr.gameMode->running = 0;
}
} else if (g_world.gameMode) {
} else if (g_modeMgr.gameMode) {
g_adventurerAgencyMgr->RequestStop(this->agency, this->stopRecruiting);
if (g_world.gameMode) {
g_world.gameMode->running = 0;
if (g_modeMgr.gameMode) {
g_modeMgr.gameMode->running = 0;
}
}
}
@ -33,7 +33,7 @@ int ModeBaseEvents::Send(int event, const char* text, int, int, int) {
if (g_serviceType == 11) {
ShellExecuteA(this->window, "open", "http://www.ragnarok.co.in/index.php", nullptr, nullptr, SW_SHOWNORMAL);
}
g_world.running = 0;
g_modeMgr.running = 0;
} else if (event == 68) {
this->transitionRequested = 1;
if (text) {