Merge lp:~widelands-dev/widelands/bug974679 into lp:widelands

Proposed by Nicolai Hähnle
Status: Merged
Merged at revision: 6510
Proposed branch: lp:~widelands-dev/widelands/bug974679
Merge into: lp:widelands
Diff against target: 19 lines (+2/-0)
1 file modified
src/economy/economy.cc (+2/-0)
To merge this branch: bzr merge lp:~widelands-dev/widelands/bug974679
Reviewer Review Type Date Requested Status
SirVer Approve
Review via email: mp+147796@code.launchpad.net

Description of the change

Should be self-explanatory, I hope. And yes, this seems a little crazy right now ;-)

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
=== modified file 'src/economy/economy.cc'
--- src/economy/economy.cc 2013-02-11 18:10:28 +0000
+++ src/economy/economy.cc 2013-02-11 22:59:26 +0000
@@ -354,6 +354,7 @@
354 //log("%p: add(%i, %i)\n", this, id, count);354 //log("%p: add(%i, %i)\n", this, id, count);
355355
356 m_wares.add(id, count);356 m_wares.add(id, count);
357 _start_request_timer();
357358
358 // TODO: add to global player inventory?359 // TODO: add to global player inventory?
359}360}
@@ -362,6 +363,7 @@
362 //log("%p: add(%i, %i)\n", this, id, count);363 //log("%p: add(%i, %i)\n", this, id, count);
363364
364 m_workers.add(id, count);365 m_workers.add(id, count);
366 _start_request_timer();
365367
366 // TODO: add to global player inventory?368 // TODO: add to global player inventory?
367}369}

Subscribers

People subscribed via source and target branches

to status/vote changes: