aboutsummaryrefslogtreecommitdiff
path: root/engines/m4
diff options
context:
space:
mode:
authordhewg2011-03-29 21:55:21 +0200
committerdhewg2011-03-29 21:57:56 +0200
commitd83a83ef5021c1e329127d3c6402088aeb1c1dd1 (patch)
tree5ade1c22a76ed8a10fac3d4c488a9866d649508e /engines/m4
parent8c70f2a58492335e9045c5abfd291887b2d7a339 (diff)
downloadscummvm-rg350-d83a83ef5021c1e329127d3c6402088aeb1c1dd1.tar.gz
scummvm-rg350-d83a83ef5021c1e329127d3c6402088aeb1c1dd1.tar.bz2
scummvm-rg350-d83a83ef5021c1e329127d3c6402088aeb1c1dd1.zip
JANITORIAL: Remove/comment unused vars
Found by GCC 4.6's -Wunused-but-set-variable
Diffstat (limited to 'engines/m4')
-rw-r--r--engines/m4/rails.cpp5
-rw-r--r--engines/m4/resource.cpp5
-rw-r--r--engines/m4/woodscript.cpp2
3 files changed, 4 insertions, 8 deletions
diff --git a/engines/m4/rails.cpp b/engines/m4/rails.cpp
index ff18d645e7..39cba9ab84 100644
--- a/engines/m4/rails.cpp
+++ b/engines/m4/rails.cpp
@@ -194,9 +194,8 @@ long SqrtF16(long n) {
void Rails::createEdge(int32 node1, int32 node2) {
uint32 index;
int32 x1, y1, x2, y2;
- bool valid, finished;
+ bool valid;
long deltaX, deltaY, distance;
- uint8 *walkCodePtr;
if ((node1 < 0) || (node1 >= MAXRAILNODES) || (node2 < 0) || (node2 >= MAXRAILNODES))
return;
@@ -214,8 +213,6 @@ void Rails::createEdge(int32 node1, int32 node2) {
_edges.resize(index + 1);
_edges.insert_at(index, 0);
valid = true;
- walkCodePtr = NULL;
- finished = false;
if (_nodes.size() <= (uint32)node1 || _nodes.size() <= (uint32)node2)
return;
diff --git a/engines/m4/resource.cpp b/engines/m4/resource.cpp
index 70abc47960..192cab0c83 100644
--- a/engines/m4/resource.cpp
+++ b/engines/m4/resource.cpp
@@ -465,7 +465,6 @@ Common::SeekableReadStream *MADSResourceManager::loadResource(const char *resour
bool MADSResourceManager::resourceExists(const char *resourceName) {
Common::File hagFile;
- uint32 offset, size;
// If the first character is the wildcard (resource indicator), skip over it
if (*resourceName == '*')
@@ -488,8 +487,8 @@ bool MADSResourceManager::resourceExists(const char *resourceName) {
while (++resIndex < numEntries) {
// Read in the details of the next resource
char resourceBuffer[14];
- offset = hagFile.readUint32LE();
- size = hagFile.readUint32LE();
+ hagFile.readUint32LE(); // offset
+ hagFile.readUint32LE(); // size
hagFile.read(resourceBuffer, 14);
if (!strcmp(resName, resourceBuffer))
diff --git a/engines/m4/woodscript.cpp b/engines/m4/woodscript.cpp
index 1235cc9cb6..1b9d9859ef 100644
--- a/engines/m4/woodscript.cpp
+++ b/engines/m4/woodscript.cpp
@@ -164,7 +164,7 @@ WoodScript::WoodScript(MadsM4Engine *vm) {
_backgroundSurface = NULL;
- Common::Rect viewBounds = Common::Rect(0, 0, 640, 480);
+ //Common::Rect viewBounds = Common::Rect(0, 0, 640, 480);
//_surfaceView = new View(viewBounds);
}