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

Move controlling_vehicle to Character class #41805

Merged
merged 1 commit into from
Jul 3, 2020
Merged

Move controlling_vehicle to Character class #41805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/character.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,8 @@ class Character : public Creature, public visitable<Character>
bool in_species( const species_id &spec ) const override;
// Turned to false for simulating NPCs on distant missions so they don't drop all their gear in sight
bool death_drops;
// Is currently in control of a vehicle
bool controlling_vehicle = false;

enum class comfort_level : int {
impossible = -999,
Expand Down
2 changes: 0 additions & 2 deletions src/player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,8 +674,6 @@ class player : public Character

// ---------------VALUES-----------------
tripoint view_offset;
// Is currently in control of a vehicle
bool controlling_vehicle;
// Relative direction of a grab, add to posx, posy to get the coordinates of the grabbed thing.
tripoint grab_point;
int volume;
Expand Down