[Gemrb-commits] gemrb: branch master updated. v0.6.2-136-g3a56ac6

[Jaka K. <lyn...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  3a56ac6c0f3258ad53c9ec6d8cfbe756a97a71e0 (commit)
       via  0c12ad1dd5055ca9cee1bdd733f7ed64835a42b8 (commit)
       via  f303a89065b133e4eb3bbc453857cd52730ed496 (commit)

Summary of changes:
 CMakeLists.txt             |    7 ++++++-
 gemrb.desktop              |    2 +-
 gemrb/core/EffectQueue.cpp |    3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)
      from  1945a16442191c2bb063bdc0f374652e3089bbaf (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=3a56ac6c0f3258ad53c9ec6d8cfbe756a97a71e0

commit 3a56ac6c0f3258ad53c9ec6d8cfbe756a97a71e0
Author: Jaka Kranjc <lyn...@us...>
Date:   Thu Sep 16 12:21:40 2010 +0200

    cmake: install gemrb-logo.png as gemrb.png, so the desktop file can use
     either this or the svg one

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 84ae64e..225376f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -264,7 +264,7 @@ ENDMACRO(ADD_GEMRB_OVERRIDE )
 
 ADD_SUBDIRECTORY( gemrb )
 INSTALL( FILES gemrb.6 DESTINATION ${MAN_DIR} )
-INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} )
+INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} RENAME gemrb.png )
 INSTALL( FILES artwork/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg )
 INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
 INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} )
diff --git a/gemrb.desktop b/gemrb.desktop
index 87c79be..9849f49 100755
--- a/gemrb.desktop
+++ b/gemrb.desktop
@@ -4,7 +4,7 @@ Name=GemRB
 GenericName=Game engine made with preRendered Background
 Comment=a portable opensource implementation of Bioware's Infinity Engine
 Type=Application
-Icon=gemrb-logo
+Icon=gemrb
 Terminal=true
 Exec=gemrb
 Categories=Game;RolePlaying;Emulator;

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=0c12ad1dd5055ca9cee1bdd733f7ed64835a42b8

commit 0c12ad1dd5055ca9cee1bdd733f7ed64835a42b8
Author: Jaka Kranjc <lyn...@us...>
Date:   Thu Sep 16 12:18:26 2010 +0200

    cmake: install the medium svg too

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36cebce..84ae64e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,7 @@ if (${LAYOUT} MATCHES "home")
 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX} )
 	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/doc )
 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX} )
+	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX} )
 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX} )
 elseif (${LAYOUT} MATCHES "fhs")
 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib/gemrb )
@@ -75,6 +76,7 @@ elseif (${LAYOUT} MATCHES "fhs")
 	ENDIF( NOT SYSCONF_DIR )
 	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
+	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps )
 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
 else (${LAYOUT} MATCHES "opt")
 	SET_PATH( LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib )
@@ -85,6 +87,7 @@ else (${LAYOUT} MATCHES "opt")
 	SET_PATH( SYSCONF_DIR ${CMAKE_INSTALL_PREFIX}/etc )
 	SET_PATH( DOC_DIR ${CMAKE_INSTALL_PREFIX}/share/doc/gemrb )
 	SET_PATH( ICON_DIR ${CMAKE_INSTALL_PREFIX}/share/pixmaps )
+	SET_PATH( SVG_DIR ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps )
 	SET_PATH( MENU_DIR ${CMAKE_INSTALL_PREFIX}/share/applications )
 endif (${LAYOUT} MATCHES "home")
 
@@ -262,6 +265,7 @@ ENDMACRO(ADD_GEMRB_OVERRIDE )
 ADD_SUBDIRECTORY( gemrb )
 INSTALL( FILES gemrb.6 DESTINATION ${MAN_DIR} )
 INSTALL( FILES artwork/gemrb-logo.png DESTINATION ${ICON_DIR} )
+INSTALL( FILES artwork/logo04-rb_only.svg DESTINATION ${SVG_DIR} RENAME gemrb.svg )
 INSTALL( FILES gemrb.desktop DESTINATION ${MENU_DIR} )
 INSTALL( FILES README INSTALL COPYING NEWS AUTHORS DESTINATION ${DOC_DIR} )
 
@@ -301,6 +305,7 @@ message(STATUS "  MAN_DIR: ${MAN_DIR}")
 message(STATUS "  SYSCONF_DIR: ${SYSCONF_DIR}")
 message(STATUS "  DOC_DIR: ${DOC_DIR}")
 message(STATUS "  ICON_DIR: ${ICON_DIR}")
+message(STATUS "  SVG_DIR: ${SVG_DIR}")
 message(STATUS "  MENU_DIR: ${MENU_DIR}")
 message(STATUS "")
 message(STATUS "Build type: ${CMAKE_BUILD_TYPE}")

http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=f303a89065b133e4eb3bbc453857cd52730ed496

commit f303a89065b133e4eb3bbc453857cd52730ed496
Author: Jaka Kranjc <lyn...@us...>
Date:   Thu Sep 16 12:05:03 2010 +0200

    check_level: skip the check if the effect is self targeted
     fixes contact other plane from iwd; not sure about correctness

diff --git a/gemrb/core/EffectQueue.cpp b/gemrb/core/EffectQueue.cpp
index 8a8ed2e..e8aa418 100644
--- a/gemrb/core/EffectQueue.cpp
+++ b/gemrb/core/EffectQueue.cpp
@@ -752,6 +752,9 @@ inline bool check_level(Actor *target, Effect *fx)
 	if( !target) {
 		return false;
 	}
+	if(fx->Target == FX_TARGET_SELF) {
+		return false;
+	}
 
 	ieDword level = (ieDword) target->GetXPLevel( true );
 	//return true if resisted

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator