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

Fix indentation

develop
lethosor 2017-07-12 16:55:50 -04:00
parent bdc746f3f1
commit c5fad31a4c
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -197,7 +197,7 @@ command_result dump_bp_mods(color_ostream &out, vector <string> & parameters)
output << ENUM_KEY_STR(appearance_modifier_type, casteRaw->bp_appearance.modifiers[casteRaw->bp_appearance.modifier_idx[partIndex]]->type) << ";"; output << ENUM_KEY_STR(appearance_modifier_type, casteRaw->bp_appearance.modifiers[casteRaw->bp_appearance.modifier_idx[partIndex]]->type) << ";";
auto appMod = casteRaw->bp_appearance.modifiers[casteRaw->bp_appearance.modifier_idx[partIndex]]; auto appMod = casteRaw->bp_appearance.modifiers[casteRaw->bp_appearance.modifier_idx[partIndex]];
#if DF_VERSION_INT > 34011 #if DF_VERSION_INT > 34011
if (appMod->growth_rate > 0) if (appMod->growth_rate > 0)
{ {
output << appMod->growth_min << " - " << appMod->growth_max << "\n"; output << appMod->growth_min << " - " << appMod->growth_max << "\n";
} }
@ -1014,7 +1014,7 @@ void CopyBlock(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetBloc
} }
} }
#endif #endif
for (int yy = 0; yy < 16; yy++) for (int yy = 0; yy < 16; yy++)
for (int xx = 0; xx < 16; xx++) for (int xx = 0; xx < 16; xx++)
{ {
df::tiletype tile = DfBlock->tiletype[xx][yy]; df::tiletype tile = DfBlock->tiletype[xx][yy];
@ -1092,7 +1092,7 @@ void CopyDesignation(df::map_block * DfBlock, RemoteFortressReader::MapBlock * N
NetBlock->add_tile_dig_designation_marker(occupancy.bits.dig_marked); NetBlock->add_tile_dig_designation_marker(occupancy.bits.dig_marked);
NetBlock->add_tile_dig_designation_auto(occupancy.bits.dig_auto); NetBlock->add_tile_dig_designation_auto(occupancy.bits.dig_auto);
#endif #endif
switch (designation.bits.dig) switch (designation.bits.dig)
{ {
case df::enums::tile_dig_designation::No: case df::enums::tile_dig_designation::No:
NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG); NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG);
@ -1313,7 +1313,7 @@ void CopyItems(df::map_block * DfBlock, RemoteFortressReader::MapBlock * NetBloc
{ {
int id = DfBlock->items[i]; int id = DfBlock->items[i];
auto item = df::item::find(id); auto item = df::item::find(id);
if(item) if(item)
CopyItem(NetBlock->add_items(), item); CopyItem(NetBlock->add_items(), item);
@ -1632,7 +1632,7 @@ DFCoord GetMapCenter()
} }
else else
#endif #endif
if (Maps::IsValid()) if (Maps::IsValid())
{ {
int x, y, z; int x, y, z;
Maps::getPosition(x,y,z); Maps::getPosition(x,y,z);
@ -1712,14 +1712,14 @@ static command_result GetWorldMap(color_ostream &stream, const EmptyMessage *in,
case df::world_data::South: case df::world_data::South:
out->set_world_poles(WorldPoles::SOUTH_POLE); out->set_world_poles(WorldPoles::SOUTH_POLE);
break; break;
case df::world_data::Both: case df::world_data::Both:
out->set_world_poles(WorldPoles::BOTH_POLES); out->set_world_poles(WorldPoles::BOTH_POLES);
break; break;
default: default:
break; break;
} }
#else #else
out->set_world_poles(WorldPoles::NO_POLES); out->set_world_poles(WorldPoles::NO_POLES);
#endif #endif
for (int yy = 0; yy < height; yy++) for (int yy = 0; yy < height; yy++)
for (int xx = 0; xx < width; xx++) for (int xx = 0; xx < width; xx++)
@ -2665,17 +2665,17 @@ static command_result SendDigCommand(color_ostream &stream, const DigCommand *in
break; break;
default: default:
break; break;
} }
mc.setDesignationAt(DFCoord(pos.x(), pos.y(), pos.z()), des); mc.setDesignationAt(DFCoord(pos.x(), pos.y(), pos.z()), des);
#if DF_VERSION_INT >= 43005 #if DF_VERSION_INT >= 43005
//remove and job postings related. //remove and job postings related.
for (df::job_list_link * listing = &(world->job_list); listing != NULL; listing = listing->next) for (df::job_list_link * listing = &(world->job_list); listing != NULL; listing = listing->next)
{ {
if (listing->item == NULL) if (listing->item == NULL)
continue; continue;
auto type = listing->item->job_type; auto type = listing->item->job_type;
switch (type) switch (type)
{ {
case df::enums::job_type::CarveFortification: case df::enums::job_type::CarveFortification:
case df::enums::job_type::DetailWall: case df::enums::job_type::DetailWall: