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.

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

Add: Draw rotor in cursor when dragging helicopters. #9612

Merged
merged 1 commit into from Oct 22, 2021

Conversation

@J0anJosep
Copy link
Contributor

@J0anJosep J0anJosep commented Oct 16, 2021

Motivation / Problem

When dragging helicopters, rotors are not drawn in cursor, resulting in an incomplete image of the vehicle being dragged.

Description

Helicopters are fully drawn as cursors, including their rotors.

Limitations

Checklist for review

Some things are not automated, and forgotten often. This list is a reminder for the reviewers.

  • The bug fix is important enough to be backported? (label: 'backport requested')
  • This PR touches english.txt or translations? Check the guidelines
  • This PR affects the save game format? (label 'savegame upgrade')
  • This PR affects the GS/AI API? (label 'needs review: Script API')
    • ai_changelog.hpp, gs_changelog.hpp need updating.
    • The compatibility wrappers (compat_*.nut) need updating.
  • This PR affects the NewGRF API? (label 'needs review: NewGRF')
src/vehicle_gui.cpp Outdated Show resolved Hide resolved
v->GetImage(rtl ? DIR_E : DIR_W, image_type, &seq);

if (rotor_seq) {
GetCustomRotorIcon(v->engine_type, image_type, &seq);
Copy link
Member

@frosch123 frosch123 Oct 21, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this needs to use GetCustomRotorSprite:

Suggested change
GetCustomRotorIcon(v->engine_type, image_type, &seq);
GetCustomRotorSprite(v, true, image_type, &seq);

Otherwise it does not depend on vehicle refitting, company colors, ...

@frosch123 frosch123 merged commit b2e83b4 into OpenTTD:master Oct 22, 2021
16 checks passed
@J0anJosep J0anJosep deleted the DrawRotorIcon branch Nov 22, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

4 participants