Skip to content

Commit

Permalink
rename GF_CLEAR_UNUSED_AREA to GF_INFOPOINT_DIALOGS
Browse files Browse the repository at this point in the history
Also invert its meaning. Makes much more sense this way around.
  • Loading branch information
fizzet committed Jul 17, 2013
1 parent 515f774 commit 1c65766
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 22 deletions.
1 change: 1 addition & 0 deletions demo/data/gemrb.ini
Expand Up @@ -81,6 +81,7 @@ HasDPLAYER = 1
HasEXPTABLE = 0
HasFloatMenu = 0
HasHideInShadows = 1
HasInfopointDialogs = 1
HasKaputz = 0
HasNoNPCFlag = 1
HasPartyINI = 0
Expand Down
2 changes: 1 addition & 1 deletion gemrb/core/Interface.cpp
Expand Up @@ -2377,7 +2377,7 @@ static const char *game_flags[GF_COUNT+1]={
"RareActionSounds", //66GF_RARE_ACTION_VB
"NoUndroppable", //67GF_NO_UNDROPPABLE
"StartActive", //68GF_START_ACTIVE
"ClearUnusedArea", //69GF_CLEAR_UNUSED_AREA
"HasInfopointDialogs", //69GF_INFOPOINT_DIALOGS
"ImplicitAreaAnimBackground", //70GF_IMPLICIT_AREAANIM_BACKGROUND
"HealOn100Plus", //71GF_HEAL_ON_100PLUS
"InPartyAllowsDead", //72GF_IN_PARTY_ALLOWS_DEAD
Expand Down
14 changes: 7 additions & 7 deletions gemrb/docs/en/gemrb_ini.txt
Expand Up @@ -203,13 +203,6 @@ CheckAbilities = <bool>
Determines if character abilities should matter in item usability checks.


ClearUnusedArea = <bool>
- - - - - - - - - - -
Determines whether some fields in ARE files that are not used in all of
the games should be cleared on load. If you don't do this in BG1, for
example, those unitialized values in the data files will cause errors.


CutsceneAreascripts = <bool>
- - - - - - - - - -
Determines whether area scripts should run during cutscenes or not.
Expand Down Expand Up @@ -301,6 +294,13 @@ Enable this if the characters also have the IE_HIDEINSHADOWS stat besides
IE_STEALTH.


HasInfopointDialogs = <bool>
- - - - - - - - - - - - - -
Determines whether ARE files can contain dialog references for infopoints.
Of the original games only PST uses this feature but it only needs to be
switched off for BG1 since those fields contain garbage there.


HasKaputz = <bool>
- - - - - - - - - -
If set to 1, then death variables will be in a separate context.
Expand Down
2 changes: 1 addition & 1 deletion gemrb/includes/globals.h
Expand Up @@ -156,7 +156,7 @@ namespace GemRB {
#define GF_RARE_ACTION_VB 66 //pst
#define GF_NO_UNDROPPABLE 67 //iwd,how
#define GF_START_ACTIVE 68 //bg1
#define GF_CLEAR_UNUSED_AREA 69 //bg1
#define GF_INFOPOINT_DIALOGS 69 //pst, but only bg1 has garbage there
#define GF_IMPLICIT_AREAANIM_BACKGROUND 70 //idw,how,iwd2
#define GF_HEAL_ON_100PLUS 71 //bg1, bg2, pst
#define GF_IN_PARTY_ALLOWS_DEAD 72 //all except bg2
Expand Down
14 changes: 7 additions & 7 deletions gemrb/plugins/AREImporter/AREImporter.cpp
Expand Up @@ -514,18 +514,18 @@ Map* AREImporter::GetMap(const char *ResRef, bool day_or_night)
//maybe we have to store this
str->Seek( 36, GEM_CURRENT_POS );

if (core->HasFeature(GF_CLEAR_UNUSED_AREA)) {
memset( WavResRef, 0, sizeof(WavResRef));
TalkX = 0;
TalkY = 0;
DialogName = -1;
memset( DialogResRef, 0, sizeof(DialogResRef));
} else {
if (core->HasFeature(GF_INFOPOINT_DIALOGS)) {
str->ReadResRef( WavResRef );
str->ReadWord( &TalkX);
str->ReadWord( &TalkY);
str->ReadDword( &DialogName );
str->ReadResRef( DialogResRef );
} else {
memset(WavResRef, 0, sizeof(WavResRef));
TalkX = 0;
TalkY = 0;
DialogName = -1;
memset(DialogResRef, 0, sizeof(DialogResRef));
}

char* string = core->GetString( StrRef );
Expand Down
2 changes: 1 addition & 1 deletion gemrb/unhardcoded/bg1/gemrb.ini
Expand Up @@ -63,7 +63,6 @@ CastingSounds = 0
ChallengeRating = 0
CharNameIsGabber = 0
CheckAbilities = 0
ClearUnusedArea = 1
CutsceneAreascripts = 1
DeathOnZeroStat = 1
DialogueScrolls = 0
Expand All @@ -79,6 +78,7 @@ HasDPLAYER = 1
HasEXPTABLE = 0
HasFloatMenu = 0
HasHideInShadows = 0
HasInfopointDialogs = 0
HasKaputz = 0
HasNoNPCFlag = 0
HasPartyINI = 0
Expand Down
2 changes: 1 addition & 1 deletion gemrb/unhardcoded/bg2/gemrb.ini
Expand Up @@ -66,7 +66,6 @@ CastingSounds = 1
ChallengeRating = 0
CharNameIsGabber = 0
CheckAbilities = 1
ClearUnusedArea = 0
CutsceneAreascripts = 0
DeathOnZeroStat = 1
DialogueScrolls = 0
Expand All @@ -82,6 +81,7 @@ HasDPLAYER = 1
HasEXPTABLE = 0
HasFloatMenu = 0
HasHideInShadows = 1
HasInfopointDialogs = 1
HasKaputz = 0
HasNoNPCFlag = 1
HasPartyINI = 0
Expand Down
2 changes: 1 addition & 1 deletion gemrb/unhardcoded/how/gemrb.ini
Expand Up @@ -65,7 +65,6 @@ CastingSounds = 1
ChallengeRating = 0
CharNameIsGabber = 1
CheckAbilities = 0
ClearUnusedArea = 0
CutsceneAreascripts = 0
DeathOnZeroStat = 0
DialogueScrolls = 0
Expand All @@ -81,6 +80,7 @@ HasDPLAYER = 1
HasEXPTABLE = 1
HasFloatMenu = 0
HasHideInShadows = 1
HasInfopointDialogs = 1
HasKaputz = 0
HasNoNPCFlag = 0
HasPartyINI = 0
Expand Down
2 changes: 1 addition & 1 deletion gemrb/unhardcoded/iwd/gemrb.ini
Expand Up @@ -65,7 +65,6 @@ CastingSounds = 1
ChallengeRating = 0
CharNameIsGabber = 1
CheckAbilities = 0
ClearUnusedArea = 0
CutsceneAreascripts = 0
DeathOnZeroStat = 0
DialogueScrolls = 0
Expand All @@ -81,6 +80,7 @@ HasDPLAYER = 1
HasEXPTABLE = 1
HasFloatMenu = 0
HasHideInShadows = 1
HasInfopointDialogs = 1
HasKaputz = 0
HasNoNPCFlag = 0
HasPartyINI = 0
Expand Down
2 changes: 1 addition & 1 deletion gemrb/unhardcoded/iwd2/gemrb.ini
Expand Up @@ -63,7 +63,6 @@ CastingSounds = 1
ChallengeRating = 1
CharNameIsGabber = 1
CheckAbilities = 0
ClearUnusedArea = 0
CutsceneAreascripts = 1
DeathOnZeroStat = 0
DialogueScrolls = 0
Expand All @@ -79,6 +78,7 @@ HasDPLAYER = 1
HasEXPTABLE = 1
HasFloatMenu = 0
HasHideInShadows = 1
HasInfopointDialogs = 1
HasKaputz = 0
HasNoNPCFlag = 0
HasPartyINI = 1
Expand Down
2 changes: 1 addition & 1 deletion gemrb/unhardcoded/pst/gemrb.ini
Expand Up @@ -58,7 +58,6 @@ CastingSounds = 0
ChallengeRating = 0
CharNameIsGabber = 0
CheckAbilities = 0
ClearUnusedArea = 0
CutsceneAreascripts = 1
DeathOnZeroStat = 0
DialogueScrolls = 1
Expand All @@ -74,6 +73,7 @@ HasDPLAYER = 0
HasEXPTABLE = 0
HasFloatMenu = 1
HasHideInShadows = 0
HasInfopointDialogs = 1
HasKaputz = 1
HasNoNPCFlag = 0
HasPartyINI = 0
Expand Down

0 comments on commit 1c65766

Please sign in to comment.