Skip to content

Commit

Permalink
Revert 2097 fix reload error (#2364)
Browse files Browse the repository at this point in the history
* Revert "Fix /reload not returning the correct text message (#2097)"

This reverts commit 5fbb12e.
  • Loading branch information
DSpeichert committed Oct 19, 2017
1 parent 263d301 commit a39f657
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions src/baseevents.cpp
Expand Up @@ -74,10 +74,9 @@ bool BaseEvents::loadFromXml()

if (!success || !registerEvent(event, node)) {
delete event;
loaded = false;
}
}
return loaded;
return true;
}

bool BaseEvents::reload()
Expand Down
3 changes: 1 addition & 2 deletions src/monsters.cpp
Expand Up @@ -182,11 +182,10 @@ bool Monsters::loadFromXml(bool reloading /*= false*/)
if (reloading && monsters.find(name) != monsters.end()) {
loadMonster(file, name, true);
} else {
loaded = false;
unloadedMonsters.emplace(name, file);
}
}
return loaded;
return true;
}

bool Monsters::reload()
Expand Down

0 comments on commit a39f657

Please sign in to comment.