summaryrefslogtreecommitdiff
path: root/ContentLoader.h
diff options
context:
space:
mode:
authorPetr Mrázek2011-07-22 00:45:54 +0000
committerPetr Mrázek2011-07-22 00:45:54 +0000
commitbf89e3ad6b98442dca909e327b80c5e292db6092 (patch)
tree27f28ac93518f26fd099bf07340e9d7fe9f11f1c /ContentLoader.h
parent650c5593bfd90afc93720b06fe74ee4ec7abf73e (diff)
downloadstonesense-bf89e3ad6b98442dca909e327b80c5e292db6092.tar.gz
stonesense-bf89e3ad6b98442dca909e327b80c5e292db6092.tar.bz2
stonesense-bf89e3ad6b98442dca909e327b80c5e292db6092.tar.xz
Update stonesense for current dfhack, make sure it's buildable as a plugin.
Diffstat (limited to 'ContentLoader.h')
-rw-r--r--ContentLoader.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/ContentLoader.h b/ContentLoader.h
index 5926ba4..640da32 100644
--- a/ContentLoader.h
+++ b/ContentLoader.h
@@ -10,8 +10,8 @@
class ContentLoader{
private:
- bool parseContentIndexFile( char* filepath );
- bool parseContentXMLFile( char* filepath );
+ bool parseContentIndexFile( const char* filepath );
+ bool parseContentXMLFile( const char* filepath );
bool parseBuildingContent( TiXmlElement* elemRoot );
bool parseCustomBuildingContent( TiXmlElement* elemRoot );
bool parseCreatureContent( TiXmlElement* elemRoot );
@@ -51,7 +51,7 @@ public:
DFHack::Buildings * Bld;
DFHack::Materials * Mats;
std::vector<t_matgloss> organic;
- std::vector<t_matgloss> inorganic;
+ std::vector<t_matglossInorganic> inorganic;
uint32_t currentTick;
uint32_t currentYear;
@@ -76,7 +76,8 @@ extern char getAnimFrames(const char* framestring);
extern int loadConfigImgFile(const char* filename, TiXmlElement* referrer);
int lookupMaterialType(const char* strValue);
int lookupMaterialIndex(int matType, const char* strValue);
-int lookupIndexedType(const char* indexName, vector<t_matgloss>& typeVector);
+template <typename T>
+int lookupIndexedType(const char* indexName, vector<T>& typeVector);
const char *lookupMaterialTypeName(int matType);
const char *lookupMaterialName(int matType,int matIndex);
uint8_t lookupMaterialFore(int matType,int matIndex);