From: Jaka K. <lyn...@us...> - 2011-08-11 22:07:02
|
gemrb: Infinity Engine emulator The branch master has been updated via 7383be7686d117ec6ebfa71578bc5bfdeffa3613 (commit) via 763c67080faa026e6cc1d04e1a1b10a70e0d6c4d (commit) via 1d47d64fa9430e64797648f86e3dce6ef29ca318 (commit) via 588d9eb29b0fdcab7371715c46f383432c31134b (commit) Summary of changes: CMakeLists.txt | 1 - INSTALL | 3 --- cmake_config.h.in | 1 - gemrb/GUIScripts/GUICommon.py | 4 ++++ gemrb/core/GUI/GameControl.cpp | 6 +++--- gemrb/override/shared/keymap.2da | 2 +- gemrb/plugins/GUIScript/GUIScript.cpp | 1 + 7 files changed, 9 insertions(+), 9 deletions(-) from 7f89562ff4ed34aaed5478103f58b75152edb5be (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=7383be7686d117ec6ebfa71578bc5bfdeffa3613 commit 7383be7686d117ec6ebfa71578bc5bfdeffa3613 Author: Jaka Kranjc <lyn...@us...> Date: Fri Aug 12 00:04:55 2011 +0200 removed last mentions of TOUCHSCREEN diff --git a/CMakeLists.txt b/CMakeLists.txt index 7877eea..6d4121f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -352,7 +352,6 @@ message(STATUS "") message(STATUS "Options:") message(STATUS " LAYOUT: ${LAYOUT}") PRINT_OPTION("${NOCOLOR}" "NOCOLOR") -PRINT_OPTION("${TOUCHSCREEN}" "TOUCHSCREEN") PRINT_OPTION("${STATIC_LINK}" "STATIC_LINK") PRINT_OPTION("${INSOURCEBUILD}" "INSOURCEBUILD") PRINT_OPTION("${DISABLE_WERROR}" "DISABLE_WERROR") diff --git a/INSTALL b/INSTALL index 1a519ae..668379c 100644 --- a/INSTALL +++ b/INSTALL @@ -38,9 +38,6 @@ If you're on an exotic platform and get a lot of errors trying to build, also pass -DDISABLE_WERROR=1, so warnings won't impede you. This option is also suggested if you're making a source package. -You can also pass -DTOUCHSCREEN=1 on devices that have one. GemRB will disable -mouse scrolling. - Please let us know if you encounter any problems while building. Building GemRB with mingw diff --git a/cmake_config.h.in b/cmake_config.h.in index cd7aa8c..018a45f 100644 --- a/cmake_config.h.in +++ b/cmake_config.h.in @@ -10,6 +10,5 @@ #define DATADIR "${DATA_DIR}" #define SYSCONFDIR "${SYSCONF_DIR}" #cmakedefine NOCOLOR ${NOCOLOR} -#cmakedefine TOUCHSCREEN ${TOUCHSCREEN} #cmakedefine HAVE_MALLOC_H 1 #cmakedefine HAVE_UNISTD_H 1 http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=763c67080faa026e6cc1d04e1a1b10a70e0d6c4d commit 763c67080faa026e6cc1d04e1a1b10a70e0d6c4d Author: Jaka Kranjc <lyn...@us...> Date: Fri Aug 12 00:03:58 2011 +0200 Beholder changed the last use of TOUCHSCREEN to the configurable variable diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp index 5e58b84..c40546e 100644 --- a/gemrb/core/GUI/GameControl.cpp +++ b/gemrb/core/GUI/GameControl.cpp @@ -1861,9 +1861,9 @@ void GameControl::OnMouseDown(unsigned short x, unsigned short y, unsigned short StartY = py; SelectionRect.w = 0; SelectionRect.h = 0; -#ifdef TOUCHSCREEN - touched=true; -#endif + if (touchScrollAreasEnabled) { + touched=true; + } } } http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=1d47d64fa9430e64797648f86e3dce6ef29ca318 commit 1d47d64fa9430e64797648f86e3dce6ef29ca318 Author: Jaka Kranjc <lyn...@us...> Date: Thu Aug 11 20:49:37 2011 +0200 GamePause: also display the head text, like the gamecontrol does diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp index 8d8f296..bd7ae0b 100644 --- a/gemrb/plugins/GUIScript/GUIScript.cpp +++ b/gemrb/plugins/GUIScript/GUIScript.cpp @@ -7851,6 +7851,7 @@ static PyObject* GemRB_GamePause(PyObject * /*self*/, PyObject* args) if (!quiet) { if (gc->GetDialogueFlags()&DF_FREEZE_SCRIPTS) { displaymsg->DisplayConstantString(STR_PAUSED, DMC_RED); + gc->SetDisplayText(STR_PAUSED, 0); // time 0 = removed instantly on unpause (for pst) } else { displaymsg->DisplayConstantString(STR_UNPAUSED, DMC_RED); } http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=588d9eb29b0fdcab7371715c46f383432c31134b commit 588d9eb29b0fdcab7371715c46f383432c31134b Author: Jaka Kranjc <lyn...@us...> Date: Thu Aug 11 20:38:44 2011 +0200 GUICommon: added a placeholder for unimplemented and hardcoded key actions shuts up the missing function warning for these cases (they're listed on init anyway) diff --git a/gemrb/GUIScripts/GUICommon.py b/gemrb/GUIScripts/GUICommon.py index 1b51013..ed750ac 100644 --- a/gemrb/GUIScripts/GUICommon.py +++ b/gemrb/GUIScripts/GUICommon.py @@ -938,5 +938,9 @@ def ceildiv (n, d): else: return (n+d-1)/d +# a placeholder for unimplemented and hardcoded key actions +def ResolveKey(): + return + GameWindow = GUIClasses.GWindow(0) GameControl = GUIClasses.GControl(0,0) diff --git a/gemrb/override/shared/keymap.2da b/gemrb/override/shared/keymap.2da index 4af30c6..3550ccf 100644 --- a/gemrb/override/shared/keymap.2da +++ b/gemrb/override/shared/keymap.2da @@ -46,5 +46,5 @@ Item_Slot_2 GUICommonWindows ActionQItem2Pressed 0 Item_Slot_3 GUICommonWindows ActionQItem3Pressed 0 Item_Slot_4 GUICommonWindows ActionQItem4Pressed 0 Item_Slot_5 GUICommonWindows ActionQItem5Pressed 0 -Default GUICommonWindows ResolveKey 0 +Default GUICommon ResolveKey 0 ----------------------------------------------------------------------- This is an automated email from the git hooks/post-receive script. -- gemrb: Infinity Engine emulator |