diff --git a/src/creport.c b/src/creport.c index aea88f03a..c8f4f9537 100644 --- a/src/creport.c +++ b/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"); diff --git a/src/magic.c b/src/magic.c index a02eff09f..a189e9495 100644 --- a/src/magic.c +++ b/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); } diff --git a/src/platform.h b/src/platform.h index 1da86fe5b..8e207fae2 100644 --- a/src/platform.h +++ b/src/platform.h @@ -34,6 +34,14 @@ 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) +# pragma warning(disable: 4710) +/* warning C4710: function not inlined */ +# pragma warning(disable: 4456) +/* warning C4456 : declaration of hides previous local declaration */ +# pragma warning(disable: 4457) +/* warning C4457: declaration of hides function parameter */ +# pragma warning(disable: 4459) +/* warning C4459: declaration of hides global declaration */ # pragma warning(disable: 4056) /* warning C4056: overflow in floating point constant arithmetic */ # pragma warning(disable: 4201) diff --git a/src/report.c b/src/report.c index e77ff1d9e..254da710e 100644 --- a/src/report.c +++ b/src/report.c @@ -96,6 +96,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include #include +#ifdef _MSC_VER +# pragma warning(disable: 4774) // TODO: remove this +#endif + extern int *storms; extern int weeks_per_month; extern int months_per_year; diff --git a/src/reports.c b/src/reports.c index 21d51afa2..5f547b6ed 100644 --- a/src/reports.c +++ b/src/reports.c @@ -73,6 +73,10 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "move.h" +#ifdef _MSC_VER +# pragma warning(disable: 4774) // TODO: remove this +#endif + #define SCALEWEIGHT 100 /* Faktor, um den die Anzeige von Gewichten skaliert wird */ bool nocr = false; diff --git a/src/spells.c b/src/spells.c index 436a1bc43..033d74024 100644 --- a/src/spells.c +++ b/src/spells.c @@ -101,6 +101,10 @@ #include /* ----------------------------------------------------------------------- */ +#ifdef _MSC_VER +# pragma warning(disable: 4774) // TODO: remove this +#endif + static double zero_effect = 0.0; attrib_type at_wdwpyramid = { diff --git a/vs2015-build.bat b/vs2015-build.bat new file mode 100644 index 000000000..82f1f4cd6 --- /dev/null +++ b/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