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

Jump to bottom

Move controlling_vehicle to Character class #41805

Merged
merged 1 commit into from
Jul 3, 2020
Merged

Move controlling_vehicle to Character class #41805

merged 1 commit into from
Jul 3, 2020

Conversation

ZhilkinSerg
Copy link
Contributor

Summary

SUMMARY: None

Purpose of change

Fix Android builds.
Follow-up after #41793

Describe the solution

Move controlling_vehicle to Character class

Testing

  1. Game compiles and runs.
  2. Your character can still drive a car.

Additional context

https://ci.narc.ro/job/Cataclysm-Android/10780/console

Also helps #34721

@ZhilkinSerg ZhilkinSerg added Vehicles Vehicles, parts, mechanics & interactions [C++] Changes (can be) made in C++. Previously named `Code` OS: Android Issues related to Android operating system Mechanics: Character / Player Character / Player mechanics labels Jul 3, 2020
@kevingranade kevingranade merged commit 15a3748 into CleverRaven:master Jul 3, 2020
@ZhilkinSerg ZhilkinSerg deleted the fix-android-2020-07-03 branch July 3, 2020 18:58
@olanti-p olanti-p mentioned this pull request Nov 23, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
[C++] Changes (can be) made in C++. Previously named `Code` Mechanics: Character / Player Character / Player mechanics OS: Android Issues related to Android operating system Vehicles Vehicles, parts, mechanics & interactions
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@ZhilkinSerg @kevingranade