diff --git a/semestralka1/src/render/loop.cpp b/semestralka1/src/render/loop.cpp index de16ff6..76e5f91 100644 --- a/semestralka1/src/render/loop.cpp +++ b/semestralka1/src/render/loop.cpp @@ -25,6 +25,11 @@ struct WalkingState { Timer state_timer; }; +struct PlayerPosition { + int x; + int y; +}; + static char rx_buffer[BUFFER_SIZE]; static char message[BUFFER_SIZE]; static bool message_active = false; @@ -128,6 +133,8 @@ void render_loop(int speed) { anim_timer.start(); int shift = 0; + PlayerPosition pos = {9, 3}; + const char *bg_file = "background_dark_inverted.txt"; bool need_redraw = false; @@ -155,7 +162,7 @@ void render_loop(int speed) { if (need_redraw) { draw_mask(bg_file, shift, message_active ? message : nullptr); int player_frame = get_player_frame(player_state.current_state); - draw_player(PLAYER_X, PLAYER_Y, player_frame); + draw_player(pos.x, pos.y, player_frame); // alternate between frame 0 and 1 when not crawling if (player_state.current_state != PlayerState::Crawl1) { diff --git a/semestralka1/src/render/player.cpp b/semestralka1/src/render/player.cpp index 3913dc3..8f779bc 100644 --- a/semestralka1/src/render/player.cpp +++ b/semestralka1/src/render/player.cpp @@ -4,9 +4,9 @@ #include "player_mask.h" #include -void draw_player(int view_width, int view_height, int frame_index) { +void draw_player(int x, int y, int frame_index) { if (frame_index < 0 || frame_index >= PLAYER_FRAME_COUNT) - frame_index = 0; // fallback + frame_index = 0; // fallback safety const char **sprite = PLAYER_FRAMES[frame_index]; int sprite_height = 0; @@ -17,19 +17,9 @@ void draw_player(int view_width, int view_height, int frame_index) { else sprite_height = PLAYER_MASK_LINES_FRAME_3; - // Width from first line - int sprite_width = 0; - if (sprite_height > 0) { - const char *first_line = sprite[0]; - while (first_line[sprite_width] != '\0') - sprite_width++; - } - - int center_x = view_width / 2 - sprite_width / 2; - int center_y = view_height / 2 - sprite_height / 2; - + // Draw the sprite starting from (x, y) for (int i = 0; i < sprite_height; i++) { - printf("\033[%d;%dH%s", center_y + i + 1, center_x + 1, sprite[i]); + printf("\033[%d;%dH%s", y + i + 1, x + 1, sprite[i]); } fflush(stdout); } diff --git a/semestralka1/src/render/player.h b/semestralka1/src/render/player.h index 85c8686..4201ca2 100644 --- a/semestralka1/src/render/player.h +++ b/semestralka1/src/render/player.h @@ -1,5 +1,5 @@ // src/render/player.h #pragma once -// Draw the player object centered over the background -void draw_player(int view_width, int view_height, int frame_index); +// Draw the player object starting at given (x, y) +void draw_player(int x, int y, int frame_index);