widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #02109
[Merge] lp:~hjd/widelands/unused-variables-n-values into lp:widelands
Hans Joachim Desserud has proposed merging lp:~hjd/widelands/unused-variables-n-values into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
For more details, see:
https://code.launchpad.net/~hjd/widelands/unused-variables-n-values/+merge/224015
Found by scan-build.
--
https://code.launchpad.net/~hjd/widelands/unused-variables-n-values/+merge/224015
Your team Widelands Developers is requested to review the proposed merge of lp:~hjd/widelands/unused-variables-n-values into lp:widelands.
=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc 2014-06-17 17:16:36 +0000
+++ src/ai/defaultai.cc 2014-06-21 09:47:29 +0000
@@ -1565,7 +1565,6 @@
if (kWinnerDebug)
log(" TDEBUG: no building picked up\n");
- mine = false;
return false;
}
=== modified file 'src/map_generator.cc'
--- src/map_generator.cc 2014-06-11 05:09:34 +0000
+++ src/map_generator.cc 2014-06-21 09:47:29 +0000
@@ -1035,12 +1035,6 @@
// Island mode
mapInfo_out.islandMode = (nums[13] == 1) ? true : false;
- // World name hash
- uint16_t nameHash = nums[14];
- nameHash |= nums[15] << 5;
- nameHash |= nums[16] << 10;
- nameHash |= nums[17] << 15;
-
return false; // No valid world name found
}