summaryrefslogtreecommitdiff
path: root/GroundMaterialConfiguration.h
diff options
context:
space:
mode:
authorKris Parker2009-12-10 12:30:22 +0000
committerKris Parker2009-12-10 12:30:22 +0000
commitafba6ea721bc363502f07826d2c0cfb184e447fa (patch)
treed8bc5cdbde815131315838ed170b1c47d7c4f618 /GroundMaterialConfiguration.h
parent35ea344b23fa77945fcf8a267e04cc2494e71a36 (diff)
downloadstonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.gz
stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.bz2
stonesense-afba6ea721bc363502f07826d2c0cfb184e447fa.tar.xz
Merge terrain config to the trunk
Diffstat (limited to 'GroundMaterialConfiguration.h')
-rw-r--r--GroundMaterialConfiguration.h38
1 files changed, 18 insertions, 20 deletions
diff --git a/GroundMaterialConfiguration.h b/GroundMaterialConfiguration.h
index ada4d75..ba3f30a 100644
--- a/GroundMaterialConfiguration.h
+++ b/GroundMaterialConfiguration.h
@@ -1,40 +1,38 @@
#pragma once
#include "dfhack/library/tinyxml/tinyxml.h"
+#include <map>
typedef struct OverridingMaterial{
int gameID;
- int spriteIndex;
- int fillerFloorSpriteIndex;
+ t_SpriteWithOffset sprite;
}OverridingMaterial;
-class GroundMaterialConfiguration
+class TerrainMaterialConfiguration
{
public:
- int defaultSprite;
- int fillerFloorSpriteIndex;
- vector<OverridingMaterial> overridingMaterials;
-
- GroundMaterialConfiguration( );
- //GroundMaterialConfiguration(char* gameIDstr, int wallSheetIndex,int floorSheetIndex);
- ~GroundMaterialConfiguration(){}
+ t_SpriteWithOffset defaultSprite;
+ int gameID;
+ map<int,t_SpriteWithOffset> overridingMaterials;
+
+ TerrainMaterialConfiguration();
+ ~TerrainMaterialConfiguration(){}
};
-
-
-class preparseGroundMaterialConfiguration
+class TerrainConfiguration
{
public:
- int spriteIndex;
- int fillerFloorSpriteIndex;
- vector<int> wallFloorIDs;
- vector<string> overridingMaterials;
+ vector<TerrainMaterialConfiguration*> terrainMaterials;
+ t_SpriteWithOffset defaultSprite;
+ TerrainConfiguration();
+ ~TerrainConfiguration();
};
-bool addSingleTerrainConfig( TiXmlElement* elemRoot, vector<preparseGroundMaterialConfiguration>* rawGroundTypes );
-void TranslateGroundMaterialNames(vector<GroundMaterialConfiguration*>& configs, vector<preparseGroundMaterialConfiguration>& rawGroundConfigs);
+bool addSingleTerrainConfig( TiXmlElement* elemRoot);
//void LoadGroundMaterialConfiguration( );
//void TranslateGroundMaterialNames();
//extern bool GroundMaterialNamesTranslatedFromGame;
-//extern vector<GroundMaterialConfiguration*> groundTypes; \ No newline at end of file
+//extern vector<GroundMaterialConfiguration*> groundTypes;
+
+void flushTerrainConfig(vector<TerrainConfiguration*>& config);