From 9410fbcb1759e41481808d495ec442cbda87fac8 Mon Sep 17 00:00:00 2001 From: Japa Date: Mon, 20 Aug 2012 07:59:42 +0530 Subject: Tidied up some error messages, fixed some sprites. Non-errors are now put into verbose logging, because end-users don't need to see that stuff. Also fixed a few other things. --- ContentBuildingReader.cpp | 10 +++++----- ContentLoader.cpp | 5 ++++- ContentLoader.h | 1 + MapLoading.cpp | 30 +++++++++++++++--------------- main.cpp | 5 +++-- resources/buildings/Craftdwarfs.xml | 2 +- 6 files changed, 29 insertions(+), 24 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 Is generic - game_subtype missing.",elemRoot); + contentWarning(" Is generic - game_subtype missing.",elemRoot); break; } FOR_ENUM_ITEMS(furnace_type,i) @@ -355,7 +355,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector Is generic - game_subtype missing.",elemRoot); + contentWarning(" Is generic - game_subtype missing.",elemRoot); break; } FOR_ENUM_ITEMS(construction_type,i) @@ -377,7 +377,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector Is generic - game_subtype missing.",elemRoot); + contentWarning(" Is generic - game_subtype missing.",elemRoot); break; } FOR_ENUM_ITEMS(siegeengine_type,i) @@ -399,7 +399,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector Is generic - game_subtype missing.",elemRoot); + contentWarning(" Is generic - game_subtype missing.",elemRoot); break; } FOR_ENUM_ITEMS(shop_type,i) @@ -421,7 +421,7 @@ bool addSingleBuildingConfig( TiXmlElement* elemRoot, vector Is generic - game_subtype missing.",elemRoot); + contentWarning(" Is generic - game_subtype missing.",elemRoot); break; } FOR_ENUM_ITEMS(workshop_type,i) diff --git a/ContentLoader.cpp b/ContentLoader.cpp index 9d4197e..77cad67 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 471ffdc..2a23bed 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 1f94eb2..569beac 100644 --- a/MapLoading.cpp +++ b/MapLoading.cpp @@ -8,8 +8,8 @@ #include "Creatures.h" #include "ContentLoader.h" #include "Occlusion_Test.h" +#include #include -#include #include "df/item_constructed.h" #include "df/itemimprovement.h" #include "df/itemimprovement_threadst.h" @@ -538,9 +538,9 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C } //add effects - for(auto iter = trueBlock->effects.begin(); iter != trueBlock->effects.end(); iter++) + for(auto iter = trueBlock->flows.begin(); iter != trueBlock->flows.end(); iter++) { - df::effect * eff = *iter; + df::flow_info * eff = *iter; assert(eff != NULL); Block* b = segment.getBlock( eff->x, eff->y, eff->z); if(!b) @@ -558,84 +558,84 @@ void ReadCellToSegment(DFHack::Core& DF, WorldSegment& segment, int CellX, int C } switch(eff->type) { - case effect_type::Steam: + case flow_type::Steam: { b->Eff_Steam.density += eff->density; b->Eff_Steam.matt.index = eff->mat_index; b->Eff_Steam.matt.type = eff->mat_type; break; } - case effect_type::Mist: + case flow_type::Mist: { b->Eff_Mist.density += eff->density; b->Eff_Mist.matt.index = eff->mat_index; b->Eff_Mist.matt.type = eff->mat_type; break; } - case effect_type::MaterialDust: + case flow_type::MaterialDust: { b->Eff_MaterialDust.density += eff->density; b->Eff_MaterialDust.matt.index = eff->mat_index; b->Eff_MaterialDust.matt.type = eff->mat_type; break; } - case effect_type::MagmaMist: + case flow_type::MagmaMist: { b->Eff_MagmaMist.density += eff->density; b->Eff_MagmaMist.matt.index = eff->mat_index; b->Eff_MagmaMist.matt.type = eff->mat_type; break; } - case effect_type::Smoke: + case flow_type::Smoke: { b->Eff_Smoke.density += eff->density; b->Eff_Smoke.matt.index = eff->mat_index; b->Eff_Smoke.matt.type = eff->mat_type; break; } - case effect_type::Dragonfire: + case flow_type::Dragonfire: { b->Eff_Dragonfire.density += eff->density; b->Eff_Dragonfire.matt.index = eff->mat_index; b->Eff_Dragonfire.matt.type = eff->mat_type; break; } - case effect_type::Fire: + case flow_type::Fire: { b->Eff_Fire.density += eff->density; b->Eff_Fire.matt.index = eff->mat_index; b->Eff_Fire.matt.type = eff->mat_type; break; } - case effect_type::Web: + case flow_type::Web: { b->Eff_Web.density += eff->density; b->Eff_Web.matt.index = eff->mat_index; b->Eff_Web.matt.type = eff->mat_type; break; } - case effect_type::MaterialGas: + case flow_type::MaterialGas: { b->Eff_MaterialGas.density += eff->density; b->Eff_MaterialGas.matt.index = eff->mat_index; b->Eff_MaterialGas.matt.type = eff->mat_type; break; } - case effect_type::MaterialVapor: + case flow_type::MaterialVapor: { b->Eff_MaterialVapor.density += eff->density; b->Eff_MaterialVapor.matt.index = eff->mat_index; b->Eff_MaterialVapor.matt.type = eff->mat_type; break; } - case effect_type::OceanWave: + case flow_type::OceanWave: { b->Eff_OceanWave.density += eff->density; b->Eff_OceanWave.matt.index = eff->mat_index; b->Eff_OceanWave.matt.type = eff->mat_type; break; } - case effect_type::SeaFoam: + case flow_type::SeaFoam: { b->Eff_SeaFoam.density += eff->density; b->Eff_SeaFoam.matt.index = eff->mat_index; diff --git a/main.cpp b/main.cpp index f163d74..8709c02 100644 --- a/main.cpp +++ b/main.cpp @@ -97,8 +97,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/Craftdwarfs.xml b/resources/buildings/Craftdwarfs.xml index ac04353..bdc4a97 100644 --- a/resources/buildings/Craftdwarfs.xml +++ b/resources/buildings/Craftdwarfs.xml @@ -1,5 +1,5 @@ - + -- cgit v1.2.1