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

dreammaster dreammaster at scummvm.org
Sat Apr 30 12:41:00 CEST 2011


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:
d673fbc6a8 TSAGE: Silenced compiler warnings


Commit: d673fbc6a84358840d5f91774aea9fe48b4477f6
    https://github.com/scummvm/scummvm/commit/d673fbc6a84358840d5f91774aea9fe48b4477f6
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2011-04-30T03:38:41-07:00

Commit Message:
TSAGE: Silenced compiler warnings

Changed paths:
    engines/tsage/core.cpp
    engines/tsage/dialogs.cpp
    engines/tsage/resources.cpp



diff --git a/engines/tsage/core.cpp b/engines/tsage/core.cpp
index 2144dd1..3196499 100644
--- a/engines/tsage/core.cpp
+++ b/engines/tsage/core.cpp
@@ -557,7 +557,6 @@ void PlayerMover::pathfind(Common::Point *routeList, Common::Point srcPos, Commo
 		} while (routeRegions[++idx] != destRegion);
 
 		tempList[idx] = 1;
-		idx = 0;
 		for (int listIndex = 1; listIndex <= endIndex; ++listIndex) {
 			int var10 = tempList[listIndex];
 			int var12 = tempList[listIndex + 1];
diff --git a/engines/tsage/dialogs.cpp b/engines/tsage/dialogs.cpp
index 7be1c88..b9ad7b0 100644
--- a/engines/tsage/dialogs.cpp
+++ b/engines/tsage/dialogs.cpp
@@ -487,7 +487,7 @@ void InventoryDialog::execute() {
 		if (!event.handled && event.eventType == EVENT_KEYPRESS) {
 			if ((event.kbd.keycode == Common::KEYCODE_RETURN) || (event.kbd.keycode == Common::KEYCODE_ESCAPE)) {
 				// Exit the dialog
-				hiliteObj = &_btnOk;
+				//hiliteObj = &_btnOk;
 				break;
 			}
 		}
diff --git a/engines/tsage/resources.cpp b/engines/tsage/resources.cpp
index 5320a57..4a188c1 100644
--- a/engines/tsage/resources.cpp
+++ b/engines/tsage/resources.cpp
@@ -239,6 +239,9 @@ byte *TLib::getResource(uint16 id, bool suppressErrors) {
 	uint16 word_48050 = 0, currentToken = 0, word_48054 =0;
 	byte byte_49068 = 0, byte_49069 = 0;
 	DecodeReference table[0x1000];
+	for (int i = 0; i < 0x1000; ++i) {
+		table[i].vByte = table[i].vWord = 0;
+	}
 	Common::Stack<uint16> tokenList;
 
 	for (;;) {






More information about the Scummvm-git-logs mailing list