summaryrefslogtreecommitdiff
path: root/ContentLoader.cpp
diff options
context:
space:
mode:
authorJapa Illo2012-02-25 09:36:24 +0530
committerJapa Illo2012-02-25 09:36:24 +0530
commitaf8f230cc6d19f3415a224de01e27f1235cf2e34 (patch)
tree509a953abbc8d6c5d2cd71becb20e932dff56fbf /ContentLoader.cpp
parent6a2241742561931aa6347c3d72529d976a82ee4d (diff)
downloadstonesense-af8f230cc6d19f3415a224de01e27f1235cf2e34.tar.gz
stonesense-af8f230cc6d19f3415a224de01e27f1235cf2e34.tar.bz2
stonesense-af8f230cc6d19f3415a224de01e27f1235cf2e34.tar.xz
fixed material lookup, job lookup, and added mipmapping.
Signed-off-by: Japa Illo <japa.mala.illo@gmail.com>
Diffstat (limited to 'ContentLoader.cpp')
-rw-r--r--ContentLoader.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index f65c863..6006a38 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -137,7 +137,9 @@ bool ContentLoader::Load( DFHack::Core& DF){
{
FOR_ENUM_ITEMS(profession, i)
{
- professionStrings.push_back(string(ENUM_ATTR(profession, key, i)));
+ if(i<0)
+ continue;
+ professionStrings.push_back(string(ENUM_KEY_STR(profession, i)));
}
}
/*
@@ -531,7 +533,7 @@ const char *lookupMaterialName(int matType,int matIndex)
{
if(matIndex < contentLoader->inorganic.size())
{
- return contentLoader->inorganic[0].id.c_str();
+ return contentLoader->inorganic[matIndex].id.c_str();
}
else return NULL;
}