diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | build/data/sounds/reload_mp5.wav | bin | 0 -> 98638 bytes | |||
| -rw-r--r-- | build/zombies.exe | bin | 1976258 -> 1976257 bytes | |||
| -rw-r--r-- | data/sounds/reload_mp5.wav | bin | 0 -> 98638 bytes | |||
| -rw-r--r-- | include/asset_defs.h | 1 | ||||
| -rw-r--r-- | src/asset_defs.c | 1 | ||||
| -rw-r--r-- | src/bullets.c | 1 | ||||
| -rw-r--r-- | src/game.c | 3 |
8 files changed, 6 insertions, 1 deletions
@@ -3,5 +3,6 @@ main: mkdir -p "build/" cp -a "data/." "build/data" gcc -m64 -g -DMODE_DEBUG main.c -o build/zombies.exe -lSDL2_mixer -lSDL2 + # cp -a "build/." "C:/Manually installed programs/zombieshooter" ./build/zombies.exe -ip 127.0.0.1 -port 27015 diff --git a/build/data/sounds/reload_mp5.wav b/build/data/sounds/reload_mp5.wav Binary files differnew file mode 100644 index 0000000..d9accf0 --- /dev/null +++ b/build/data/sounds/reload_mp5.wav diff --git a/build/zombies.exe b/build/zombies.exe Binary files differindex 8f92f23..d3279d9 100644 --- a/build/zombies.exe +++ b/build/zombies.exe diff --git a/data/sounds/reload_mp5.wav b/data/sounds/reload_mp5.wav Binary files differnew file mode 100644 index 0000000..d9accf0 --- /dev/null +++ b/data/sounds/reload_mp5.wav diff --git a/include/asset_defs.h b/include/asset_defs.h index 623c54d..27c31e4 100644 --- a/include/asset_defs.h +++ b/include/asset_defs.h @@ -37,6 +37,7 @@ image* img_tile_grass1; // Sounds Mix_Chunk* wav_throwable_bounce; Mix_Chunk* wav_shoot_mp5; +Mix_Chunk* wav_reload_mp5; void load_assets(); diff --git a/src/asset_defs.c b/src/asset_defs.c index bc3919c..88e6616 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -35,4 +35,5 @@ void load_assets() { // sounds wav_throwable_bounce = Mix_LoadWAV("data/sounds/throwable_bounce.wav"); wav_shoot_mp5 = Mix_LoadWAV("data/sounds/shoot_mp5.wav"); + wav_reload_mp5 = Mix_LoadWAV("data/sounds/reload_mp5.wav"); }
\ No newline at end of file diff --git a/src/bullets.c b/src/bullets.c index 47171bb..d1c8d97 100644 --- a/src/bullets.c +++ b/src/bullets.c @@ -21,6 +21,7 @@ void shoot(platform_window* window, u32 id, float dirx, float diry) { if (bullets_to_shoot > p->ammo_in_mag) bullets_to_shoot = p->ammo_in_mag; p->ammo_in_mag -= bullets_to_shoot; if (p->ammo_in_mag == 0) { + play_positioned_sound(CHANNEL_SHOOTING, wav_reload_mp5, (vec3f){.x = p->playerx, .y = p->playery, .z = p->height}, 10); p->interact_state = INTERACT_RELOADING; p->sec_since_interact_state_change = 0; return; @@ -190,8 +190,9 @@ void update_server(platform_window* window) { broadcast_zombies = platform_get_time(TIME_FULL, TIME_NS) - broadcast_zombies; update_throwables_server(window); - broadcast_stamp = platform_get_time(TIME_FULL, TIME_NS); + + broadcast_stamp = platform_get_time(TIME_FULL, TIME_NS); broadcast_to_clients(create_protocol_user_list()); broadcast_to_clients(create_protocol_zombie_list()); broadcast_to_clients(create_protocol_bullets_list()); |