widelands

Merge lp:~hjd/widelands/unused-variables-n-values into lp:widelands

  1. unused-variables-n-values
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 6994
Proposed branch: lp:~hjd/widelands/unused-variables-n-values
Merge into: lp:widelands
Diff against target: 27 lines (+0/-7)
2 files modified
src/ai/defaultai.cc (+0/-1)
src/map_generator.cc (+0/-6)
To merge this branch: bzr merge lp:~hjd/widelands/unused-variables-n-values
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+224015@code.launchpad.net

Description of the change

Found by scan-build.

To post a comment you must log in.
Revision history for this message
SirVer (sirver) wrote :

LGTM.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/ai/defaultai.cc'
2--- src/ai/defaultai.cc 2014-06-17 17:16:36 +0000
3+++ src/ai/defaultai.cc 2014-06-21 09:47:29 +0000
4@@ -1565,7 +1565,6 @@
5 if (kWinnerDebug)
6 log(" TDEBUG: no building picked up\n");
7
8- mine = false;
9 return false;
10 }
11
12
13=== modified file 'src/map_generator.cc'
14--- src/map_generator.cc 2014-06-11 05:09:34 +0000
15+++ src/map_generator.cc 2014-06-21 09:47:29 +0000
16@@ -1035,12 +1035,6 @@
17 // Island mode
18 mapInfo_out.islandMode = (nums[13] == 1) ? true : false;
19
20- // World name hash
21- uint16_t nameHash = nums[14];
22- nameHash |= nums[15] << 5;
23- nameHash |= nums[16] << 10;
24- nameHash |= nums[17] << 15;
25-
26 return false; // No valid world name found
27 }
28

Subscribers

People subscribed via source and target branches

to status/vote changes: