libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-26 12:48:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Fix various warnings

Browse Source
This commit is contained in:
Paul Gilbert 2013-12-14 17:38:01 -05:00
parent 49d50afb47
commit af90a11ff2
5 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/voyeur/events.h
View File

@ -110,7 +110,7 @@ public:
int _evidence[20];
Common::Array<VoyeurEvent> _events;
int _field4376;
byte *_field4376;
int _field4378;
int _field437A;
int _field437C;

4
engines/voyeur/files_threads.cpp
View File

@ -798,9 +798,7 @@ void ThreadResource::parsePlayCommands() {
}
const byte *ThreadResource::cardPerform(const byte *card) {
int var7 = 0;
uint32 varC = 0;
const byte *p, *p2;
const byte *p2;
byte *pDest;
uint16 id = *card++;

5
engines/voyeur/graphics.cpp
View File

@ -87,9 +87,6 @@ void GraphicsManager::setupMCGASaveRect(ViewPortResource *viewPort) {
}
void GraphicsManager::addRectOptSaveRect(ViewPortResource *viewPort, int idx, const Common::Rect &bounds) {
int count1, count2;
int idx1, varE, var24;
if (viewPort->_rectListCount[idx] == -1)
return;
@ -138,7 +135,7 @@ void GraphicsManager::sDrawPic(DisplayResource *srcDisplay, DisplayResource *des
bool isClipped = false;
int var52;
int var20, var22;
int var26, var2C;
int var26;
byte pixel;
byte *srcImgData, *destImgData;

8
engines/voyeur/voyeur.cpp
View File

@ -134,7 +134,7 @@ void VoyeurEngine::globalInitBolt() {
// Setup default flags
Common::fill((byte *)&_voy, (byte *)&_voy + sizeof(SVoy), 0);
_voy._field478 = 1;
_voy._field4376 = NULL; // Original set 63h:63h
_voy._field4376 = nullptr; // Original set 63h:63h
_voy._field4F2 = 9999;
_voy._field472 = -1;
_voy._field478 = 256;
@ -473,6 +473,7 @@ void VoyeurEngine::showTitleScreen() {
}
void VoyeurEngine::doOpening() {
/*
_graphicsManager.screenReset();
if (!_bVoy->getBoltGroup(0x10200))
@ -519,13 +520,14 @@ void VoyeurEngine::doOpening() {
if (decoder.needsUpdate()) {
const Graphics::Surface *frame = decoder.decodeNextFrame();
Common::copy((byte *)frame->getPixels(), (byte *)frame->getPixels() + 320 * 200,
Common::copy((const byte *)frame->getPixels(), (const byte *)frame->getPixels() + 320 * 200,
(byte *)_graphicsManager._screenSurface.getPixels());
}
_eventsManager.pollEvents();
g_system->delayMillis(10);
}
*/
}
void VoyeurEngine::playRL2Video(const Common::String &filename) {
@ -542,7 +544,7 @@ void VoyeurEngine::playRL2Video(const Common::String &filename) {
if (decoder.needsUpdate()) {
const Graphics::Surface *frame = decoder.decodeNextFrame();
Common::copy((byte *)frame->getPixels(), (byte *)frame->getPixels() + 320 * 200,
Common::copy((const byte *)frame->getPixels(), (const byte *)frame->getPixels() + 320 * 200,
(byte *)_graphicsManager._screenSurface.getPixels());
}

2
engines/voyeur/voyeur_game.cpp
View File

@ -149,7 +149,7 @@ void VoyeurEngine::playStamp() {
_graphicsManager._backgroundPage = _bVoy->boltEntry(_playStamp1)._picResource;
_graphicsManager._backColors = _bVoy->boltEntry(_playStamp1 + 1)._cMapResource;
int buttonId = getChooseButton();
buttonId = getChooseButton();
if (_voy._fadeFunc)
buttonId = 4;