Removed accidental double window init

This commit is contained in:
Warwick 2025-11-28 14:39:27 +00:00
parent 3e1bdccf75
commit e1249ec669
2 changed files with 6 additions and 6 deletions

View file

@ -60,7 +60,7 @@ int main(int argc, char *argv[]) {
Arena *global_arena = arena_init(NULL, 0); Arena *global_arena = arena_init(NULL, 0);
wn_window *window = wn_window_init(global_arena); wn_window *window = wn_window_init(global_arena);
if (wn_window_init(global_arena) == NULL) { if (window == NULL) {
SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize wn_window"); SDL_LogError(SDL_LOG_CATEGORY_APPLICATION, "Couldn't initialize wn_window");
return EXIT_FAILURE; return EXIT_FAILURE;
} }

View file

@ -7,6 +7,8 @@
wn_window *wn_window_init(Arena *arena) { wn_window *wn_window_init(Arena *arena) {
wn_window *window = arena_alloc(arena, sizeof(wn_window)); wn_window *window = arena_alloc(arena, sizeof(wn_window));
*window = (wn_window){0};
window->window = SDL_CreateWindow("Hello SDL3", 320, 240, window->window = SDL_CreateWindow("Hello SDL3", 320, 240,
SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE); SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
if (!SDL_Init(SDL_INIT_VIDEO)) { if (!SDL_Init(SDL_INIT_VIDEO)) {
@ -50,11 +52,9 @@ wn_window *wn_window_init(Arena *arena) {
SDL_GetRelativeMouseState(NULL, NULL); SDL_GetRelativeMouseState(NULL, NULL);
// add deinit function to arena deinit stack // add deinit function to arena deinit stack
ArenaDeinitTask deinitTask = (ArenaDeinitTask){.func_param = (void *)window, arena_deinit_task_push(arena, (ArenaDeinitTask){.func_param = (void *)window,
.func_ptr = *wn_window_deinit, .func_ptr = *wn_window_deinit,
.next = NULL}; .next = NULL});
arena_deinit_task_push(arena, deinitTask);
return window; return window;
} }