[Scummvm-git-logs] scummvm master -> 8078b28e1037f8e2b95cff34b7cb2b92e3a3f505

[djsrv]

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:
8078b28e10 DIRECTOR: LINGO: Rewrite b_version


Commit: 8078b28e1037f8e2b95cff34b7cb2b92e3a3f505
    https://github.com/scummvm/scummvm/commit/8078b28e1037f8e2b95cff34b7cb2b92e3a3f505
Author: djsrv (dservilla at gmail.com)
Date: 2020-08-19T19:27:23-04:00

Commit Message:
DIRECTOR: LINGO: Rewrite b_version

It should support any version now.

Changed paths:
    engines/director/lingo/lingo-builtins.cpp
    engines/director/lingo/tests/builtin.lingo


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 9f7952218b..72f6664687 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -2302,17 +2302,16 @@ void LB::b_true(int nargs) {
 }
 
 void LB::b_version(int nargs) {
-	switch (g_director->getVersion()) {
-	case 3:
-		g_lingo->push(Datum(Common::String("3.1.1"))); // Mac
-		break;
-	case 4:
-		g_lingo->push(Datum(Common::String("4.0"))); // Mac
-		break;
-	default:
-		error("Unsupported Director for 'version'");
-		break;
+	int major = g_director->getVersion() / 100;
+	int minor = (g_director->getVersion() / 10) % 10;
+	int patch = g_director->getVersion() % 10;
+	Common::String res;
+	if (patch) {
+		res = Common::String::format("%d.%d.%d", major, minor, patch);
+	} else {
+		res = Common::String::format("%d.%d", major, minor);
 	}
+	g_lingo->push(res);
 }
 
 ///////////////////
diff --git a/engines/director/lingo/tests/builtin.lingo b/engines/director/lingo/tests/builtin.lingo
index 198efa840a..1669289d76 100644
--- a/engines/director/lingo/tests/builtin.lingo
+++ b/engines/director/lingo/tests/builtin.lingo
@@ -35,3 +35,16 @@ unload ab
 unload ab, bc
 
 put framesToHMS(integer(field 3),30,false,false) into field 5
+
+set save to the scummvmVersion
+
+set the scummvmVersion to 300
+scummvmAssert(version = "3.0")
+set the scummvmVersion to 310
+scummvmAssert(version = "3.1")
+set the scummvmVersion to 404
+scummvmAssert(version = "4.0.4")
+set the scummvmVersion to 1201
+scummvmAssert(version = "12.0.1")
+
+set the scummvmVersion to save