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

Maniacs Feature - Add .relative & .centered support on PixelPanScreen #3302

Merged
merged 1 commit into from
Nov 24, 2024
Merged

Maniacs Feature - Add .relative & .centered support on PixelPanScreen #3302

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
8 changes: 6 additions & 2 deletions src/game_player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,8 +811,12 @@ void Game_Player::StartPixelPan(int h, int v, int speed, bool interpolated, bool
int new_pan_x;
int new_pan_y;

// FIXME: Fails when relative and centered are used in combination
if (relative) {
if (relative && centered) {
int screen_width = static_cast<int>(std::ceil(static_cast<float>(Player::screen_width) / 2)) * TILE_SIZE;
int screen_height = static_cast<int>(std::ceil(static_cast<float>(Player::screen_height) / 2)) * TILE_SIZE;
new_pan_x = data()->pan_finish_x - (h - screen_width) * 0.5;
new_pan_y = data()->pan_finish_y - (v - screen_height) * 0.5;
} else if (relative) {
new_pan_x = data()->pan_finish_x - h;
new_pan_y = data()->pan_finish_y - v;
} else if (centered) {
Expand Down
Loading