Merge lp:~alocritani/widelands/bug585987 into lp:widelands

[Angelo Locritani]

just a proposal: healing in warehouses and headquarters, not in training. Logic: when soldiers are idle, their health increases: while training they are "busy" doing other things so no healing.

[SirVer (sirver)]

This will not suffice. The proper code will also need to be done to Warehouse class in the code. There is a comment in warehouse.cc somewhere.

review: Needs Fixing

[Angelo Locritani (alocritani)]

I added the healing logic to warehouses (thanks for the tip). I tested it and seems to work fine, so I hope I'm not missing anything.

[SirVer (sirver)]

Looks good to me. I am gonna merge this right away.

review: Approve

=== modified file 'src/logic/warehouse.cc'
--- src/logic/warehouse.cc	2011-11-30 21:38:37 +0000
+++ src/logic/warehouse.cc	2012-01-26 17:32:28 +0000
@@ -250,8 +250,10 @@
 	 Tribe_Descr const & _tribe)
 :
 	Building_Descr(_name, _descname, directory, prof, global_s, _tribe),
-m_conquers    (0)
+m_conquers    (0),
+m_heal_per_second(0)
 {
+	m_heal_per_second     = global_s.get_safe_int("heal_per_second");
 	if
 		((m_conquers =
 		  	prof.get_safe_section("global").get_positive("conquers", 0)))
@@ -639,6 +641,7 @@
 		if (m_incorporated_workers.count(ware)) {
 			WorkerList & soldiers = m_incorporated_workers[ware];
 
+			uint32_t total_heal = descr().get_heal_per_second();
 			// Do not use container_iterate, as we plan to erase some
 			// of those guys
 			for
@@ -656,7 +659,12 @@
 					m_supply->remove_workers(ware, 1);
 					continue;
 				}
-				//  If warehouse can heal, this is the place to put it.
+
+				if (soldier->get_current_hitpoints() < soldier->get_max_hitpoints()) {
+					soldier->heal(total_heal);
+					continue;
+				}
+
 			}
 		}
 		m_next_military_act = schedule_act(game, 1000);
 
=== modified file 'src/logic/warehouse.h'
--- src/logic/warehouse.h	2011-11-30 21:38:37 +0000
+++ src/logic/warehouse.h	2012-01-26 17:32:28 +0000
@@ -55,8 +55,12 @@
 
 	virtual uint32_t get_conquers() const {return m_conquers;}
 
+	uint32_t get_heal_per_second        () const throw () {
+		return m_heal_per_second;
+	}
 private:
 	int32_t m_conquers;
+	uint32_t m_heal_per_second;
 };
 
 
 
=== modified file 'tribes/atlanteans/headquarters/conf'
--- tribes/atlanteans/headquarters/conf	2009-12-31 18:36:51 +0000
+++ tribes/atlanteans/headquarters/conf	2012-01-26 17:32:28 +0000
@@ -2,6 +2,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]
 
=== modified file 'tribes/atlanteans/port/conf'
--- tribes/atlanteans/port/conf	2011-01-19 18:15:57 +0000
+++ tribes/atlanteans/port/conf	2012-01-26 17:32:28 +0000
@@ -1,5 +1,6 @@
 size=port
 conquers=5
+heal_per_second=2
 
 [buildcost]
 trunk=3
 
=== modified file 'tribes/atlanteans/warehouse/conf'
--- tribes/atlanteans/warehouse/conf	2011-09-12 17:29:32 +0000
+++ tribes/atlanteans/warehouse/conf	2012-01-26 17:32:28 +0000
@@ -1,4 +1,5 @@
 size=medium
+heal_per_second=2
 
 [buildcost]
 trunk=2
 
=== modified file 'tribes/barbarians/headquarters/conf'
--- tribes/barbarians/headquarters/conf	2010-11-23 19:33:08 +0000
+++ tribes/barbarians/headquarters/conf	2012-01-26 17:32:28 +0000
@@ -6,6 +6,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]
 
=== modified file 'tribes/barbarians/headquarters_interim/conf'
--- tribes/barbarians/headquarters_interim/conf	2011-09-12 17:29:32 +0000
+++ tribes/barbarians/headquarters_interim/conf	2012-01-26 17:32:28 +0000
@@ -4,6 +4,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]
 
=== modified file 'tribes/barbarians/port/conf'
--- tribes/barbarians/port/conf	2011-12-15 23:09:47 +0000
+++ tribes/barbarians/port/conf	2012-01-26 17:32:28 +0000
@@ -1,5 +1,6 @@
 size=port
 conquers=5
+heal_per_second=2
 
 [buildcost]
 trunk=3
 
=== modified file 'tribes/barbarians/warehouse/conf'
--- tribes/barbarians/warehouse/conf	2010-10-18 15:50:45 +0000
+++ tribes/barbarians/warehouse/conf	2012-01-26 17:32:28 +0000
@@ -1,4 +1,5 @@
 size=medium
+heal_per_second=2
 
 [buildcost]
 trunk=3
 
=== modified file 'tribes/empire/headquarters/conf'
--- tribes/empire/headquarters/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/headquarters/conf	2012-01-26 17:32:28 +0000
@@ -2,6 +2,7 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]
 
=== modified file 'tribes/empire/headquarters_shipwreck/conf'
--- tribes/empire/headquarters_shipwreck/conf	2011-09-12 17:29:32 +0000
+++ tribes/empire/headquarters_shipwreck/conf	2012-01-26 17:32:28 +0000
@@ -2,10 +2,11 @@
 size=big
 buildable=no
 destructible=no
+heal_per_second=2
 conquers=9
 
 [idle]
 # sfx=0 ../../../sound/spoken/warehouse-bringitin
 pics=headquarters_shipwreck_i_??.png
 hotspot=93 40
-playercolor=true
 \ No newline at end of file
+playercolor=true
 
=== modified file 'tribes/empire/port/conf'
--- tribes/empire/port/conf	2011-12-15 23:09:47 +0000
+++ tribes/empire/port/conf	2012-01-26 17:32:28 +0000
@@ -1,5 +1,6 @@
 size=port
 conquers=5
+heal_per_second=2
 
 [buildcost]
 trunk=3
 
=== modified file 'tribes/empire/warehouse/conf'
--- tribes/empire/warehouse/conf	2010-08-01 14:35:38 +0000
+++ tribes/empire/warehouse/conf	2012-01-26 17:32:28 +0000
@@ -1,4 +1,5 @@
 size=medium
+heal_per_second=2
 
 [buildcost]
 trunk=2