summaryrefslogtreecommitdiff
path: root/ContentLoader.h
diff options
context:
space:
mode:
authorJapa2010-05-04 10:54:06 +0000
committerJapa2010-05-04 10:54:06 +0000
commit4a51199a91b37a97edca760ffa22629499fd8d83 (patch)
treea84f3f5d37263034d38b347ed5d48a28319c6497 /ContentLoader.h
parent6f188cc32530c8a422f1223741acb81ae7535c4d (diff)
downloadstonesense-4a51199a91b37a97edca760ffa22629499fd8d83.tar.gz
stonesense-4a51199a91b37a97edca760ffa22629499fd8d83.tar.bz2
stonesense-4a51199a91b37a97edca760ffa22629499fd8d83.tar.xz
updated to the latest DFhack, added the functionality to have seperate sprites for blocks, boulders, etc.
Diffstat (limited to 'ContentLoader.h')
-rw-r--r--ContentLoader.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/ContentLoader.h b/ContentLoader.h
index 10585ea..2d4b26f 100644
--- a/ContentLoader.h
+++ b/ContentLoader.h
@@ -33,14 +33,11 @@ public:
vector<TerrainConfiguration*> terrainBlockConfigs;
vector<ColorConfiguration> colorConfigs;
- vector<t_matgloss> inorganicMaterials;
- vector<t_matgloss> organicMaterials;
- vector<t_matgloss> creatureMaterials;
-
vector<string> classIdStrings;
vector<string> professionStrings;
memory_info *memoryInfo;
DFHack::Buildings * Bld;
+ DFHack::Materials * Mats;
};
//singleton instance
@@ -59,4 +56,5 @@ uint8_t lookupMaterialFore(int matType,int matIndex);
uint8_t lookupMaterialBack(int matType,int matIndex);
uint8_t lookupMaterialBright(int matType,int matIndex);
const char *lookupTreeName(int matIndex);
-ALLEGRO_COLOR lookupMaterialColor(int matType,int matIndex); \ No newline at end of file
+ALLEGRO_COLOR lookupMaterialColor(int matType,int matIndex);
+const char * lookupFormName(int formType); \ No newline at end of file