diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui.cpp | 2 | ||||
| -rw-r--r-- | src/ui_action.cpp | 2 | ||||
| -rw-r--r-- | src/world.cpp | 14 |
3 files changed, 9 insertions, 9 deletions
@@ -1152,7 +1152,7 @@ EXIT: toggleBlackFast(); player->canMove = true; }; - + while(SDL_PollEvent(&e)) { switch(e.type) { diff --git a/src/ui_action.cpp b/src/ui_action.cpp index ebdc705..9029907 100644 --- a/src/ui_action.cpp +++ b/src/ui_action.cpp @@ -124,7 +124,7 @@ void actionAttack(void) ui::toggleWhiteFast(); } } else { - ui::dialogBox(player->name, "", false, "%s doesn't appear to be in the mood for fighting...", m->name); + ui::dialogBox(player->name, "", false, "%s doesn't appear to be in the mood for fighting...", m->name.c_str()); } ACTION_EPILOUGE; diff --git a/src/world.cpp b/src/world.cpp index b096180..11bd671 100644 --- a/src/world.cpp +++ b/src/world.cpp @@ -718,7 +718,7 @@ void World::draw(Player *p) std::vector<GLfloat> partVec(pss); GLfloat *pIndex = &partVec[0]; - + for (const auto &p : particles) { pc += 30; if (pc > pss) { @@ -2193,15 +2193,15 @@ loadWorldFromXMLNoSave(std::string path) { vil = vil->NextSiblingElement(); } - std::ifstream dat ((_currentXML + ".dat").data()); - if (dat.good()) { - dat.close(); - tmp->load(); - } - if (!loadedLeft && !loadedRight) { currentXML = _currentXML; currentXMLRaw = _currentXMLRaw; + + std::ifstream dat ((_currentXML + ".dat").data()); + if (dat.good()) { + dat.close(); + tmp->load(); + } } else { delete _currentXMLDoc; } |