diff --git a/dfhack/include/modules/Creatures.h b/dfhack/include/modules/Creatures.h index 15a85c7be..e6f826f9b 100644 --- a/dfhack/include/modules/Creatures.h +++ b/dfhack/include/modules/Creatures.h @@ -327,7 +327,6 @@ namespace DFHack t_name name; int16_t mood; - int16_t mood_skill; t_name artifact_name; uint8_t profession; diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index e707d0f2a..2be94dc20 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -5,10 +5,6 @@ IF(UNIX) add_definitions(-DLINUX_BUILD) ENDIF(UNIX) -# a moodump clone -ADD_EXECUTABLE(dfmoodump moodump.cpp) -TARGET_LINK_LIBRARIES(dfmoodump dfhack) - # a reveal clone ADD_EXECUTABLE(dfreveal reveal.cpp) TARGET_LINK_LIBRARIES(dfreveal dfhack) @@ -67,7 +63,6 @@ dfincremental #dfmagma_create dfprospector dfreveal -dfmoodump RUNTIME DESTINATION bin ) -ENDIF(UNIX) +ENDIF(UNIX) \ No newline at end of file diff --git a/tools/moodump.cpp b/tools/moodump.cpp deleted file mode 100644 index ebce5eced..000000000 --- a/tools/moodump.cpp +++ /dev/null @@ -1,139 +0,0 @@ -#include -#include -#include -#include -#include -using namespace std; - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -struct matGlosses -{ - vector plantMat; - vector woodMat; - vector stoneMat; - vector metalMat; - vector creatureMat; -}; - -vector creaturestypes; -matGlosses mat; -vector< vector > itemTypes; -DFHack::memory_info *mem; -vector< vector > englishWords; -vector< vector > foreignWords; - -int main (int numargs, char ** args) -{ - DFHack::API DF("Memory.xml"); - DFHack::Process * p; - try - { - DF.Attach(); - } - catch (exception& e) - { - cerr << e.what() << endl; - #ifndef LINUX_BUILD - cin.ignore(); - #endif - return 1; - } - p = DF.getProcess(); - string check = ""; - if(numargs == 2) - check = args[1]; - - DFHack::Creatures * Creatures = DF.getCreatures(); - DFHack::Materials * Materials = DF.getMaterials(); - DFHack::Translation * Tran = DF.getTranslation(); - - uint32_t numCreatures; - if(!Creatures->Start(numCreatures)) - { - cerr << "Can't get creatures" << endl; - #ifndef LINUX_BUILD - cin.ignore(); - #endif - return 1; - } - if(!numCreatures) - { - cerr << "No creatures to print" << endl; - #ifndef LINUX_BUILD - cin.ignore(); - #endif - return 1; - } - mem = DF.getMemoryInfo(); - // get stone matgloss mapping - if(!Materials->ReadCreatureTypesEx(creaturestypes)) - { - cerr << "Can't get the creature types." << endl; - return 1; - } - - if(!Tran->Start()) - { - cerr << "Can't get name tables" << endl; - return 1; - } - vector addrs; - //DF.InitViewAndCursor(); - for(uint32_t i = 0; i < numCreatures; i++) - { - DFHack::t_creature temp; - unsigned int current_job; - unsigned int mat_start; - unsigned int mat_end; - unsigned int j,k; - unsigned int matptr; - unsigned int tmp; - - Creatures->ReadCreature(i,temp); - if(temp.mood) - { - cout << "address: " << hex << temp.origin << dec << " creature type: " << creaturestypes[temp.race].rawname << endl; - current_job = p->readDWord(temp.origin + 0x390); - mat_start = p->readDWord(current_job + 0xa4 + 4*3); - mat_end = p->readDWord(current_job + 0xa4 + 4*4); - for(j=mat_start;jreadDWord(j); - for(k=0;k<4;k++) - printf("%.4X ", p->readWord(matptr + k*2)); - for(k=0;k<3;k++) - printf("%.8X ", p->readDWord(matptr + k*4 + 0x8)); - for(k=0;k<2;k++) - printf("%.4X ", p->readWord(matptr + k*2 + 0x14)); - for(k=0;k<3;k++) - printf("%.8X ", p->readDWord(matptr + k*4 + 0x18)); - for(k=0;k<4;k++) - printf("%.2X ", p->readByte(matptr + k + 0x24)); - for(k=0;k<6;k++) - printf("%.8X ", p->readDWord(matptr + k*4 + 0x28)); - for(k=0;k<4;k++) - printf("%.2X ", p->readByte(matptr + k + 0x40)); - for(k=0;k<9;k++) - printf("%.8X ", p->readDWord(matptr + k*4 + 0x44)); - printf("\n"); - } - } - } - Creatures->Finish(); - DF.Detach(); - #ifndef LINUX_BUILD - cout << "Done. Press any key to continue" << endl; - cin.ignore(); - #endif - return 0; -} -