oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

timer_t conflict -> gtimer_t

Browse source
This commit is contained in:
p.kosyh 2009-10-25 07:09:02 +00:00
parent 9c4f8a1f67
commit 4c899b89cf
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/sdl-instead/game.c
View file

@ -464,7 +464,7 @@ int game_change_hz(int hz)
unsigned int timer_counter = 0;
timer_t timer_han = NULL;
gtimer_t timer_han = NULL;
static void anigif_do(void *data)
{

6
src/sdl-instead/graphics.c
View file

@ -2546,12 +2546,12 @@ void gfx_done(void)
SDL_Quit();
}
timer_t gfx_add_timer(int delay, int (*fn)(int, void*), void *aux)
gtimer_t gfx_add_timer(int delay, int (*fn)(int, void*), void *aux)
{
return (timer_t)SDL_AddTimer(delay, (SDL_NewTimerCallback)fn, aux);
return (gtimer_t)SDL_AddTimer(delay, (SDL_NewTimerCallback)fn, aux);
}
void gfx_del_timer(timer_t han)
void gfx_del_timer(gtimer_t han)
{
if (han)
SDL_RemoveTimer((SDL_TimerID)han);

6
src/sdl-instead/graphics.h
View file

@ -1,6 +1,6 @@
#ifndef __GRAPHICS_H__
#define __GRAPHICS_H__
typedef void* timer_t;
typedef void* gtimer_t;
typedef void* img_t;
typedef void* fnt_t;
typedef void* layout_t;
@ -129,8 +129,8 @@ extern void xref_update(xref_t xref, int x, int y, clear_fn clear, update_fn upd
extern void gfx_start_gif(img_t img);
extern void gfx_stop_gif(img_t img);
extern int gfx_frame_gif(img_t img);
extern void gfx_del_timer(timer_t han);
extern timer_t gfx_add_timer(int delay, int (*fn)(int, void*), void *aux);
extern void gfx_del_timer(gtimer_t han);
extern gtimer_t gfx_add_timer(int delay, int (*fn)(int, void*), void *aux);
extern void gfx_update_gif(img_t img);
extern void gfx_dispose_gif(img_t p);
#endif