[Scummvm-cvs-logs] scummvm master -> 0ecdf85280bd60eae92bd7b08c0f9dd32c97fa05
sev-
sev at scummvm.org
Mon Nov 14 21:28:18 CET 2011
This automated email contains information about 4 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
f51116bb46 CRUISE: Remove unused variables
981ca90c4e MADS: remove/comment unused variables
290515d2ab QUEEN: Comment unused variable
0ecdf85280 GRAPHICS: Comment unused variables
Commit: f51116bb4615b629cf008caa71d4a536457cfb6d
https://github.com/scummvm/scummvm/commit/f51116bb4615b629cf008caa71d4a536457cfb6d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-14T12:21:56-08:00
Commit Message:
CRUISE: Remove unused variables
Changed paths:
engines/cruise/cruise_main.cpp
engines/cruise/volume.cpp
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index d034023..a1337ae 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -998,7 +998,7 @@ bool findRelation(int objOvl, int objIdx, int x, int y) {
ovlDataStruct *ovl2 = NULL;
ovlDataStruct *ovl3 = NULL;
- ovlDataStruct *ovl4 = NULL;
+ //ovlDataStruct *ovl4 = NULL;
if (verbeOvl > 0)
ovl2 = overlayTable[verbeOvl].ovlData;
@@ -1006,8 +1006,8 @@ bool findRelation(int objOvl, int objIdx, int x, int y) {
if (obj1Ovl > 0)
ovl3 = overlayTable[obj1Ovl].ovlData;
- if (obj2Ovl > 0)
- ovl4 = overlayTable[obj2Ovl].ovlData;
+ //if (obj2Ovl > 0)
+ // ovl4 = overlayTable[obj2Ovl].ovlData;
if ((ovl3) && (ptrHead->obj1Number >= 0)) {
testState = ptrHead->obj1OldState;
diff --git a/engines/cruise/volume.cpp b/engines/cruise/volume.cpp
index 773a146..4b64d4f 100644
--- a/engines/cruise/volume.cpp
+++ b/engines/cruise/volume.cpp
@@ -326,7 +326,7 @@ int closeCnf() {
int16 readVolCnf() {
int i;
Common::File fileHandle;
- short int sizeHEntry;
+ //short int sizeHEntry;
volumeDataLoaded = 0;
@@ -344,7 +344,7 @@ int16 readVolCnf() {
}
numOfDisks = fileHandle.readSint16BE();
- sizeHEntry = fileHandle.readSint16BE(); // size of one header entry - 20 bytes
+ /*sizeHEntry =*/ fileHandle.readSint16BE(); // size of one header entry - 20 bytes
for (i = 0; i < numOfDisks; i++) {
// fread(&volumeData[i],20,1,fileHandle);
Commit: 981ca90c4eaa6d9cc4f56b706340294d2ea3f697
https://github.com/scummvm/scummvm/commit/981ca90c4eaa6d9cc4f56b706340294d2ea3f697
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-14T12:22:50-08:00
Commit Message:
MADS: remove/comment unused variables
Changed paths:
engines/m4/assets.cpp
engines/m4/mads_menus.cpp
engines/m4/mads_views.cpp
diff --git a/engines/m4/assets.cpp b/engines/m4/assets.cpp
index d6cc71e..f70a35d 100644
--- a/engines/m4/assets.cpp
+++ b/engines/m4/assets.cpp
@@ -301,11 +301,11 @@ void SpriteAsset::loadMadsSpriteAsset(MadsM4Engine *vm, Common::SeekableReadStre
int32 SpriteAsset::parseSprite(bool isBigEndian) {
- uint32 format, chunkType, chunkSize = 0;
+ uint32 chunkType, chunkSize = 0;
_colorCount = 0;
- format = (!isBigEndian) ? _stream->readUint32LE() : _stream->readUint32BE();
+ /*format = (!isBigEndian) ? _stream->readUint32LE() : */_stream->readUint32BE();
chunkType = (!isBigEndian) ? _stream->readUint32LE() : _stream->readUint32BE();
diff --git a/engines/m4/mads_menus.cpp b/engines/m4/mads_menus.cpp
index 8a2ab67..ae16b00 100644
--- a/engines/m4/mads_menus.cpp
+++ b/engines/m4/mads_menus.cpp
@@ -716,7 +716,7 @@ void RexDialogView::onRefresh(RectList *rects, M4Surface *destSurface) {
bool RexDialogView::onEvent(M4EventType eventType, int32 param1, int x, int y, bool &captureEvents) {
static bool word_7F28C = false;
int word_7FED2 = 0;
- int word_8502A = 0;
+ //int word_8502A = 0;
// If it's a keypress, handle it immediately
if (eventType == KEVENT_KEY) {
@@ -789,7 +789,7 @@ bool RexDialogView::onEvent(M4EventType eventType, int32 param1, int x, int y, b
if (!word_7F28C || (objIndex <= 18))
_selectedLine = objIndex;
- word_8502A = -1;
+ //word_8502A = -1;
}
return true;
diff --git a/engines/m4/mads_views.cpp b/engines/m4/mads_views.cpp
index d21bfc1..c1d88d5 100644
--- a/engines/m4/mads_views.cpp
+++ b/engines/m4/mads_views.cpp
@@ -77,7 +77,7 @@ void MadsAction::appendVocab(int vocabId, bool capitalise) {
void MadsAction::set() {
int hotspotCount = _madsVm->scene()->getSceneResources().hotspots->size();
- bool flag = false;
+ bool flag = false; // FIXME: unused
strcpy(_statusText, "");
_currentAction = -1;
Commit: 290515d2ab62789becb6fc46870194b3a7986d38
https://github.com/scummvm/scummvm/commit/290515d2ab62789becb6fc46870194b3a7986d38
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-14T12:23:21-08:00
Commit Message:
QUEEN: Comment unused variable
Changed paths:
engines/queen/talk.cpp
diff --git a/engines/queen/talk.cpp b/engines/queen/talk.cpp
index 1f8d9b2..307425b 100644
--- a/engines/queen/talk.cpp
+++ b/engines/queen/talk.cpp
@@ -96,7 +96,7 @@ void Talk::talk(const char *filename, int personInRoom, char *cutawayFilename) {
}
int16 oldLevel = 0;
- bool personWalking = false;
+ bool personWalking = false; // FIXME: unused
// Lines 828-846 in talk.c
for (i = 1; i <= 4; i++) {
@@ -373,7 +373,7 @@ byte *Talk::loadDialogFile(const char *filename) {
void Talk::load(const char *filename) {
int i;
byte *ptr = _fileData = loadDialogFile(filename);
- bool canQuit;
+ bool canQuit; // FIXME: unused
// Load talk header
Commit: 0ecdf85280bd60eae92bd7b08c0f9dd32c97fa05
https://github.com/scummvm/scummvm/commit/0ecdf85280bd60eae92bd7b08c0f9dd32c97fa05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2011-11-14T12:24:34-08:00
Commit Message:
GRAPHICS: Comment unused variables
Changed paths:
graphics/pict.cpp
diff --git a/graphics/pict.cpp b/graphics/pict.cpp
index 0f4dcd4..dcd0df8 100644
--- a/graphics/pict.cpp
+++ b/graphics/pict.cpp
@@ -467,7 +467,7 @@ void PictDecoder::skipBitsRect(Common::SeekableReadStream *stream, bool hasPalet
stream->readUint16BE();
uint16 packType;
- uint16 pixelSize;
+ uint16 pixelSize; // FIXME: unused
// Top two bits signify PixMap vs BitMap
if (rowBytes & 0xC000) {
More information about the Scummvm-git-logs
mailing list