mirror of
https://github.com/DarkStore-3DS/Universal-Core.git
synced 2026-07-06 08:49:06 +00:00
Remove Gui::CallConstructor();.
This commit is contained in:
@@ -259,11 +259,6 @@ void Gui::ScreenLogic(u32 hDown, u32 hHeld, touchPosition touch, bool waitFade)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Calls the current screen's constructor.
|
|
||||||
void Gui::CallConstructor() {
|
|
||||||
if (usedScreen != nullptr) usedScreen->callConstructor();
|
|
||||||
}
|
|
||||||
|
|
||||||
// Move's the tempScreen to the used one.
|
// Move's the tempScreen to the used one.
|
||||||
void Gui::transferScreen() {
|
void Gui::transferScreen() {
|
||||||
if (tempScreen != nullptr) usedScreen = std::move(tempScreen);
|
if (tempScreen != nullptr) usedScreen = std::move(tempScreen);
|
||||||
@@ -298,7 +293,6 @@ void Gui::fadeEffects(int fadeoutFrames, int fadeinFrames) {
|
|||||||
if (fadealpha > 255) {
|
if (fadealpha > 255) {
|
||||||
fadealpha = 255;
|
fadealpha = 255;
|
||||||
Gui::transferScreen(); // Transfer Temp screen to the used one.
|
Gui::transferScreen(); // Transfer Temp screen to the used one.
|
||||||
Gui::CallConstructor(); // Here we call the constructor for the current screen.
|
|
||||||
fadein = true;
|
fadein = true;
|
||||||
fadeout = false;
|
fadeout = false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,11 +143,6 @@ namespace Gui {
|
|||||||
*/
|
*/
|
||||||
void ScreenLogic(u32 hDown, u32 hHeld, touchPosition touch, bool waitFade = true);
|
void ScreenLogic(u32 hDown, u32 hHeld, touchPosition touch, bool waitFade = true);
|
||||||
|
|
||||||
/* Used for the current Screen's Constructor call. (Optional!)
|
|
||||||
* This is useful if you need to call the screen's constructor.
|
|
||||||
*/
|
|
||||||
void CallConstructor();
|
|
||||||
|
|
||||||
/* Transfer the Temp Screen to the used one. (Optional!)
|
/* Transfer the Temp Screen to the used one. (Optional!)
|
||||||
* It will check, if the tempScreen variable is not nullptr, so don't worry.
|
* It will check, if the tempScreen variable is not nullptr, so don't worry.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -35,7 +35,6 @@ public:
|
|||||||
virtual ~Screen() {}
|
virtual ~Screen() {}
|
||||||
virtual void Logic(u32 hDown, u32 hHeld, touchPosition touch) = 0;
|
virtual void Logic(u32 hDown, u32 hHeld, touchPosition touch) = 0;
|
||||||
virtual void Draw() const = 0;
|
virtual void Draw() const = 0;
|
||||||
virtual void callConstructor() = 0;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
Reference in New Issue
Block a user