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

fix some crashes in the new instrument reader code.

develop
Japa 2018-02-27 21:01:38 +05:30
parent d758104f5e
commit 65e549848d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/proto/ItemdefInstrument.proto
Unescape Escape View File

@ -62,8 +62,8 @@ enum TuningType
PEGS = 0; PEGS = 0;
ADJUSTABLE_BRIDGES = 1; ADJUSTABLE_BRIDGES = 1;
CROOKS = 2; CROOKS = 2;
TIGHTENING = 4; TIGHTENING = 3;
LEVERS = 5; LEVERS = 4;
} }
message InstrumentPiece message InstrumentPiece

10
plugins/remotefortressreader/item_reader.cpp
Unescape Escape View File

@ -575,7 +575,7 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
case df::enums::item_type::INSTRUMENT: case df::enums::item_type::INSTRUMENT:
{ {
VIRTUAL_CAST_VAR(instrument, df::itemdef_instrumentst, item); VIRTUAL_CAST_VAR(instrument, df::itemdef_instrumentst, item);
mat_def->set_name(instrument->name); mat_def->set_name(DF2UTF(instrument->name));
auto send_instrument = mat_def->mutable_instrument(); auto send_instrument = mat_def->mutable_instrument();
auto flags = send_instrument->mutable_flags(); auto flags = send_instrument->mutable_flags();
flags->set_indefinite_pitch(instrument->flags.is_set(instrument_flags::INDEFINITE_PITCH)); flags->set_indefinite_pitch(instrument->flags.is_set(instrument_flags::INDEFINITE_PITCH));
@ -593,10 +593,10 @@ DFHack::command_result GetItemList(DFHack::color_ostream &stream, const DFHack::
for (int j = 0; j < instrument->pieces.size(); j++) for (int j = 0; j < instrument->pieces.size(); j++)
{ {
auto piece = send_instrument->add_pieces(); auto piece = send_instrument->add_pieces();
piece->set_type(instrument->pieces[i]->type); piece->set_type(instrument->pieces[j]->type);
piece->set_id(instrument->pieces[i]->id); piece->set_id(instrument->pieces[j]->id);
piece->set_name(instrument->pieces[i]->name); piece->set_name(DF2UTF(instrument->pieces[j]->name));
piece->set_name_plural(instrument->pieces[i]->name_plural); piece->set_name_plural(DF2UTF(instrument->pieces[j]->name_plural));
} }
send_instrument->set_pitch_range_min(instrument->pitch_range_min); send_instrument->set_pitch_range_min(instrument->pitch_range_min);
send_instrument->set_pitch_range_max(instrument->pitch_range_max); send_instrument->set_pitch_range_max(instrument->pitch_range_max);