[Scummvm-cvs-logs] scummvm master -> 68e468ee01b243e31b154a7fab42396c9b24e5f0

hkzlab hkzlabnet at gmail.com
Wed Feb 16 09:55:22 CET 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:
68e468ee01 N64: revert fix in svn r55745 and added a FIXME


Commit: 68e468ee01b243e31b154a7fab42396c9b24e5f0
    https://github.com/scummvm/scummvm/commit/68e468ee01b243e31b154a7fab42396c9b24e5f0
Author: Fabio Battaglia (hkzlabnet at gmail.com)
Date: 2011-02-16T00:51:32-08:00

Commit Message:
N64: revert fix in svn r55745 and added a FIXME

The sign comparison fix requires a little more work than int->uint change, else it
throws an exception on the N64

Changed paths:
    backends/platform/n64/osys_n64.h



diff --git a/backends/platform/n64/osys_n64.h b/backends/platform/n64/osys_n64.h
index 5264a8a..e5ffc7f 100644
--- a/backends/platform/n64/osys_n64.h
+++ b/backends/platform/n64/osys_n64.h
@@ -111,7 +111,10 @@ protected:
 	bool _cursorPaletteDisabled;
 	bool _dirtyPalette;
 
-	uint _cursorWidth, _cursorHeight;
+	// FIXME: This must be left as "int" for now, to fix the sign-comparison problem
+	// there is a little more work involved than an int->uint change
+	int _cursorWidth, _cursorHeight;
+	
 	int _cursorKeycolor;
 
 	uint16	_overlayHeight, _overlayWidth;






More information about the Scummvm-git-logs mailing list