[freesci-develop] r1525 - in freesci/branches/glutton/src: . engine include

[freesci]

Author: jameson
Date: 2006-02-12 00:29:05 +0100 (Sun, 12 Feb 2006)
New Revision: 1525

Modified:
   freesci/branches/glutton/src/config.c
   freesci/branches/glutton/src/engine/game.c
   freesci/branches/glutton/src/engine/kgraphics.c
   freesci/branches/glutton/src/include/games.h
Log:
* Added Hugues' extended game ID list to Glutton
* Added Hugues' 14 priority zone fix
* Changed version to 0.6.2pre0

-- Christoph



Modified: freesci/branches/glutton/src/config.c
===================================================================
--- freesci/branches/glutton/src/config.c       2006-02-09 20:17:03 UTC (rev 
1524)
+++ freesci/branches/glutton/src/config.c       2006-02-11 23:29:05 UTC (rev 
1525)
@@ -1,5 +1,5 @@
 
-#line 3 "config.c"
+#line 3 "lex.yy.c"
 
 #define  YY_INT_ALIGNED short int
 
@@ -1339,7 +1339,7 @@
 char *
 purge_comments(char *comments);
 
-#line 1343 "config.c"
+#line 1343 "lex.yy.c"
 
 #define INITIAL 0
 
@@ -1493,7 +1493,7 @@
 #line 312 "config.l"
 
 
-#line 1497 "config.c"
+#line 1497 "lex.yy.c"
 
        if ( (yy_init) )
                {
@@ -1784,7 +1784,7 @@
 #line 477 "config.l"
 ECHO;
        YY_BREAK
-#line 1788 "config.c"
+#line 1788 "lex.yy.c"
 
        case YY_END_OF_BUFFER:
                {
@@ -2514,7 +2514,6 @@
 
 /** Setup the input buffer state to scan a string. The next call to yylex() 
will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
  * @param yy_str a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.

Modified: freesci/branches/glutton/src/engine/game.c
===================================================================
--- freesci/branches/glutton/src/engine/game.c  2006-02-09 20:17:03 UTC (rev 
1524)
+++ freesci/branches/glutton/src/engine/game.c  2006-02-11 23:29:05 UTC (rev 
1525)
@@ -177,7 +177,7 @@
 
        s->priority_first = 42; /* Priority zone 0 ends here */
 
-       if (s->version <= SCI_VERSION_FTU_PRIORITY_14_ZONES)
+       if (s->version < SCI_VERSION_FTU_PRIORITY_14_ZONES)
                s->priority_last = 200; else
                s->priority_last = 190;
 

Modified: freesci/branches/glutton/src/engine/kgraphics.c
===================================================================
--- freesci/branches/glutton/src/engine/kgraphics.c     2006-02-09 20:17:03 UTC 
(rev 1524)
+++ freesci/branches/glutton/src/engine/kgraphics.c     2006-02-11 23:29:05 UTC 
(rev 1525)
@@ -162,7 +162,7 @@
                return 14; /* Maximum */
        } else
        {
-               if (s->version>SCI_VERSION_FTU_PRIORITY_14_ZONES)
+               if (s->version >= SCI_VERSION_FTU_PRIORITY_14_ZONES)
                        return SCI0_VIEW_PRIORITY_14_ZONES(y); else
                                return SCI0_VIEW_PRIORITY(y);
                
@@ -1142,7 +1142,7 @@
 
        s->priority_first = 42;
 
-       if (s->version <= SCI_VERSION_FTU_PRIORITY_14_ZONES)
+       if (s->version < SCI_VERSION_FTU_PRIORITY_14_ZONES)
                s->priority_last = 200;
        else
                s->priority_last = 190;

Modified: freesci/branches/glutton/src/include/games.h
===================================================================
--- freesci/branches/glutton/src/include/games.h        2006-02-09 20:17:03 UTC 
(rev 1524)
+++ freesci/branches/glutton/src/include/games.h        2006-02-11 23:29:05 UTC 
(rev 1525)
@@ -67,6 +67,22 @@
        { 0x31F46F7D, SCI_VERSION(0,000,453), "Space Quest III v1.0V int"},
        { 0xAA2C94B9, SCI_VERSION(0,000,685), "Mixed-Up Mother Goose v1.011 
Int.#8.2.90"},
 
+       { 0x3B15678B, SCI_VERSION(0,000,631), "The Colonel's Bequest 
v1.000.046-3.5"},
+       { 0x0E042F46, SCI_VERSION(0,000,530), "Hoyle 1 v1.000.113-3.5"},
+       { 0x1EACB959, SCI_VERSION(0,000,566), "HQ v1.000-5.25"},
+       { 0x2BEAF5E7, SCI_VERSION(0,000,566), "HQ v1.001-5.25"},
+       { 0x63626D3E, SCI_VERSION(0,000,668), "Iceman v1.023-5.25"},
+       { 0xDA5E7B7D, SCI_VERSION(0,000,409), "KQ4 v1.003.006-3.5"},
+       { 0x376A5472, SCI_VERSION(0,000,502), "KQ4 v1.006.003-5.25"},
+       { 0xFEAB629D, SCI_VERSION(0,000,343), "LSL2 v1.000.011-3.5"},
+       { 0x40BEC726, SCI_VERSION(0,000,409), "LSL2 v1.002.000-3.5"},
+       { 0x06D737B5, SCI_VERSION(0,000,572), "LSL3 v1.003-3.5"},
+       { 0x484587DD, SCI_VERSION(0,000,572), "LSL3 v1.021-5.25"},
+       { 0x364B40B2, SCI_VERSION(0,000,395), "PQ2 v1.001.000-5.25"},
+       { 0x664B4123, SCI_VERSION(0,000,409), "PQ2 v1.001.006-3.5"},
+       { 0x379F4582, SCI_VERSION(0,000,453), "SQ3 v1.0V-5.25"},
+       { 0x04B0B081, SCI_VERSION(0,000,294), "xmascard v1.04"},
+
        /* Undetermined Amiga versions: */
 /*     { 0x8AE5F854, SCI_VERSION(), "ARTHUR" }, */
 /*     { 0x9FB7015B, SCI_VERSION(), "CB1" }, */