Merge lp:~widelands-dev/widelands/bug-1422452 into lp:widelands

[TiborB]

So many hours of work and so tiny fix. :(

There is a question in a diff....

I have not tested the attached (to the bug) file, but I have own replay files that were broken before and "worked" after the fix

[GunChleoc (gunchleoc)]

I think something like:

ScoutingDirection unsign = static_cast<ScoutingDirection>(des.unsigned_8());

should work. The compiler will tell you if I'm wrong.

[TiborB (tiborb95)]

then there would be only one line:

scouting_direction = static_cast<ScoutingDirection>(des.unsigned_8());

compiler says it is OK, but this kind of bugs is extremly hard to trace, so this must be 100% reliable

[SirVer (sirver)]

The one liner is fine.

An enum class is internally always represented as an (unsigned) int, but since enum class are guaranteed to be typesafe you must explicitly tell the compiler to interpret the integer as another type, ergo the static_cast is needed.

Good catch! Since when was this broken?

[TiborB (tiborb95)]

"An enum class is internally always represented as an (unsigned) int" - I presumed it is this way but was not sure.

The bug was introduced in seafaring-ai branch....

[GunChleoc (gunchleoc)]

Using enum classes instead of enums does take some getting used to in these cases. LGTM, thanks for hunting!

review: Approve

=== modified file 'src/logic/playercommand.cc'
--- src/logic/playercommand.cc	2015-02-13 18:48:37 +0000
+++ src/logic/playercommand.cc	2015-02-19 07:59:28 +0000
@@ -910,7 +910,7 @@
 	PlayerCommand (0, des.unsigned_8())
 {
 	serial = des.unsigned_32();
-	scouting_direction = ScoutingDirection::kClockwise;
+	scouting_direction = static_cast<ScoutingDirection>(des.unsigned_8());
 }
 
 void CmdShipExploreIsland::execute (Game & game)