Simplify observer calls

pskelton · Mar 25, 2024 · f4b2794 · f4b2794
1 parent 14b9a66
commit f4b2794
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 19 deletions.
diff --git a/src/Engine/EngineCallObserver.h b/src/Engine/EngineCallObserver.h
@@ -6,10 +6,10 @@ enum class EngineCall {
     CALL_PLAY_SOUND,
     CALL_DRAW_2D_TEXTURE,
     CALL_DRAW_MESSAGE_BOX,
-    CALL_DRAW_MESSAGE_BOX_TEXT,
+    CALL_DRAW_GUIWindow_TEXT,
 
     CALL_FIRST = CALL_PLAY_SOUND,
-    CALL_LAST = CALL_DRAW_MESSAGE_BOX_TEXT
+    CALL_LAST = CALL_DRAW_GUIWindow_TEXT
 };
 using enum EngineCall;
 

diff --git a/src/GUI/GUIWindow.cpp b/src/GUI/GUIWindow.cpp
@@ -204,10 +204,9 @@ GUIButton *GUIWindow::GetControl(unsigned int uID) {
 }
 
 void GUIWindow::DrawMessageBox(bool inside_game_viewport) {
-    _isMessageBox = true;
-    if (engine->callObserver && !sHint.empty()) {
+    // TODO(pskelton): Derived Messagebox types for different kinds of popup boxes
+    if (engine->callObserver) {
         engine->callObserver->notify(CALL_DRAW_MESSAGE_BOX, sHint);
-        _observerNotified = true;
     }
 
     int x = 0;
@@ -327,11 +326,6 @@ void GUIWindow::DrawShops_next_generation_time_string(Duration time) {
 
 //----- (0044D406) --------------------------------------------------------
 void GUIWindow::DrawTitleText(GUIFont *pFont, int horizontalMargin, int verticalMargin, Color color, const std::string &text, int lineSpacing) {
-    if (engine->callObserver && _isMessageBox && !_observerNotified) {
-        engine->callObserver->notify(CALL_DRAW_MESSAGE_BOX, text);
-        _observerNotified = true;
-    }
-
     int width = this->uFrameWidth - horizontalMargin;
     std::string resString = pFont->FitTextInAWindow(text, this->uFrameWidth, horizontalMargin);
     std::istringstream stream(resString);
@@ -348,8 +342,8 @@ void GUIWindow::DrawTitleText(GUIFont *pFont, int horizontalMargin, int vertical
 
 //----- (0044CE08) --------------------------------------------------------
 void GUIWindow::DrawText(GUIFont *font, Pointi position, Color color, const std::string &text, int maxHeight, Color shadowColor) {
-    if (_isMessageBox && engine->callObserver) {
-        engine->callObserver->notify(CALL_DRAW_MESSAGE_BOX_TEXT, text);
+    if (engine->callObserver) {
+        engine->callObserver->notify(CALL_DRAW_GUIWindow_TEXT, text);
     }
     font->DrawText(this, position, color, text, maxHeight, shadowColor);
 }

diff --git a/src/GUI/GUIWindow.h b/src/GUI/GUIWindow.h
@@ -100,10 +100,6 @@ class GUIWindow {
     std::vector<GUIButton*> vButtons;
 
     std::shared_ptr<Io::Mouse> mouse = nullptr;
-
-    // TODO(pskelton): message box as child type?
-    bool _isMessageBox = false;
-    bool _observerNotified = false;
 };
 
 class OnButtonClick : public GUIWindow {

diff --git a/test/Bin/GameTest/GameTests_1500.cpp b/test/Bin/GameTest/GameTests_1500.cpp
@@ -46,8 +46,8 @@ GAME_TEST(Issues, Issue1519) {
     // message box body text was displayed.
     auto flatMessageBoxes = messageBoxesTape.flattened();
     auto flatMessageBoxesBody = messageBoxesBody.flattened();
-    EXPECT_TRUE(flatMessageBoxes.front().starts_with("Baby Dragon"));
-    EXPECT_TRUE(flatMessageBoxesBody.front().starts_with("The Baby Dragon"));
+    EXPECT_GT(flatMessageBoxes.size(), 0);
+    EXPECT_GT(flatMessageBoxesBody.filtered([](const auto &s) { return s.starts_with("The Baby Dragon"); }).size(), 0);
 }
 
 GAME_TEST(Issues, Issue1524) {

diff --git a/test/Testing/Game/CommonTapeRecorder.cpp b/test/Testing/Game/CommonTapeRecorder.cpp
@@ -154,5 +154,5 @@ TestMultiTape<std::string> CommonTapeRecorder::messageBoxes() {
 }
 
 TestMultiTape<std::string> CommonTapeRecorder::messageBoxesText() {
-    return _controller->recordFunctionTape<std::string>(CALL_DRAW_MESSAGE_BOX_TEXT);
+    return _controller->recordFunctionTape<std::string>(CALL_DRAW_GUIWindow_TEXT);
 }