MetzNet
/
dfhack
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2573 from myk002/myk_compile_update 

get things to compile with the recent structure updates
develop
Myk 2023-01-08 13:03:50 -08:00 committed by GitHub
parent f78267351d 92489ef27d
commit 32f6e67a4a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/modules/Buildings.cpp
Unescape Escape View File

@ -1263,7 +1263,8 @@ bool Buildings::deconstruct(df::building *bld)
// Assume: no parties. // Assume: no parties.
unlinkRooms(bld); unlinkRooms(bld);
// Assume: not unit destroy target // Assume: not unit destroy target
vector_erase_at(plotinfo->tax_collection.rooms, linear_index(plotinfo->tax_collection.rooms, bld->id)); int id = bld->id;
vector_erase_at(plotinfo->tax_collection.rooms, linear_index(plotinfo->tax_collection.rooms, id));
// Assume: not used in punishment // Assume: not used in punishment
// Assume: not used in non-own jobs // Assume: not used in non-own jobs
// Assume: does not affect pathfinding // Assume: does not affect pathfinding
@ -1283,7 +1284,7 @@ bool Buildings::deconstruct(df::building *bld)
{ {
auto item = ui_look_list->items[i]; auto item = ui_look_list->items[i];
if (item->type == df::ui_look_list::T_items::Building && if (item->type == df::ui_look_list::T_items::Building &&
item->data.Building == bld) item->data.building.bld_id == id)
{ {
vector_erase_at(ui_look_list->items, i); vector_erase_at(ui_look_list->items, i);
delete item; delete item;

4
library/modules/Gui.cpp
Unescape Escape View File

@ -2024,8 +2024,8 @@ bool Gui::revealInDwarfmodeMap(int32_t x, int32_t y, int32_t z, bool center)
*window_x = clip_range(new_win_x, 0, (world->map.x_count - w)); *window_x = clip_range(new_win_x, 0, (world->map.x_count - w));
*window_y = clip_range(new_win_y, 0, (world->map.y_count - h)); *window_y = clip_range(new_win_y, 0, (world->map.y_count - h));
*window_z = clip_range(new_win_z, 0, (world->map.z_count - 1)); *window_z = clip_range(new_win_z, 0, (world->map.z_count - 1));
game->minimap.need_render = true; game->minimap.update = true;
game->minimap.need_scan = true; game->minimap.mustmake = true;
return true; return true;
} }

22
library/modules/Job.cpp
Unescape Escape View File

@ -593,17 +593,17 @@ std::string Job::getName(df::job *job)
std::string desc; std::string desc;
auto button = df::allocate<df::interface_button_building_new_jobst>(); auto button = df::allocate<df::interface_button_building_new_jobst>();
button->reaction_name = job->reaction_name; button->mstring = job->reaction_name;
button->hist_figure_id = job->hist_figure_id; button->spec_id = job->hist_figure_id;
button->job_type = job->job_type; button->jobtype = job->job_type;
button->item_type = job->item_type; button->itemtype = job->item_type;
button->item_subtype = job->item_subtype; button->subtype = job->item_subtype;
button->mat_type = job->mat_type; button->material = job->mat_type;
button->mat_index = job->mat_index; button->matgloss = job->mat_index;
button->item_category = job->item_category; button->specflag = job->item_category;
button->material_category = job->material_category; button->job_item_flag = job->material_category;
button->getLabel(&desc); button->text(&desc);
delete button; delete button;
return desc; return desc;

3
plugins/remotefortressreader/dwarf_control.cpp
Unescape Escape View File

@ -1,3 +1,4 @@
#include "dwarf_control.h" #include "dwarf_control.h"
#include "DataDefs.h" #include "DataDefs.h"
#include "df_version_int.h" #include "df_version_int.h"
@ -10,8 +11,6 @@
#include "df/building_def_workshopst.h" #include "df/building_def_workshopst.h"
#include "df/job.h" #include "df/job.h"
#include "df/job_list_link.h" #include "df/job_list_link.h"
#include "df/interface_button_construction_building_selectorst.h"
#include "df/interface_button_construction_category_selectorst.h"
#include "df/plotinfost.h" #include "df/plotinfost.h"
#include "df/buildreq.h" #include "df/buildreq.h"
#include "df/gamest.h" #include "df/gamest.h"