Minor fixes to get build working for vs2017 project;

This commit is contained in:
Mark Clark
2018-02-25 13:57:40 -05:00
parent cec4ca7a20
commit e70c360e11
5 changed files with 10 additions and 8 deletions

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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;

View File

@@ -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;