gemrb: Infinity Engine emulator
The branch master has been updated
via 02f1d395983e186ada6ba3a6425735029a39fa2c (commit)
via fcb75fea2a7e5795d26fcdbe0c148e6b978886d4 (commit)
Summary of changes:
gemrb/GUIScripts/CommonWindow.py | 13 +++++++------
gemrb/core/Interface.cpp | 1 +
gemrb/includes/globals.h | 4 ++--
gemrb/override/how/gemrb.ini | 1 +
gemrb/override/iwd/gemrb.ini | 1 +
gemrb/override/iwd2/gemrb.ini | 2 +-
gemrb/plugins/AREImporter/AREImporter.cpp | 5 +++++
7 files changed, 18 insertions(+), 9 deletions(-)
from b7261af4a1e7a17d00c60b547cd3d3416fbee1f6 (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=02f1d395983e186ada6ba3a6425735029a39fa2c
commit 02f1d395983e186ada6ba3a6425735029a39fa2c
Author: Avenger <avenger_teambg@...>
Date: Sun Jan 23 16:56:52 2011 +0100
fixed container handling in iwd2
diff --git a/gemrb/GUIScripts/CommonWindow.py b/gemrb/GUIScripts/CommonWindow.py
index 385c7a1..02ea1e6 100644
--- a/gemrb/GUIScripts/CommonWindow.py
+++ b/gemrb/GUIScripts/CommonWindow.py
@@ -168,12 +168,13 @@ def OpenContainerWindow ():
else:
# FIXME: see note in CloseContainerWindow
if GUICommon.GameIsIWD2():
- GUIWORLD.OldActionsWindow = GUIClasses.GWindow( GemRB.GetVar ("PortraitWindow") )
+ GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
+ GemRB.SetVar ("MessageWindow", Window.ID)
else:
GUIWORLD.OldActionsWindow = GUIClasses.GWindow( GemRB.GetVar ("ActionsWindow") )
- GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
- GemRB.SetVar ("MessageWindow", -1)
- GemRB.SetVar ("ActionsWindow", Window.ID)
+ GUIWORLD.OldMessageWindow = GUIClasses.GWindow( GemRB.GetVar ("MessageWindow") )
+ GemRB.SetVar ("MessageWindow", -1)
+ GemRB.SetVar ("ActionsWindow", Window.ID)
Container = GemRB.GetContainer(0)
@@ -279,10 +280,10 @@ def CloseContainerWindow ():
# FIXME: iwd2 bug or just bad naming?
if GUICommon.GameIsIWD2():
- GemRB.SetVar ("PortraitWindow", OldActionsWindow.ID)
+ GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID)
else:
GemRB.SetVar ("ActionsWindow", GUIWORLD.OldActionsWindow.ID)
- GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID)
+ GemRB.SetVar ("MessageWindow", GUIWORLD.OldMessageWindow.ID)
Table = GemRB.LoadTable ("containr")
row = Container['Type']
tmp = Table.GetValue (row, 2)
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=fcb75fea2a7e5795d26fcdbe0c148e6b978886d4
commit fcb75fea2a7e5795d26fcdbe0c148e6b978886d4
Author: Avenger <avenger_teambg@...>
Date: Sun Jan 23 16:55:34 2011 +0100
added ForceAreaScript gameflag
diff --git a/gemrb/core/Interface.cpp b/gemrb/core/Interface.cpp
index f9b2bcf..9161614 100644
--- a/gemrb/core/Interface.cpp
+++ b/gemrb/core/Interface.cpp
@@ -2476,6 +2476,7 @@ static const char *game_flags[GF_COUNT+1]={
"JournalHasSections", //56GF_JOURNAL_HAS_SECTIONS
"CastingSounds", //57GF_CASTING_SOUNDS
"EnhancedCastingSounds", //58GF_CASTING_SOUNDS2
+ "ForceAreaScript", //59GF_FORCE_AREA_SCRIPT
NULL //for our own safety, this marks the end of the pole
};
diff --git a/gemrb/includes/globals.h b/gemrb/includes/globals.h
index 91ade29..e4ff5cf 100644
--- a/gemrb/includes/globals.h
+++ b/gemrb/includes/globals.h
@@ -146,9 +146,9 @@
#define GF_JOURNAL_HAS_SECTIONS 56 //bg2
#define GF_CASTING_SOUNDS 57 //all except pst and bg1
#define GF_CASTING_SOUNDS2 58 //bg2
-
+#define GF_FORCE_AREA_SCRIPT 59 //how and iwd2 (maybe iwd1)
//update this or bad things can happen
-#define GF_COUNT 59
+#define GF_COUNT 60
//the number of item usage fields (used in CREItem and STOItem)
#define CHARGE_COUNTERS 3
diff --git a/gemrb/override/how/gemrb.ini b/gemrb/override/how/gemrb.ini
index cdb8930..6530e41 100644
--- a/gemrb/override/how/gemrb.ini
+++ b/gemrb/override/how/gemrb.ini
@@ -86,6 +86,7 @@ AutoSearchHidden = 1
CutsceneAreascripts = 0
PSTStateFlags = 0
CastingSounds = 1
+ForceAreaScript = 1
[charset]
CharCount = 31
diff --git a/gemrb/override/iwd/gemrb.ini b/gemrb/override/iwd/gemrb.ini
index fc6266b..40f4286 100644
--- a/gemrb/override/iwd/gemrb.ini
+++ b/gemrb/override/iwd/gemrb.ini
@@ -84,6 +84,7 @@ AutoSearchHidden = 1
CutsceneAreascripts = 0
PSTStateFlags = 0
CastingSounds = 1
+ForceAreaScript = 1
[charset]
CharCount = 31
diff --git a/gemrb/override/iwd2/gemrb.ini b/gemrb/override/iwd2/gemrb.ini
index 0f6b9fb..b619c47 100644
--- a/gemrb/override/iwd2/gemrb.ini
+++ b/gemrb/override/iwd2/gemrb.ini
@@ -95,4 +95,4 @@ FlexibleWorldmap = 1
AutoSearchHidden = 0
PSTStateFlags = 0
CastingSounds = 1
-
+ForceAreaScript = 1
diff --git a/gemrb/plugins/AREImporter/AREImporter.cpp b/gemrb/plugins/AREImporter/AREImporter.cpp
index 9878646..f35c7af 100644
--- a/gemrb/plugins/AREImporter/AREImporter.cpp
+++ b/gemrb/plugins/AREImporter/AREImporter.cpp
@@ -450,6 +450,11 @@ Map* AREImporter::GetMap(const char *ResRef, bool day_or_night)
str->ReadWord( &LaunchY );
str->ReadResRef( KeyResRef );
str->ReadResRef( Script );
+ //if the Script field is empty, the area name will be copied into it on first load
+ //this works only in the iwd branch of the games
+ if (!Script[0] && core->HasFeature(GF_FORCE_AREA_SCRIPT) ) {
+ memcpy(Script, ResRef, sizeof(ieResRef) );
+ }
str->ReadWord( &PosX);
str->ReadWord( &PosY);
//maybe we have to store this
-----------------------------------------------------------------------
This is an automated email from the git hooks/post-receive script.
--
gemrb: Infinity Engine emulator
|