diff --git a/mk/windoze/glest_game.vcxproj b/mk/windoze/glest_game.vcxproj index f741f6ed..1231d5d7 100644 --- a/mk/windoze/glest_game.vcxproj +++ b/mk/windoze/glest_game.vcxproj @@ -58,6 +58,7 @@ $(Configuration)\ false false + megaglest @@ -112,7 +113,7 @@ AnySuitable true Speed - true + false false ../../source/shared_lib/include/graphics;../../source/shared_lib/include/graphics/gl;../../source/shared_lib/include/platform;../../source/shared_lib/include/platform/win32;../../source/shared_lib/include/sound;../../source/shared_lib/include/sound/ds8;../../source/shared_lib/include/util;../../source/shared_lib/include/lua;../../source/shared_lib/include/xml;../../source/shared_lib/include/xml/rapidxml;../../source/glest_game/ai;../../source/glest_game/facilities;../../source/glest_game/game;../../source/glest_game/global;../../source/glest_game/graphics;../../source/glest_game/gui;../../source/glest_game/main;../../source/glest_game/menu;../../source/glest_game/network;../../source/glest_game/sound;../../source/glest_game/type_instances;../../source/glest_game/types;../../source/glest_game/world;../../source/windows_deps/include;../../source/windows_deps/xerces-c-3.1.1/src;../../source/windows_deps/SDL-1.2.15/include;../../source/shared_lib/include/platform/sdl;../../source/shared_lib/include/sound/openal;../../source/windows_deps/openal-soft-1.14/include;../../source/shared_lib/include/platform/posix;../../source/shared_lib/include/streflop;../../source/shared_lib/include/platform/common;../../source/windows_deps/curl-7.21.3/include;../../source/shared_lib/include/map;../../source/windows_deps/libircclient/include;../../source/windows_deps/glew-1.7.0/include %(AdditionalUsingDirectories) @@ -122,12 +123,13 @@ MultiThreaded true StreamingSIMDExtensions - Fast - $(IntDir)$(ProjectName).pdb + Precise + $(IntDir)$(TargetName).pdb Level3 ProgramDatabase 4018;4244;4250;4503;%(DisableSpecificWarnings) true + true dsound.lib;dxguid.lib;glew32s.lib;libogg_static.lib;libvorbis_static.lib;libvorbisfile_static.lib;opengl32.lib;glu32.lib;wsock32.lib;libglest.lib;mmc.lib;lua.lib;xerces-c_static_3.lib;Dbghelp.lib;libpng15.lib;jpeg.lib;zlibstat.lib;sdl.lib;sdlmain.lib;winmm.lib;openal32.lib;iphlpapi.lib;libstreflop.lib;libcurl.lib;ws2_32.lib;libircclient.lib;freetype244MT.lib;ftgl_static.lib;libeay32.lib;ssleay32.lib;%(AdditionalDependencies) @@ -145,7 +147,7 @@ NotSet - $(OutDir)\megaglest.exe + $(OutDir)$(TargetName)$(TargetExt) true true diff --git a/source/glest_game/graphics/renderer.cpp b/source/glest_game/graphics/renderer.cpp index 84660558..e5be01d2 100644 --- a/source/glest_game/graphics/renderer.cpp +++ b/source/glest_game/graphics/renderer.cpp @@ -6045,7 +6045,7 @@ void Renderer::renderMarkedCellsOnMinimap() { if(bm.getFaction() != NULL) { color= bm.getFaction()->getTexture()->getPixmapConst()->getPixel3f(0, 0); } - float alpha = 0.65; + float alpha = 0.65f; unit_colors[unitIdx] = Vec4f(color.x,color.y,color.z,alpha); unit_vertices[unitIdx] = Vec2f(mx + pos.x*zoom.x, my + mh - (pos.y*zoom.y)); @@ -9668,7 +9668,7 @@ void Renderer::renderVideoLoading(int progressPercent) { if(cycle.getCurMillis() % 50 == 0) { static bool animCycleUp = true; if(animCycleUp == true) { - anim += 0.1; + anim += 0.1f; if(anim > 1.f) { anim= 1.f; cycle.reset(); diff --git a/source/glest_game/main/battle_end.cpp b/source/glest_game/main/battle_end.cpp index cd3bd0b6..fe2f047c 100644 --- a/source/glest_game/main/battle_end.cpp +++ b/source/glest_game/main/battle_end.cpp @@ -620,9 +620,9 @@ void BattleEnd::render() { Vec3f highliteColor = Vec3f(WHITE.x,WHITE.y,WHITE.z); if(disableStatsColorCoding == false) { - highliteColor.x = 0.85; - highliteColor.y = 0.8; - highliteColor.z = 0.07; + highliteColor.x = 0.85f; + highliteColor.y = 0.8f; + highliteColor.z = 0.07f; } if(stats.getPersonalityType(i) == fpt_Observer) {