[Scummvm-git-logs] scummvm master -> 63e4f63483c2af5b4e07ba59d754392b9d95b4d9

[aquadran]

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

Summary:
63e4f63483 WINTERMUTE: Janitorial


Commit: 63e4f63483c2af5b4e07ba59d754392b9d95b4d9
    https://github.com/scummvm/scummvm/commit/63e4f63483c2af5b4e07ba59d754392b9d95b4d9
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-07-02T23:08:44+02:00

Commit Message:
WINTERMUTE: Janitorial

Changed paths:
    engines/wintermute/ad/ad_scene.cpp
    engines/wintermute/base/base_game.cpp


diff --git a/engines/wintermute/ad/ad_scene.cpp b/engines/wintermute/ad/ad_scene.cpp
index 680096445ca..dde473ed968 100644
--- a/engines/wintermute/ad/ad_scene.cpp
+++ b/engines/wintermute/ad/ad_scene.cpp
@@ -1956,12 +1956,11 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		stack->correctParams(1);
 		const char *nodeName = stack->pop()->getString();
 
-		if (!_sceneGeometry) {
-			script->runtimeError("Scene.EnableNode3D: Scene doesn't contain any geometry");
-			stack->pushBool(false);
-		} else {
+		if (_sceneGeometry) {
 			bool ret = _sceneGeometry->isNodeEnabled(nodeName);
 			stack->pushBool(ret);
+		} else {
+			stack->pushBool(false);
 		}
 
 		return STATUS_OK;
@@ -1976,6 +1975,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		const char *lightName = stack->pop()->getString();
 
 		if (!_sceneGeometry) {
+			script->runtimeError("Scene.EnableLight: Scene doesn't contain any geometry");
 			stack->pushBool(false);
 		} else {
 			bool res = _sceneGeometry->enableLight(lightName);
@@ -1994,6 +1994,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		const char *lightName = stack->pop()->getString();
 
 		if (!_sceneGeometry) {
+			script->runtimeError("Scene.DisableLight: Scene doesn't contain any geometry");
 			stack->pushBool(false);
 		} else {
 			bool res = _sceneGeometry->enableLight(lightName, false);
@@ -2048,6 +2049,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		uint32 color = static_cast<uint32>(stack->pop()->getInt());
 
 		if (!_sceneGeometry) {
+			script->runtimeError("Scene.SetLightColor: Scene doesn't contain any geometry");
 			stack->pushBool(false);
 		} else {
 			bool ret = _sceneGeometry->setLightColor(lightName, color);
@@ -2064,10 +2066,11 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		stack->correctParams(1);
 		const char *lightName = stack->pop()->getString();
 
-		if (_sceneGeometry) {
-			stack->pushInt(_sceneGeometry->getLightColor(lightName));
-		} else {
+		if (!_sceneGeometry) {
+			script->runtimeError("Scene.GetLightColor: Scene doesn't contain any geometry");
 			stack->pushInt(0);
+		} else {
+			stack->pushInt(_sceneGeometry->getLightColor(lightName));
 		}
 
 		return STATUS_OK;
@@ -2081,6 +2084,7 @@ bool AdScene::scCallMethod(ScScript *script, ScStack *stack, ScStack *thisStack,
 		const char *lightName = stack->pop()->getString();
 
 		if (!_sceneGeometry) {
+			script->runtimeError("Scene.GetLightPosition: Scene doesn't contain any geometry");
 			stack->pushInt(0);
 		} else {
 			Math::Vector3d pos = _sceneGeometry->getLightPos(lightName);
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 2aa5d0022be..b11bd303334 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -4089,7 +4089,7 @@ void BaseGame::setWindowTitle() {
 		if (title[0] != '\0') {
 			Common::strlcat(title, " - ", 512);
 		}
-		Common::strlcat(title, "WME Lite", 512);
+		Common::strlcat(title, "Wintermute Engine", 512);
 
 
 		Utf8String utf8Title;