mirror of
https://github.com/thepigeongenerator/tetris_clone.git
synced 2025-12-17 14:05:45 +01:00
implement new code, and remove deprecated old code. Overal optimisation.
this code is currently broken, but this'll be fixed in a subsequent commit
This commit is contained in:
@@ -5,17 +5,20 @@
|
||||
#include <SDL_error.h>
|
||||
#include <SDL_video.h>
|
||||
#include <assert.h>
|
||||
#include <time.h>
|
||||
|
||||
#include "../error.h"
|
||||
#include "../game/game.h"
|
||||
#include "../game/time.h"
|
||||
#include "audio.h"
|
||||
#include "input.h"
|
||||
#include "render.h"
|
||||
|
||||
static SDL_Window* win = NULL;
|
||||
static bool close = false;
|
||||
static audiodata music;
|
||||
|
||||
void window_init(void) {
|
||||
static void window_init(struct gamedata const* gdat) {
|
||||
assert(!win && !close);
|
||||
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_AUDIO) < 0)
|
||||
fatal(ERROR_SDL_INIT, "SDL could not initialize! SDL Error: %s", SDL_GetError());
|
||||
@@ -24,27 +27,37 @@ void window_init(void) {
|
||||
if (window == NULL)
|
||||
fatal(ERROR_SDL_RENDERING_INIT, "Window failed to be created! SDL Error: %s", SDL_GetError());
|
||||
|
||||
render_init(win);
|
||||
render_init(win, gdat);
|
||||
audio_device_init(32000, AUDIO_S16, 1, 4096);
|
||||
music = audio_wav_load("korobeiniki.wav");
|
||||
}
|
||||
|
||||
static void window_free(void) {
|
||||
assert(win);
|
||||
// render_free();
|
||||
SDL_DestroyWindow(win);
|
||||
win = NULL;
|
||||
close = false;
|
||||
|
||||
audio_wav_unload(&music);
|
||||
audio_device_free();
|
||||
}
|
||||
|
||||
void window_open(struct gamedata const* gdat) {
|
||||
window_init(gdat);
|
||||
|
||||
while (!close) {
|
||||
game_update(input_getdat());
|
||||
render_update();
|
||||
|
||||
static time_t timeout = 0;
|
||||
if (time_poll(time_pull(), music.ms, &timeout))
|
||||
audio_play(&music);
|
||||
}
|
||||
|
||||
window_free();
|
||||
}
|
||||
|
||||
void window_close(void) {
|
||||
close = true;
|
||||
}
|
||||
|
||||
void window_loop(void) {
|
||||
assert(win);
|
||||
|
||||
while (!close) {
|
||||
game_update(input_getdat());
|
||||
render_update();
|
||||
}
|
||||
}
|
||||
|
||||
void window_free(void) {
|
||||
assert(win);
|
||||
render_free();
|
||||
SDL_DestroyWindow(win);
|
||||
win = NULL;
|
||||
close = false;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user