summaryrefslogtreecommitdiff
path: root/ContentLoader.h
diff options
context:
space:
mode:
authorJapa2012-08-24 23:50:10 +0530
committerJapa2012-08-24 23:50:10 +0530
commitca40092182c8cc937d3985d8f3e01c3855082c91 (patch)
tree27932226ecec9a97cbe0da14050d2c207d4adc7c /ContentLoader.h
parent5d4f06d785f8a9933679fe3caa12c18215e9674d (diff)
parent9410fbcb1759e41481808d495ec442cbda87fac8 (diff)
downloadstonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.gz
stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.bz2
stonesense-ca40092182c8cc937d3985d8f3e01c3855082c91.tar.xz
Merge branch 'master' of https://github.com/JapaMala/stonesense
Conflicts: MapLoading.cpp resources/buildings/Craftsdwarfs.xml
Diffstat (limited to 'ContentLoader.h')
-rw-r--r--ContentLoader.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/ContentLoader.h b/ContentLoader.h
index 4bedeed..2adc080 100644
--- a/ContentLoader.h
+++ b/ContentLoader.h
@@ -67,6 +67,7 @@ extern ContentLoader * contentLoader;
extern const char* getDocument(TiXmlNode* element);
bool getLocalFilename(char * buffer, const char* filename, const char* relativeto);
extern void contentError(const char* message, TiXmlNode* element);
+extern void contentWarning(const char* message, TiXmlNode* element);
extern char getAnimFrames(const char* framestring);
extern int loadConfigImgFile(const char* filename, TiXmlElement* referrer);
MAT_BASICS lookupMaterialType(const char* strValue);