[Scummvm-cvs-logs] SF.net SVN: scummvm: [32740] scummvm/branches/gsoc2008-rtl
cpage88 at users.sourceforge.net
cpage88 at users.sourceforge.net
Fri Jun 20 21:42:29 CEST 2008
Revision: 32740
http://scummvm.svn.sourceforge.net/scummvm/?rev=32740&view=rev
Author: cpage88
Date: 2008-06-20 12:42:29 -0700 (Fri, 20 Jun 2008)
Log Message:
-----------
Merged revisions 32727-32728,32730-32733,32737-32738 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
Modified Paths:
--------------
scummvm/branches/gsoc2008-rtl/engines/cine/unpack.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/drascula.h
scummvm/branches/gsoc2008-rtl/engines/drascula/graphics.cpp
scummvm/branches/gsoc2008-rtl/engines/drascula/palette.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/scenery.cpp
scummvm/branches/gsoc2008-rtl/engines/gob/videoplayer.cpp
scummvm/branches/gsoc2008-rtl/engines/m4/converse.cpp
scummvm/branches/gsoc2008-rtl/engines/m4/graphics.cpp
scummvm/branches/gsoc2008-rtl/engines/m4/graphics.h
scummvm/branches/gsoc2008-rtl/engines/m4/m4_views.cpp
scummvm/branches/gsoc2008-rtl/engines/m4/mads_anim.cpp
scummvm/branches/gsoc2008-rtl/engines/m4/viewmgr.cpp
scummvm/branches/gsoc2008-rtl/engines/made/database.cpp
scummvm/branches/gsoc2008-rtl/engines/made/detection.cpp
scummvm/branches/gsoc2008-rtl/engines/made/made.cpp
scummvm/branches/gsoc2008-rtl/engines/made/made.h
scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.cpp
Property Changed:
----------------
scummvm/branches/gsoc2008-rtl/
scummvm/branches/gsoc2008-rtl/backends/fs/wii/
Property changes on: scummvm/branches/gsoc2008-rtl
___________________________________________________________________
Name: svnmerge-integrated
- /scummvm/branches/gsoc2008-gui:1-31703 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/trunk:1-32719
+ /scummvm/branches/gsoc2008-gui:1-31703 /scummvm/branches/gsoc2008-tfmx:1-31765 /scummvm/trunk:1-32739
Property changes on: scummvm/branches/gsoc2008-rtl/backends/fs/wii
___________________________________________________________________
Name: svn:ignore
+ .deps
*.o
lib*.a
Modified: scummvm/branches/gsoc2008-rtl/engines/cine/unpack.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/cine/unpack.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/cine/unpack.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -111,7 +111,7 @@
while (_dst >= _dstBegin && !_error) {
/*
Bits => Action:
- 0 0 => unpackRawBytes(3 bits + 1) i.e. unpackRawBytes(1..9)
+ 0 0 => unpackRawBytes(3 bits + 1) i.e. unpackRawBytes(1..8)
1 1 1 => unpackRawBytes(8 bits + 9) i.e. unpackRawBytes(9..264)
0 1 => copyRelocatedBytes(8 bits, 2) i.e. copyRelocatedBytes(0..255, 2)
1 0 0 => copyRelocatedBytes(9 bits, 3) i.e. copyRelocatedBytes(0..511, 3)
Modified: scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/drascula/animation.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -1669,7 +1669,7 @@
const int frusky_x[] = {100, 139, 178, 217, 100, 178, 217, 139, 100, 139};
const int elfrusky_x[] = {1, 68, 135, 1, 68, 135, 1, 68, 135, 68, 1, 135, 68, 135, 68};
int color, component;
- char fade;
+ signed char fade;
playMusic(26);
updateRoom();
Modified: scummvm/branches/gsoc2008-rtl/engines/drascula/drascula.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/drascula/drascula.h 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/drascula/drascula.h 2008-06-20 19:42:29 UTC (rev 32740)
@@ -245,7 +245,7 @@
void loadPic(const char *NamePcc, byte *targetSurface, int colorCount = 1);
- typedef char DacPalette256[256][3];
+ typedef signed char DacPalette256[256][3];
void setRGB(byte *pal, int plt);
void assignDefaultPalette();
@@ -397,7 +397,7 @@
void playFLI(const char *filefli, int vel);
void fadeFromBlack(int fadeSpeed);
void fadeToBlack(int fadeSpeed);
- char adjustToVGA(char value);
+ signed char adjustToVGA(signed char value);
void color_abc(int cl);
void centerText(const char *,int,int);
void playSound(int soundNum);
Modified: scummvm/branches/gsoc2008-rtl/engines/drascula/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/drascula/graphics.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/drascula/graphics.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -89,32 +89,22 @@
}
void DrasculaEngine::loadPic(const char *NamePcc, byte *targetSurface, int colorCount) {
- unsigned int con, x = 0;
- unsigned int fExit = 0;
- byte ch, rep;
+ uint dataSize = 0;
+ byte *pcxData;
_arj.open(NamePcc);
if (!_arj.isOpen())
error("missing game data %s %c", NamePcc, 7);
- _arj.seek(128);
- while (!fExit) {
- ch = _arj.readByte();
- rep = 1;
- if ((ch & 192) == 192) {
- rep = (ch & 63);
- ch = _arj.readByte();
- }
- for (con = 0; con < rep; con++) {
- x++;
- if (x > 64000) {
- fExit = 1;
- break;
- }
- *targetSurface++ = ch;
- }
- }
+ dataSize = _arj.size() - 128 - (256 * 3);
+ pcxData = (byte *)malloc(dataSize);
+ _arj.seek(128, SEEK_SET);
+ _arj.read(pcxData, dataSize);
+
+ decodeRLE(pcxData, targetSurface);
+ free(pcxData);
+
for (int i = 0; i < 256; i++) {
cPal[i * 3 + 0] = _arj.readByte();
cPal[i * 3 + 1] = _arj.readByte();
@@ -141,7 +131,6 @@
memcpy(prevFrame, VGA, 64000);
decodeRLE(pcxData, VGA);
-
free(pcxData);
if (!firstFrame)
Modified: scummvm/branches/gsoc2008-rtl/engines/drascula/palette.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/drascula/palette.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/drascula/palette.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -87,12 +87,12 @@
setPalette((byte *)&gamePalette);
}
-char DrasculaEngine::adjustToVGA(char value) {
+signed char DrasculaEngine::adjustToVGA(signed char value) {
return (value & 0x3F) * (value > 0);
}
void DrasculaEngine::fadeToBlack(int fadeSpeed) {
- char fade;
+ signed char fade;
unsigned int color, component;
DacPalette256 palFade;
@@ -110,7 +110,7 @@
}
void DrasculaEngine::fadeFromBlack(int fadeSpeed) {
- char fade;
+ signed char fade;
unsigned int color, component;
DacPalette256 palFade;
@@ -186,7 +186,7 @@
}
void DrasculaEngine::setPaletteBase(int darkness) {
- char fade;
+ signed char fade;
unsigned int color, component;
for (fade = darkness; fade >= 0; fade--) {
Modified: scummvm/branches/gsoc2008-rtl/engines/gob/scenery.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/gob/scenery.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/gob/scenery.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -595,7 +595,7 @@
int16 destX;
int16 destY;
- if (animation < 0) {
+ if ((_vm->getGameType() == kGameTypeWoodruff) && (animation < 0)) {
// Object video
if (flags & 1) { // Do capture
@@ -736,6 +736,8 @@
return;
}
+ if ((animation < 0) || (animation >= 10))
+ return;
if ((_animPictCount[animation] == 0) || (layer < 0))
return;
if (layer >= _animations[animation].layersCount)
Modified: scummvm/branches/gsoc2008-rtl/engines/gob/videoplayer.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/gob/videoplayer.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/gob/videoplayer.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -588,12 +588,14 @@
}
void VideoPlayer::copyPalette(CoktelVideo &video, int16 palStart, int16 palEnd) {
- if ((palStart != -1) && (palEnd != -1))
- memcpy(((char *) (_vm->_global->_pPaletteDesc->vgaPal)) + palStart * 3,
- video.getPalette() + palStart * 3,
- (palEnd - palStart + 1) * 3);
- else
- memcpy((char *) _vm->_global->_pPaletteDesc->vgaPal, video.getPalette(), 768);
+ if (palStart < 0)
+ palStart = 0;
+ if (palEnd < 0)
+ palEnd = 255;
+
+ memcpy(((char *) (_vm->_global->_pPaletteDesc->vgaPal)) + palStart * 3,
+ video.getPalette() + palStart * 3,
+ (palEnd - palStart + 1) * 3);
}
void VideoPlayer::writeVideoInfo(const char *videoFile, int16 varX, int16 varY,
Modified: scummvm/branches/gsoc2008-rtl/engines/m4/converse.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/m4/converse.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/m4/converse.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -153,7 +153,7 @@
void ConversationView::onRefresh(RectList *rects, M4Surface *destSurface) {
//if (!this->isVisible())
// return;
- empty();
+ clear();
if (_entriesShown) {
// Write out the conversation options
Modified: scummvm/branches/gsoc2008-rtl/engines/m4/graphics.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/m4/graphics.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/m4/graphics.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -320,7 +320,7 @@
void M4Surface::freeData() {
}
-void M4Surface::empty() {
+void M4Surface::clear() {
Common::set_to((byte *) pixels, (byte *) pixels + w * h, _vm->_palette->BLACK);
}
@@ -389,7 +389,7 @@
}
void M4Surface::loadBackground(int sceneNumber, RGBList **palData) {
- this->empty(); // clear previous scene
+ clear(); // clear previous scene
if (_vm->isM4() || (_vm->getGameType() == GType_RexNebular)) {
char resourceName[20];
@@ -502,7 +502,7 @@
//printf("Tile: %i, compressed size: %i\n", i, compressedTileDataSize);
- newTile->empty();
+ newTile->clear();
byte *compressedTileData = new byte[compressedTileDataSize];
Modified: scummvm/branches/gsoc2008-rtl/engines/m4/graphics.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/m4/graphics.h 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/m4/graphics.h 2008-06-20 19:42:29 UTC (rev 32740)
@@ -128,7 +128,7 @@
byte *getData();
byte *getBasePtr(int x, int y);
void freeData();
- void empty();
+ void clear();
void frameRect(const Common::Rect &r, uint8 color);
void fillRect(const Common::Rect &r, uint8 color);
void copyFrom(M4Surface *src, const Common::Rect &srcBounds, int destX, int destY,
Modified: scummvm/branches/gsoc2008-rtl/engines/m4/m4_views.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/m4/m4_views.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/m4/m4_views.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -331,7 +331,7 @@
}
void GameInterfaceView::onRefresh(RectList *rects, M4Surface *destSurface) {
- empty();
+ clear();
_statusText.onRefresh();
_inventory.onRefresh();
Modified: scummvm/branches/gsoc2008-rtl/engines/m4/mads_anim.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/m4/mads_anim.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/m4/mads_anim.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -61,9 +61,9 @@
_vm->_font->setColors(5, 6, 4);
- empty();
- _bgSurface.empty();
- _textSurface.empty();
+ clear();
+ _bgSurface.clear();
+ _textSurface.clear();
int y = (height() - MADS_SURFACE_HEIGHT) / 2;
setColor(2);
@@ -83,8 +83,8 @@
}
void TextviewView::reset() {
- _bgSurface.empty();
- _textSurface.empty();
+ _bgSurface.clear();
+ _textSurface.clear();
_animating = false;
_panX = 0;
_panY = 0;
@@ -456,8 +456,8 @@
// Set up system palette colors
_vm->_palette->setMadsSystemPalette();
- empty();
- _bgSurface.empty();
+ clear();
+ _bgSurface.clear();
int y = (height() - MADS_SURFACE_HEIGHT) / 2;
setColor(2);
@@ -471,7 +471,7 @@
}
void AnimviewView::reset() {
- _bgSurface.empty();
+ _bgSurface.clear();
_soundDriverLoaded = false;
}
Modified: scummvm/branches/gsoc2008-rtl/engines/m4/viewmgr.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/m4/viewmgr.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/m4/viewmgr.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -380,7 +380,7 @@
}
void ViewManager::refreshAll() {
- _vm->_screen->empty();
+ _vm->_screen->clear();
for (ListIterator i = _views.begin(); i != _views.end(); ++i) {
View *v = *i;
Modified: scummvm/branches/gsoc2008-rtl/engines/made/database.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/made/database.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/made/database.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -88,12 +88,9 @@
if (getClass() == 0x7FFF) {
byte *vector = (byte*)getData();
return vector[index];
- } else if (getClass() == 0x7FFE) {
+ } else if (getClass() <= 0x7FFE) {
int16 *vector = (int16*)getData();
return READ_LE_UINT16(&vector[index]);
- } else if (getClass() < 0x7FFE) {
- int16 *vector = (int16*)getData();
- return READ_LE_UINT16(&vector[index]);
} else {
// should never reach here
error("Unknown object class");
@@ -372,7 +369,7 @@
debug(2, "textOffs = %08X; textSize = %08X; objectCount = %d; varObjectCount = %d; gameStateSize = %d; objectsOffs = %08X; objectsSize = %d\n", textOffs, textSize, objectCount, varObjectCount, _gameStateSize, objectsOffs, objectsSize);
_gameState = new byte[_gameStateSize + 2];
- memset(_gameState, 0, _gameStateSize);
+ memset(_gameState, 0, _gameStateSize + 2);
setVar(1, objectCount);
sourceS.seek(textOffs);
@@ -441,7 +438,7 @@
int16 *propPtr2 = prop + count2;
// First see if the property exists in the given object
- while (count2-- > 0) {
+ while (count2--) {
if ((READ_LE_UINT16(prop) & 0x7FFF) == propertyId) {
propertyFlag = obj->getFlags() & 1;
return propPtr1;
@@ -467,8 +464,8 @@
propPtr1 = propPtr2 + count1 - count2;
int16 *propertyPtr = prop + count1;
- while (count2-- > 0) {
- if (!(READ_LE_UINT16(prop) & 0x8000)) {
+ while (count2--) {
+ if ((READ_LE_UINT16(prop) & 0x8000) == 0) {
if ((READ_LE_UINT16(prop) & 0x7FFF) == propertyId) {
propertyFlag = obj->getFlags() & 1;
return propPtr1;
Modified: scummvm/branches/gsoc2008-rtl/engines/made/detection.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/made/detection.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/made/detection.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -65,7 +65,7 @@
{"manhole", "The Manhole"},
{"rtz", "Return to Zork"},
{"lgop2", "Leather Goddesses of Phobos 2"},
- {"rodney", "Rodney's Fun Screen"},
+ {"rodney", "Rodney's Funscreen"},
{0, 0}
};
@@ -278,7 +278,7 @@
},
{
- // Rodney's Fun Screen
+ // Rodney's Funscreen
{
"rodney",
"",
Modified: scummvm/branches/gsoc2008-rtl/engines/made/made.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/made/made.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/made/made.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -148,27 +148,31 @@
return 0;
}
+int16 MadeEngine::getTicks() {
+ return g_system->getMillis() * 30 / 1000;
+}
+
int16 MadeEngine::getTimer(int16 timerNum) {
if (timerNum > 0 && timerNum <= ARRAYSIZE(_timers) && _timers[timerNum - 1] != -1)
- return (_system->getMillis() - _timers[timerNum - 1]) / kTimerResolution;
+ return (getTicks() - _timers[timerNum - 1]);
else
return 32000;
}
void MadeEngine::setTimer(int16 timerNum, int16 value) {
if (timerNum > 0 && timerNum <= ARRAYSIZE(_timers))
- _timers[timerNum - 1] = value * kTimerResolution;
+ _timers[timerNum - 1] = value;
}
void MadeEngine::resetTimer(int16 timerNum) {
if (timerNum > 0 && timerNum <= ARRAYSIZE(_timers))
- _timers[timerNum - 1] = _system->getMillis();
+ _timers[timerNum - 1] = getTicks();
}
int16 MadeEngine::allocTimer() {
for (int i = 0; i < ARRAYSIZE(_timers); i++) {
if (_timers[i] == -1) {
- _timers[i] = _system->getMillis();
+ _timers[i] = getTicks();
return i + 1;
}
}
@@ -202,24 +206,20 @@
break;
case Common::EVENT_LBUTTONDOWN:
- _eventNum = 1;
+ _eventNum = 2;
break;
- /*
case Common::EVENT_LBUTTONUP:
- _eventNum = 2; // TODO: Is this correct?
+ _eventNum = 1;
break;
- */
case Common::EVENT_RBUTTONDOWN:
- _eventNum = 3;
+ _eventNum = 4;
break;
- /*
case Common::EVENT_RBUTTONUP:
- eventNum = 4; // TODO: Is this correct?
+ _eventNum = 3;
break;
- */
case Common::EVENT_KEYDOWN:
_eventKey = event.kbd.ascii;
@@ -239,7 +239,7 @@
}
}
-
+
AudioCD.updateCD();
}
Modified: scummvm/branches/gsoc2008-rtl/engines/made/made.h
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/made/made.h 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/made/made.h 2008-06-20 19:42:29 UTC (rev 32740)
@@ -120,6 +120,7 @@
int _engineVersion;
int32 _timers[50];
+ int16 getTicks();
int16 getTimer(int16 timerNum);
void setTimer(int16 timerNum, int16 value);
void resetTimer(int16 timerNum);
Modified: scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.cpp
===================================================================
--- scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.cpp 2008-06-20 19:38:38 UTC (rev 32739)
+++ scummvm/branches/gsoc2008-rtl/engines/made/scriptfuncs.cpp 2008-06-20 19:42:29 UTC (rev 32740)
@@ -106,7 +106,7 @@
External(sfStopSound);
External(sfPlayVoice);
- if (_vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RTZ) {
+ if (_vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RTZ || _vm->getGameID() == GID_RODNEY) {
External(sfPlayCd);
External(sfStopCd);
External(sfGetCdStatus);
@@ -332,7 +332,7 @@
if (_vm->getGameID() == GID_RTZ) {
// Unused in RTZ
return 0;
- } if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE) {
+ } if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RODNEY) {
return _vm->_screen->addToSpriteList(argv[2], argv[1], argv[0]);
} else {
return 0;
@@ -341,7 +341,7 @@
int16 ScriptFunctions::sfFreeAnim(int16 argc, int16 *argv) {
_vm->_screen->clearChannels();
- if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE) {
+ if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RODNEY) {
_vm->_screen->clearSpriteList();
}
return 0;
@@ -350,7 +350,7 @@
int16 ScriptFunctions::sfDrawSprite(int16 argc, int16 *argv) {
if (_vm->getGameID() == GID_RTZ) {
return _vm->_screen->drawSprite(argv[2], argv[1], argv[0]);
- } if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE) {
+ } if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RODNEY) {
SpriteListItem item = _vm->_screen->getFromSpriteList(argv[2]);
int16 channelIndex = _vm->_screen->drawSprite(item.index, argv[1] - item.xofs, argv[0] - item.yofs);
_vm->_screen->setChannelUseMask(channelIndex);
@@ -409,7 +409,7 @@
if (_vm->getGameID() == GID_RTZ) {
text = _vm->_dat->getObjectString(argv[argc - 1]);
- } if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE) {
+ } if (_vm->getGameID() == GID_LGOP2 || _vm->getGameID() == GID_MANHOLE || _vm->getGameID() == GID_RODNEY) {
text = _vm->_dat->getString(argv[argc - 1]);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list