summaryrefslogtreecommitdiff
path: root/GroundMaterialConfiguration.h
diff options
context:
space:
mode:
authorJonas Ask2009-11-16 03:26:44 +0000
committerJonas Ask2009-11-16 03:26:44 +0000
commit158fb586bf1a40252b284e82a6038868d4fc2e31 (patch)
tree6b074e164809f2aefb6b5cda0770ad58eb594f76 /GroundMaterialConfiguration.h
parentd6b417e3acc48a11ad972af8eca2c144943ab37e (diff)
downloadstonesense-158fb586bf1a40252b284e82a6038868d4fc2e31.tar.gz
stonesense-158fb586bf1a40252b284e82a6038868d4fc2e31.tar.bz2
stonesense-158fb586bf1a40252b284e82a6038868d4fc2e31.tar.xz
Finished implementation of the config based wall and floor system.
Fixed a crash bug in DrawSpriteIndexOverlay in GUI.cpp
Diffstat (limited to 'GroundMaterialConfiguration.h')
-rw-r--r--GroundMaterialConfiguration.h31
1 files changed, 19 insertions, 12 deletions
diff --git a/GroundMaterialConfiguration.h b/GroundMaterialConfiguration.h
index fe529a4..8a2c16f 100644
--- a/GroundMaterialConfiguration.h
+++ b/GroundMaterialConfiguration.h
@@ -1,26 +1,33 @@
#pragma once
+
+typedef struct OverridingMaterial{
+ int gameID;
+ int spriteIndex;
+ int fillerFloorSpriteIndex;
+}OverridingMaterial;
+
class GroundMaterialConfiguration
{
public:
- char gameIDstr[100];
- int wallSheetIndex;
- int floorSheetIndex;
+ int defaultSprite;
+ int fillerFloorSpriteIndex;
+ vector<OverridingMaterial> overridingMaterials;
- GroundMaterialConfiguration(char* gameIDstr, int wallSheetIndex,int floorSheetIndex);
+ GroundMaterialConfiguration( );
+ //GroundMaterialConfiguration(char* gameIDstr, int wallSheetIndex,int floorSheetIndex);
~GroundMaterialConfiguration(){}
};
-typedef struct OverridingMaterial{
- int id;
- int spriteIndex;
-}OverridingMaterial;
-class FloorConfiguration
+
+class preparseGroundMaterialConfiguration
{
public:
- int defaultSprite;
- vector<OverridingMaterial> overridingMaterials;
+ int spriteIndex;
+ int fillerFloorSpriteIndex;
+ vector<int> wallFloorIDs;
+ vector<string> overridingMaterials;
};
@@ -28,4 +35,4 @@ void LoadGroundMaterialConfiguration( );
void TranslateGroundMaterialNames();
extern bool GroundMaterialNamesTranslatedFromGame;
-extern vector<GroundMaterialConfiguration> groundTypes; \ No newline at end of file
+extern vector<GroundMaterialConfiguration*> groundTypes; \ No newline at end of file