summaryrefslogtreecommitdiff
path: root/plugins/mapexport
diff options
context:
space:
mode:
authorPetr Mrázek2012-01-27 05:54:26 +0100
committerPetr Mrázek2012-01-27 05:54:26 +0100
commitd5d487553243e2a4f4505b5c85356bc3900e7a14 (patch)
tree697f45b992bb0f8cd638e3681a21104a4a8794ce /plugins/mapexport
parent0375be549cd2febd4c33ffb46957607403628f62 (diff)
downloaddfhack-d5d487553243e2a4f4505b5c85356bc3900e7a14.tar.gz
dfhack-d5d487553243e2a4f4505b5c85356bc3900e7a14.tar.bz2
dfhack-d5d487553243e2a4f4505b5c85356bc3900e7a14.tar.xz
Make things work properly.
Diffstat (limited to 'plugins/mapexport')
-rw-r--r--plugins/mapexport/CMakeLists.txt2
-rw-r--r--plugins/mapexport/mapexport.cpp5
2 files changed, 4 insertions, 3 deletions
diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt
index 6349b5ad..68422f5b 100644
--- a/plugins/mapexport/CMakeLists.txt
+++ b/plugins/mapexport/CMakeLists.txt
@@ -39,7 +39,7 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS})
#Generate sources from our proto files and store them in the source tree
ADD_CUSTOM_COMMAND(
OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS}
-COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto ${PROJECT_PROTOS}
+COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS}
DEPENDS protoc-bin ${PROJECT_PROTOS}
)
diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp
index 576a6f98..2cca26b3 100644
--- a/plugins/mapexport/mapexport.cpp
+++ b/plugins/mapexport/mapexport.cpp
@@ -12,6 +12,8 @@ using namespace DFHack;
#include "proto/Map.pb.h"
+using namespace DFHack::Simple;
+
DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & parameters);
DFhackCExport const char * plugin_name ( void )
@@ -67,8 +69,7 @@ DFhackCExport command_result mapexport (Core * c, std::vector <std::string> & pa
MapExtras::MapCache map;
DFHack::Materials *mats = c->getMaterials();
- DFHack::Vegetation *veg = c->getVegetation();
- if (veg->Start())
+ if (!Vegetation::isValid())
{
c->con.printerr("Unable to read vegetation; plants won't be listed!\n" );
}