From d83a83ef5021c1e329127d3c6402088aeb1c1dd1 Mon Sep 17 00:00:00 2001
From: dhewg
Date: Tue, 29 Mar 2011 21:55:21 +0200
Subject: JANITORIAL: Remove/comment unused vars

Found by GCC 4.6's -Wunused-but-set-variable
---
 engines/cine/saveload.cpp | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'engines/cine/saveload.cpp')

diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index fd426be66a..4911f78da9 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -996,9 +996,8 @@ void CineEngine::makeSave(char *saveFileName) {
  * at a time.
  */
 void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGameFormat saveGameFormat) {
-	int16 currentAnim, foundFileIdx, frame;
+	int16 currentAnim, foundFileIdx;
 	char *animName, part[256], name[10];
-	uint16 width, height, bpp, var1;
 
 	strcpy(part, currentPartName);
 
@@ -1012,10 +1011,10 @@ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGam
 		// Seek to the start of the current animation's entry
 		fHandle.seek(fileStartPos + currentAnim * entrySize);
 		// Read in the current animation entry
-		width = fHandle.readUint16BE();
-		var1 = fHandle.readUint16BE();
-		bpp = fHandle.readUint16BE();
-		height = fHandle.readUint16BE();
+		fHandle.readUint16BE(); // width
+		fHandle.readUint16BE();
+		fHandle.readUint16BE(); // bpp
+		fHandle.readUint16BE(); // height
 
 		bool validPtr = false;
 		// Handle variables only present in animation entries of size 30
@@ -1025,7 +1024,7 @@ void loadResourcesFromSave(Common::SeekableReadStream &fHandle, enum CineSaveGam
 		}
 
 		foundFileIdx = fHandle.readSint16BE();
-		frame = fHandle.readSint16BE();
+		fHandle.readSint16BE(); // frame
 		fHandle.read(name, 10);
 
 		// Handle variables only present in animation entries of size 23
-- 
cgit v1.2.3


From 9414d7a6e287ff8abfb5746b564e92c8f0e6de58 Mon Sep 17 00:00:00 2001
From: Ori Avtalion
Date: Sun, 24 Apr 2011 11:34:27 +0300
Subject: JANITORIAL: Reduce header dependencies in shared code

Some backends may break as I only compiled SDL
---
 engines/cine/saveload.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/cine/saveload.cpp')

diff --git a/engines/cine/saveload.cpp b/engines/cine/saveload.cpp
index 4911f78da9..1fc2a8b2fd 100644
--- a/engines/cine/saveload.cpp
+++ b/engines/cine/saveload.cpp
@@ -25,6 +25,7 @@
 
 #include "common/debug.h"
 #include "common/savefile.h"
+#include "common/textconsole.h"
 
 #include "cine/cine.h"
 #include "cine/bg_list.h"
-- 
cgit v1.2.3