filipriec/pvs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some renames, nothing much

Browse Source
This commit is contained in:
Priec
2025-11-14 19:39:19 +01:00
parent b9ca8df59b
commit 4ed4452fae
6 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
semestralka1/src/render/loop.cpp
View File

@@ -19,6 +19,7 @@ constexpr auto MESSAGE_DISPLAY_DURATION = 1s;
constexpr int PLAYER_X = 9;
constexpr int PLAYER_Y = 6;
// PlayerState is what user pressed. We are mapping CharacterState to it
enum class PlayerState { Walk1, Walk2, Crawl1 };
struct WalkingState {
@@ -86,16 +87,16 @@ static bool update_animation(Timer &anim_timer, int &shift, int speed) {
return false;
}
static PlayerFrame get_player_frame(PlayerState state) {
static CharacterFrame get_character_frame(PlayerState state) {
switch (state) {
case PlayerState::Walk1:
return PlayerFrame::Walk1;
return CharacterFrame::Walk1;
case PlayerState::Walk2:
return PlayerFrame::Walk2;
return CharacterFrame::Walk2;
case PlayerState::Crawl1:
return PlayerFrame::Crawl1;
return CharacterFrame::Crawl1;
default:
return PlayerFrame::Walk1;
return CharacterFrame::Walk1;
}
}
@@ -129,7 +130,7 @@ void render_loop(int speed) {
anim_timer.start();
int shift = 0;
PlayerPosition pos = {PLAYER_X, PLAYER_Y};
CharacterPosition pos = {PLAYER_X, PLAYER_Y};
const char *bg_file = "background_dark_inverted.txt";
bool need_redraw = false;
@@ -157,9 +158,9 @@ void render_loop(int speed) {
if (need_redraw) {
draw_mask(bg_file, shift, message_active ? message : nullptr);
PlayerFrame player_frame = get_player_frame(player_state.current_state);
PlayerPosition draw_pos = get_aligned_frame_position(pos, player_frame);
draw_player(draw_pos.x, draw_pos.y, player_frame);
CharacterFrame player_frame = get_character_frame(player_state.current_state);
CharacterPosition draw_pos = get_aligned_frame_position(pos, player_frame);
draw_character(draw_pos.x, draw_pos.y, player_frame);
// alternate between frame 0 and 1 when not crawling
if (player_state.current_state != PlayerState::Crawl1) {