diff options
| author | Aldrik Ramaekers <aldrik@amftech.nl> | 2023-12-26 19:15:46 +0100 |
|---|---|---|
| committer | Aldrik Ramaekers <aldrik@amftech.nl> | 2023-12-26 19:15:46 +0100 |
| commit | 67cec2bf936f0274b61bb803b0baca3ffdb488fc (patch) | |
| tree | 584ebb61bcfca9fc24984bea348eca23a4039722 /src | |
| parent | d018848939d1101df21515cb81f611f23c119d10 (diff) | |
fix bug
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset_defs.c | 5 | ||||
| -rw-r--r-- | src/players.c | 10 |
2 files changed, 8 insertions, 7 deletions
diff --git a/src/asset_defs.c b/src/asset_defs.c index bca99f4..ae389ff 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -30,7 +30,7 @@ void load_assets() { img_disconnected = assets_load_image_from_file("data/imgs/icons/disconnected.png"); img_icon_grenade = assets_load_image_from_file("data/imgs/icons/grenade.png"); img_icon_molotov = assets_load_image_from_file("data/imgs/icons/molotov.png"); - img_test = assets_load_image_from_file("data/imgs/players/body.png"); + // Throwables img_grenade = assets_load_image_from_file("data/imgs/throwables/grenade.png"); @@ -76,11 +76,12 @@ void load_assets() { for (int i = 1; i <= NUM_SCREECHES; i++) { char path[100]; sprintf(path, "data/sounds/screech%d.wav", i); - wav_screech[i] = Mix_LoadWAV(path); + wav_screech[i-1] = Mix_LoadWAV(path); } // music music_inside1 = Mix_LoadMUS("data/sounds/music_inside1.mp3"); + } font* get_font(platform_window* window, float scale) { diff --git a/src/players.c b/src/players.c index c4f2c61..6bdac1d 100644 --- a/src/players.c +++ b/src/players.c @@ -279,8 +279,8 @@ void take_player_input(platform_window* window) { dirx /= length; diry /= length; - float gun_offset_x = (get_player_size_in_tile()/2) + (dirx/4); - float gun_offset_y = (get_player_size_in_tile()/2) + (diry/4); + float gun_offset_x = (get_player_size_in_tile()/2) + (dirx); + float gun_offset_y = (get_player_size_in_tile()/2) + (diry); add_message_to_outgoing_queuex(create_protocol_user_look(player_id, gun_offset_x, gun_offset_y, dirx, diry), *global_state.client); } @@ -466,15 +466,15 @@ void draw_player(platform_window* window, player* p, int index) { // Body { - sprite_frame frame = sprite_get_frame(img_test, &p->sprite); - renderer->render_image_quad_partial(img_test, + sprite_frame frame = sprite_get_frame(img_body, &p->sprite); + renderer->render_image_quad_partial(img_body, player_render_x, player_render_y, player_render_x, player_render_y + size, player_render_x + size, player_render_y + size, player_render_x + size, player_render_y, frame.tl, frame.tr, frame.bl, frame.br); - renderer->render_image_quad_partial_tint(img_test, + renderer->render_image_quad_partial_tint(img_body, player_render_x, player_render_y, player_render_x, player_render_y + size, player_render_x + size, player_render_y + size, |