From e95b907ba9b70a7fdd9bc08eef58111ab18579aa Mon Sep 17 00:00:00 2001 From: Andrew Kesterson Date: Mon, 4 May 2026 00:18:55 -0400 Subject: [PATCH] Game rebuilds against latest libsdl3game --- Makefile | 4 ++-- assets/characters/littleguy.json | 6 +++--- assets/sprites/little_guy_walking_down.json | 2 +- assets/sprites/little_guy_walking_left.json | 2 +- assets/sprites/little_guy_walking_right.json | 2 +- assets/sprites/little_guy_walking_up.json | 2 +- src/sdl3-gametest.c | 11 +++++------ 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index e8466c8..83bdbaf 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -SDLFLAGS_CC:=$(shell pkg-config sdl3 --cflags) -SDLFLAGS_LD:=$(shell pkg-config sdl3 --libs) $(shell pkg-config sdl3-mixer --libs) $(shell pkg-config sdl3-image --libs) -lasound +SDLFLAGS_CC:=$(shell pkg-config sdl3 --cflags) $(shell pkg-config sdl3-image --cflags) $(shell pkg-config sdl3game --clfags) $(shell pkg-config akerror --cflags) +SDLFLAGS_LD:=$(shell pkg-config sdl3 --libs) $(shell pkg-config sdl3-mixer --libs) $(shell pkg-config sdl3-image --libs) $(shell pkg-config sdl3game --libs) $(shell pkg-config akerror --libs) -lasound CC:=$(shell which gcc) LD:=$(shell which ld) diff --git a/assets/characters/littleguy.json b/assets/characters/littleguy.json index 789687c..5d0e44d 100644 --- a/assets/characters/littleguy.json +++ b/assets/characters/littleguy.json @@ -1,8 +1,8 @@ { "name": "little guy", - "movementspeed": 1, - "velocity_x": 0.02, - "velocity_y": 0.02, + "movementspeed": 30, + "velocity_x": 0.15, + "velocity_y": 0.15, "sprite_mappings": [ { "state": [ diff --git a/assets/sprites/little_guy_walking_down.json b/assets/sprites/little_guy_walking_down.json index 6e13983..e7755d1 100644 --- a/assets/sprites/little_guy_walking_down.json +++ b/assets/sprites/little_guy_walking_down.json @@ -7,7 +7,7 @@ "name": "little guy walking down", "width": 48, "height": 48, - "speed": 1000, + "speed": 300, "loop": true, "loopReverse": true, "frames": [ diff --git a/assets/sprites/little_guy_walking_left.json b/assets/sprites/little_guy_walking_left.json index cccbde1..a7a3d2c 100644 --- a/assets/sprites/little_guy_walking_left.json +++ b/assets/sprites/little_guy_walking_left.json @@ -7,7 +7,7 @@ "name": "little guy walking left", "width": 48, "height": 48, - "speed": 1000, + "speed": 300, "loop": true, "loopReverse": true, "frames": [ diff --git a/assets/sprites/little_guy_walking_right.json b/assets/sprites/little_guy_walking_right.json index ff575c4..1640bb7 100644 --- a/assets/sprites/little_guy_walking_right.json +++ b/assets/sprites/little_guy_walking_right.json @@ -7,7 +7,7 @@ "name": "little guy walking right", "width": 48, "height": 48, - "speed": 1000, + "speed": 300, "loop": true, "loopReverse": true, "frames": [ diff --git a/assets/sprites/little_guy_walking_up.json b/assets/sprites/little_guy_walking_up.json index db9d9fb..6f857e4 100644 --- a/assets/sprites/little_guy_walking_up.json +++ b/assets/sprites/little_guy_walking_up.json @@ -7,7 +7,7 @@ "name": "little guy walking up", "width": 48, "height": 48, - "speed": 1000, + "speed": 300, "loop": true, "loopReverse": true, "frames": [ diff --git a/src/sdl3-gametest.c b/src/sdl3-gametest.c index 0f45cd4..679cd1d 100644 --- a/src/sdl3-gametest.c +++ b/src/sdl3-gametest.c @@ -5,7 +5,6 @@ #include #include -#include #include #include #include @@ -31,7 +30,7 @@ char *spritepaths[] = { char dirnamebuf[1024]; -ErrorContext ERROR_NOIGNORE *user_breakpoint(actor *obj, SDL_Event *event) +akerr_ErrorContext AKERR_NOIGNORE *user_breakpoint(actor *obj, SDL_Event *event) { PREPARE_ERROR(errctx); SDL_Log("User breakpoint hit"); @@ -45,7 +44,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[]) *appstate = (void *)&game.state; PREPARE_ERROR(errctx); ATTEMPT { - FAIL_ZERO_BREAK(errctx, appstate, ERR_NULLPOINTER, "NULL appstate pointer"); + FAIL_ZERO_BREAK(errctx, appstate, AKERR_NULLPOINTER, "NULL appstate pointer"); strcpy((char *)&game.name, "sdl3-gametest"); strcpy((char *)&game.version, "0.0.1"); @@ -67,7 +66,7 @@ SDL_AppResult SDL_AppInit(void **appstate, int argc, char *argv[]) REGISTRY_CHARACTER, "little guy", NULL); - FAIL_ZERO_BREAK(errctx, actorptr->basechar, ERR_REGISTRY, "Can't load character 'little guy' from the registry"); + FAIL_ZERO_BREAK(errctx, actorptr->basechar, AKERR_REGISTRY, "Can't load character 'little guy' from the registry"); actorptr->movement_controls_face = false; actorptr->state = (ACTOR_STATE_ALIVE | ACTOR_STATE_FACE_LEFT); actorptr->x = 320; @@ -134,8 +133,8 @@ SDL_AppResult SDL_AppEvent(void *appstate, SDL_Event *event) PREPARE_ERROR(errctx); ATTEMPT { - FAIL_ZERO_BREAK(errctx, appstate, ERR_NULLPOINTER, "NULL appstate pointer"); - FAIL_ZERO_BREAK(errctx, event, ERR_NULLPOINTER, "NULL event pointer"); + FAIL_ZERO_BREAK(errctx, appstate, AKERR_NULLPOINTER, "NULL appstate pointer"); + FAIL_ZERO_BREAK(errctx, event, AKERR_NULLPOINTER, "NULL event pointer"); CATCH(errctx, controller_handle_event(appstate, event)); if (event->type == SDL_EVENT_QUIT) {