[Gemrb-commits] gemrb: branch master updated. v0.6.2-1136-g58fa78d

[Alyssa M. <fu...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  58fa78df43a97ccb9e477a9f7ee45ed51601be2b (commit)
       via  becf902e086273a5bf3fea41b90674c716c2e541 (commit)

Summary of changes:
 gemrb/core/GUI/GameControl.cpp                     |    3 +--
 gemrb/core/Scriptable/Actor.cpp                    |    2 +-
 .../DirectoryImporter/DirectoryImporter.cpp        |    3 +++
 3 files changed, 5 insertions(+), 3 deletions(-)
      from  fca4c716e1f002d2c966ddd335d288926486ad54 (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=58fa78df43a97ccb9e477a9f7ee45ed51601be2b

commit 58fa78df43a97ccb9e477a9f7ee45ed51601be2b
Author: dhewg <dh...@wi...>
Date:   Mon Apr 25 21:11:41 2011 +0200

    don't let corpses block the way
    
    Signed-off-by: Alyssa Milburn <fu...@fu...>

diff --git a/gemrb/core/GUI/GameControl.cpp b/gemrb/core/GUI/GameControl.cpp
index 1d92613..5665899 100644
--- a/gemrb/core/GUI/GameControl.cpp
+++ b/gemrb/core/GUI/GameControl.cpp
@@ -1069,8 +1069,7 @@ void GameControl::DisplayTooltip() {
 		Map* area = game->GetCurrentArea( );
 		if (area) {
 			Actor *actor = area->GetActorByGlobalID(lastActorID);
-			if (actor && (actor->GetStat(IE_STATE_ID)&STATE_DEAD || actor->GetInternalFlag()&IF_JUSTDIED)) {
-				// checking IF_JUSTDIED is kind of horrid, but seems necessary
+			if (actor && (actor->GetStat(IE_STATE_ID)&STATE_DEAD || actor->GetInternalFlag()&IF_REALLYDIED)) {
 				// no tooltips for dead actors!
 				actor->SetOver( false );
 				lastActorID = 0;
diff --git a/gemrb/core/Scriptable/Actor.cpp b/gemrb/core/Scriptable/Actor.cpp
index 0b7e7e1..248a276 100644
--- a/gemrb/core/Scriptable/Actor.cpp
+++ b/gemrb/core/Scriptable/Actor.cpp
@@ -3836,7 +3836,7 @@ bool Actor::ValidTarget(int ga_flags) const
 		break;
 	}
 	if (ga_flags&GA_NO_DEAD) {
-		if (InternalFlags&IF_JUSTDIED) return false;
+		if (InternalFlags&IF_REALLYDIED) return false;
 		if (Modified[IE_STATE_ID] & STATE_DEAD) return false;
 	}
 	if (ga_flags&GA_SELECT) {

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

commit becf902e086273a5bf3fea41b90674c716c2e541
Author: dhewg <dh...@wi...>
Date:   Mon Apr 25 13:57:39 2011 +0200

    Don't look for files in non-existent directories
    
    Signed-off-by: Alyssa Milburn <fu...@fu...>

diff --git a/gemrb/plugins/DirectoryImporter/DirectoryImporter.cpp b/gemrb/plugins/DirectoryImporter/DirectoryImporter.cpp
index ad69343..9f32e0f 100644
--- a/gemrb/plugins/DirectoryImporter/DirectoryImporter.cpp
+++ b/gemrb/plugins/DirectoryImporter/DirectoryImporter.cpp
@@ -37,6 +37,9 @@ DirectoryImporter::~DirectoryImporter(void)
 
 bool DirectoryImporter::Open(const char *dir, const char *desc)
 {
+	if (!dir_exists(dir))
+		return false;
+
 	free(description);
 	description = strdup(desc);
 	strcpy(path, dir);

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


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