From 7a04fefb0b56b126f1b44caf18c6bada8297bf3d Mon Sep 17 00:00:00 2001 From: lethosor Date: Fri, 1 Jun 2018 00:20:56 -0400 Subject: [PATCH] Remove Vermin module (unused and obsolete) --- library/CMakeLists.txt | 2 - library/include/modules/Vermin.h | 44 ----------------- library/modules/Vermin.cpp | 83 -------------------------------- 3 files changed, 129 deletions(-) delete mode 100644 library/include/modules/Vermin.h delete mode 100644 library/modules/Vermin.cpp diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index 8541f37cd..2047b3615 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -131,7 +131,6 @@ include/modules/Renderer.h include/modules/Screen.h include/modules/Translation.h include/modules/Units.h -include/modules/Vermin.h include/modules/World.h ) @@ -158,7 +157,6 @@ modules/Renderer.cpp modules/Screen.cpp modules/Translation.cpp modules/Units.cpp -modules/Vermin.cpp modules/Windows.cpp modules/World.cpp ) diff --git a/library/include/modules/Vermin.h b/library/include/modules/Vermin.h deleted file mode 100644 index 9f440606b..000000000 --- a/library/include/modules/Vermin.h +++ /dev/null @@ -1,44 +0,0 @@ -#pragma once -/** - * \defgroup grp_vermin Wild vermin (ants, bees, etc) - */ -#include "Export.h" -#include "DataDefs.h" -#include "df/vermin.h" - -namespace DFHack -{ -namespace Vermin -{ - /** - * Structure for holding a read DF vermin spawn point object - * \ingroup grp_vermin - */ - struct t_vermin - { - df::vermin * origin; - int16_t race; - int16_t caste; - uint16_t x; - uint16_t y; - uint16_t z; - uint32_t countdown; - bool visible:1; - bool is_colony:1; /// Is vermin object a colony? - }; - - static const uint16_t TYPE_WILD_COLONY = 0xFFFF; - /** - * Get number of vermin objects - */ - DFHACK_EXPORT uint32_t getNumVermin(); - /** - * Read from vermin object - */ - DFHACK_EXPORT bool Read (const uint32_t index, t_vermin & point); - /** - * Write into vermin object - */ - DFHACK_EXPORT bool Write (const uint32_t index, t_vermin & point); -}// end DFHack::Vermin -} diff --git a/library/modules/Vermin.cpp b/library/modules/Vermin.cpp deleted file mode 100644 index e5401ba9e..000000000 --- a/library/modules/Vermin.cpp +++ /dev/null @@ -1,83 +0,0 @@ -/* -www.sourceforge.net/projects/dfhack -Copyright (c) 2009 Petr Mrázek (peterix), Kenneth Ferland (Impaler[WrG]), dorf - -This software is provided 'as-is', without any express or implied -warranty. In no event will the authors be held liable for any -damages arising from the use of this software. - -Permission is granted to anyone to use this software for any -purpose, including commercial applications, and to alter it and -redistribute it freely, subject to the following restrictions: - -1. The origin of this software must not be misrepresented; you must -not claim that you wrote the original software. If you use this -software in a product, an acknowledgment in the product documentation -would be appreciated but is not required. - -2. Altered source versions must be plainly marked as such, and -must not be misrepresented as being the original software. - -3. This notice may not be removed or altered from any source -distribution. -*/ - -#include "Internal.h" - -#include -#include -#include -using namespace std; - -#include "VersionInfo.h" -#include "Types.h" -#include "Error.h" -#include "MemAccess.h" -#include "modules/Vermin.h" -#include "ModuleFactory.h" -#include "Core.h" -using namespace DFHack; - -#include "DataDefs.h" -#include "df/world.h" -#include "df/vermin.h" -using namespace df::enums; -using df::global::world; - -uint32_t Vermin::getNumVermin() -{ - return df::vermin::get_vector().size(); -} - -bool Vermin::Read (const uint32_t index, t_vermin & sp) -{ - df::vermin *verm = df::vermin::find(index); - if (!verm) return false; - - sp.origin = verm; - sp.race = verm->race; - sp.caste = verm->caste; - sp.visible = verm->visible; - sp.countdown = verm->countdown; - sp.x = verm->pos.x; - sp.y = verm->pos.y; - sp.z = verm->pos.z; - sp.is_colony = verm->flags.bits.is_colony; - return true; -} - -bool Vermin::Write (const uint32_t index, t_vermin & sp) -{ - df::vermin *verm = df::vermin::find(index); - if (!verm) return false; - - verm->race = sp.race; - verm->caste = sp.caste; - verm->visible = sp.visible; - verm->countdown = sp.countdown; - verm->pos.x = sp.x; - verm->pos.y = sp.y; - verm->pos.z = sp.z; - verm->flags.bits.is_colony = sp.is_colony; - return true; -}