Skip to content

Commit

Permalink
Merge pull request #326 from jimbowhales/whales/loading-stages
Browse files Browse the repository at this point in the history
viewscreen_loadgamest::cur_step
  • Loading branch information
lethosor authored Oct 11, 2019
2 parents dea73f7 + cf63d77 commit da144d6
Showing 1 changed file with 54 additions and 4 deletions.
58 changes: 54 additions & 4 deletions df.viewscreen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,7 @@
<pointer name='unk_2c'/> 0
<int32_t name='unk_2d'/> -1
<int32_t name='unk_2e'/> -1

<pointer name='unk_cache_ptr'/> points into unk_cache.tmp2
<compound name='unk_cache'>
todo: fix layout - some fields in "tmp2" are int8/int32, but many others are uninitialized
Expand Down Expand Up @@ -1880,7 +1880,57 @@
</struct-type>

<class-type type-name='viewscreen_loadgamest' inherits-from='viewscreen'>
<int32_t name='cur_step'/>
<enum name='cur_step' comment='After the on-screen text shown while loading.'>
<enum-item name='OPENING_FILE' value='0'/>
<enum-item name='PROCESSING_RAW_DATA' value='1'/>
<enum-item name='ALLOCATING_SPACE' value='2'/>
<enum-item name='LOADING_ITEMS' value='3'/>
<enum-item name='LOADING_UNITS' value='4'/>
<enum-item name='LOADING_JOBS' value='5'/>
<enum-item name='LOADING_SCHEDULES' value='6'/>
<enum-item name='LOADING_PROJECTILES' value='7'/>
<enum-item name='LOADING_BUILDINGS' value='8'/>
<enum-item name='LOADING_MACHINES' value='9'/>
<enum-item name='LOADING_FLOW_GUIDES' value='10'/>
<enum-item name='LOADING_EFFECTS' value='11'/>
<enum-item name='LOADING_ENTITIES' value='12'/>
<enum-item name='LOADING_LOCAL_ANIMAL_POPULATIONS' value='13'/>
<enum-item name='LOADING_EVENTS' value='14'/>
<enum-item name='LOADING_MANDATES' value='15'/>
<enum-item name='LOADING_WORK_QUOTAS' value='16'/>
<enum-item name='LOADING_WORLD_EVENTS' value='17'/>
<enum-item name='LOADING_COIN_INFORMATION' value='18'/>
<enum-item name='LOADING_SQUADS' value='19'/>
<enum-item name='LOADING_FORMATIONS' value='20'/>
<enum-item name='LOADING_ACTIVITIES' value='21'/>
<enum-item name='LOADING_INTERACTIONS' value='22'/>
<enum-item name='LOADING_WRITTEN_CONTENT' value='23'/>
<enum-item name='LOADING_IDENTITIES' value='24'/>
<enum-item name='LOADING_INCIDENTS' value='25'/>
<enum-item name='LOADING_CRIMES' value='26'/>
<enum-item name='LOADING_VEHICLES' value='27'/>
<enum-item name='LOADING_ARMIES' value='28'/>
<enum-item name='LOADING_ARMY_CONTROLLERS' value='29'/>
<enum-item name='LOADING_TRACKING_INFORMATION' value='30'/>
<enum-item name='LOADING_CULTURAL_IDENTITIES' value='31'/>
<enum-item name='LOADING_AGREEMENTS' value='32'/>
<enum-item name='LOADING_ART_FORMS' value='33'/>
<enum-item name='LOADING_OCCUPATIONS' value='34'/>
<enum-item name='LOADING_BELIEF_SYSTEMS' value='35'/>
<enum-item name='LOADING_ANNOUNCEMENTS' value='36'/>
<enum-item name='LOADING_FORTRESS_INFORMATION' value='37'/>
<enum-item name='LOADING_WORLD_INFORMATION' value='38'/>
<enum-item name='LOADING_ARTIFACTS' value='39'/>
<enum-item name='LOADING_ACTIVE_HISTORICAL_FIGURES' value='40'/>
<enum-item name='LOADING_ADVENTURE' value='41'/>
<enum-item name='LOADING_GENERAL_INFORMATION' value='42'/>
<enum-item name='CLOSING_FILE' value='43'/>
<enum-item name='REBUILDING_TEMPORARY_INFORMATION' value='44'/>
<enum-item name='REBUILDING_MORE_TEMPORARY_INFORMATION' value='45'/>
<enum-item name='PREPARING_GAME_SCREEN' value='46'/>
<enum-item name='HANDLING_COMPATIBILITY_ISSUES' value='47'/>
<enum-item name='FINISHING' value='48'/>
</enum>
<int32_t name='unk_v40_1b' since='v0.40.01'/>
<int8_t name='loading'/>
<int32_t name='sel_idx'/>
Expand Down Expand Up @@ -2062,7 +2112,7 @@
<pointer name='mission_report' type-name='mission_report'/>
<int32_t name='map_cursor_x'/>
<int32_t name='map_cursor_y'/>
<int32_t name='mission_path_finished'/>
<int32_t name='mission_path_finished'/>
<int32_t name='mission_path_progress'/>
<int32_t name='mission_text_finished'/>
<int32_t name='mission_text_progress'/>
Expand Down Expand Up @@ -2199,7 +2249,7 @@
<bool name='unk_2'/>
<int16_t name='unk_3'/>
<bool name='playable'/> will be included in wild_creature_ids
</pointer>
</pointer>
</stl-vector>
<compound type-name='setup_character_info' name='adventurer'/>

Expand Down

0 comments on commit da144d6

Please sign in to comment.