diff options
| author | Japa | 2010-09-04 13:06:19 +0000 |
|---|---|---|
| committer | Japa | 2010-09-04 13:06:19 +0000 |
| commit | 0d375ca72b33eb526695c381c894154894fe2807 (patch) | |
| tree | 5d103efbceb3457cde86ce6c2821cab76e4d4efc /ContentLoader.cpp | |
| parent | 37e4d4080e81ab4167eb269b469b17be0ffd501f (diff) | |
| download | stonesense-0d375ca72b33eb526695c381c894154894fe2807.tar.gz stonesense-0d375ca72b33eb526695c381c894154894fe2807.tar.bz2 stonesense-0d375ca72b33eb526695c381c894154894fe2807.tar.xz | |
made the debug more actually report the same words that need to be used in the content XML files.
Diffstat (limited to 'ContentLoader.cpp')
| -rw-r--r-- | ContentLoader.cpp | 66 |
1 files changed, 37 insertions, 29 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp index 7a2f230..2fea7f6 100644 --- a/ContentLoader.cpp +++ b/ContentLoader.cpp @@ -424,34 +424,6 @@ char getAnimFrames(const char* framestring) return aframes;
}
-int lookupMaterialType(const char* strValue)
-{
- if (strValue == NULL || strValue[0] == 0)
- return INVALID_INDEX;
- else if( strcmp(strValue, "Stone") == 0)
- return INORGANIC;
- else if( strcmp(strValue, "Metal") == 0)
- return INORGANIC;
- else if( strcmp(strValue, "Inorganic") == 0)
- return INORGANIC;
- else if( strcmp(strValue, "GreenGlass") == 0)
- return GREEN_GLASS;
- else if( strcmp(strValue, "Wood") == 0)
- return WOOD;
- else if( strcmp(strValue, "Ice") == 0)
- return ICE;
- else if( strcmp(strValue, "ClearGlass") == 0)
- return CLEAR_GLASS;
- else if( strcmp(strValue, "CrystalGlass") == 0)
- return CRYSTAL_GLASS;
- else if( strcmp(strValue, "PlantCloth") == 0)
- return PLANTCLOTH;
- else if( strcmp(strValue, "Leather") == 0)
- return LEATHER;
- //TODO this needs fixing on dfhack side
- return INVALID_INDEX;
-}
-
int lookupIndexedType(const char* indexName, vector<t_matgloss>& typeVector)
{
if (indexName == NULL || indexName[0] == 0)
@@ -502,7 +474,7 @@ const char *lookupMaterialTypeName(int matType) case INORGANIC:
return "Inorganic";
case GREEN_GLASS:
- return "Green Glass";
+ return "GreenGlass";
case WOOD:
return "Wood";
case PLANTCLOTH:
@@ -511,11 +483,47 @@ const char *lookupMaterialTypeName(int matType) return "Leather";
case ICE:
return "Ice";
+ case CLEAR_GLASS:
+ return "ClearGlass";
+ case CRYSTAL_GLASS:
+ return "CrystalGlass";
+ case PLANTCLOTH:
+ return "PlantCloth";
+ case LEATHER:
+ return "Leather";
default:
return NULL;
}
}
+int lookupMaterialType(const char* strValue)
+{
+ if (strValue == NULL || strValue[0] == 0)
+ return INVALID_INDEX;
+ else if( strcmp(strValue, "Stone") == 0)
+ return INORGANIC;
+ else if( strcmp(strValue, "Metal") == 0)
+ return INORGANIC;
+ else if( strcmp(strValue, "Inorganic") == 0)
+ return INORGANIC;
+ else if( strcmp(strValue, "GreenGlass") == 0)
+ return GREEN_GLASS;
+ else if( strcmp(strValue, "Wood") == 0)
+ return WOOD;
+ else if( strcmp(strValue, "Ice") == 0)
+ return ICE;
+ else if( strcmp(strValue, "ClearGlass") == 0)
+ return CLEAR_GLASS;
+ else if( strcmp(strValue, "CrystalGlass") == 0)
+ return CRYSTAL_GLASS;
+ else if( strcmp(strValue, "PlantCloth") == 0)
+ return PLANTCLOTH;
+ else if( strcmp(strValue, "Leather") == 0)
+ return LEATHER;
+ //TODO this needs fixing on dfhack side
+ return INVALID_INDEX;
+}
+
const char *lookupMaterialName(int matType,int matIndex)
{
if (matIndex < 0)
|
