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

Moved the version define into a header file, and fixed removing designations that are alreaddy converted to jobs.

develop
Japa Illo 2017-06-20 15:46:03 +05:30
parent 48f5fd7a39
commit 9ae50279a1
4 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/proto/RemoteFortressReader.proto
Unescape Escape View File

@ -254,6 +254,8 @@ message MapBlock
repeated TileDigDesignation tile_dig_designation = 24;
repeated SpatterPile spatterPile = 25;
repeated Item items = 26;
repeated bool tile_dig_designation_marker = 27;
repeated bool tile_dig_designation_auto = 28;
}
message MatPair {

1
plugins/remotefortressreader/CMakeLists.txt
Unescape Escape View File

@ -7,6 +7,7 @@ SET(PROJECT_SRCS
# A list of headers
SET(PROJECT_HDRS
building_reader.h
df_version_int.h
)
#proto files to include.
SET(PROJECT_PROTO

3
plugins/remotefortressreader/df_version_int.h
Unescape Escape View File

@ -0,0 +1,3 @@
#ifndef DF_VERSION_INT_H
#define DF_VERSION_INT 43005
#endif // !DF_VERSION_INT_H

44
plugins/remotefortressreader/remotefortressreader.cpp
Unescape Escape View File

@ -1,4 +1,4 @@
#define DF_VERSION_INT 42004
#include "df_version_int.h"
#define RFR_VERSION "0.16.1"
#include <cstdio>
@ -21,6 +21,7 @@
#include "modules/Gui.h"
#include "modules/Items.h"
#include "modules/Job.h"
#include "modules/MapCache.h"
#include "modules/Maps.h"
#include "modules/Materials.h"
@ -1035,6 +1036,7 @@ void CopyDesignation(df::map_block * DfBlock, RemoteFortressReader::MapBlock * N
for (int xx = 0; xx < 16; xx++)
{
df::tile_designation designation = DfBlock->designation[xx][yy];
df::tile_occupancy occupancy = DfBlock->occupancy[xx][yy];
int lava = 0;
int water = 0;
if (designation.bits.liquid_type == df::enums::tile_liquid::Magma)
@ -1054,10 +1056,14 @@ void CopyDesignation(df::map_block * DfBlock, RemoteFortressReader::MapBlock * N
auto fog_of_war = DfBlock->fog_of_war[xx][yy];
NetBlock->add_hidden(designation.bits.dig == TileDigDesignation::NO_DIG || designation.bits.hidden);
NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG);
NetBlock->add_tile_dig_designation_marker(false);
NetBlock->add_tile_dig_designation_auto(false);
}
else
{
NetBlock->add_hidden(designation.bits.hidden);
NetBlock->add_tile_dig_designation_marker(occupancy.bits.dig_marked);
NetBlock->add_tile_dig_designation_auto(occupancy.bits.dig_auto);
switch (designation.bits.dig)
{
case df::enums::tile_dig_designation::No:
@ -2548,6 +2554,42 @@ static command_result SendDigCommand(color_ostream &stream, const DigCommand *in
break;
}
mc.setDesignationAt(DFCoord(pos.x(), pos.y(), pos.z()), des);
//remove and job postings related.
for (df::job_list_link * listing = &(world->job_list); listing != NULL; listing = listing->next)
{
if (listing->item == NULL)
continue;
auto type = listing->item->job_type;
switch (type)
{
case df::enums::job_type::CarveFortification:
case df::enums::job_type::DetailWall:
case df::enums::job_type::DetailFloor:
case df::enums::job_type::Dig:
case df::enums::job_type::CarveUpwardStaircase:
case df::enums::job_type::CarveDownwardStaircase:
case df::enums::job_type::CarveUpDownStaircase:
case df::enums::job_type::CarveRamp:
case df::enums::job_type::DigChannel:
case df::enums::job_type::FellTree:
case df::enums::job_type::GatherPlants:
case df::enums::job_type::RemoveConstruction:
case df::enums::job_type::CarveTrack:
{
if (listing->item->pos == DFCoord(pos.x(), pos.y(), pos.z()))
{
Job::removeJob(listing->item);
goto JOB_FOUND;
}
break;
}
default:
continue;
}
}
JOB_FOUND:
continue;
}
mc.WriteAll();