From e5c3ed9ad3cb79ccf612796a3be4396fb8d69c64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Mon, 8 Mar 2010 14:50:32 +0100 Subject: [PATCH] Fix python and a gcc syntax error --- library/DFHackAPI.cpp | 2 +- library/pydfhack.i | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/library/DFHackAPI.cpp b/library/DFHackAPI.cpp index 396fd3f96..7049966fe 100644 --- a/library/DFHackAPI.cpp +++ b/library/DFHackAPI.cpp @@ -1192,7 +1192,7 @@ void API::WriteLabors(const uint32_t index, uint8_t labors[NUM_CREATURE_LABORS]) WriteRaw(temp + d->creature_labors_offset, NUM_CREATURE_LABORS, labors); } -bool API::InitReadNameTables(vector> & translations , vector > & foreign_languages) //(map< string, vector > & nameTable) +bool API::InitReadNameTables(vector > & translations , vector > & foreign_languages) //(map< string, vector > & nameTable) { try { diff --git a/library/pydfhack.i b/library/pydfhack.i index 13fb7117d..2547bac84 100644 --- a/library/pydfhack.i +++ b/library/pydfhack.i @@ -196,12 +196,10 @@ namespace DFHack bool getItemIndexesInBox(std::vector &indexes, const uint16_t x1, const uint16_t y1, const uint16_t z1, const uint16_t x2, const uint16_t y2, const uint16_t z2); - bool InitReadNameTables (std::map< std::string, std::vector > & OUTPUT); + bool InitReadNameTables (std::vector< std::vector > & translations , std::vector< std::vector > & foreign_languages); void FinishReadNameTables(); - - std::string TranslateName(const t_lastname & last, const std::map< std::string, std::vector< std::string > > &nameTable,const std::string & language="GENERIC"); - std::string TranslateName(const t_squadname & squad, const std::map< std::string, std::vector< std::string > > &nameTable,const std::string & language="GENERIC"); - std::string TranslateName (const int names[], int size, const std::map > &nameTable, const std::string & language="GENERIC"); + + std::string TranslateName(const t_name & name,const std::vector< std::vector > & translations ,const std::vector< std::vector > & foreign_languages, bool inEnglish=true); void WriteLabors(const uint32_t index, uint8_t labors[NUM_CREATURE_LABORS]);