summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ContentBuildingReader.cpp10
-rw-r--r--ContentLoader.cpp5
-rw-r--r--ContentLoader.h1
-rw-r--r--MapLoading.cpp7
-rw-r--r--main.cpp5
-rw-r--r--resources/buildings/Craftsdwarfs.xml4
6 files changed, 19 insertions, 13 deletions
diff --git a/ContentBuildingReader.cpp b/ContentBuildingReader.cpp
index 31836f8..f180869 100644
--- a/ContentBuildingReader.cpp
+++ b/ContentBuildingReader.cpp
@@ -331,7 +331,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector<BuildingConfigurat
{
if(!strGameSub)
{
- contentError("<building> Is generic - game_subtype missing.",elemRoot);
+ contentWarning("<building> Is generic - game_subtype missing.",elemRoot);
break;
}
FOR_ENUM_ITEMS(furnace_type,i)
@@ -355,7 +355,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector<BuildingConfigurat
{
if(!strGameSub)
{
- contentError("<building> Is generic - game_subtype missing.",elemRoot);
+ contentWarning("<building> Is generic - game_subtype missing.",elemRoot);
break;
}
FOR_ENUM_ITEMS(construction_type,i)
@@ -377,7 +377,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector<BuildingConfigurat
{
if(!strGameSub)
{
- contentError("<building> Is generic - game_subtype missing.",elemRoot);
+ contentWarning("<building> Is generic - game_subtype missing.",elemRoot);
break;
}
FOR_ENUM_ITEMS(siegeengine_type,i)
@@ -399,7 +399,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector<BuildingConfigurat
{
if(!strGameSub)
{
- contentError("<building> Is generic - game_subtype missing.",elemRoot);
+ contentWarning("<building> Is generic - game_subtype missing.",elemRoot);
break;
}
FOR_ENUM_ITEMS(shop_type,i)
@@ -421,7 +421,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector<BuildingConfigurat
{
if(!strGameSub)
{
- contentError("<building> Is generic - game_subtype missing.",elemRoot);
+ contentWarning("<building> Is generic - game_subtype missing.",elemRoot);
break;
}
FOR_ENUM_ITEMS(workshop_type,i)
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)
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);
diff --git a/MapLoading.cpp b/MapLoading.cpp
index b1c8fe5..6957aa3 100644
--- a/MapLoading.cpp
+++ b/MapLoading.cpp
@@ -8,8 +8,9 @@
#include "Creatures.h"
#include "ContentLoader.h"
#include "Occlusion_Test.h"
-#include <df/plant.h>
#include <df/flow_info.h>
+#include <df/plant.h>
+#include <df/flow_info.h>
#include "df/item_constructed.h"
#include "df/itemimprovement.h"
#include "df/itemimprovement_threadst.h"
@@ -597,8 +598,8 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C
//add effects
for(auto iter = trueBlock->flows.begin(); iter != trueBlock->flows.end(); iter++)
- {
- df::flow_info * eff = *iter;
+ {
+ df::flow_info * eff = *iter;
assert(eff != NULL);
Block* b = segment.getBlock( eff->x, eff->y, eff->z);
if(!b)
diff --git a/main.cpp b/main.cpp
index f76bac4..be421cd 100644
--- a/main.cpp
+++ b/main.cpp
@@ -108,8 +108,9 @@ void LogVerbose(const char* msg, ...){
return;
va_list arglist;
va_start(arglist, msg);
- // char buf[200] = {0};
- // vsprintf(buf, msg, arglist);
+ char buf[512] = {0};
+ vsprintf(buf, msg, arglist);
+ Core::printerr(buf);
FILE* fp = fopen( "Stonesense.log", "a");
if(fp)
vfprintf( fp, msg, arglist );
diff --git a/resources/buildings/Craftsdwarfs.xml b/resources/buildings/Craftsdwarfs.xml
index d9c5adc..f893e83 100644
--- a/resources/buildings/Craftsdwarfs.xml
+++ b/resources/buildings/Craftsdwarfs.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" ?>
-<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="workshop.png">
+<?xml version="1.0" ?>
+<building name="Craftsdwarfs Workshop" game_type="Workshop" game_subtype="Craftsdwarfs" file="workshop.png">
<!-- benches block -->
<if>
<!-- replace this with position index if required -->