Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Destroyed cargo part fix #10746

Merged
merged 3 commits into from
Jan 6, 2015
Merged

Destroyed cargo part fix #10746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d4d99d
Remove items from destroyed vehicle parts properly.
kevingranade Jan 5, 2015
d060291
Misc style fixes.
kevingranade Jan 5, 2015
4b6d466
Use the safe check for active item presence in process_items_in_vehic…
kevingranade Jan 5, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/item_stack.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ class item_stack {
virtual bool empty() const = 0;
virtual std::list<item>::iterator erase( std::list<item>::iterator it ) = 0;
virtual void push_back( const item &newitem ) = 0;
virtual void insert_at( std::list<item>::iterator,
const item &newitem ) = 0;
virtual void insert_at( std::list<item>::iterator, const item &newitem ) = 0;
virtual item &front() = 0;
virtual item &operator[]( size_t index ) = 0;
};
Expand Down
2 changes: 1 addition & 1 deletion src/map.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3168,7 +3168,7 @@ void map::process_items_in_vehicle( vehicle *cur_veh, submap *const current_subm
std::vector<int> cargo_parts = cur_veh->all_parts_with_feature(VPFLAG_CARGO, true);
auto active_items = cur_veh->active_items.get();
for( auto &active_item : active_items ) {
if( !cur_veh->active_items.has( active_item.item_iterator, active_item.location ) ) {
if( !cur_veh->active_items.has( active_item ) ) {
continue;
}

Expand Down
54 changes: 29 additions & 25 deletions src/vehicle.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ bool vehicle::remote_controlled (player *p)
return true;
}
}

add_msg(m_bad, _("Lost connection with the vehicle due to distance!"));
g->setremoteveh( nullptr );
return false;
Expand Down Expand Up @@ -378,7 +378,7 @@ void vehicle::init_state(int init_veh_fuel, int init_veh_status)
if( one_in(16) ) {
dome_lights_on = true;
}

// aisle lights being on would be common for the vehicles they are in (vans, RVs, 18-wheelers, etc)
if( one_in(8) ) {
aisle_lights_on = true;
Expand Down Expand Up @@ -586,7 +586,7 @@ void vehicle::control_doors() {
pmenu.callback = &callback;
pmenu.w_y = 0; // Move the menu so that we can see our vehicle
pmenu.query();

if( pmenu.ret >= 0 && pmenu.ret < (int)doors_with_motors.size() ) {
int part = doors_with_motors[pmenu.ret];
open_or_close( part, !(parts[part].open) );
Expand Down Expand Up @@ -621,7 +621,7 @@ void vehicle::control_engines() {
if( velocity > safe_vel ) {
cruise_velocity = safe_vel;
}

//if an engine isn't running, and player is in control, need to start engine.
if (g->u.controlling_vehicle && !engine_on) {
start_engine();
Expand All @@ -634,9 +634,8 @@ int vehicle::select_engine() {
tmenu.text = _("Toggle which?");
for( size_t e = 0; e < engines.size(); ++e ) {
name = part_info(engines[e]).name;
tmenu.addentry(e, true, -1, "[%s] %s",
((parts[engines[e]].enabled) ? "x" : " ") , name.c_str());

tmenu.addentry( e, true, -1, "[%s] %s",
((parts[engines[e]].enabled) ? "x" : " ") , name.c_str() );
}

tmenu.addentry(-1, true, 'q', _("Finish"));
Expand All @@ -645,7 +644,7 @@ int vehicle::select_engine() {
}

void vehicle::toggle_specific_engine(int e,bool on) {
toggle_specific_part(engines[e],on);
toggle_specific_part( engines[e], on );
}
void vehicle::toggle_specific_part(int p,bool on) {
parts[p].enabled = on;
Expand All @@ -655,18 +654,18 @@ bool vehicle::is_engine_type_on(int e, const ammotype & ft) {
}

bool vehicle::has_engine_type(const ammotype & ft, bool enabled) {
for (size_t e=0; e<engines.size(); ++e) {
if (is_engine_type(e, ft) &&
(!enabled || is_engine_on(e)))
return true;
for( size_t e = 0; e < engines.size(); ++e ) {
if( is_engine_type(e, ft) && (!enabled || is_engine_on(e)) ) {
return true;
}
}
return false;
}
bool vehicle::has_engine_type_not(const ammotype & ft, bool enabled) {
for (size_t e=0; e<engines.size(); ++e) {
if (!is_engine_type(e, ft) &&
(!enabled || is_engine_on(e)))
return true;
for( size_t e = 0; e < engines.size(); ++e ) {
if( !is_engine_type(e, ft) && (!enabled || is_engine_on(e)) ) {
return true;
}
}
return false;
}
Expand Down Expand Up @@ -707,7 +706,7 @@ bool vehicle::is_active_engine_at(int x,int y) {
}

bool vehicle::is_alternator_on(int a) {
return (parts[alternators[a]].hp > 0) && is_active_engine_at(
return (parts[alternators[a]].hp > 0) && is_active_engine_at(
parts[alternators[a]].mount.x, parts[alternators[a]].mount.y );
}
bool vehicle::has_security_working(){
Expand Down Expand Up @@ -1908,14 +1907,14 @@ bool vehicle::remove_part (int p)
// Update current engine configuration if needed
if(part_flag(p, "ENGINE") && engines.size() > 1){
bool any_engine_on = false;

for(auto &e : engines) {
if(e != p && is_part_on(e)) {
any_engine_on = true;
break;
}
}

if(!any_engine_on) {
engine_on = false;
for(auto &e : engines) {
Expand Down Expand Up @@ -1951,6 +1950,10 @@ void vehicle::part_removal_cleanup() {
bool changed = false;
for (std::vector<vehicle_part>::iterator it = parts.begin(); it != parts.end(); /* noop */) {
if ((*it).removed) {
auto items = get_items( std::distance( parts.begin(), it ) );
while( !items.empty() ) {
items.erase( items.begin() );
}
it = parts.erase(it);
changed = true;
}
Expand Down Expand Up @@ -4345,8 +4348,8 @@ vehicle_stack vehicle::get_items( int part )

void vehicle::place_spawn_items()
{
for(std::vector<vehicle_item_spawn>::iterator next_spawn = item_spawns.begin();
next_spawn != item_spawns.end(); next_spawn++) {
for( std::vector<vehicle_item_spawn>::iterator next_spawn = item_spawns.begin();
next_spawn != item_spawns.end(); next_spawn++ ) {
if(rng(1, 100) <= next_spawn->chance) {
//Find the cargo part in that square
int part = part_at(next_spawn->x, next_spawn->y);
Expand Down Expand Up @@ -4405,8 +4408,9 @@ void vehicle::gain_moves()
of_turn_carry = 0;

// cruise control TODO: enable for NPC?
if (player_in_control(&g->u) && cruise_on && cruise_velocity != velocity )
thrust (cruise_velocity > velocity? 1 : -1);
if( player_in_control(&g->u) && cruise_on && cruise_velocity != velocity ) {
thrust( (cruise_velocity) > velocity ? 1 : -1 );
}

// Force off-map vehicles to load by visiting them every time we gain moves.
// Shouldn't be too expensive if there aren't fifty trillion vehicles in the graph...
Expand Down Expand Up @@ -5159,7 +5163,7 @@ bool vehicle::fire_turret (int p, bool /* burst */ )
charge_mult *= 10; // 1 unit of hydrogen adds 10 units to hydro tank
}
if( liquid_fuel < charges * charge_mult ) {
charges = liquid_fuel / charge_mult;
charges = liquid_fuel / charge_mult;
}
if( liquid_fuel < 1 || charges < 1 ) {
return false;
Expand Down Expand Up @@ -5220,7 +5224,7 @@ int aoe_size( std::set< std::string > tags )
tags.count( "FLAME" ) ) {
return 1;
}

return 0;
}

Expand Down