Remove unneeded dependencies on modules/Graphic.h

docs/changelog.txt

@@ -47,6 +47,7 @@ changelog.txt uses a syntax similar to RST, with a few special sequences:
 ## Documentation
 
 ## API
+- Removed ``Engravings`` module (C++-only). Access ``world.engravings`` directly instead.
 - Removed ``Notes`` module (C++-only). Access ``ui.waypoints.points`` directly instead.
 - Removed ``Windows`` module (C++-only) - unused.
 

library/CMakeLists.txt

@@ -126,7 +126,6 @@ set(MODULE_HEADERS
     include/modules/Burrows.h
     include/modules/Constructions.h
     include/modules/Designations.h
-    include/modules/Engravings.h
     include/modules/EventManager.h
     include/modules/Filesystem.h
     include/modules/Graphic.h
@@ -153,7 +152,6 @@ set(MODULE_SOURCES
     modules/Burrows.cpp
     modules/Constructions.cpp
     modules/Designations.cpp
-    modules/Engravings.cpp
     modules/EventManager.cpp
     modules/Filesystem.cpp
     modules/Graphic.cpp

library/Core.cpp

@@ -53,7 +53,6 @@ using namespace std;
 #include "modules/Filesystem.h"
 #include "modules/Gui.h"
 #include "modules/World.h"
-#include "modules/Graphic.h"
 #include "modules/Persistence.h"
 #include "RemoteServer.h"
 #include "RemoteTools.h"

library/PlugLoad-windows.cpp

@@ -35,7 +35,6 @@ distribution.
 #include <stdio.h>
 
 #include "tinythread.h"
-#include "modules/Graphic.h"
 #include "../plugins/uicommon.h"
 
 /*

library/include/DFHack.h

@@ -54,7 +54,6 @@ distribution.
 
 // DFHack modules
 #include "modules/Buildings.h"
-#include "modules/Engravings.h"
 #include "modules/Materials.h"
 #include "modules/Constructions.h"
 #include "modules/Units.h"

library/include/Hooks.h

@@ -47,7 +47,6 @@ namespace SDL
 // these functions are here because they call into DFHack::Core and therefore need to
 // be declared as friend functions/known
 #ifdef _DARWIN
-#include "modules/Graphic.h"
 DFhackCExport int DFH_SDL_NumJoysticks(void);
 DFhackCExport void DFH_SDL_Quit(void);
 DFhackCExport int DFH_SDL_PollEvent(SDL::Event* event);

library/include/modules/Engravings.h

@@ -1,63 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-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.
-*/
-
-#pragma once
-#ifndef CL_MOD_ENGRAVINGS
-#define CL_MOD_ENGRAVINGS
-/*
-* DF engravings
-*/
-#include "Export.h"
-#include "DataDefs.h"
-#include "df/engraving.h"
-/**
- * \defgroup grp_engraving Engraving module parts
- * @ingroup grp_modules
- */
-namespace DFHack
-{
-namespace Engravings
-{
-// "Simplified" copy of engraving
-struct t_engraving {
-    int32_t artist;
-    int32_t masterpiece_event;
-    int32_t skill_rating;
-    df::coord pos;
-    df::engraving_flags flags;
-    int8_t tile;
-    int32_t art_id;
-    int16_t art_subid;
-    df::item_quality quality;
-    // Pointer to original object, in case you want to modify it
-    df::engraving *origin;
-};
-
-DFHACK_EXPORT bool isValid();
-DFHACK_EXPORT uint32_t getCount();
-DFHACK_EXPORT bool copyEngraving (const int32_t index, t_engraving &out);
-DFHACK_EXPORT df::engraving * getEngraving (const int32_t index);
-}
-}
-#endif

library/modules/Engravings.cpp

@@ -1,78 +0,0 @@
-/*
-https://github.com/peterix/dfhack
-Copyright (c) 2009-2012 Petr Mrázek (peterix@gmail.com)
-
-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 <string>
-#include <vector>
-#include <map>
-using namespace std;
-
-#include "VersionInfo.h"
-#include "MemAccess.h"
-#include "Types.h"
-#include "Core.h"
-
-#include "modules/Engravings.h"
-#include "df/world.h"
-
-using namespace DFHack;
-using df::global::world;
-
-bool Engravings::isValid()
-{
-    return (world != NULL);
-}
-
-uint32_t Engravings::getCount()
-{
-    return world->engravings.size();
-}
-
-df::engraving * Engravings::getEngraving(int index)
-{
-    if (uint32_t(index) >= getCount())
-        return NULL;
-    return world->engravings[index];
-}
-
-bool Engravings::copyEngraving(const int32_t index, t_engraving &out)
-{
-    if (uint32_t(index) >= getCount())
-        return false;
-
-    out.origin = world->engravings[index];
-
-    out.artist = out.origin->artist;
-    out.masterpiece_event = out.origin->masterpiece_event;
-    out.skill_rating = out.origin->skill_rating;
-    out.pos = out.origin->pos;
-    out.flags = out.origin->flags;
-    out.tile = out.origin->tile;
-    out.art_id = out.origin->art_id;
-    out.art_subid = out.origin->art_subid;
-    out.quality = out.origin->quality;
-    return true;
-}