widelands-dev team mailing list archive

[Nicolai Hähnle <prefect_@xxxxxxx>]

Nicolai Hähnle has proposed merging lp:~widelands-dev/widelands/bug974679 into lp:widelands.

Requested reviews:
  Widelands Developers (widelands-dev)
Related bugs:
  Bug #974679 in widelands: "Inconsistent behaviour in soldier creation leads to irregular economy state"
  https://bugs.launchpad.net/widelands/+bug/974679

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/bug974679/+merge/147796

Should be self-explanatory, I hope. And yes, this seems a little crazy right now ;-)
-- 
https://code.launchpad.net/~widelands-dev/widelands/bug974679/+merge/147796
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/bug974679 into lp:widelands.

=== 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 @@
 	//log("%p: add(%i, %i)\n", this, id, count);
 
 	m_wares.add(id, count);
+	_start_request_timer();
 
 	// TODO: add to global player inventory?
 }
@@ -362,6 +363,7 @@
 	//log("%p: add(%i, %i)\n", this, id, count);
 
 	m_workers.add(id, count);
+	_start_request_timer();
 
 	// TODO: add to global player inventory?
 }