[Scummvm-cvs-logs] scummvm master -> b3e6899f900226c4afd44cee68b06453258e1ac8

clone2727 clone2727 at gmail.com
Tue Jul 19 16:20:50 CEST 2011


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:
d38fa57d1b VIDEO: Fix typo with last commit
b3e6899f90 DEVTOOLS: Fix typos and formatting in create_toon


Commit: d38fa57d1bff511513bd98db622f9752254283c5
    https://github.com/scummvm/scummvm/commit/d38fa57d1bff511513bd98db622f9752254283c5
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-07-19T07:15:51-07:00

Commit Message:
VIDEO: Fix typo with last commit

Changed paths:
    video/smk_decoder.cpp



diff --git a/video/smk_decoder.cpp b/video/smk_decoder.cpp
index adb8fad..dce80ed 100644
--- a/video/smk_decoder.cpp
+++ b/video/smk_decoder.cpp
@@ -375,7 +375,7 @@ bool SmackerDecoder::loadStream(Common::SeekableReadStream *stream) {
 	// Read in the Smacker header
 	_header.signature = _fileStream->readUint32BE();
 
-	if (_header.signature != MKTAG('S', 'M', 'K', '2') && _header.signature == MKTAG('S', 'M', 'K', '4'))
+	if (_header.signature != MKTAG('S', 'M', 'K', '2') && _header.signature != MKTAG('S', 'M', 'K', '4'))
 		return false;
 
 	uint32 width = _fileStream->readUint32LE();


Commit: b3e6899f900226c4afd44cee68b06453258e1ac8
    https://github.com/scummvm/scummvm/commit/b3e6899f900226c4afd44cee68b06453258e1ac8
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2011-07-19T07:16:20-07:00

Commit Message:
DEVTOOLS: Fix typos and formatting in create_toon

Changed paths:
    devtools/create_toon/create_toon.cpp
    devtools/create_toon/create_toon.h



diff --git a/devtools/create_toon/create_toon.cpp b/devtools/create_toon/create_toon.cpp
index bdd57be..d01102b 100644
--- a/devtools/create_toon/create_toon.cpp
+++ b/devtools/create_toon/create_toon.cpp
@@ -77,8 +77,8 @@ int main(int argc, char *argv[]) {
 	writeByte(outFile, TOON_DAT_VER_MAJ);
 	writeByte(outFile, TOON_DAT_VER_MIN);
 
-	// game versions/variantes
-	writeUint16BE(outFile, NUM_VARIANTE);
+	// game versions/variants
+	writeUint16BE(outFile, NUM_VARIANTS);
 
 	// Write locationDirNotVisited
 	nbrElem = sizeof(locationDirNotVisited_EN) / sizeof(char *);
@@ -128,7 +128,7 @@ int main(int argc, char *argv[]) {
 	nbrElem = sizeof(specialInfoLine_SP) / sizeof(char *);
 	writeTextArray(outFile, specialInfoLine_SP, nbrElem);
 
-// Not yet handled : miscTexts, endingLine and exitLine. Are they useful?
+	// Not yet handled: miscTexts, endingLine and exitLine. Are they useful?
 
 	fclose(outFile);
 	return 0;
diff --git a/devtools/create_toon/create_toon.h b/devtools/create_toon/create_toon.h
index 60b3301..b047959 100644
--- a/devtools/create_toon/create_toon.h
+++ b/devtools/create_toon/create_toon.h
@@ -30,9 +30,9 @@
 #define TOON_DAT_VER_MAJ 0  // 1 byte
 #define TOON_DAT_VER_MIN 3  // 1 byte
 
-// Number of Variante of the game. For the moment, it's the same
-// than the number of languages
-#define NUM_VARIANTE   5
+// Number of variants of the game. For the moment, it's the same
+// as the number of languages
+#define NUM_VARIANTS   5
 
 typedef unsigned char  uint8;
 typedef unsigned char  byte;






More information about the Scummvm-git-logs mailing list