From 6e19511d48da36d3a4846cc4a1f3e62b387ef67e Mon Sep 17 00:00:00 2001 From: twanvl Date: Sat, 30 Aug 2008 13:14:30 +0000 Subject: [PATCH] minor fixes for building with vs2008. git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@1179 0fc631ac-6414-0410-93d0-97cfa31319b6 --- src/cli/win32_cli_wrapper.cpp | 2 ++ src/data/action/value.hpp | 2 +- src/script/context.cpp | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cli/win32_cli_wrapper.cpp b/src/cli/win32_cli_wrapper.cpp index 1462f46f..3e1232d8 100644 --- a/src/cli/win32_cli_wrapper.cpp +++ b/src/cli/win32_cli_wrapper.cpp @@ -27,6 +27,8 @@ #define UNICODE #define _UNICODE +#define _CRT_SECURE_NO_WARNINGS + #include #include #include diff --git a/src/data/action/value.hpp b/src/data/action/value.hpp index 9cf23076..f70a3847 100644 --- a/src/data/action/value.hpp +++ b/src/data/action/value.hpp @@ -146,7 +146,7 @@ class ScriptStyleEvent : public Action { inline ScriptStyleEvent(const StyleSheet* stylesheet, const Style* style) : stylesheet(stylesheet), style(style) {} - + virtual String getName(bool to_undo) const; virtual void perform(bool to_undo); diff --git a/src/script/context.cpp b/src/script/context.cpp index 3b59c6a7..fd9292ca 100644 --- a/src/script/context.cpp +++ b/src/script/context.cpp @@ -440,7 +440,7 @@ void instrBinary (BinaryInstructionType i, ScriptValueP& a, const ScriptValueP& else if (bi == 1) a = to_script(aa); else if (bi == 2) a = to_script(aa * aa); else if (bi == 3) a = to_script(aa * aa * aa); - else a = to_script(pow(aa,bi)); + else a = to_script(pow((double)aa,bi)); } } else { a = to_script(pow((double)*a, (double)*b));