[Scummvm-git-logs] scummvm master -> 093fdffa6ba0b205a5a0c23d78f09290633f477f

[dreammaster]

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

Summary:
d62c667ca7 XEEN: Fix typo and improve comment
6cad70deab XEEN: Return error on invalid number of arguments
093fdffa6b XEEN: Fix "remove X to equip Y" display issue


Commit: d62c667ca7807cb2f0465bfaf85d6f98f7ca2773
    https://github.com/scummvm/scummvm/commit/d62c667ca7807cb2f0465bfaf85d6f98f7ca2773
Author: Jonathan Phénix (greaterd at gmail.com)
Date: 2020-07-06T18:46:09-07:00

Commit Message:
XEEN: Fix typo and improve comment

Changed paths:
    engines/xeen/resources.h


diff --git a/engines/xeen/resources.h b/engines/xeen/resources.h
index c26c1cb2da..e4f690e223 100644
--- a/engines/xeen/resources.h
+++ b/engines/xeen/resources.h
@@ -105,7 +105,7 @@ private:
 	char _buffer[STRING_BUFFER_SIZE];
 private:
 	/**
-	 * Loads all the constants data stored in the xeen.css
+	 * Loads all the constants data stored in the xeen.ccs archive shipped with ScummVM
 	 */
 	void loadData();
 public:


Commit: 6cad70deab104fdab48acda591c731db61ae31ec
    https://github.com/scummvm/scummvm/commit/6cad70deab104fdab48acda591c731db61ae31ec
Author: Jonathan Phénix (greaterd at gmail.com)
Date: 2020-07-06T18:46:09-07:00

Commit Message:
XEEN: Return error on invalid number of arguments

Changed paths:
    devtools/create_xeen/create_xeen.cpp


diff --git a/devtools/create_xeen/create_xeen.cpp b/devtools/create_xeen/create_xeen.cpp
index 95253a2d66..61f57cf5da 100644
--- a/devtools/create_xeen/create_xeen.cpp
+++ b/devtools/create_xeen/create_xeen.cpp
@@ -57,7 +57,7 @@ void writeVersion(CCArchive &cc) {
 int main(int argc, char *argv[]) {
 	if (argc != 3) {
 		printf("Format: %s dark.cc \"swords xeen.dat\"\n", argv[0]);
-		exit(0);
+		return 1;
 	}
 
 	if (!outputFile.open("xeen.ccs", Common::kFileWriteMode)) {


Commit: 093fdffa6ba0b205a5a0c23d78f09290633f477f
    https://github.com/scummvm/scummvm/commit/093fdffa6ba0b205a5a0c23d78f09290633f477f
Author: Jonathan Phénix (greaterd at gmail.com)
Date: 2020-07-06T18:46:09-07:00

Commit Message:
XEEN: Fix "remove X to equip Y" display issue

Without the terminal space, the last character is vertically cut.
Tested with the Xeen Slayer Sword.

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


diff --git a/devtools/create_xeen/constants.cpp b/devtools/create_xeen/constants.cpp
index eea7f93f38..d38b862968 100644
--- a/devtools/create_xeen/constants.cpp
+++ b/devtools/create_xeen/constants.cpp
@@ -1305,8 +1305,8 @@ const char *const WEAPON_NAMES[41] = {
 	"wakazashi ", "dagger ", "mace ", "flail ", "cudgel ", "maul ", "spear ",
 	"bardiche ", "glaive ", "halberd ", "pike ", "flamberge ", "trident ",
 	"staff ", "hammer ", "naginata ", "battle axe ", "grand axe ", "great axe ",
-	"short bow ", "long bow ", "crossbow ", "sling ", "Xeen Slayer Sword",
-	"Elder LongSword", "Elder Dagger ", "Elder Mace ", "Elder Spear ",
+	"short bow ", "long bow ", "crossbow ", "sling ", "Xeen Slayer Sword ",
+	"Elder LongSword ", "Elder Dagger ", "Elder Mace ", "Elder Spear ",
 	"Elder Staff ", "Elder LongBow "
 };
 
diff --git a/dists/engine-data/xeen.ccs b/dists/engine-data/xeen.ccs
index 3dec6af400..59e18c0292 100644
Binary files a/dists/engine-data/xeen.ccs and b/dists/engine-data/xeen.ccs differ