[Scummvm-cvs-logs] scummvm master -> d1bc69426eac2458b46ab7fede31c6dd71314ccb

Strangerke Strangerke at scummvm.org
Mon Dec 22 19:43:02 CET 2014


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d1bc69426e ACCESS: Move variable from Room manager to local function


Commit: d1bc69426eac2458b46ab7fede31c6dd71314ccb
    https://github.com/scummvm/scummvm/commit/d1bc69426eac2458b46ab7fede31c6dd71314ccb
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-12-22T19:41:40+01:00

Commit Message:
ACCESS: Move variable from Room manager to local function

Changed paths:
    engines/access/room.cpp
    engines/access/room.h



diff --git a/engines/access/room.cpp b/engines/access/room.cpp
index f7c2eab..607259e 100644
--- a/engines/access/room.cpp
+++ b/engines/access/room.cpp
@@ -370,9 +370,9 @@ void Room::loadPlayField(int fileNum, int subfile) {
 	screen.loadRawPalette(playData->_stream);
 
 	// Copy off the tile data
-	_tileSize = (int)header[2] << 8;
-	_tile = new byte[_tileSize];
-	playData->_stream->read(_tile, _tileSize);
+	int tileSize = (int)header[2] << 8;
+	_tile = new byte[tileSize];
+	playData->_stream->read(_tile, tileSize);
 
 	// Copy off the playfield data
 	_matrixSize = header[0] * header[1];
diff --git a/engines/access/room.h b/engines/access/room.h
index 44279fa..eec273e 100644
--- a/engines/access/room.h
+++ b/engines/access/room.h
@@ -124,7 +124,6 @@ public:
 	int _playFieldWidth;
 	int _playFieldHeight;
 	byte *_tile;
-	int _tileSize;
 	int _selectCommand;
 	bool _conFlag;
 public:






More information about the Scummvm-git-logs mailing list