[Scummvm-cvs-logs] CVS: scummvm/scumm help.cpp,1.25,1.26 scumm.cpp,1.687,1.688 sound.cpp,1.498,1.499 vars.cpp,1.159,1.160 scumm.h,1.663,1.664
kirben
kirben at users.sourceforge.net
Sat Jan 14 01:29:02 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22873/scumm
Modified Files:
help.cpp scumm.cpp sound.cpp vars.cpp scumm.h
Log Message:
Add SegaCD platform and remove SegaCD specific game Id.
Index: help.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/help.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- help.cpp 18 Oct 2005 01:30:20 -0000 1.25
+++ help.cpp 14 Jan 2006 09:28:35 -0000 1.26
@@ -20,9 +20,12 @@
*/
#include "common/stdafx.h"
+
+#include "common/str.h"
+#include "common/util.h"
+
#include "scumm/help.h"
#include "scumm/scumm.h"
-#include "common/str.h"
namespace Scumm {
@@ -40,7 +43,6 @@
case GID_LOOM256:
case GID_MONKEY_EGA:
case GID_MONKEY_VGA:
- case GID_MONKEY_SEGA:
case GID_MONKEY:
case GID_MONKEY2:
case GID_INDY4:
@@ -64,8 +66,8 @@
#define ADD_TEXT(d) ADD_BIND("",d)
#define ADD_LINE ADD_BIND("","")
-void ScummHelp::updateStrings(byte gameId, byte version, int page,
- String &title, String *&key, String *&dsc) {
+void ScummHelp::updateStrings(byte gameId, byte version, Common::Platform platform,
+ int page, String &title, String *&key, String *&dsc) {
key = new String[HELP_NUM_LINES];
dsc = new String[HELP_NUM_LINES];
int i = 0;
@@ -206,7 +208,6 @@
ADD_BIND("f", "turn oFf");
break;
case GID_MONKEY:
- case GID_MONKEY_SEGA:
case GID_MONKEY2:
case GID_INDY4:
case GID_TENTACLE:
@@ -219,7 +220,7 @@
ADD_BIND("u", "Use");
ADD_BIND("s", "puSh");
ADD_BIND("y", "pull (Yank)");
- if (gameId == GID_MONKEY_SEGA) {
+ if (platform == Common::kPlatformSegaCD) {
// FIXME look at scripts to figure all options out...
// keys 1->4 seem to do something as well
ADD_BIND("6", "Highlight prev dialogue");
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.687
retrieving revision 1.688
diff -u -d -r1.687 -r1.688
--- scumm.cpp 14 Jan 2006 08:51:22 -0000 1.687
+++ scumm.cpp 14 Jan 2006 09:28:37 -0000 1.688
@@ -649,8 +649,8 @@
{"e17db1ddf91b39ca6bbc8ad3ed19e883", "The Secret of Monkey Island (FM-TOWNS Jp)", GID_MONKEY, 5, 0, /*MDT_PCSPK |*/ MDT_ADLIB,
GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformFMTowns},
- {"c13225cb1bbd3bc9fe578301696d8021", "The Secret of Monkey Island (SegaCD)", GID_MONKEY_SEGA, 5, 0, MDT_NONE,
- GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformPC},
+ {"c13225cb1bbd3bc9fe578301696d8021", "The Secret of Monkey Island (SegaCD)", GID_MONKEY, 5, 0, MDT_NONE,
+ GF_USE_KEY | GF_AUDIOTRACKS, Common::kPlatformSegaCD},
{"3de99ef0523f8ca7958faa3afccd035a", "Spy Fox 1: Dry Cereal (Updated)", GID_HEGAME, 6, 100, MDT_NONE,
GF_USE_KEY | GF_NEW_COSTUMES, Common::kPlatformWindows},
@@ -1813,9 +1813,6 @@
VAR(85) = 1;
}
- if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
- _scummVars[74] = 1225;
-
if (_imuse) {
_imuse->setBase(res.address[rtSound]);
}
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.498
retrieving revision 1.499
diff -u -d -r1.498 -r1.499
--- sound.cpp 14 Jan 2006 04:29:30 -0000 1.498
+++ sound.cpp 14 Jan 2006 09:28:38 -0000 1.499
@@ -281,7 +281,7 @@
// I'll add some code to test that theory for now.
// Check if the resource has already been demangled
- if ((_vm->_gameId == GID_MONKEY_SEGA) && (ptr[0] != 1)) {
+ if ((_vm->_platform == Common::kPlatformSegaCD) && (ptr[0] != 1)) {
for (int i = 0; i < size; i++) {
ptr[i] ^= 0x16;
if (ptr[i] >= 0x7F) {
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- vars.cpp 14 Jan 2006 05:32:11 -0000 1.159
+++ vars.cpp 14 Jan 2006 09:28:38 -0000 1.160
@@ -551,7 +551,7 @@
VAR(VAR_CURRENT_LIGHTS) = LIGHTMODE_actor_base | LIGHTMODE_actor_color | LIGHTMODE_screen;
}
- if (_gameId == GID_MONKEY || _gameId == GID_MONKEY_SEGA)
+ if (_gameId == GID_MONKEY)
_scummVars[74] = 1225;
}
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.663
retrieving revision 1.664
diff -u -d -r1.663 -r1.664
--- scumm.h 14 Jan 2006 05:32:11 -0000 1.663
+++ scumm.h 14 Jan 2006 09:28:38 -0000 1.664
@@ -206,7 +206,6 @@
GID_CMI,
GID_MANIAC,
GID_ZAK,
- GID_MONKEY_SEGA,
GID_HEGAME, // Generic name for all HE games with default behaviour
GID_PUTTDEMO,
GID_FBEAR,
More information about the Scummvm-git-logs
mailing list