diff --git a/src/boe.town.cpp b/src/boe.town.cpp index 5fe31ebd..278c7823 100644 --- a/src/boe.town.cpp +++ b/src/boe.town.cpp @@ -292,12 +292,6 @@ void start_town_mode(short which_town, short entry_dir) { // First set up the values. cCreature& preset = univ.town->creatures(i); univ.town.monst.assign(i, preset, univ.scenario.scen_monsters[preset.number], PSD[SDF_EASY_MODE], univ.difficulty_adjust()); - univ.town.monst[i].target = 6; - univ.town.monst[i].active = 1; // TODO: Can those two \/ be commented out? - //univ.town.monst[i].attitude = univ.town->creatures(i).start_attitude; - //univ.town.monst[i].cur_loc = univ.town->creatures(i).start_loc; - //univ.town.monst[i].mobility = univ.town->creatures(i).mobility; - univ.town.monst[i].summoned = 0; if(univ.town.monst[i].spec_enc_code > 0) univ.town.monst[i].active = 0; diff --git a/src/classes/creatlist.cpp b/src/classes/creatlist.cpp index 0f5a94bc..a76fafef 100644 --- a/src/classes/creatlist.cpp +++ b/src/classes/creatlist.cpp @@ -56,4 +56,5 @@ void cPopulation::assign(size_t n, const cCreature& other, const cMonster& base, dudes[n].attitude = dudes[n].start_attitude; // TODO: Is this right? dudes[n].cur_loc = dudes[n].start_loc; dudes[n].target = 6; // No target + dudes[n].summoned = 0; } diff --git a/src/classes/monster.h b/src/classes/monster.h index ce0f826b..44a8613e 100644 --- a/src/classes/monster.h +++ b/src/classes/monster.h @@ -151,7 +151,6 @@ public: class cCreature : public cMonster { public: - using cMonster::operator=; unsigned long id; m_num_t number; short active, attitude; diff --git a/src/dialogxml/dialog.cpp b/src/dialogxml/dialog.cpp index a062cb7b..afadeaf9 100644 --- a/src/dialogxml/dialog.cpp +++ b/src/dialogxml/dialog.cpp @@ -812,7 +812,7 @@ void cDialog::loadFromFile(std::string path){ fname = path; fs::path cPath = progDir/"data"/"dialogs"/path; try{ - printf("Loading dialog from: %s\n", cPath.c_str()); + printf("Loading dialog from: %s\n", cPath.string().c_str()); TiXmlBase::SetCondenseWhiteSpace(false); Document xml(cPath.string().c_str()); xml.LoadFile(); diff --git a/src/tools/fileio.cpp b/src/tools/fileio.cpp index c2e2f235..e6ad1671 100644 --- a/src/tools/fileio.cpp +++ b/src/tools/fileio.cpp @@ -467,7 +467,7 @@ void load_spec_graphics(fs::path scen_file) { static const char*const noGraphics = "The game will still work without the custom graphics, but some things will not look right."; short i; fs::path path(scen_file); - printf("Loading scenario graphics... (%s)\n",path.c_str()); + printf("Loading scenario graphics... (%s)\n",path.string().c_str()); // Tried path.replace_extension, but that only deleted the extension, so I have to do it manually std::string filename = path.stem().string(); path = path.parent_path(); diff --git a/src/tools/winutil.win.cpp b/src/tools/winutil.win.cpp index d7fc3e13..714844c1 100644 --- a/src/tools/winutil.win.cpp +++ b/src/tools/winutil.win.cpp @@ -231,7 +231,7 @@ ModalSession::ModalSession(sf::Window& win, sf::Window& p) : parent(&p) { ModalSession::~ModalSession() { HWND win_handle = (HWND)session; EnableWindow(parent->getSystemHandle(), true); - makeFrontWindow(parent); + makeFrontWindow(*parent); RedrawWindow(parent->getSystemHandle(), NULL, NULL, RDW_NOCHILDREN | RDW_UPDATENOW); }