diff --git a/docs/Compile.rst b/docs/Compile.rst index c69d1de29..74ffb4078 100644 --- a/docs/Compile.rst +++ b/docs/Compile.rst @@ -693,12 +693,19 @@ for. For example, if you are building for 32-bit Linux and 64-bit Windows, download all files starting with ``linux32`` and ``win64``. GitHub should sort files alphabetically, so all the files you need should be next to each other. +.. note:: + + * Any files containing "allegro" in their filename are only necessary for + building `stonesense`. If you are not building Stonesense, you don't have to + download these, as they are larger than any other listed files. + It is recommended that you create a build folder and run CMake to verify that you have downloaded everything at this point, assuming your download machine has CMake installed. This involves running a "generate" batch script on Windows, or -a command starting with ``cmake ..`` on Linux and OS X. CMake should -automatically locate files that you placed in ``CMake/downloads``, and use them -instead of attempting to download them. +a command starting with ``cmake ..`` on Linux and OS X, following the +instructions in the sections above. CMake should automatically locate files that +you placed in ``CMake/downloads``, and use them instead of attempting to +download them. .. _note-old-git-and-dfhack: diff --git a/library/include/PluginManager.h b/library/include/PluginManager.h index 42bebb2d3..f7a8a7d87 100644 --- a/library/include/PluginManager.h +++ b/library/include/PluginManager.h @@ -296,7 +296,7 @@ namespace DFHack DFhackDataExport const char * plugin_name = m_plugin_name;\ DFhackDataExport const char * plugin_version = DFHack::Version::dfhack_version();\ DFhackDataExport const char * plugin_git_description = DFHack::Version::git_description();\ - DFhackDataExport Plugin *plugin_self = NULL;\ + DFhackDataExport DFHack::Plugin *plugin_self = NULL;\ std::vector _plugin_globals;\ DFhackDataExport std::vector* plugin_globals = &_plugin_globals; \ DFhackDataExport bool plugin_dev = is_dev; diff --git a/library/xml b/library/xml index 40da7231a..a9268e6d2 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 40da7231a0114fe3420d475961b08826f64fbf79 +Subproject commit a9268e6d27fedcc97d661bbcd87c25173d570b29 diff --git a/plugins/dwarfvet.cpp b/plugins/dwarfvet.cpp index 920e13d34..604f399a7 100644 --- a/plugins/dwarfvet.cpp +++ b/plugins/dwarfvet.cpp @@ -135,8 +135,8 @@ AnimalHospital::AnimalHospital(df::building * building, color_ostream &out) { z = building->z; // Determine how many spots we have for animals - this->length = x2-x1; - this->height = y2-y1; + this->length = x2-x1+1; + this->height = y2-y1+1; // And calculate the hospital! this->calculateHospital(true, out); @@ -237,8 +237,7 @@ void AnimalHospital::calculateHospital(bool force, color_ostream &out) { // then walk the patient array and remark those spots as used. // If a patient is in an invalid spot, reassign it - for (size_t b =0 ; b < world->buildings.all.size(); b++) { - df::building* building = world->buildings.all[b]; + for (df::building *building : world->buildings.all) { // Check that we're not comparing ourselves; if (building->id == this->id) { @@ -322,8 +321,8 @@ void AnimalHospital::calculateHospital(bool force, color_ostream &out) { spot_cur += building_offset_x; /* Start marking! */ - for (int i = 0; i != building_height; i++) { - for (int j = 0; j != building_length; j++) { + for (int i = 0; i < building_height; i++) { + for (int j = 0; j < building_length; j++) { spots_in_use[spot_cur+j] = true; } @@ -507,13 +506,13 @@ void tickHandler(color_ostream& out, void* data) { // It's possible our hospital cache is empty, if so, simply copy it, and jump to the main logic if (!hospitals_cached && count_of_hospitals) { out.print("Populating hospital cache:\n"); - for (vector::iterator current_hospital = hospitals_on_map.begin(); current_hospital != hospitals_on_map.end(); current_hospital++) { - AnimalHospital * hospital = new AnimalHospital(*current_hospital, out); - out.print(" Found animal hospital %d at x1: %d, y1: %d from valid hospital list\n", + for (df::building *current_hospital : hospitals_on_map) { + AnimalHospital * hospital = new AnimalHospital(current_hospital, out); + out.print(" Found animal hospital %d at x1: %d, y1: %d, z: %d from valid hospital list\n", hospital->getID(), - (*current_hospital)->x1, - (*current_hospital)->y1, - (*current_hospital)->z + current_hospital->x1, + current_hospital->y1, + current_hospital->z ); animal_hospital_zones.push_back(hospital); } @@ -779,7 +778,7 @@ command_result dwarfvet (color_ostream &out, std::vector & paramet for (size_t b =0 ; b < world->buildings.all.size(); b++) { df::building* building = world->buildings.all[b]; if (isActiveAnimalHospital(building)) { - out.print(" at x1: %d, x2%: %d, y1: %d, y2: %d, z: %d\n", building->x1, building->x2, building->y1, building->y2, building->z); + out.print(" at x1: %d, x2: %d, y1: %d, y2: %d, z: %d\n", building->x1, building->x2, building->y1, building->y2, building->z); } } return CR_OK; @@ -832,4 +831,4 @@ DFhackCExport command_result plugin_onstatechange(color_ostream &out, state_chan break; } return CR_OK; -} \ No newline at end of file +} diff --git a/plugins/stonesense b/plugins/stonesense index 455b51aab..031bf4caa 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 455b51aab7a93095a775285782635cfc17ac651a +Subproject commit 031bf4caafec321dd315202a83539d052ed49d84