Merge pull request #311 from ennorehling/master

Getting ready for Visual Studio 2015

scripts/tests/common.lua

@@ -45,7 +45,7 @@ function test_flags()
     eressea.write_game("test.dat")
     eressea.free_game()
     eressea.read_game("test.dat")
-    os.remove('test.dat')
+    os.remove('data/test.dat')
     f = get_faction(no)
     assert_equal(flags, f.flags)
 end

scripts/tests/orders.lua

@@ -104,7 +104,7 @@ function test_process_quit()
     eressea.write_game('test.dat')
     eressea.free_game()
     eressea.read_game('test.dat')
-    os.remove('test.dat')
+    os.remove('data/test.dat')
     assert_equal(nil, _G.get_faction(fno))
 end
 

scripts/tests/storage.lua

@@ -28,4 +28,5 @@ function test_store_unit()
     store:close()
     assert_not_nil(u)
     assert_equal(u:get_item("money"), u.number * 100)
+    os.remove(filename)
 end

src/creport.c

@@ -1531,7 +1531,7 @@ report_computer(const char *filename, report_context * ctx, const char *charset)
     fprintf(F, "\"%s\";charset\n", charset);
     fprintf(F, "\"%s\";locale\n", locale_name(f->locale));
     fprintf(F, "%d;noskillpoints\n", 1);
-    fprintf(F, "%ld;date\n", ctx->report_time);
+    fprintf(F, "%lld;date\n", (long long)ctx->report_time);
     fprintf(F, "\"%s\";Spiel\n", game_name());
     fprintf(F, "\"%s\";Konfiguration\n", "Standard");
     fprintf(F, "\"%s\";Koordinaten\n", "Hex");

src/magic.c

@@ -870,9 +870,9 @@ int eff_spelllevel(unit * u, const spell * sp, int cast_level, int range)
     /* Ein Spruch mit Fixkosten wird immer mit der Stufe des Spruchs und
      * nicht auf der Stufe des Magiers gezaubert */
     if (costtyp == SPC_FIX) {
-        spellbook * spells = unit_get_spellbook(u);
-        if (spells) {
-            spellbook_entry * sbe = spellbook_get(spells, sp);
+        spellbook * sb = unit_get_spellbook(u);
+        if (sb) {
+            spellbook_entry * sbe = spellbook_get(sb, sp);
             if (sbe) {
                 return _min(cast_level, sbe->level);
             }

src/platform.h

@@ -34,6 +34,16 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 # undef MOUSE_MOVED
 # define STDIO_CP 1252          /* log.c, convert to console character set */
 # pragma warning (disable: 4201 4214 4514 4115 4711)
+#if _MSC_VER >= 1900
+# pragma warning(disable: 4710)
+/* warning C4710: function not inlined */
+# pragma warning(disable: 4456)
+/* warning C4456 : declaration of <name> hides previous local declaration */
+# pragma warning(disable: 4457)
+/* warning C4457: declaration of <name> hides function parameter */
+# pragma warning(disable: 4459)
+/* warning C4459: declaration of <name> hides global declaration */
+#endif
 # pragma warning(disable: 4056)
 /* warning C4056: overflow in floating point constant arithmetic */
 # pragma warning(disable: 4201)

src/report.c

@@ -96,6 +96,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include <limits.h>
 #include <stdlib.h>
 
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+# pragma warning(disable: 4774) // TODO: remove this
+#endif
+
 extern int *storms;
 extern int weeks_per_month;
 extern int months_per_year;

src/reports.c

@@ -73,6 +73,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 #include "move.h"
 
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+# pragma warning(disable: 4774) // TODO: remove this
+#endif
+
 #define SCALEWEIGHT      100    /* Faktor, um den die Anzeige von Gewichten skaliert wird */
 
 bool nocr = false;

src/spells.c

@@ -101,6 +101,10 @@
 #include <attributes/hate.h>
 /* ----------------------------------------------------------------------- */
 
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+# pragma warning(disable: 4774) // TODO: remove this
+#endif
+
 static double zero_effect = 0.0;
 
 attrib_type at_wdwpyramid = {

tests/runtests.bat

@@ -1,5 +1,8 @@
 @ECHO OFF
-SET BUILD=..\build-vs12\eressea\Debug\
+IF EXIST ..\build-vs10 SET BUILD=..\build-vs10\eressea\Debug
+IF EXIST ..\build-vs11 SET BUILD=..\build-vs11\eressea\Debug
+IF EXIST ..\build-vs12 SET BUILD=..\build-vs12\eressea\Debug
+IF EXIST ..\build-vs14 SET BUILD=..\build-vs14\eressea\Debug
 SET SERVER=%BUILD%\eressea.exe
 %BUILD%\test_eressea.exe
 %SERVER% ..\scripts\run-tests.lua

vs2015-build.bat

@@ -0,0 +1,11 @@
+@ECHO OFF
+SET VSVERSION=14
+SET SRCDIR=%CD%
+CD ..
+SET ERESSEA=%CD%
+
+CD %SRCDIR%
+mkdir build-vs%VSVERSION%
+cd build-vs%VSVERSION%
+"%ProgramFiles(x86)%\CMake\bin\cmake.exe" -G "Visual Studio %VSVERSION%" -DCMAKE_PREFIX_PATH="%ProgramFiles(x86)%/Lua/5.1;%ERESSEA%/dependencies-win32" -DCMAKE_MODULE_PATH="%SRCDIR%/cmake/Modules" -DCMAKE_SUPPRESS_REGENERATION=TRUE ..
+PAUSE