summaryrefslogtreecommitdiff
path: root/ContentLoader.cpp
diff options
context:
space:
mode:
authorJapa2012-08-24 23:50:10 +0530
committerJapa2012-08-24 23:50:10 +0530
commitca40092182c8cc937d3985d8f3e01c3855082c91 (patch)
tree27932226ecec9a97cbe0da14050d2c207d4adc7c /ContentLoader.cpp
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.cpp')
-rw-r--r--ContentLoader.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp
index c597f0b..1014d1e 100644
--- a/ContentLoader.cpp
+++ b/ContentLoader.cpp
@@ -444,7 +444,10 @@ void contentError(const char* message, TiXmlNode* element)
{
LogError("%s: %s: %s (Line %d)\n",getDocument(element),message,element->Value(),element->Row());
}
-
+void contentWarning(const char* message, TiXmlNode* element)
+{
+ LogVerbose("%s: %s: %s (Line %d)\n",getDocument(element),message,element->Value(),element->Row());
+}
// converts list of characters 0-5 into bits, ignoring garbage
// eg "035" or "0 3 5" or "0xx3x5" are all good
char getAnimFrames(const char* framestring)