Showing with 11,251 additions and 8,704 deletions.
  1. +1 −1 README.UPDATE
  2. +8 −4 StructFields.pm
  3. +11 −22 df.advmode.xml
  4. +2 −6 df.art.xml
  5. +1 −3 df.building-raws.xml
  6. +41 −81 df.buildings.xml
  7. +128 −90 df.creature-raws.xml
  8. +4 −2 df.d_init.xml
  9. +4 −12 df.descriptors.xml
  10. +352 −188 df.entities.xml
  11. +54 −148 df.entity-raws.xml
  12. +6 −15 df.globals.xml
  13. +161 −144 df.history.xml
  14. +1 −3 df.init.xml
  15. +5 −15 df.item-raws.xml
  16. +54 −3 df.itemimprovements.xml
  17. +22 −33 df.items.xml
  18. +2 −2 df.job-types.xml
  19. +14 −28 df.jobs.xml
  20. +14 −3 df.language.xml
  21. +6 −6 df.legends.xml
  22. +19 −27 df.map.xml
  23. +8 −24 df.materials.xml
  24. +223 −37 df.meeting.xml
  25. +7 −105 df.military.xml
  26. +228 −0 df.pathfinding.xml
  27. +2 −6 df.plant-raws.xml
  28. +1 −3 df.plants.xml
  29. +44 −145 df.raws.xml
  30. +4 −12 df.reaction-raws.xml
  31. +4 −4 df.refs.xml
  32. +78 −0 df.skills.xml
  33. +3 −9 df.stockpile.xml
  34. +50 −59 df.syndrome.xml
  35. +73 −77 df.ui-menus.xml
  36. +110 −158 df.ui.xml
  37. +205 −188 df.units.xml
  38. +1 −1 df.vermin.xml
  39. +126 −220 df.viewscreen.xml
  40. +134 −71 df.world-data.xml
  41. +16 −14 df.world-site.xml
  42. +97 −214 df.world.xml
  43. +1,890 −845 linux/all.csv
  44. +2,562 −2,410 linux/globals.csv
  45. +23 −11 symbols.xml
  46. +1,890 −845 windows/all.csv
  47. +2,562 −2,410 windows/globals.csv
2 changes: 1 addition & 1 deletion README.UPDATE
View file
Expand Up @@ -195,7 +195,7 @@ STAGE 4. Primary windows compound globals

Alternatively, look before ui for clocks changing every frame.

8. cursor_unit_list
8. map_renderer

Put a 'v' cursor exactly above a unit; backtrack from the unit object.

Expand Down
12 changes: 8 additions & 4 deletions StructFields.pm
View file
Expand Up @@ -576,18 +576,22 @@ sub emit_struct_fields($$;%) {
}
} 'ctors';

%info = $flags{-addmethods}->($tag) if $flags{-addmethods};

my $alloc_fn = $info{nodtor} ? 'allocator_nodel_fn' : 'allocator_fn';

if ($want_ctor) {
outdent { emit $flags{-class} ? "protected:" : "public:"; };
emit "$name($ctor_args$ctor_arg_init);";
if ($flags{-class}) {
emit "friend void *${main_namespace}::${alloc_fn}<${full_name}>(void*,const void*);";
}
}

%info = $flags{-addmethods}->($tag) if $flags{-addmethods};

with_emit_static {
my $ftable = render_field_metadata $tag, $full_name, @fields, %info;

if ($flags{-class}) {
my $alloc_fn = $info{nodtor} ? 'allocator_nodel_fn' : 'allocator_fn';

emit "virtual_identity ${full_name}::_identity(",
"sizeof($full_name), &${alloc_fn}<${full_name}>, ",
"\"$name\",",
Expand Down
33 changes: 11 additions & 22 deletions df.advmode.xml
View file
Expand Up @@ -111,10 +111,11 @@
<padding size='2'/>
<int32_t name='tick_counter' comment='goes up to XXX'/>
<int32_t name='frame_counter' comment='goes up to 10000 (ticks?)'/>
<int32_t name='unk6'/>
<int32_t name='unk7'/>
<int32_t name='unk8'/>
<int32_t name='unk9'/>
<int16_t name='unk6'/>
<bool name='sleeping'/>
<int32_t name='bogeymen_timer' comment='initialized to 4-7 when the cackling starts'/>
<int32_t name='bogeymen_killed'/>
<int32_t name='unk9' comment='initialized to 60 when the cackling starts'/>
<int32_t name='unk10'/>

<stl-vector name='unk11'/>
Expand All @@ -128,15 +129,9 @@
<int32_t name='unk18'/>
<int32_t name='unk19'/>

<stl-vector name='unk20'>
<int32_t ref-target='world_site'/>
</stl-vector>
<stl-vector name='unk21'>
<int32_t/>
</stl-vector>
<stl-vector name='unk22'>
<int32_t/>
</stl-vector>
<stl-vector name='unk20' type-name='int32_t' ref-target='world_site'/>
<stl-vector name='unk21' type-name='int32_t'/>
<stl-vector name='unk22' type-name='int32_t'/>

<int16_t name='unk23'/>
<int16_t name='unk24'/>
Expand Down Expand Up @@ -169,9 +164,7 @@
<stl-vector name='unk28'/>
<stl-vector name='unk29'/>
<stl-vector name='unk30'/>
<stl-vector name='actions'>
<pointer type-name='adventure_movement_option'/>
</stl-vector>
<stl-vector name='actions' pointer-type='adventure_movement_option'/>
<stl-vector name='unk31' comment='v0.34.08'/>

<int32_t name='unk32'/>
Expand All @@ -184,15 +177,11 @@
<int32_t name='unk36'/>

<compound name='companions'>
<stl-vector name='unit'>
<pointer type-name='unit'/>
</stl-vector>
<stl-vector name='unit' pointer-type='unit'/>
<stl-bit-vector name='unit_visible'/>
<compound name='unit_position' type-name='coord_path'/>

<stl-vector name='all_histfigs' comment='includes dead'>
<int32_t ref-target='historical_figure'/>
</stl-vector>
<stl-vector name='all_histfigs' comment='includes dead' type-name='int32_t' ref-target='historical_figure'/>
</compound>

<stl-vector name='unk37'/>
Expand Down
8 changes: 2 additions & 6 deletions df.art.xml
View file
Expand Up @@ -172,12 +172,8 @@
<code-helper name='find-instance'>$(find-instance $art_image_chunk $$).images[$]</code-helper>
<code-helper name='describe'>(describe-obj $.name)</code-helper>

<stl-vector name='elements'>
<pointer type-name='art_image_element'/>
</stl-vector>
<stl-vector name='properties'>
<pointer type-name='art_image_property'/>
</stl-vector>
<stl-vector name='elements' pointer-type='art_image_element'/>
<stl-vector name='properties' pointer-type='art_image_property'/>

<int32_t name='event' ref-target='history_event'/>
<compound name='name' type-name='language_name'/>
Expand Down
4 changes: 1 addition & 3 deletions df.building-raws.xml
View file
Expand Up @@ -33,9 +33,7 @@
<int32_t name='build_key'/>
<bool name='needs_magma'/>

<stl-vector name="build_items">
<pointer type-name='building_def_item'/>
</stl-vector>
<stl-vector name="build_items" pointer-type='building_def_item'/>

<int32_t name="dim_x"/>
<int32_t name="dim_y"/>
Expand Down