From e70c360e11ebb7a5027eeca2cbb2fafce8e79da6 Mon Sep 17 00:00:00 2001
From: Mark Clark <markjclark@outlook.com>
Date: Sun, 25 Feb 2018 13:57:40 -0500
Subject: [PATCH] Minor fixes to get build working for vs2017 project;

---
 rsrc/menus/BladesOfExile.rc    | 6 +++---
 src/fileio/debugout.win.cpp    | 4 ++--
 src/game/boe.graphics.cpp      | 2 ++
 src/scenedit/scen.graphics.cpp | 2 +-
 src/scenedit/scen.keydlgs.cpp  | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/rsrc/menus/BladesOfExile.rc b/rsrc/menus/BladesOfExile.rc
index 0524badd..bfa2877e 100644
--- a/rsrc/menus/BladesOfExile.rc
+++ b/rsrc/menus/BladesOfExile.rc
@@ -32,9 +32,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_BLADESOFEXILE       ICON                    "../../../rsrc/icons/win/BOE Icon.ico"
-IDI_BOESAVE             ICON                    "../../../rsrc/icons/win/BoE Save.ico"
-IDI_BOESCEN             ICON                    "../../../rsrc/icons/win/BoE Scenario.ico"
+IDI_BLADESOFEXILE       ICON                    "BOE Icon.ico"
+IDI_BOESAVE             ICON                    "BoE Save.ico"
+IDI_BOESCEN             ICON                    "BoE Scenario.ico"
 
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/src/fileio/debugout.win.cpp b/src/fileio/debugout.win.cpp
index 41d3740e..20ac85ee 100644
--- a/src/fileio/debugout.win.cpp
+++ b/src/fileio/debugout.win.cpp
@@ -15,8 +15,8 @@ public:
 	}
 protected:
 	int sync() {
-		output_debug_string(str().c_str());
-		str(std::basic_string<CharT>()); // Clear the string buffer
+		output_debug_string(this->str().c_str());
+		this->str(std::basic_string<CharT>()); // Clear the string buffer
 		return 0;
 	}
 
diff --git a/src/game/boe.graphics.cpp b/src/game/boe.graphics.cpp
index 6d60b17d..3241b67a 100644
--- a/src/game/boe.graphics.cpp
+++ b/src/game/boe.graphics.cpp
@@ -31,7 +31,9 @@
 #include "boe.menus.hpp"
 #include "winutil.hpp"
 #include "prefs.hpp"
+#ifndef MSBUILD_GITREV
 #include "gitrev.hpp"
+#endif
 
 extern sf::RenderWindow mainPtr;
 extern short stat_window;
diff --git a/src/scenedit/scen.graphics.cpp b/src/scenedit/scen.graphics.cpp
index 63173946..cfc193b7 100644
--- a/src/scenedit/scen.graphics.cpp
+++ b/src/scenedit/scen.graphics.cpp
@@ -976,7 +976,7 @@ void draw_terrain(){
 
 void draw_monsts() {
 	short width,height,m_start_pic;
-	sf::Texture* from_gworld;
+	sf::Texture* from_gworld = nullptr;
 	rectangle source_rect;
 	location where_draw,store_loc;
 	
diff --git a/src/scenedit/scen.keydlgs.cpp b/src/scenedit/scen.keydlgs.cpp
index ae95acb2..a38762f9 100644
--- a/src/scenedit/scen.keydlgs.cpp
+++ b/src/scenedit/scen.keydlgs.cpp
@@ -831,8 +831,8 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
 	bool choose_string = true;
 	eStrType strt;
 	short str_adj = 0;
-	const char* title;
-	cSpecial* node_to_change_to;
+	const char* title = "";
+	cSpecial* node_to_change_to = nullptr;
 	switch(btn) {
 		case 'm':
 			choose_string = false;