[Gemrb-commits] gemrb: branch master updated. v0.6.2-1520-gbbf9c2b

[Laszlo T. <ave...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  bbf9c2b40a8d989c8f2d47953d66083034c31e53 (commit)
       via  4b2a4b77c885f9a8339d4e22f7fe408c6c8a6bc3 (commit)

Summary of changes:
 gemrb/core/Interface.cpp         |    8 ++++++--
 gemrb/override/shared/keymap.2da |    6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)
      from  812d4993f6a077864ee37e5dacba9e40100c310d (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=bbf9c2b40a8d989c8f2d47953d66083034c31e53

commit bbf9c2b40a8d989c8f2d47953d66083034c31e53
Author: Avenger <ave...@so...>
Date:   Wed Aug 10 23:03:30 2011 +0200

    even more safeguards to validate the CachePath

diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index e5f592d..5cbdfeb 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -1487,7 +1487,11 @@ int Interface::Init()
 		char path[_MAX_PATH];
 
 		PathJoin( path, CachePath, NULL);
-		gamedata->AddSource(path, "Cache", PLUGIN_RESOURCE_DIRECTORY);
+		if (!gamedata->AddSource(path, "Cache", PLUGIN_RESOURCE_DIRECTORY)) {
+			print( "The cache path couldn't be registered, please check! " );
+			printStatus( "ERROR", LIGHT_RED );
+			return GEM_ERROR;
+		}
 
 		PathJoin( path, GemRBOverridePath, "override", GameType, NULL);
 		gamedata->AddSource(path, "GemRB Override", PLUGIN_RESOURCE_CACHEDDIRECTORY);
@@ -1785,7 +1789,7 @@ int Interface::Init()
 	}
 	game = NULL;
 	calendar = NULL;
-        keymap = NULL;
+	keymap = NULL;
 
 	timer = new GlobalTimer();
 	printMessage( "Core", "Bringing up the Global Timer...", WHITE );

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

commit 4b2a4b77c885f9a8339d4e22f7fe408c6c8a6bc3
Author: Avenger <ave...@so...>
Date:   Wed Aug 10 23:02:55 2011 +0200

    added quick spells to keymap entries

diff --git a/gemrb/override/shared/keymap.2da b/gemrb/override/shared/keymap.2da
index a7175b5..4af30c6 100644
--- a/gemrb/override/shared/keymap.2da
+++ b/gemrb/override/shared/keymap.2da
@@ -34,9 +34,9 @@ Toggle_AI             GUICommonWindows AIPress                           0
 Hard_Pause            GUICommonWindows HardPausePressed                  0
 Location              GUICommonWindows LocationPressed                   0
 Chat_Window           GUIMP            *
-Spell_Slot_1          GUICommonWindows *
-Spell_Slot_2          GUICommonWindows *
-Spell_Slot_3          GUICommonWindows *
+Spell_Slot_1          GUICommonWindows ActionQSpell1Pressed              0
+Spell_Slot_2          GUICommonWindows ActionQSpell2Pressed              0
+Spell_Slot_3          GUICommonWindows ActionQSpell3Pressed              0
 Weapon_Slot_1         GUICommonWindows ActionQWeapon1Pressed             0
 Weapon_Slot_2         GUICommonWindows ActionQWeapon2Pressed             0
 Weapon_Slot_3         GUICommonWindows ActionQWeapon3Pressed             0

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


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