0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renaming a unit no longer genarates an OOS error (bug #7864).

Browse source
This commit is contained in:
Mark de Wever 2007-12-31 19:45:21 +00:00
parent 29dd806f2c
commit 880bc75c98
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -1,6 +1,8 @@
Version 1.3.13+svn:
* language and i18n:
* updated translations: Chinese, Lithuanian
* multiplayer:
* renaming a unit no longer genarates an OOS error (bug #7864)
* sound:
* timer bell in MP starts when there are 20 seconds left and fades in
gradually for 10 seconds (fr #10559)

11
src/replay.cpp
View file

@ -43,6 +43,7 @@
#include <sstream>
#define LOG_REPLAY LOG_STREAM(info, replay)
#define WRN_REPLAY LOG_STREAM(warn, replay)
#define ERR_REPLAY LOG_STREAM(err, replay)
std::string replay::last_replay_error;
@ -803,10 +804,12 @@ bool do_replay(game_display& disp, const gamemap& map, const game_data& gameinfo
}
u->second.rename(name);
} else {
std::stringstream errbuf;
errbuf << "attempt to rename unit at location: "
<< loc << ", where none exists.\n";
replay::throw_error(errbuf.str());
// Users can rename units while it's being killed at another machine.
// This since the player can rename units when it's not his/her turn.
// There's not a simple way to prevent that so in that case ignore the
// rename instead of throwing an OOS.
WRN_REPLAY << "attempt to rename unit at location: "
<< loc << ", where none exists (anymore).\n";
}
}