Author: alink
Date: Sat May 9 20:32:41 2009
New Revision: 35513
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35513&view=rev
Log:
backport r35494 (optimize unit_type access, help AI recruiting)
Modified:
branches/1.6/src/unit_types.cpp
Modified: branches/1.6/src/unit_types.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/branches/1.6/src/unit_types.cpp?rev=35513&r1=35512&r2=35513&view=diff
==============================================================================
--- branches/1.6/src/unit_types.cpp (original)
+++ branches/1.6/src/unit_types.cpp Sat May 9 20:32:41 2009
@@ -1278,26 +1278,29 @@
DBG_UT << "Building unit type " << ut->first << ", level " << status <<
"\n";
- const config& unit_cfg = find_config(key);
-
switch (status){
- case unit_type::CREATED:
+ case unit_type::CREATED: {
+ const config& unit_cfg = find_config(key);
ut->second.set_config(unit_cfg);
ut->second.build_created(unit_cfg, movement_types_, races_,
unit_traits_);
break;
- case unit_type::HELP_INDEX:
+ }
+ case unit_type::HELP_INDEX: {
//build the stuff that is needed to feed the help index
- if ( (ut->second.build_status() == unit_type::NOT_BUILT) ||
(ut->second.build_status() == unit_type::CREATED) )
+ if ( (ut->second.build_status() == unit_type::NOT_BUILT) ||
(ut->second.build_status() == unit_type::CREATED) ) {
+ const config& unit_cfg = find_config(key);
ut->second.build_help_index(unit_cfg, movement_types_, races_,
unit_traits_);
-
- add_advancefrom(unit_cfg);
+ add_advancefrom(unit_cfg);
+ }
break;
+ }
case unit_type::WITHOUT_ANIMATIONS:
- case unit_type::FULL:
+ case unit_type::FULL: {
if ( (ut->second.build_status() == unit_type::NOT_BUILT) ||
(ut->second.build_status() == unit_type::CREATED) ||
(ut->second.build_status() == unit_type::HELP_INDEX) )
{
+ const config& unit_cfg = find_config(key);
ut->second.build_full(unit_cfg, movement_types_, races_,
unit_traits_);
if ( (ut->second.build_status() == unit_type::NOT_BUILT) ||
@@ -1305,6 +1308,7 @@
add_advancefrom(unit_cfg);
}
break;
+ }
default:
break;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
