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

dreammaster dreammaster at scummvm.org
Sun Mar 25 04:06:12 CEST 2018


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:
edf19f5f0d XEEN: Fix showing training costs for next level


Commit: edf19f5f0d4d23d11008a9b59163527caf3f1369
    https://github.com/scummvm/scummvm/commit/edf19f5f0d4d23d11008a9b59163527caf3f1369
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2018-03-24T22:06:07-04:00

Commit Message:
XEEN: Fix showing training costs for next level

Changed paths:
    devtools/create_xeen/constants.cpp
    dists/engine-data/xeen.ccs
    engines/xeen/locations.cpp


diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index db1c73d..81ca71c 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -952,7 +952,8 @@ const char *const EXPERIENCE_FOR_LEVEL =
 
 const char *const LEARNED_ALL = "%s has learned all we can teach!";
 
-const char *const ELIGIBLE_FOR_LEVEL = "%s is eligible for level %d.";
+const char *const ELIGIBLE_FOR_LEVEL = "%s is eligible for level %u.\x3l\n"
+	"\v081Cost\x3r\t000%u";
 
 const char *const TRAINING_TEXT =
 	"\x0D\x03""cTraining Options\n"
diff --git a/dists/engine-data/xeen.ccs b/dists/engine-data/xeen.ccs
index 801168a..767b7ed 100644
Binary files a/dists/engine-data/xeen.ccs and b/dists/engine-data/xeen.ccs differ
diff --git a/engines/xeen/locations.cpp b/engines/xeen/locations.cpp
index 95bb7c7..7934c05 100644
--- a/engines/xeen/locations.cpp
+++ b/engines/xeen/locations.cpp
@@ -1043,8 +1043,9 @@ Common::String TrainingLocation::createLocationText(Character &ch) {
 		msg = Common::String::format(Res.LEARNED_ALL, ch._name.c_str());
 	} else {
 		// Eligble for level increase
+		uint cost = ch._level._permanent * ch._level._permanent * 10;
 		msg = Common::String::format(Res.ELIGIBLE_FOR_LEVEL,
-			ch._name.c_str(), ch._level._permanent + 1);
+			ch._name.c_str(), ch._level._permanent + 1, cost);
 	}
 
 	return Common::String::format(Res.TRAINING_TEXT, msg.c_str(),





More information about the Scummvm-git-logs mailing list