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

Merge branch 'develop' of https://github.com/dfhack/dfhack into develop

develop
lethosor 2016-06-07 08:20:12 -04:00
parent a47a1c83ba 8543121ece
commit bcefb0205a
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/probe.cpp
Unescape Escape View File

@ -198,6 +198,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
df::tiletype tiletype = mc.tiletypeAt(cursor); df::tiletype tiletype = mc.tiletypeAt(cursor);
df::tile_designation &des = block.designation[tileX][tileY]; df::tile_designation &des = block.designation[tileX][tileY];
df::tile_occupancy &occ = block.occupancy[tileX][tileY]; df::tile_occupancy &occ = block.occupancy[tileX][tileY];
uint8_t fog_of_war = block.fog_of_war[tileX][tileY];
/* /*
if(showDesig) if(showDesig)
{ {
@ -303,7 +304,8 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
if(des.bits.water_stagnant) if(des.bits.water_stagnant)
out << "stagnant" << endl; out << "stagnant" << endl;
out.print("%-16s= %s\n", "dig", ENUM_KEY_STR(tile_dig_designation,des.bits.dig).c_str()); out.print("%-16s= %s\n", "dig", ENUM_KEY_STR(tile_dig_designation, des.bits.dig).c_str());
out.print("%-16s= %s\n", "traffic", ENUM_KEY_STR(tile_traffic, des.bits.traffic).c_str());
#define PRINT_FLAG( FIELD, BIT ) out.print("%-16s= %c\n", #BIT , ( FIELD.bits.BIT ? 'Y' : ' ' ) ) #define PRINT_FLAG( FIELD, BIT ) out.print("%-16s= %c\n", #BIT , ( FIELD.bits.BIT ? 'Y' : ' ' ) )
PRINT_FLAG( des, hidden ); PRINT_FLAG( des, hidden );
@ -313,6 +315,7 @@ command_result df_probe (color_ostream &out, vector <string> & parameters)
PRINT_FLAG( des, water_table ); PRINT_FLAG( des, water_table );
PRINT_FLAG( des, rained ); PRINT_FLAG( des, rained );
PRINT_FLAG( occ, monster_lair); PRINT_FLAG( occ, monster_lair);
out.print("%-16s= %d\n", "fog_of_war", fog_of_war);
df::coord2d pc(blockX, blockY); df::coord2d pc(blockX, blockY);

60
plugins/remotefortressreader.cpp
Unescape Escape View File

@ -101,6 +101,7 @@ using namespace df::global;
REQUIRE_GLOBAL(world); REQUIRE_GLOBAL(world);
REQUIRE_GLOBAL(gps); REQUIRE_GLOBAL(gps);
REQUIRE_GLOBAL(ui); REQUIRE_GLOBAL(ui);
REQUIRE_GLOBAL(gamemode);
#endif #endif
// Here go all the command declarations... // Here go all the command declarations...
@ -1165,38 +1166,47 @@ void CopyDesignation(df::map_block * DfBlock, RemoteFortressReader::MapBlock * N
NetBlock->add_magma(lava); NetBlock->add_magma(lava);
NetBlock->add_water(water); NetBlock->add_water(water);
NetBlock->add_aquifer(designation.bits.water_table); NetBlock->add_aquifer(designation.bits.water_table);
NetBlock->add_hidden(designation.bits.hidden);
NetBlock->add_light(designation.bits.light); NetBlock->add_light(designation.bits.light);
NetBlock->add_outside(designation.bits.outside); NetBlock->add_outside(designation.bits.outside);
NetBlock->add_subterranean(designation.bits.subterranean); NetBlock->add_subterranean(designation.bits.subterranean);
NetBlock->add_water_salt(designation.bits.water_salt); NetBlock->add_water_salt(designation.bits.water_salt);
NetBlock->add_water_stagnant(designation.bits.water_stagnant); NetBlock->add_water_stagnant(designation.bits.water_stagnant);
switch (designation.bits.dig) if (gamemode && (*gamemode == game_mode::ADVENTURE))
{ {
case df::enums::tile_dig_designation::No: 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(TileDigDesignation::NO_DIG);
break; }
case df::enums::tile_dig_designation::Default: else
NetBlock->add_tile_dig_designation(TileDigDesignation::DEFAULT_DIG); {
break; NetBlock->add_hidden(designation.bits.hidden);
case df::enums::tile_dig_designation::UpDownStair: switch (designation.bits.dig)
NetBlock->add_tile_dig_designation(TileDigDesignation::UP_DOWN_STAIR_DIG); {
break; case df::enums::tile_dig_designation::No:
case df::enums::tile_dig_designation::Channel: NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG);
NetBlock->add_tile_dig_designation(TileDigDesignation::CHANNEL_DIG); break;
break; case df::enums::tile_dig_designation::Default:
case df::enums::tile_dig_designation::Ramp: NetBlock->add_tile_dig_designation(TileDigDesignation::DEFAULT_DIG);
NetBlock->add_tile_dig_designation(TileDigDesignation::RAMP_DIG); break;
break; case df::enums::tile_dig_designation::UpDownStair:
case df::enums::tile_dig_designation::DownStair: NetBlock->add_tile_dig_designation(TileDigDesignation::UP_DOWN_STAIR_DIG);
NetBlock->add_tile_dig_designation(TileDigDesignation::DOWN_STAIR_DIG); break;
break; case df::enums::tile_dig_designation::Channel:
case df::enums::tile_dig_designation::UpStair: NetBlock->add_tile_dig_designation(TileDigDesignation::CHANNEL_DIG);
NetBlock->add_tile_dig_designation(TileDigDesignation::UP_STAIR_DIG); break;
break; case df::enums::tile_dig_designation::Ramp:
default: NetBlock->add_tile_dig_designation(TileDigDesignation::RAMP_DIG);
NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG); break;
break; case df::enums::tile_dig_designation::DownStair:
NetBlock->add_tile_dig_designation(TileDigDesignation::DOWN_STAIR_DIG);
break;
case df::enums::tile_dig_designation::UpStair:
NetBlock->add_tile_dig_designation(TileDigDesignation::UP_STAIR_DIG);
break;
default:
NetBlock->add_tile_dig_designation(TileDigDesignation::NO_DIG);
break;
}
} }
} }
} }