diff options
| author | Kris Parker | 2009-12-10 12:30:22 +0000 |
|---|---|---|
| committer | Kris Parker | 2009-12-10 12:30:22 +0000 |
| commit | afba6ea721bc363502f07826d2c0cfb184e447fa (patch) | |
| tree | d8bc5cdbde815131315838ed170b1c47d7c4f618 /ContentLoader.h | |
| parent | 35ea344b23fa77945fcf8a267e04cc2494e71a36 (diff) | |
| download | stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.gz stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.bz2 stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.xz | |
Merge terrain config to the trunk
Diffstat (limited to 'ContentLoader.h')
| -rw-r--r-- | ContentLoader.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/ContentLoader.h b/ContentLoader.h index 9d18021..3b2096f 100644 --- a/ContentLoader.h +++ b/ContentLoader.h @@ -21,20 +21,20 @@ public: ~ContentLoader(void);
bool Load(API& DF);
- void TranslateConfigsFromDFAPI( API& DF );
- bool Translated(){ return translationComplete; }
vector<BuildingConfiguration> buildingConfigs;
vector<CreatureConfiguration> creatureConfigs;
vector<VegetationConfiguration> treeConfigs;
vector<VegetationConfiguration> shrubConfigs;
- vector<GroundMaterialConfiguration*> groundConfigs;
+ vector<TerrainConfiguration*> terrainFloorConfigs;
+ vector<TerrainConfiguration*> terrainBlockConfigs;
vector<t_matgloss> creatureNameStrings;
+ vector<t_matgloss> stoneNameStrings;
vector<t_matgloss> woodNameStrings;
+ vector<t_matgloss> metalNameStrings;
vector<t_matgloss> plantNameStrings;
vector<string> buildingNameStrings;
- vector<preparseGroundMaterialConfiguration> unparsedGroundConfigs;
};
//singleton instance
@@ -43,3 +43,7 @@ extern ContentLoader contentLoader; extern const char* getDocument(TiXmlNode* element);
extern void contentError(const char* message, TiXmlNode* element);
extern char getAnimFrames(const char* framestring);
+int lookupMaterialType(const char* strValue);
+int lookupMaterialIndex(int matType, const char* strValue);
+int lookupIndexedType(const char* indexName, vector<t_matgloss>& typeVector);
+
|
