mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-14 21:59:17 +00:00
f96c8f6e39
The collisionPage is only initialised with values when loadCtFw() / loadCtOS() is called. However, currently during the display of the Delphine Software Logo in Operation Stealth, checkCollision() is called, but the collisionPage has not been loaded. To fix the invalid reads, have added code to set the page to zero after allocation. Shouldn't cause any issues to FW as this will load over the top anyway. Have also added debug output around this behaviour so that if this is not sufficient i.e. a collision page load is actually missing, then this will aid investigation. svn-id: r55071
144 lines
3.6 KiB
C++
144 lines
3.6 KiB
C++
/* ScummVM - Graphic Adventure Engine
|
|
*
|
|
* ScummVM is the legal property of its developers, whose names
|
|
* are too numerous to list here. Please refer to the COPYRIGHT
|
|
* file distributed with this source distribution.
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version 2
|
|
* of the License, or (at your option) any later version.
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
|
*
|
|
* $URL$
|
|
* $Id$
|
|
*
|
|
*/
|
|
|
|
|
|
#include "common/endian.h"
|
|
#include "common/memstream.h"
|
|
|
|
#include "cine/cine.h"
|
|
#include "cine/various.h"
|
|
#include "cine/bg.h"
|
|
|
|
namespace Cine {
|
|
|
|
uint16 bgVar0;
|
|
byte *additionalBgTable[9];
|
|
int16 currentAdditionalBgIdx = 0, currentAdditionalBgIdx2 = 0;
|
|
|
|
byte loadCtFW(const char *ctName) {
|
|
debugC(1, kCineDebugCollision, "loadCtFW(\"%s\")", ctName);
|
|
uint16 header[32];
|
|
byte *ptr, *dataPtr;
|
|
|
|
int16 foundFileIdx = findFileInBundle(ctName);
|
|
if (foundFileIdx == -1) {
|
|
warning("loadCtFW: Unable to find collision data file '%s'", ctName);
|
|
// FIXME: Rework this function's return value policy and return an appropriate value here.
|
|
// The return value isn't yet used for anything so currently it doesn't really matter.
|
|
return 0;
|
|
}
|
|
|
|
if (currentCtName != ctName)
|
|
strcpy(currentCtName, ctName);
|
|
|
|
ptr = dataPtr = readBundleFile(foundFileIdx);
|
|
|
|
loadRelatedPalette(ctName);
|
|
|
|
assert(strstr(ctName, ".NEO"));
|
|
|
|
Common::MemoryReadStream readS(ptr, 32);
|
|
|
|
for (int i = 0; i < 16; i++) {
|
|
header[i] = readS.readUint16BE();
|
|
}
|
|
|
|
gfxConvertSpriteToRaw(collisionPage, ptr + 0x80, 160, 200);
|
|
|
|
free(dataPtr);
|
|
return 0;
|
|
}
|
|
|
|
byte loadCtOS(const char *ctName) {
|
|
debugC(1, kCineDebugCollision, "loadCtOS(\"%s\")", ctName);
|
|
byte *ptr, *dataPtr;
|
|
|
|
int16 foundFileIdx = findFileInBundle(ctName);
|
|
if (foundFileIdx == -1) {
|
|
warning("loadCtOS: Unable to find collision data file '%s'", ctName);
|
|
// FIXME: Rework this function's return value policy and return an appropriate value here.
|
|
// The return value isn't yet used for anything so currently it doesn't really matter.
|
|
return 0;
|
|
}
|
|
|
|
if (currentCtName != ctName)
|
|
strcpy(currentCtName, ctName);
|
|
|
|
ptr = dataPtr = readBundleFile(foundFileIdx);
|
|
|
|
uint16 bpp = READ_BE_UINT16(ptr);
|
|
ptr += 2;
|
|
|
|
if (bpp == 8) {
|
|
renderer->loadCt256(ptr, ctName);
|
|
} else {
|
|
gfxConvertSpriteToRaw(collisionPage, ptr + 32, 160, 200);
|
|
renderer->loadCt16(ptr, ctName);
|
|
}
|
|
|
|
free(dataPtr);
|
|
return 0;
|
|
}
|
|
|
|
byte loadBg(const char *bgName) {
|
|
byte *ptr, *dataPtr;
|
|
|
|
byte fileIdx = findFileInBundle(bgName);
|
|
ptr = dataPtr = readBundleFile(fileIdx);
|
|
|
|
uint16 bpp = READ_BE_UINT16(ptr);
|
|
ptr += 2;
|
|
|
|
if (bpp == 8) {
|
|
renderer->loadBg256(ptr, bgName);
|
|
} else {
|
|
if (g_cine->getGameType() == Cine::GType_FW) {
|
|
loadRelatedPalette(bgName);
|
|
}
|
|
|
|
renderer->loadBg16(ptr, bgName);
|
|
}
|
|
free(dataPtr);
|
|
return 0;
|
|
}
|
|
|
|
void addBackground(const char *bgName, uint16 bgIdx) {
|
|
byte *ptr, *dataPtr;
|
|
|
|
byte fileIdx = findFileInBundle(bgName);
|
|
ptr = dataPtr = readBundleFile(fileIdx);
|
|
|
|
uint16 bpp = READ_BE_UINT16(ptr); ptr += 2;
|
|
|
|
if (bpp == 8) {
|
|
renderer->loadBg256(ptr, bgName, bgIdx);
|
|
} else {
|
|
renderer->loadBg16(ptr, bgName, bgIdx);
|
|
}
|
|
free(dataPtr);
|
|
}
|
|
|
|
} // End of namespace Cine
|