mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-02-27 08:34:02 +00:00
Code Issues Releases Wiki Activity

remove pointless self-refs (dsq->... and core->...) in DSQ

Browse source
This commit is contained in:
fgenesis 2023-05-31 17:37:20 +02:00
parent dbda4d0bf8
commit fd1ac85af3
9 changed files with 282 additions and 280 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

520
Aquaria/DSQ.cpp
View file

File diff suppressed because it is too large Load diff

8
Aquaria/DSQ.h
View file

@ -250,7 +250,7 @@ public:
int getEntityTypeIndexByName(std::string s); int getEntityTypeIndexByName(std::string s);
void screenMessage(const std::string &msg); void screenMessage(const std::string &msg);
void debugLog(const std::string &s); void _debugLog(const std::string &s) OVERRIDE;
void toggleConsole(); void toggleConsole();
void toggleEffects(); void toggleEffects();
void debugMenu(); void debugMenu();
@ -268,7 +268,7 @@ public:
Vector getNoteVector(int note, float mag=1); Vector getNoteVector(int note, float mag=1);
void toggleCursor(bool v, float t = -1); void toggleCursor(bool v, float t = -1);
bool isDeveloperKeys(); bool isDeveloperKeys() const;
bool canOpenEditor() const; bool canOpenEditor() const;
void loadElementEffects(); void loadElementEffects();
@ -324,8 +324,8 @@ public:
bool mountModPackage(const std::string&); bool mountModPackage(const std::string&);
bool modIsKnown(const std::string& name); bool modIsKnown(const std::string& name);
void unloadMods(); void unloadMods();
static void loadModsCallback(const std::string &filename, void *param); static void LoadModsCallback(const std::string &filename, void *param);
static void loadModPackagesCallback(const std::string &filename, void *param); static void LoadModPackagesCallback(const std::string &filename, void *param);
AquariaSaveSlot *selectedSaveSlot; AquariaSaveSlot *selectedSaveSlot;
void setStory(); void setStory();

8
Aquaria/Mod.cpp
View file

@ -70,17 +70,17 @@ void Mod::clear()
compatScript = ""; compatScript = "";
} }
bool Mod::isDebugMenu() bool Mod::isDebugMenu() const
{ {
return debugMenu; return debugMenu;
} }
bool Mod::hasWorldMap() bool Mod::hasWorldMap() const
{ {
return hasMap; return hasMap;
} }
bool Mod::isEditorBlocked() bool Mod::isEditorBlocked() const
{ {
return blockEditor; return blockEditor;
} }
@ -257,7 +257,7 @@ void Mod::applyStart()
} }
} }
bool Mod::isActive() bool Mod::isActive() const
{ {
return active; return active;
} }

8
Aquaria/Mod.h
View file

@ -45,10 +45,10 @@ public:
const std::string& getBaseModPath() const; const std::string& getBaseModPath() const;
bool isActive(); bool isActive() const;
bool isDebugMenu(); bool isDebugMenu() const;
bool hasWorldMap(); bool hasWorldMap() const;
bool isEditorBlocked(); bool isEditorBlocked() const;
const std::string& getPath() const; const std::string& getPath() const;
const std::string& getName() const; const std::string& getName() const;

2
Aquaria/ModDownloader.cpp
View file

@ -527,7 +527,7 @@ void ModDL::NotifyMod(ModRequest *rq, NetEvent ev, size_t recvd, size_t total)
if(!dsq->modIsKnown(localname)) if(!dsq->modIsKnown(localname))
{ {
// yay, got something new! // yay, got something new!
DSQ::loadModsCallback(archiveFile, 0); // does not end in ".xml" but thats no problem here DSQ::LoadModsCallback(archiveFile, dsq); // does not end in ".xml" but thats no problem here
if(dsq->modSelectorScr) if(dsq->modSelectorScr)
dsq->modSelectorScr->initModAndPatchPanel(); // HACK dsq->modSelectorScr->initModAndPatchPanel(); // HACK
} }

2
Aquaria/SceneEditor.cpp
View file

@ -2577,7 +2577,7 @@ void SceneEditor::update(float dt)
if(dsq->game->saveScene(os.str())) if(dsq->game->saveScene(os.str()))
{ {
std::string m = "Map AutoSaved to " + os.str(); std::string m = "Map AutoSaved to " + os.str();
dsq->debugLog(m); debugLog(m);
dsq->screenMessage(m); dsq->screenMessage(m);
} }

4
BBGE/Base.cpp
View file

@ -299,7 +299,7 @@ void errorLog(const std::string &s)
{ {
if (core) if (core)
{ {
core->errorLog(s); core->_errorLog(s);
} }
else else
{ {
@ -310,7 +310,7 @@ void errorLog(const std::string &s)
void debugLog(const std::string &s) void debugLog(const std::string &s)
{ {
if (core) if (core)
core->debugLog(s); core->_debugLog(s);
else else
{ {
//MessageBox(0, s.c_str(), "DebugLog (Core Not Initalized)", MB_OK); //MessageBox(0, s.c_str(), "DebugLog (Core Not Initalized)", MB_OK);

6
BBGE/Core.cpp
View file

@ -221,10 +221,10 @@ bool Core::getCtrlState()
return getKeyState(KEY_LCONTROL) || getKeyState(KEY_RCONTROL); return getKeyState(KEY_LCONTROL) || getKeyState(KEY_RCONTROL);
} }
void Core::errorLog(const std::string &s) void Core::_errorLog(const std::string &s)
{ {
messageBox("Error!", s); messageBox("Error!", s);
debugLog(s); this->_debugLog(s);
} }
void Core::messageBox(const std::string &title, const std::string &msg) void Core::messageBox(const std::string &title, const std::string &msg)
@ -232,7 +232,7 @@ void Core::messageBox(const std::string &title, const std::string &msg)
::messageBox(title, msg); ::messageBox(title, msg);
} }
void Core::debugLog(const std::string &s) void Core::_debugLog(const std::string &s)
{ {
if (debugLogActive) if (debugLogActive)
{ {

4
BBGE/Core.h
View file

@ -342,8 +342,8 @@ public:
bool getMouseButtonState(int m); bool getMouseButtonState(int m);
int keys[KEY_MAXARRAY]; int keys[KEY_MAXARRAY];
virtual void debugLog(const std::string &s); virtual void _debugLog(const std::string &s);
virtual void errorLog(const std::string &s); virtual void _errorLog(const std::string &s);
void messageBox(const std::string &title, const std::string &msg); void messageBox(const std::string &title, const std::string &msg);
bool getShiftState(); bool getShiftState();
bool getAltState(); bool getAltState();