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

fixed a crash in remotefortressreader.cpp that occured if Armok Vision is connected while saving.

develop
Japa 2016-04-03 11:09:16 +05:30
parent ede81c0f09
commit 39bcee11d8
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plugins/remotefortressreader.cpp
Unescape Escape View File

@ -1727,6 +1727,12 @@ static command_result GetWorldMap(color_ostream &stream, const EmptyMessage *in,
return CR_FAILURE; return CR_FAILURE;
} }
df::world_data * data = df::global::world->world_data; df::world_data * data = df::global::world->world_data;
if (!data->region_map)
{
out->set_world_width(0);
out->set_world_height(0);
return CR_FAILURE;
}
int width = data->world_width; int width = data->world_width;
int height = data->world_height; int height = data->world_height;
out->set_world_width(width); out->set_world_width(width);
@ -2057,7 +2063,7 @@ static command_result CopyScreen(color_ostream &stream, const EmptyMessage *in,
auto tile = out->add_tiles(); auto tile = out->add_tiles();
tile->set_character(gps->screen[index]); tile->set_character(gps->screen[index]);
tile->set_foreground(gps->screen[index + 1] | (gps->screen[index + 3] * 8)); tile->set_foreground(gps->screen[index + 1] | (gps->screen[index + 3] * 8));
tile->set_background(gps->screen[index]); tile->set_background(gps->screen[index + 2]);
} }
return CR_OK; return CR_OK;