[Scummvm-cvs-logs] SF.net SVN: scummvm: [30703] scummvm/trunk
Anotherguest at users.sourceforge.net
Anotherguest at users.sourceforge.net
Tue Jan 29 22:19:45 CET 2008
Revision: 30703
http://scummvm.svn.sourceforge.net/scummvm/?rev=30703&view=rev
Author: Anotherguest
Date: 2008-01-29 13:19:45 -0800 (Tue, 29 Jan 2008)
Log Message:
-----------
- Updated default char signing to signed (as per PC) in makefiles
- Fix for Symbian scrolling problem in GOB3, expressions not evaluated properly resulting in offset beeing set to -1 and not the right offset.
Modified Paths:
--------------
scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_agos.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_igor.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in
scummvm/trunk/engines/gob/util.cpp
Modified: scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -29,6 +29,7 @@
TARGET ScummVM.exe
TARGETPATH sys\bin
TARGETTYPE exe
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
UID 0x100039ce 0xA0000657
Modified: scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,8 @@
TARGETPATH sys\bin
TARGETTYPE exe
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
+
UID 0x100039ce 0xA0000657
START RESOURCE ScummVM_reg.rss
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_agi.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_agos.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_agos.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_agos.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_base.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
// Note: the LIB:*.lib statements are used by AdaptAllMMPs.pl, so don't remove them!
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_cine.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_cruise.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_cruise.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_cruise.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_drascula.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_drascula.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_drascula.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_gob.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_igor.mmp.in
===================================================================
(Binary files differ)
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_kyra.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_lure.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_parallaction.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_queen.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_saga.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_scumm.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_sky.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword1.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_sword2.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/backends/platform/symbian/mmp/scummvm_touche.mmp.in 2008-01-29 21:19:45 UTC (rev 30703)
@@ -30,6 +30,7 @@
TARGETTYPE lib
OPTION MSVC /QIfist /Ob1 /Oy /GF // /QIfist disables use of __ftol2 to avoid linker probs with MS libc: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vccore/html/vcrefQIfistSuppress_ftol.asp
OPTION GCC -Wno-multichar -Wno-reorder // don't optimize for ARM, platform way too sensitive for that :( just turn off some common warnings
+OPTION GCCE -Wno-multichar -Wno-reorder -fsigned-char
ALWAYS_BUILD_AS_ARM
//START_AUTO_MACROS_SLAVE//
Modified: scummvm/trunk/engines/gob/util.cpp
===================================================================
--- scummvm/trunk/engines/gob/util.cpp 2008-01-29 21:18:33 UTC (rev 30702)
+++ scummvm/trunk/engines/gob/util.cpp 2008-01-29 21:19:45 UTC (rev 30703)
@@ -324,8 +324,17 @@
void Util::setScrollOffset(int16 x, int16 y) {
processInput();
- _vm->_video->_scrollOffsetX = x >= 0 ? x : _vm->_draw->_scrollOffsetX;
- _vm->_video->_scrollOffsetY = y >= 0 ? y : _vm->_draw->_scrollOffsetY;
+
+ if(x >= 0)
+ _vm->_video->_scrollOffsetX = x;
+ else
+ _vm->_video->_scrollOffsetX = _vm->_draw->_scrollOffsetX;
+
+ if(y >= 0)
+ _vm->_video->_scrollOffsetY = y;
+ else
+ _vm->_video->_scrollOffsetY = _vm->_draw->_scrollOffsetY;
+
_vm->_video->waitRetrace();
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list