fix the bug with spawned units not getting traits
fix the horrible indentation in unit.cpp
This commit is contained in:
parent
7a29b49153
commit
ec9a77bced
3 changed files with 368 additions and 377 deletions
|
@ -1362,7 +1362,7 @@ bool event_handler::handle_event_command(const queued_event& event_info,
|
|||
wassert(units != NULL);
|
||||
wassert(game_map != NULL);
|
||||
wassert(status_ptr != NULL);
|
||||
unit new_unit(game_data_ptr,units,game_map,status_ptr,teams,cfg.get_parsed_config());
|
||||
unit new_unit(game_data_ptr,units,game_map,status_ptr,teams,cfg.get_parsed_config(),true);
|
||||
preferences::encountered_units().insert(new_unit.id());
|
||||
gamemap::location loc = cfg_to_loc(cfg);
|
||||
|
||||
|
|
741
src/unit.cpp
741
src/unit.cpp
File diff suppressed because it is too large
Load diff
|
@ -69,7 +69,7 @@ public:
|
|||
void set_game_context(const game_data* gamedata, unit_map* unitmap, const gamemap* map, const gamestatus* game_status, const std::vector<team>* teams);
|
||||
|
||||
//! Advances this unit to another type
|
||||
void advance_to(const unit_type* t);
|
||||
void advance_to(const unit_type* t, bool use_traits=false);
|
||||
const std::vector<std::string> advances_to() const { return advances_to_; }
|
||||
|
||||
//! The current type id
|
||||
|
|
Loading…
Add table
Reference in a new issue