Permalink
Browse files

added a gameflag for the slight difference in continuation handling

fixes bg2 spectral and spirit trolls immortality after the how djinni change
  • Loading branch information...
1 parent 2d33418 commit 8776b90fddc16b606b29352d03593ef4ed15534f @lynxlynxlynx lynxlynxlynx committed Apr 22, 2013
@@ -1963,7 +1963,10 @@ bool GameScript::Update(bool *continuing, bool *done)
// the first block encountered), needs more testing
//HoW ar9708, djinni would become visible only if this is not commented out
//See: SEDJINNI.BCS
- if (done) *done = true;
+ //BG2 on the other hand ... (eg. spirit trolls trollsp01 in ar1506)
+ if (core->HasFeature(GF_SKIPUPDATE_HACK)) {
+ if (done) *done = true;
+ }
return false;
}
View
@@ -2372,6 +2372,7 @@ static const char *game_flags[GF_COUNT+1]={
"HealOn100Plus", //71GF_HEAL_ON_100PLUS
"InPartyAllowsDead", //72GF_IN_PARTY_ALLOWS_DEAD
"ZeroTimerIsValid", //73GF_ZERO_TIMER_IS_VALID
+ "SkipUpdateHack", //74GF_SKIPUPDATE_HACK
NULL //for our own safety, this marks the end of the pole
};
@@ -514,6 +514,11 @@ Determines whether the magic resistance applies to all effects, even the
beneficial ones.
+SkipUpdateHack = <bool>
+- - - - - - - - - - - -
+Determines how the engine treats a very specific script continuation nuance.
+
+
SmallFog = <bool>
- - - - - - - - - - -
Whether fog-of-war maintained in Map::ExploredBitmap is aligned with
View
@@ -161,9 +161,10 @@ namespace GemRB {
#define GF_HEAL_ON_100PLUS 71 //bg1, bg2, pst
#define GF_IN_PARTY_ALLOWS_DEAD 72 //all except bg2
#define GF_ZERO_TIMER_IS_VALID 73 // how, not bg2, other unknown
+#define GF_SKIPUPDATE_HACK 74 // how, not bg2
//update this or bad things can happen
-#define GF_COUNT 74
+#define GF_COUNT 75
//the number of item usage fields (used in CREItem and STOItem)
#define CHARGE_COUNTERS 3
@@ -116,6 +116,7 @@ ReverseDoor = 0
ReverseToHit = 1
SaveForHalfDamage = 0
SelectiveMagicRes = 0
+SkipUpdateHack = 0
SmallFog = 1
SoundFolders = 0
SpawnIni = 0
@@ -119,6 +119,7 @@ ReverseDoor = 0
ReverseToHit = 1
SaveForHalfDamage = 0
SelectiveMagicRes = 1
+SkipUpdateHack = 0
SmallFog = 0
SoundFolders = 0
SpawnIni = 0
@@ -120,6 +120,7 @@ ReverseDoor = 0
ReverseToHit = 1
SaveForHalfDamage = 0
SelectiveMagicRes = 1
+SkipUpdateHack = 1
SmallFog = 0
SoundFolders = 1
SpawnIni = 1
@@ -120,6 +120,7 @@ ReverseDoor = 0
ReverseToHit = 1
SaveForHalfDamage = 0
SelectiveMagicRes = 0
+SkipUpdateHack = 1
SmallFog = 0
SoundFolders = 1
SpawnIni = 1
@@ -118,6 +118,7 @@ ReverseDoor = 0
ReverseToHit = 0
SaveForHalfDamage = 0
SelectiveMagicRes = 1
+SkipUpdateHack = 1
SmallFog = 0
SoundFolders = 1
SpawnIni = 1
@@ -113,6 +113,7 @@ ReverseDoor = 1
ReverseToHit = 1
SaveForHalfDamage = 1
SelectiveMagicRes = 0
+SkipUpdateHack = 0
SmallFog = 1
SoundFolders = 0
SpawnIni = 1

0 comments on commit 8776b90

Please sign in to comment.