widelands-dev team mailing list archive
-
widelands-dev team
-
Mailing list archive
-
Message #00076
[Merge] lp:~raul.ferriz/widelands/remove_medic into lp:widelands
Raul Ferriz has proposed merging lp:~raul.ferriz/widelands/remove_medic into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
#575628 Remove dead code for healer / medic
https://bugs.launchpad.net/bugs/575628
Removed unused medic code and tribe tags for medics.
--
https://code.launchpad.net/~raul.ferriz/widelands/remove_medic/+merge/24884
Your team Widelands Developers is requested to review the proposed merge of lp:~raul.ferriz/widelands/remove_medic into lp:widelands.
=== modified file 'global/militarysites/barracks.empire/conf'
--- global/militarysites/barracks.empire/conf 2009-11-22 23:46:28 +0000
+++ global/militarysites/barracks.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1 # very low -> smallest building
conquers=5
max_soldiers=1
-max_medics=0
-heal_increase_per_medic=0
buildable=no
[idle]
=== modified file 'global/militarysites/barrier.barbarians/conf'
--- global/militarysites/barrier.barbarians/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/barrier.barbarians/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=1
conquers=8
-max_medics=2
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/barrier.empire/conf'
--- global/militarysites/barrier.empire/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/barrier.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=1
conquers=8
-max_medics=2
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/castle.atlanteans/conf'
--- global/militarysites/castle.atlanteans/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/castle.atlanteans/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=12
heal_per_second=2
conquers=12
-max_medics=4
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/castle.empire/conf'
--- global/militarysites/castle.empire/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/castle.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=12
heal_per_second=2
conquers=12
-max_medics=4
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/citadel.barbarians/conf'
--- global/militarysites/citadel.barbarians/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/citadel.barbarians/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=12
heal_per_second=2
conquers=12
-max_medics=4
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/donjon.barbarians/conf'
--- global/militarysites/donjon.barbarians/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/donjon.barbarians/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=2
conquers=8
-max_medics=2
-heal_increase_per_medic=3
vision_range=17
buildable=no
=== modified file 'global/militarysites/fortress.barbarians/conf'
--- global/militarysites/fortress.barbarians/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/fortress.barbarians/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=8
heal_per_second=1
conquers=11
-max_medics=3
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/fortress.empire/conf'
--- global/militarysites/fortress.empire/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/fortress.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=8
heal_per_second=1
conquers=11
-max_medics=3
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/guardhall.atlanteans/conf'
--- global/militarysites/guardhall.atlanteans/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/guardhall.atlanteans/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=7
heal_per_second=2
conquers=7
-max_medics=3
-heal_increase_per_medic=4
buildable=no
[idle]
=== modified file 'global/militarysites/guardhouse.atlanteans/conf'
--- global/militarysites/guardhouse.atlanteans/conf 2009-11-22 23:46:28 +0000
+++ global/militarysites/guardhouse.atlanteans/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1 # very low -> smallest building
conquers=6
max_soldiers=2
-max_medics=0
-heal_increase_per_medic=0
buildable=no
[idle]
=== modified file 'global/militarysites/high_tower.atlanteans/conf'
--- global/militarysites/high_tower.atlanteans/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/high_tower.atlanteans/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=2
conquers=9
-max_medics=2
-heal_increase_per_medic=3
vision_range=21
buildable=no
=== modified file 'global/militarysites/outpost.empire/conf'
--- global/militarysites/outpost.empire/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/outpost.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=3
heal_per_second=1
conquers=7
-max_medics=1
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/sentry.barbarians/conf'
--- global/militarysites/sentry.barbarians/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/sentry.barbarians/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1
conquers=6
max_soldiers=2
-max_medics=0
-heal_increase_per_medic=0
buildable=no
[idle]
=== modified file 'global/militarysites/sentry.empire/conf'
--- global/militarysites/sentry.empire/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/sentry.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1
conquers=6
max_soldiers=2
-max_medics=0
-heal_increase_per_medic=0
buildable=no
[idle]
=== modified file 'global/militarysites/small_tower.atlanteans/conf'
--- global/militarysites/small_tower.atlanteans/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/small_tower.atlanteans/conf 2010-05-07 09:58:29 +0000
@@ -3,8 +3,6 @@
conquers=6
vision_range=13
max_soldiers=3
-max_medics=0
-heal_increase_per_medic=0
buildable=no
[idle]
=== modified file 'global/militarysites/stronghold.barbarians/conf'
--- global/militarysites/stronghold.barbarians/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/stronghold.barbarians/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=3
heal_per_second=1
conquers=7
-max_medics=1
-heal_increase_per_medic=3
buildable=no
[idle]
=== modified file 'global/militarysites/tower.atlanteans/conf'
--- global/militarysites/tower.atlanteans/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/tower.atlanteans/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=4
heal_per_second=2
conquers=9
-max_medics=2
-heal_increase_per_medic=3
vision_range=17
buildable=no
=== modified file 'global/militarysites/tower.empire/conf'
--- global/militarysites/tower.empire/conf 2010-05-07 09:56:16 +0000
+++ global/militarysites/tower.empire/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=2
conquers=9
-max_medics=2
-heal_increase_per_medic=3
vision_range=19
buildable=no
=== modified file 'src/logic/militarysite.cc'
--- src/logic/militarysite.cc 2010-05-07 06:56:37 +0000
+++ src/logic/militarysite.cc 2010-05-07 09:58:29 +0000
@@ -53,15 +53,11 @@
(_name, _descname, directory, prof, global_s, _tribe, encdata),
m_conquer_radius (0),
m_num_soldiers (0),
-m_num_medics (0),
-m_heal_per_second (0),
-m_heal_incr_per_medic(0)
+m_heal_per_second (0)
{
m_conquer_radius = global_s.get_safe_int("conquers");
m_num_soldiers = global_s.get_safe_int("max_soldiers");
- m_num_medics = global_s.get_safe_int("max_medics");
m_heal_per_second = global_s.get_safe_int("heal_per_second");
- m_heal_incr_per_medic = global_s.get_safe_int("heal_increase_per_medic");
if (m_conquer_radius > 0)
m_workarea_info[m_conquer_radius].insert(descname() + _(" conquer"));
}
=== modified file 'src/logic/militarysite.h'
--- src/logic/militarysite.h 2010-03-24 11:43:37 +0000
+++ src/logic/militarysite.h 2010-05-07 09:58:29 +0000
@@ -41,22 +41,14 @@
uint32_t get_max_number_of_soldiers () const throw () {
return m_num_soldiers;
}
- uint32_t get_max_number_of_medics () const throw () {
- return m_num_medics;
- }
uint32_t get_heal_per_second () const throw () {
return m_heal_per_second;
}
- uint32_t get_heal_increase_per_medic() const throw () {
- return m_heal_incr_per_medic;
- }
private:
uint32_t m_conquer_radius;
uint32_t m_num_soldiers;
- uint32_t m_num_medics;
uint32_t m_heal_per_second;
- uint32_t m_heal_incr_per_medic;
};
class MilitarySite :
=== modified file 'tribes/atlanteans/castle/conf'
--- tribes/atlanteans/castle/conf 2010-05-07 07:14:32 +0000
+++ tribes/atlanteans/castle/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=12
heal_per_second=2
conquers=12
-max_medics=4
-heal_increase_per_medic=3
[buildcost]
planks=4
=== modified file 'tribes/atlanteans/guardhall/conf'
--- tribes/atlanteans/guardhall/conf 2010-05-07 07:14:32 +0000
+++ tribes/atlanteans/guardhall/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=7
heal_per_second=2
conquers=7
-max_medics=3
-heal_increase_per_medic=4
[buildcost]
trunk=2
=== modified file 'tribes/atlanteans/guardhouse/conf'
--- tribes/atlanteans/guardhouse/conf 2009-01-25 19:40:02 +0000
+++ tribes/atlanteans/guardhouse/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1 # very low -> smallest building
conquers=6
max_soldiers=2
-max_medics=0
-heal_increase_per_medic=0
[buildcost]
trunk=1
=== modified file 'tribes/atlanteans/high_tower/conf'
--- tribes/atlanteans/high_tower/conf 2010-05-07 07:14:32 +0000
+++ tribes/atlanteans/high_tower/conf 2010-05-07 09:58:29 +0000
@@ -3,8 +3,6 @@
max_soldiers=5
heal_per_second=2
conquers=9
-max_medics=2
-heal_increase_per_medic=3
vision_range=21
enhanced_building=yes
=== modified file 'tribes/atlanteans/small_tower/conf'
--- tribes/atlanteans/small_tower/conf 2010-05-07 07:14:32 +0000
+++ tribes/atlanteans/small_tower/conf 2010-05-07 09:58:29 +0000
@@ -3,8 +3,6 @@
conquers=6
vision_range=13
max_soldiers=3
-max_medics=0
-heal_increase_per_medic=0
[buildcost]
trunk=1
=== modified file 'tribes/atlanteans/tower/conf'
--- tribes/atlanteans/tower/conf 2010-05-07 07:14:32 +0000
+++ tribes/atlanteans/tower/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=4
heal_per_second=2
conquers=9
-max_medics=2
-heal_increase_per_medic=3
vision_range=17
enhancement=high_tower
=== modified file 'tribes/barbarians/barrier/conf'
--- tribes/barbarians/barrier/conf 2010-05-07 07:04:17 +0000
+++ tribes/barbarians/barrier/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=1
conquers=8
-max_medics=2
-heal_increase_per_medic=3
enhanced_building=yes
[buildcost]
=== modified file 'tribes/barbarians/citadel/conf'
--- tribes/barbarians/citadel/conf 2010-05-07 07:04:17 +0000
+++ tribes/barbarians/citadel/conf 2010-05-07 09:58:29 +0000
@@ -4,8 +4,6 @@
max_soldiers=12
heal_per_second=2
conquers=12
-max_medics=4
-heal_increase_per_medic=3
enhanced_building=yes
[buildcost]
=== modified file 'tribes/barbarians/donjon/conf'
--- tribes/barbarians/donjon/conf 2010-05-07 07:04:17 +0000
+++ tribes/barbarians/donjon/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=2
conquers=8
-max_medics=2
-heal_increase_per_medic=3
vision_range=17
[buildcost]
=== modified file 'tribes/barbarians/fortress/conf'
--- tribes/barbarians/fortress/conf 2010-05-07 09:56:16 +0000
+++ tribes/barbarians/fortress/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=8
heal_per_second=1
conquers=11
-max_medics=3
-heal_increase_per_medic=3
enhancement=citadel
[buildcost]
=== modified file 'tribes/barbarians/sentry/conf'
--- tribes/barbarians/sentry/conf 2010-05-07 07:04:17 +0000
+++ tribes/barbarians/sentry/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1
conquers=6
max_soldiers=2
-max_medics=0
-heal_increase_per_medic=0
[buildcost]
blackwood=2
=== modified file 'tribes/barbarians/stronghold/conf'
--- tribes/barbarians/stronghold/conf 2010-05-07 07:04:17 +0000
+++ tribes/barbarians/stronghold/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=3
heal_per_second=1
conquers=7
-max_medics=1
-heal_increase_per_medic=3
enhancement=barrier
[buildcost]
=== modified file 'tribes/empire/barracks/conf'
--- tribes/empire/barracks/conf 2010-04-22 09:02:51 +0000
+++ tribes/empire/barracks/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1 # very low -> smallest building
conquers=6
max_soldiers=1
-max_medics=0
-heal_increase_per_medic=0
enhancement=sentry
[buildcost]
=== modified file 'tribes/empire/barrier/conf'
--- tribes/empire/barrier/conf 2010-05-07 07:08:53 +0000
+++ tribes/empire/barrier/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=1
conquers=8
-max_medics=2
-heal_increase_per_medic=3
enhanced_building=yes
[buildcost]
=== modified file 'tribes/empire/castle/conf'
--- tribes/empire/castle/conf 2010-05-07 07:08:53 +0000
+++ tribes/empire/castle/conf 2010-05-07 09:58:29 +0000
@@ -3,8 +3,6 @@
max_soldiers=12
heal_per_second=2
conquers=12
-max_medics=4
-heal_increase_per_medic=3
enhanced_building=yes
[buildcost]
=== modified file 'tribes/empire/fortress/conf'
--- tribes/empire/fortress/conf 2010-05-07 07:08:53 +0000
+++ tribes/empire/fortress/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=8
heal_per_second=1
conquers=11
-max_medics=3
-heal_increase_per_medic=3
enhancement=castle
[buildcost]
=== modified file 'tribes/empire/outpost/conf'
--- tribes/empire/outpost/conf 2010-05-07 07:08:53 +0000
+++ tribes/empire/outpost/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=3
heal_per_second=1
conquers=7
-max_medics=1
-heal_increase_per_medic=3
enhancement=barrier
[buildcost]
=== modified file 'tribes/empire/sentry/conf'
--- tribes/empire/sentry/conf 2010-05-07 07:08:53 +0000
+++ tribes/empire/sentry/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
heal_per_second=1
conquers=6
max_soldiers=2
-max_medics=0
-heal_increase_per_medic=0
enhanced_building=yes
[buildcost]
=== modified file 'tribes/empire/tower/conf'
--- tribes/empire/tower/conf 2010-05-07 07:08:53 +0000
+++ tribes/empire/tower/conf 2010-05-07 09:58:29 +0000
@@ -2,8 +2,6 @@
max_soldiers=5
heal_per_second=2
conquers=9
-max_medics=2
-heal_increase_per_medic=3
vision_range=19
[buildcost]
