diff options
| author |   Andrew Opalach <andrew@akon.city>
| 2019-11-01 23:27:46 -0400 |
|---|---|---|
| committer | Andrew Opalach <andrew@akon.city>
| 2019-11-01 23:27:46 -0400 |
| commit | 7b78101297834ee591c7a02284d57adbd876bc70 (patch) | |
| tree | 1ab288e7aa518aca88e1b0f1c023535690dd4fde /frontends/gl | |
| parent | e7b0e9ae398f891abfdf44e43deffb1cdf12c50b (diff) | |
| download | cetris-7b78101297834ee591c7a02284d57adbd876bc70.tar.gz cetris-7b78101297834ee591c7a02284d57adbd876bc70.tar.bz2 cetris-7b78101297834ee591c7a02284d57adbd876bc70.zip | |
move das sound
Diffstat (limited to 'frontends/gl')
| -rw-r--r-- | frontends/gl/audio.c | 2 | ||||
| -rw-r--r-- | frontends/gl/audio.h | 1 | ||||
| -rw-r--r-- | frontends/gl/main.c | 7 | ||||
| -rw-r--r-- | frontends/gl/skin.c | 4 | ||||
| -rw-r--r-- | frontends/gl/ui.h | 1 |
5 files changed, 7 insertions, 8 deletions
diff --git a/frontends/gl/audio.c b/frontends/gl/audio.c index 1e194a2..2adbd09 100644 --- a/frontends/gl/audio.c +++ b/frontends/gl/audio.c @@ -4,9 +4,9 @@ #define format_str snprintf #endif -#include <SDL.h> #include <SDL_mixer.h> +#include <stdio.h> #include "audio.h" void load_multiple_audio(char* name, char* dir_name, int *count, Mix_Chunk** list) { diff --git a/frontends/gl/audio.h b/frontends/gl/audio.h index aef8f9d..11c6098 100644 --- a/frontends/gl/audio.h +++ b/frontends/gl/audio.h @@ -6,7 +6,6 @@ #define format_str snprintf #endif -#include <SDL.h> #include <SDL_mixer.h> void load_multiple_audio(char* name, char* dir_name, int *count, Mix_Chunk** list); diff --git a/frontends/gl/main.c b/frontends/gl/main.c index 0dfd2a2..7c3d163 100644 --- a/frontends/gl/main.c +++ b/frontends/gl/main.c @@ -128,11 +128,10 @@ void handle_game_events(cetris_ui *ui, tetris_board_t *board) { Mix_PlayChannel( 1, board->skin.tetris_sound[0], 0 ); board->game.tetris_event--; } - if (board->game.move_event > 0) { - Mix_HaltChannel(0); - Mix_PlayChannel( 0, board->skin.move_sound, 0 ); - board->game.move_event = 0; + //int index = rand() % ui->skin.tetris_sound_count; + Mix_PlayChannel( 0, board->skin.move_sound, 0); + board->game.move_event--; } } diff --git a/frontends/gl/skin.c b/frontends/gl/skin.c index c83d57b..e54b372 100644 --- a/frontends/gl/skin.c +++ b/frontends/gl/skin.c @@ -9,6 +9,8 @@ #include <stdio.h> #include <sys/stat.h> +#include <SDL_mixer.h> + #ifdef _WIN32 #define format_str sprintf_s #else @@ -64,6 +66,6 @@ void load_skin(char* name, cetris_skin_t* skin) { format_str(file, 125, "%s/lock.wav", dir_name); skin->lock_sound = Mix_LoadWAV(file); - format_str(file, 125, "%s/move.wav", dir_name); + format_str(file, 125, "%s/move_das.wav", dir_name); skin->move_sound = Mix_LoadWAV(file); } diff --git a/frontends/gl/ui.h b/frontends/gl/ui.h index 8ffca95..8a6f2c6 100644 --- a/frontends/gl/ui.h +++ b/frontends/gl/ui.h @@ -50,7 +50,6 @@ typedef struct { tetris_board_t board; GLuint shader_program; - } cetris_ui; void draw_tetris_board(cetris_ui *ui); |