From 887f1942cc967ee56d9e343c5006cd0b7057bd3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sat, 10 Apr 2010 03:49:37 +0200 Subject: [PATCH] Tagging first DF 2010 release --- dfhack/DFMemInfo.cpp | 2 +- dfhack/include/Tranquility.h | 2 ++ dfhack/include/modules/Buildings.h | 2 +- dfhack/include/modules/Constructions.h | 2 +- dfhack/include/modules/Materials.h | 2 +- dfhack/include/modules/Position.h | 2 +- dfhack/include/modules/Translation.h | 2 +- dfhack/include/modules/Vegetation.h | 2 +- dfhack/modules/Buildings.cpp | 1 + dfhack/modules/Creatures.cpp | 1 + examples/buildingsdump.cpp | 2 +- examples/materialtest.cpp | 6 +++--- examples/miscutils.h | 18 +++++++++--------- examples/spatterdump.cpp | 5 ++--- 14 files changed, 26 insertions(+), 23 deletions(-) diff --git a/dfhack/DFMemInfo.cpp b/dfhack/DFMemInfo.cpp index f15f88c70..af8aa875e 100644 --- a/dfhack/DFMemInfo.cpp +++ b/dfhack/DFMemInfo.cpp @@ -395,7 +395,7 @@ bool memory_info::resolveClassnameToVPtr(const string classname, uint32_t & vptr bool memory_info::resolveClassIDToClassname (const int32_t classID, string & classname) { - if (classID >=0 && classID < d->classnames.size()) + if (classID >=0 && (uint32_t)classID < d->classnames.size()) { classname = d->classnames[classID]; return true; diff --git a/dfhack/include/Tranquility.h b/dfhack/include/Tranquility.h index bd52f0972..e1ada3ff4 100644 --- a/dfhack/include/Tranquility.h +++ b/dfhack/include/Tranquility.h @@ -9,6 +9,8 @@ #pragma warning( disable: 4251 ) // don't display bogus 'deprecation' and 'unsafe' warnings #pragma warning( disable: 4996 ) + // disable stupid + #pragma warning( disable: 4800 ) #endif #endif diff --git a/dfhack/include/modules/Buildings.h b/dfhack/include/modules/Buildings.h index e348a57a1..fd3589bee 100644 --- a/dfhack/include/modules/Buildings.h +++ b/dfhack/include/modules/Buildings.h @@ -25,7 +25,7 @@ namespace DFHack // FIXME: not complete, we need building presence bitmaps for stuff like farm plots and stockpiles, orientation (N,E,S,W) and state (open/closed) }; - struct APIPrivate; + class APIPrivate; class DFHACK_EXPORT Buildings { public: diff --git a/dfhack/include/modules/Constructions.h b/dfhack/include/modules/Constructions.h index 2d2b53924..ea91ac809 100644 --- a/dfhack/include/modules/Constructions.h +++ b/dfhack/include/modules/Constructions.h @@ -39,7 +39,7 @@ namespace DFHack uint32_t origin; }; - struct APIPrivate; + class APIPrivate; class DFHACK_EXPORT Constructions { public: diff --git a/dfhack/include/modules/Materials.h b/dfhack/include/modules/Materials.h index cfbfb9471..83a4f203b 100644 --- a/dfhack/include/modules/Materials.h +++ b/dfhack/include/modules/Materials.h @@ -6,7 +6,7 @@ #include "Export.h" namespace DFHack { - struct APIPrivate; + class APIPrivate; struct t_matgloss { diff --git a/dfhack/include/modules/Position.h b/dfhack/include/modules/Position.h index 1b1168dde..338316e3c 100644 --- a/dfhack/include/modules/Position.h +++ b/dfhack/include/modules/Position.h @@ -6,7 +6,7 @@ #include "Export.h" namespace DFHack { - struct APIPrivate; + class APIPrivate; class DFHACK_EXPORT Position { public: diff --git a/dfhack/include/modules/Translation.h b/dfhack/include/modules/Translation.h index e6b4d2237..7027df61e 100644 --- a/dfhack/include/modules/Translation.h +++ b/dfhack/include/modules/Translation.h @@ -6,7 +6,7 @@ #include "Export.h" namespace DFHack { - struct APIPrivate; + class APIPrivate; typedef std::vector< std::vector > DFDict; typedef struct { diff --git a/dfhack/include/modules/Vegetation.h b/dfhack/include/modules/Vegetation.h index f5c21a564..9408c9c0b 100644 --- a/dfhack/include/modules/Vegetation.h +++ b/dfhack/include/modules/Vegetation.h @@ -27,7 +27,7 @@ namespace DFHack uint32_t address; }; - struct APIPrivate; + class APIPrivate; class DFHACK_EXPORT Vegetation { public: diff --git a/dfhack/modules/Buildings.cpp b/dfhack/modules/Buildings.cpp index 5f13e4224..8e8c4de31 100644 --- a/dfhack/modules/Buildings.cpp +++ b/dfhack/modules/Buildings.cpp @@ -121,4 +121,5 @@ bool Buildings::Finish() d->p_bld = NULL; } d->Started = false; + return true; } \ No newline at end of file diff --git a/dfhack/modules/Creatures.cpp b/dfhack/modules/Creatures.cpp index d3246db05..fca097c51 100644 --- a/dfhack/modules/Creatures.cpp +++ b/dfhack/modules/Creatures.cpp @@ -292,6 +292,7 @@ bool Creatures::WriteLabors(const uint32_t index, uint8_t labors[NUM_CREATURE_LA if(!d->Started) return false; uint32_t temp = * (uint32_t *) d->p_cre->at (index); g_pProcess->write(temp + d->creatures.labors_offset, NUM_CREATURE_LABORS, labors); + return true; } /* diff --git a/examples/buildingsdump.cpp b/examples/buildingsdump.cpp index aff92bcb6..ba6d77cc4 100644 --- a/examples/buildingsdump.cpp +++ b/examples/buildingsdump.cpp @@ -104,7 +104,7 @@ int main (int argc,const char* argv[]) { DFHack::t_building temp; Bld->Read(i, temp); - if(x >= temp.x1 && x <= temp.x2 && y >= temp.y1 && y <= temp.y2 && z == temp.z) + if((uint32_t)x >= temp.x1 && (uint32_t)x <= temp.x2 && (uint32_t)y >= temp.y1 && (uint32_t)y <= temp.y2 && (uint32_t)z == temp.z) { string typestr; mem->resolveClassIDToClassname(temp.type, typestr); diff --git a/examples/materialtest.cpp b/examples/materialtest.cpp index 815a0c510..09f414fdf 100644 --- a/examples/materialtest.cpp +++ b/examples/materialtest.cpp @@ -44,7 +44,7 @@ int main (int numargs, const char ** args) cout << "----==== Inorganic ====----" << endl; vector matgloss; Materials->ReadInorganicMaterials (matgloss); - for(int i = 0; i < matgloss.size();i++) + for(uint32_t i = 0; i < matgloss.size();i++) { cout << matgloss[i].id << endl; } @@ -52,14 +52,14 @@ int main (int numargs, const char ** args) cout << endl << "----==== Organic ====----" << endl; vector organic; Materials->ReadOrganicMaterials (matgloss); - for(int i = 0; i < matgloss.size();i++) + for(uint32_t i = 0; i < matgloss.size();i++) { cout << matgloss[i].id << endl; } cout << endl << "----==== Creature types ====----" << endl; vector creature; Materials->ReadCreatureTypes (matgloss); - for(int i = 0; i < matgloss.size();i++) + for(uint32_t i = 0; i < matgloss.size();i++) { cout << matgloss[i].id << endl; } diff --git a/examples/miscutils.h b/examples/miscutils.h index bfe768aae..504933e36 100644 --- a/examples/miscutils.h +++ b/examples/miscutils.h @@ -16,7 +16,7 @@ void DumpObjStr0Vector (const char * name, DFHack::Process *p, uint32_t addr) { cout << "----==== " << name << " ====----" << endl; DFHack::DfVector vect(p,addr,4); - for(int i = 0; i < vect.getSize();i++) + for(uint32_t i = 0; i < vect.getSize();i++) { uint32_t addr = *(uint32_t *) vect[i]; cout << p->readSTLString(addr) << endl; @@ -27,7 +27,7 @@ void DumpObjVtables (const char * name, DFHack::Process *p, uint32_t addr) { cout << "----==== " << name << " ====----" << endl; DFHack::DfVector vect(p,addr,4); - for(int i = 0; i < vect.getSize();i++) + for(uint32_t i = 0; i < vect.getSize();i++) { uint32_t addr = *(uint32_t *) vect[i]; uint32_t vptr = p->readDWord(addr); @@ -39,7 +39,7 @@ void DumpDWordVector (const char * name, DFHack::Process *p, uint32_t addr) { cout << "----==== " << name << " ====----" << endl; DFHack::DfVector vect(p,addr,4); - for(int i = 0; i < vect.getSize();i++) + for(uint32_t i = 0; i < vect.getSize();i++) { uint32_t number = *(uint32_t *) vect[i]; cout << number << endl; @@ -56,7 +56,7 @@ void hexdump (DFHack::API& DF, uint32_t address, uint32_t length) char *buf = new char[length * 16]; DF.ReadRaw(address, length * 16, (uint8_t *) buf); - for (int i = 0; i < length; i++) + for (uint32_t i = 0; i < length; i++) { // leading offset cout << "0x" << hex << setw(8) << address + i*16 << "| "; @@ -81,7 +81,7 @@ void interleave_hex (DFHack::API& DF, vector < uint32_t > & addresses, uint32_t { vector bufs; - for(int counter = 0; counter < addresses.size(); counter ++) + for(uint32_t counter = 0; counter < addresses.size(); counter ++) { char * buf = new char[length * 16]; DF.ReadRaw(addresses[counter], length * 16, (uint8_t *) buf); @@ -91,13 +91,13 @@ void interleave_hex (DFHack::API& DF, vector < uint32_t > & addresses, uint32_t // output a header cout << "line offset "; - for (int obj = 0; obj < addresses.size(); obj++) + for (uint32_t obj = 0; obj < addresses.size(); obj++) { cout << "0x" << hex << setw(9) << addresses[obj] << " "; } cout << endl; - for(int offs = 0 ; offs < length * 16; offs += 4) + for(uint32_t offs = 0 ; offs < length * 16; offs += 4) { if((!(offs % 16)) && offs != 0) { @@ -107,7 +107,7 @@ void interleave_hex (DFHack::API& DF, vector < uint32_t > & addresses, uint32_t cout << dec << setw(4) << offs/4 << " "; cout << setfill('0'); cout << "0x" << hex << setw(4) << offs << " "; - for (int object = 0; object < bufs.size(); object++) + for (uint32_t object = 0; object < bufs.size(); object++) { // bytes for(int k = 0; k < 4; k++) @@ -119,7 +119,7 @@ void interleave_hex (DFHack::API& DF, vector < uint32_t > & addresses, uint32_t } cout << endl; } - for(int counter = 0; counter < addresses.size(); counter ++) + for(uint32_t counter = 0; counter < addresses.size(); counter ++) { delete bufs[counter]; } diff --git a/examples/spatterdump.cpp b/examples/spatterdump.cpp index a6e0fb3d6..3eae5a737 100644 --- a/examples/spatterdump.cpp +++ b/examples/spatterdump.cpp @@ -77,7 +77,6 @@ int get_material_vector(uint32_t vein_8, uint16_t vein_4, int WORLD_) char shades[10] = {'#','$','O','=','+','|','-','^','.',' '}; int main (int numargs, const char ** args) { - uint32_t addr; uint32_t x_max,y_max,z_max; vector veinVector; vector IceVeinVector; @@ -130,7 +129,7 @@ int main (int numargs, const char ** args) { printf("Block %d/%d/%d\n",x,y,z); - for(int i = 0; i < splatter.size(); i++) + for(uint32_t i = 0; i < splatter.size(); i++) { printf("Splatter %d\nmat1: %d\nunknown: %d\nmat2: %d\nmat3: %d\n",i,splatter[i].mat1,splatter[i].unk1,splatter[i].mat2,splatter[i].mat3); cout << PrintSplatterType(splatter[i].mat1,splatter[i].mat2,creature_types) << endl; @@ -165,7 +164,7 @@ int main (int numargs, const char ** args) { printf("Block %d/%d/%d\n",bx,by,bz); - for(int i = 0; i < splatter.size(); i++) + for(uint32_t i = 0; i < splatter.size(); i++) { printf("Splatter %d\nmat1: %d\nunknown: %d\nmat2: %d\nmat3: %d\n",i,splatter[i].mat1,splatter[i].unk1,splatter[i].mat2,splatter[i].mat3); PrintSplatterType(splatter[i].mat1,splatter[i].mat2,creature_types);