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

Merge remote-tracking branch 'DFHack/develop' into remote_control 

# Conflicts:
#	scripts
develop
Japa Mala Illo 2018-01-12 11:17:22 +05:30
parent a9af3d4792 14466d2dfc
commit 56c76d5abc
4 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
Unescape Escape View File

@ -140,9 +140,9 @@ if (NOT EXISTS ${dfhack_SOURCE_DIR}/library/xml/codegen.pl OR NOT EXISTS ${dfhac
endif() endif()
# set up versioning. # set up versioning.
set(DF_VERSION "0.44.03") set(DF_VERSION "0.44.04")
SET(DFHACK_RELEASE "beta1") set(DFHACK_RELEASE "alpha1")
SET(DFHACK_PRERELEASE TRUE) set(DFHACK_PRERELEASE TRUE)
set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}") set(DFHACK_VERSION "${DF_VERSION}-${DFHACK_RELEASE}")

8
docs/NEWS-dev.rst
Unescape Escape View File

@ -37,6 +37,14 @@ Development Changelog
.. contents:: .. contents::
:depth: 2 :depth: 2
DFHack 0.44.04-alpha1
=====================
Structures
----------
- ``artifact_record``: fixed layout (changed in 0.44.04)
- ``incident``: fixed layout (changed in 0.44.01) - note that many fields have moved
DFHack 0.44.03-beta1 DFHack 0.44.03-beta1
==================== ====================

2
library/xml

@ -1 +1 @@
Subproject commit 7e23a328fd81e3d6db794c0c18b8b2e7bd235649 Subproject commit 72dd9b14633e448f5e882e27a8d9af22ea9fdd5a

20
plugins/tweak/tweaks/condition-material.h
Unescape Escape View File

@ -8,8 +8,8 @@ struct condition_material_hook : df::viewscreen_workquota_conditionst {
struct T_order_mat_data { struct T_order_mat_data {
std::vector<std::string*> list_entries; std::vector<std::string*> list_entries;
std::vector<int16_t> list_unk1; std::vector<int16_t> mat_types;
std::vector<int32_t> list_unk2; std::vector<int32_t> mat_indices;
std::vector<int16_t> list_unk3; std::vector<int16_t> list_unk3;
std::vector<int16_t> list_visible; std::vector<int16_t> list_visible;
}; };
@ -24,8 +24,8 @@ struct condition_material_hook : df::viewscreen_workquota_conditionst {
} }
auto data = new T_order_mat_data; auto data = new T_order_mat_data;
data->list_entries = scr->list_entries; data->list_entries = scr->list_entries;
data->list_unk1 = scr->list_unk1; data->mat_types = scr->mat_types;
data->list_unk2 = scr->list_unk2; data->mat_indices = scr->mat_indices;
data->list_unk3 = scr->list_unk3; data->list_unk3 = scr->list_unk3;
data->list_visible = scr->list_visible; data->list_visible = scr->list_visible;
order_mat_data[scr] = data; order_mat_data[scr] = data;
@ -37,8 +37,8 @@ struct condition_material_hook : df::viewscreen_workquota_conditionst {
{ {
T_order_mat_data *data = order_mat_data[scr]; T_order_mat_data *data = order_mat_data[scr];
scr->list_entries = data->list_entries; scr->list_entries = data->list_entries;
scr->list_unk1 = data->list_unk1; scr->mat_types = data->mat_types;
scr->list_unk2 = data->list_unk2; scr->mat_indices = data->mat_indices;
scr->list_unk3 = data->list_unk3; scr->list_unk3 = data->list_unk3;
scr->list_visible = data->list_visible; scr->list_visible = data->list_visible;
delete data; delete data;
@ -55,8 +55,8 @@ struct condition_material_hook : df::viewscreen_workquota_conditionst {
// keep the first item ("no material") around, because attempts to delete it // keep the first item ("no material") around, because attempts to delete it
// result in it still being displayed first, regardless of list_entries[0] // result in it still being displayed first, regardless of list_entries[0]
list_entries.resize(1); list_entries.resize(1);
list_unk1.resize(1); mat_types.resize(1);
list_unk2.resize(1); mat_indices.resize(1);
list_unk3.resize(1); list_unk3.resize(1);
list_visible.resize(1); list_visible.resize(1);
// skip "no material" here // skip "no material" here
@ -71,8 +71,8 @@ struct condition_material_hook : df::viewscreen_workquota_conditionst {
if (s->find(filter) != std::string::npos) if (s->find(filter) != std::string::npos)
{ {
list_entries.push_back(data->list_entries[i]); list_entries.push_back(data->list_entries[i]);
list_unk1.push_back(data->list_unk1[i]); mat_types.push_back(data->mat_types[i]);
list_unk2.push_back(data->list_unk2[i]); mat_indices.push_back(data->mat_indices[i]);
list_unk3.push_back(data->list_unk3[i]); list_unk3.push_back(data->list_unk3[i]);
// this should be small enough to fit in an int16_t // this should be small enough to fit in an int16_t
list_visible.push_back(int16_t(list_entries.size() - 1)); list_visible.push_back(int16_t(list_entries.size() - 1));