Encapsulate PBI Category-1 transition flags as file-statics

mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00

gfEnteringMapScreenToEnterPreBattleInterface, gfAutomaticallyStartAutoResolve
and gfDelayAutoResolveStart are now file-static in PreBattle Interface.cpp
(the latter's definition moved here from Strategic Movement.cpp). External
access goes through accessors declared in the header; PBI.cpp touches the
statics directly.

Accessors exist only where an external caller needs one:
AutomaticallyStartAutoResolve() getter (read in Town Militia,
gamescreen, Player Command); SetAutomaticallyStartAutoResolve (set in
Creature Spreading, strategicmap); SetDelayAutoResolveStart (set in
Strategic Movement);
SetEnteringMapScreenToEnterPreBattleInterface (set in strategicmap).
gfEnteringMapScreen stays a raw cross-read into mapscreen state, not
PBI-owned.  No behavior change: getter returns BOOLEAN.

Verify: grep the three flag names across the tree hits only PreBattle
Interface.cpp (three static defs, four accessor bodies, and in-file
Handle/reader access). No header externs, no external raw refs. Build: JA2.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

This commit is contained in:

Marco Antonio J. Costa

2026-08-02 14:58:24 -03:00

committed by

majcosta

co-authored by

Claude Opus 4.8

parent f1d5431660

commit 380fedca10

8 changed files with 22 additions and 17 deletions

									
										Ja2/gamescreen.cpp
									
		+1
		-1
	
												View File
												
				@@ -353,7 +353,7 @@ void InternalLeaveTacticalScreen( UINT32 uiNewScreen )

					gpCustomizableTimerCallback = NULL;

					// unload the sector they teleported out of

					if ( !gfAutomaticallyStartAutoResolve )

					if ( !AutomaticallyStartAutoResolve() )

					{

					CheckAndHandleUnloadingOfCurrentWorld();

					}