Permalink
Browse files

d9896f3 was detrimental to iwd/how, so make it more finegrained

  • Loading branch information...
1 parent 4683000 commit 5895c14af0a1d3a92e268042fa8a357ef4038b8c @lynxlynxlynx lynxlynxlynx committed May 2, 2014
@@ -2383,6 +2383,7 @@ static const char *game_flags[GF_COUNT+1]={
"ZeroTimerIsValid", //73GF_ZERO_TIMER_IS_VALID
"SkipUpdateHack", //74GF_SKIPUPDATE_HACK
"MeleeHeaderUsesProjectile", //75GF_MELEEHEADER_USESPROJECTILE
+ "ForceDialogPause", //76GF_FORCE_DIALOGPAUSE
NULL //for our own safety, this marks the end of the pole
};
@@ -163,9 +163,10 @@ namespace GemRB {
#define GF_ZERO_TIMER_IS_VALID 73 // how, not bg2, other unknown
#define GF_SKIPUPDATE_HACK 74 // how, not bg2
#define GF_MELEEHEADER_USESPROJECTILE 75 // minimally bg2
+#define GF_FORCE_DIALOGPAUSE 76 // iwd/how, not bg1, bg2 is special
//update this or bad things can happen
-#define GF_COUNT 76
+#define GF_COUNT 77
//the number of item usage fields (used in CREItem and STOItem)
#define CHARGE_COUNTERS 3
@@ -74,7 +74,11 @@ bool DLGImporter::Open(DataStream* stream)
str->ReadDword( &Flags );
}
else {
- Flags = 1; // none of these game have dialog pause
+ // only bg2 has the Flags field in the disk format
+ // some games default to unpaused, while others don't
+ // iwd/how relies on this for ar2112 dialog with arundel
+ // after returning from dragon's eye (double dialog break)
+ Flags = !core->HasFeature(GF_FORCE_DIALOGPAUSE);
}
return true;
}
@@ -70,6 +70,7 @@ EnhancedCastingSounds = 0
EnhancedEffects = 0
FistStat = 232
FlexibleWorldmap = 0
+ForceDialogPause = 0
ForceAreaScript = 0
ForceStereo = 1
HasBeastsINI = 0
@@ -74,6 +74,7 @@ EnhancedEffects = 0
FistStat = 232
ForceAreaScript = 0
FlexibleWorldmap = 0
+ForceDialogPause = 0
ForceStereo = 0
HasBeastsINI = 0
HasDescIcon = 1
@@ -72,6 +72,7 @@ EnhancedCastingSounds = 0
EnhancedEffects = 0
FistStat = 232
FlexibleWorldmap = 1
+ForceDialogPause = 1
ForceAreaScript = 1
ForceStereo = 0
HasBeastsINI = 0
@@ -72,6 +72,7 @@ EnhancedCastingSounds = 0
EnhancedEffects = 0
FistStat = 232
FlexibleWorldmap = 1
+ForceDialogPause = 1
ForceAreaScript = 1
ForceStereo = 0
HasBeastsINI = 0
@@ -70,6 +70,7 @@ EnhancedCastingSounds = 0
EnhancedEffects = 1
FistStat = 232
FlexibleWorldmap = 1
+ForceDialogPause = 0
ForceAreaScript = 1
ForceStereo = 0
HasBeastsINI = 0
@@ -64,6 +64,7 @@ EnhancedCastingSounds = 0
EnhancedEffects = 0
FistStat = 235
FlexibleWorldmap = 0
+ForceDialogPause = 0
ForceAreaScript = 0
ForceStereo = 1
HasBeastsINI = 1

0 comments on commit 5895c14

Please sign in to comment.