[Scummvm-cvs-logs] scummvm master -> 243779a7ebb3e6d263a99fa7c6fcf2240b6be148

[lordhoto]

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:
243779a7eb GRAPHICS: Display warning in case the SJIS.FNT version does not match.


Commit: 243779a7ebb3e6d263a99fa7c6fcf2240b6be148
    https://github.com/scummvm/scummvm/commit/243779a7ebb3e6d263a99fa7c6fcf2240b6be148
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-08-23T06:15:29-07:00

Commit Message:
GRAPHICS: Display warning in case the SJIS.FNT version does not match.

Changed paths:
    graphics/sjis.cpp
    graphics/sjis.h



diff --git a/graphics/sjis.cpp b/graphics/sjis.cpp
index 4dd24d9..facf047 100644
--- a/graphics/sjis.cpp
+++ b/graphics/sjis.cpp
@@ -537,7 +537,8 @@ bool FontSjisSVM::loadData() {
 	}
 
 	uint32 version = data->readUint32BE();
-	if (version != 3) {
+	if (version != kSjisFontVersion) {
+		warning("SJIS font version mismatch, expected: %d found: %u", kSjisFontVersion, version);
 		delete data;
 		return false;
 	}
diff --git a/graphics/sjis.h b/graphics/sjis.h
index 185b6cc..f96eef6 100644
--- a/graphics/sjis.h
+++ b/graphics/sjis.h
@@ -263,6 +263,10 @@ private:
 	const uint8 *getCharDataDefault(uint16 c) const;
 
 	void mapKANJIChar(const uint8 fB, const uint8 sB, int &base, int &index) const;
+
+	enum {
+		kSjisFontVersion = 3
+	};
 };
 
 // TODO: Consider adding support for PC98 ROM