aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorXavier Del Campo Romero <xavi.dcr@tutanota.com>2022-05-24 22:08:18 +0200
committerXavier Del Campo Romero <xavi.dcr@tutanota.com>2022-05-24 22:20:04 +0200
commitd07b682c9b283216d4c2d1f046483b165958d929 (patch)
tree53ca549248e4239da55af3a5aa451125c98f4d1c /src
parentf34113de515522dd76709403be5015698c6fbd29 (diff)
downloadjancity-d07b682c9b283216d4c2d1f046483b165958d929.tar.gz
Make gfx_draw return int
Diffstat (limited to 'src')
-rw-r--r--src/game/src/game.c4
-rw-r--r--src/gfx/inc/gfx.h2
-rw-r--r--src/gfx/ps1/src/sort.c3
-rw-r--r--src/gfx/sdl-1.2/src/env.c6
4 files changed, 11 insertions, 4 deletions
diff --git a/src/game/src/game.c b/src/game/src/game.c
index e1a316e..dede611 100644
--- a/src/game/src/game.c
+++ b/src/game/src/game.c
@@ -94,7 +94,9 @@ int game(void)
}
instance_cyclic();
- gfx_draw();
+
+ if (gfx_draw())
+ goto end;
}
ret = 0;
diff --git a/src/gfx/inc/gfx.h b/src/gfx/inc/gfx.h
index 32c65a6..686839a 100644
--- a/src/gfx/inc/gfx.h
+++ b/src/gfx/inc/gfx.h
@@ -11,7 +11,7 @@ extern "C"
#endif
int gfx_init(void);
-void gfx_draw(void);
+int gfx_draw(void);
int gfx_toggle_fullscreen(void);
void sprite_sort(struct sprite *s);
int sprite_clone(const struct sprite *src, struct sprite *dst);
diff --git a/src/gfx/ps1/src/sort.c b/src/gfx/ps1/src/sort.c
index 1c61d12..3f2314a 100644
--- a/src/gfx/ps1/src/sort.c
+++ b/src/gfx/ps1/src/sort.c
@@ -55,7 +55,7 @@ static void gfx_sync(void)
vblank_set = false;
}
-void gfx_draw(void)
+int gfx_draw(void)
{
static union gfx_sznext term = {.cmd_next = 0xffffff};
@@ -71,4 +71,5 @@ void gfx_draw(void)
D2_BCR = 0;
D2_CHCR = (1 << 0xa) | 1 | (1 << 0x18);
first = NULL;
+ return 0;
}
diff --git a/src/gfx/sdl-1.2/src/env.c b/src/gfx/sdl-1.2/src/env.c
index 18cfe95..07bc25d 100644
--- a/src/gfx/sdl-1.2/src/env.c
+++ b/src/gfx/sdl-1.2/src/env.c
@@ -158,7 +158,7 @@ int gfx_toggle_fullscreen(void)
return 0;
}
-void gfx_draw(void)
+int gfx_draw(void)
{
enum {FPS = 50, REFRESH_MS = 1000 / FPS};
static Uint32 prev;
@@ -170,7 +170,11 @@ void gfx_draw(void)
prev = SDL_GetTicks();
if (SDL_Flip(screen))
+ {
fprintf(stderr, "SDL_Flip: %s\n", SDL_GetError());
+ return -1;
+ }
get_resize_events();
+ return 0;
}