diff --git a/plugins/remotefortressreader/remotefortressreader.cpp b/plugins/remotefortressreader/remotefortressreader.cpp index 6b5733970..1570a0e60 100644 --- a/plugins/remotefortressreader/remotefortressreader.cpp +++ b/plugins/remotefortressreader/remotefortressreader.cpp @@ -130,7 +130,6 @@ using namespace DFHack; using namespace df::enums; using namespace RemoteFortressReader; -using namespace std; DFHACK_PLUGIN("RemoteFortressReader"); @@ -193,7 +192,7 @@ const char* growth_locations[] = { #include "df/art_image.h" #include "df/art_image_chunk.h" #include "df/art_image_ref.h" -command_result loadArtImageChunk(color_ostream &out, vector & parameters) +command_result loadArtImageChunk(color_ostream &out, std::vector & parameters) { if (parameters.size() != 1) return CR_WRONG_USAGE; @@ -214,7 +213,7 @@ command_result loadArtImageChunk(color_ostream &out, vector & parameter return CR_OK; } -command_result RemoteFortressReader_version(color_ostream &out, vector ¶meters) +command_result RemoteFortressReader_version(color_ostream &out, std::vector ¶meters) { out.print(RFR_VERSION); return CR_OK; @@ -645,7 +644,7 @@ void CopyMat(RemoteFortressReader::MatPair * mat, int type, int index) } -map hashes; +std::map hashes; bool IsTiletypeChanged(DFCoord pos) { @@ -663,7 +662,7 @@ bool IsTiletypeChanged(DFCoord pos) return false; } -map waterHashes; +std::map waterHashes; bool IsDesignationChanged(DFCoord pos) { @@ -681,7 +680,7 @@ bool IsDesignationChanged(DFCoord pos) return false; } -map buildingHashes; +std::map buildingHashes; bool IsBuildingChanged(DFCoord pos) { @@ -700,7 +699,7 @@ bool IsBuildingChanged(DFCoord pos) return changed; } -map spatterHashes; +std::map spatterHashes; bool IsspatterChanged(DFCoord pos) { @@ -737,7 +736,7 @@ bool IsspatterChanged(DFCoord pos) return false; } -map itemHashes; +std::map itemHashes; bool isItemChanged(int i) { @@ -755,7 +754,7 @@ bool isItemChanged(int i) return false; } -bool areItemsChanged(vector * items) +bool areItemsChanged(std::vector * items) { bool result = false; for (size_t i = 0; i < items->size(); i++) @@ -766,7 +765,7 @@ bool areItemsChanged(vector * items) return result; } -map engravingHashes; +std::map engravingHashes; bool isEngravingNew(int index) {