[Scummvm-cvs-logs] scummvm master -> 8ff9e0cbff38e092b62dd55df4136aea2c8bff44

lordhoto lordhoto at gmail.com
Sun Dec 4 15:55:02 CET 2011


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:
8ff9e0cbff GUI: Fix GUIO flags again.


Commit: 8ff9e0cbff38e092b62dd55df4136aea2c8bff44
    https://github.com/scummvm/scummvm/commit/8ff9e0cbff38e092b62dd55df4136aea2c8bff44
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-04T06:54:32-08:00

Commit Message:
GUI: Fix GUIO flags again.

The GUIO flags use an escape sequence for octal numbers. Starting with
18e84f9c1138ea4ce66cbbea53e6957bee3e588f GUIO_MIDICMS used "\008" which
resulted in the CMS flag adding a zero into the flags and thus terminating the
GUIO flag string.

Changed paths:
    common/util.h



diff --git a/common/util.h b/common/util.h
index 08a49f3..dfa57d7 100644
--- a/common/util.h
+++ b/common/util.h
@@ -87,19 +87,19 @@ template<typename T> inline void SWAP(T &a, T &b) { T tmp = a; a = b; b = tmp; }
 #define GUIO_NOLAUNCHLOAD	"\006"
 
 #define GUIO_MIDIPCSPK		"\007"
-#define GUIO_MIDICMS		"\008"
-#define GUIO_MIDIPCJR		"\010"
-#define GUIO_MIDIADLIB		"\011"
-#define GUIO_MIDIC64        "\012"
-#define GUIO_MIDIAMIGA      "\013"
-#define GUIO_MIDIAPPLEIIGS  "\014"
-#define GUIO_MIDITOWNS		"\015"
-#define GUIO_MIDIPC98		"\016"
-#define GUIO_MIDIMT32		"\017"
-#define GUIO_MIDIGM			"\020"
-
-#define GUIO_NOASPECT		"\021"
-#define GUIO_EGAUNDITHER	"\022"
+#define GUIO_MIDICMS		"\010"
+#define GUIO_MIDIPCJR		"\011"
+#define GUIO_MIDIADLIB		"\012"
+#define GUIO_MIDIC64        "\013"
+#define GUIO_MIDIAMIGA      "\014"
+#define GUIO_MIDIAPPLEIIGS  "\015"
+#define GUIO_MIDITOWNS		"\016"
+#define GUIO_MIDIPC98		"\017"
+#define GUIO_MIDIMT32		"\020"
+#define GUIO_MIDIGM			"\021"
+
+#define GUIO_NOASPECT		"\022"
+#define GUIO_EGAUNDITHER	"\023"
 
 #define GUIO0() (GUIO_NONE)
 #define GUIO1(a) (a)






More information about the Scummvm-git-logs mailing list