From d451c6910b3dae537449585de09e57f48aaafc13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= Date: Sun, 28 Aug 2011 22:28:23 +0200 Subject: [PATCH] Add stonesense as a submodule, fix MSVC build of vdig module --- .gitmodules | 3 +++ plugins/stonesense | 1 + plugins/vdig.cpp | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 plugins/stonesense diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 000000000..071f19cf3 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "plugins/stonesense"] + path = plugins/stonesense + url = git://github.com/peterix/stonesense.git diff --git a/plugins/stonesense b/plugins/stonesense new file mode 160000 index 000000000..7d41a1d6f --- /dev/null +++ b/plugins/stonesense @@ -0,0 +1 @@ +Subproject commit 7d41a1d6f1e770012bfb412aed3ef9b06fd04723 diff --git a/plugins/vdig.cpp b/plugins/vdig.cpp index 6da466ef9..2453bacad 100644 --- a/plugins/vdig.cpp +++ b/plugins/vdig.cpp @@ -293,7 +293,7 @@ DFhackCExport command_result digcircle (Core * c, vector & parameters) int top = cy - ((iter + 1) / 2) + adjust; int bottom = cy + ((iter + 1) / 2); // see where the current 'line' intersects the circle - double val = std::sqrt(diameter*diameter - iter*iter); + double val = std::sqrt(double(diameter*diameter - iter*iter)); // adjust for circles with odd diameter if(!adjust) val -= 1;