[Scummvm-git-logs] scummvm master -> ababc83fb15e5224ce674b727ee68196c5f374b7

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
932ad55f98 TETRAEDGE: Implement tolua_pushstring
ababc83fb1 TETRAEDGE: Don't crash on missing quit button


Commit: 932ad55f98c6f7c9a5c69d78dc496a0941dfa10d
    https://github.com/scummvm/scummvm/commit/932ad55f98c6f7c9a5c69d78dc496a0941dfa10d
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-27T09:29:02+03:00

Commit Message:
TETRAEDGE: Implement tolua_pushstring

Changed paths:
    engines/tetraedge/to_lua.cpp
    engines/tetraedge/to_lua.h


diff --git a/engines/tetraedge/to_lua.cpp b/engines/tetraedge/to_lua.cpp
index 2dc7a6ea9e9..2928b7c4ffc 100644
--- a/engines/tetraedge/to_lua.cpp
+++ b/engines/tetraedge/to_lua.cpp
@@ -444,6 +444,10 @@ void tolua_pushnumber(lua_State *L, double val) {
 	lua_pushnumber(L, val);
 }
 
+void tolua_pushstring(lua_State *L, const char *val) {
+	lua_pushstring(L, val);
+}
+
 } // end namespace ToLua
 
 } // end namespace Tetraedge
diff --git a/engines/tetraedge/to_lua.h b/engines/tetraedge/to_lua.h
index 94717e2d3a1..6ac573c5fe2 100644
--- a/engines/tetraedge/to_lua.h
+++ b/engines/tetraedge/to_lua.h
@@ -69,6 +69,7 @@ bool tolua_toboolean(lua_State *L, int narg, bool def);
 
 void tolua_pushboolean(lua_State *L, bool val);
 void tolua_pushnumber(lua_State *L, double val);
+void tolua_pushstring(lua_State *L, const char *val);
 
 } // end namespace ToLua
 


Commit: ababc83fb15e5224ce674b727ee68196c5f374b7
    https://github.com/scummvm/scummvm/commit/ababc83fb15e5224ce674b727ee68196c5f374b7
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2024-09-27T09:29:02+03:00

Commit Message:
TETRAEDGE: Don't crash on missing quit button

Changed paths:
    engines/tetraedge/game/options_menu.cpp


diff --git a/engines/tetraedge/game/options_menu.cpp b/engines/tetraedge/game/options_menu.cpp
index 5256eb49d62..b87046da09f 100644
--- a/engines/tetraedge/game/options_menu.cpp
+++ b/engines/tetraedge/game/options_menu.cpp
@@ -64,7 +64,10 @@ void OptionsMenu::enter() {
 		app->music().volume(1.0);
 	}
 
-	buttonLayoutChecked("quitButton")->onMouseClickValidated().add(this, &OptionsMenu::onQuitButton);
+	Tetraedge::TeButtonLayout *quitButton = buttonLayout("quitButton");
+	if (quitButton) {
+		quitButton->onMouseClickValidated().add(this, &OptionsMenu::onQuitButton);
+	}
 	buttonLayoutChecked("creditsButton")->onMouseClickValidated().add(this, &OptionsMenu::onCreditsButton);
 	TeButtonLayout *supportBtn = buttonLayout("supportButton");
 	if (supportBtn) {