|
5 | 5 |
|
6 | 6 | union SDL_Event; |
7 | 7 |
|
8 | | -typedef void (*dfhooks_preinit_fn)(std::filesystem::path); |
9 | | -typedef void (*dfhooks_init_fn)(); |
10 | | -typedef void (*dfhooks_shutdown_fn)(); |
11 | | -typedef void (*dfhooks_update_fn)(); |
12 | | -typedef void (*dfhooks_prerender_fn)(); |
13 | | -typedef bool (*dfhooks_sdl_event_fn)(SDL_Event* event); |
14 | | -typedef void (*dfhooks_sdl_loop_fn)(); |
15 | | -typedef bool (*dfhooks_ncurses_key_fn)(int key); |
| 8 | +using dfhooks_preinit_fn = auto (std::filesystem::path) -> void; |
| 9 | +using dfhooks_init_fn = auto () -> void; |
| 10 | +using dfhooks_shutdown_fn = auto () -> void; |
| 11 | +using dfhooks_update_fn = auto () -> void; |
| 12 | +using dfhooks_prerender_fn = auto () -> void; |
| 13 | +using dfhooks_sdl_event_fn = auto (SDL_Event* event) -> bool; |
| 14 | +using dfhooks_sdl_loop_fn = auto () -> void; |
| 15 | +using dfhooks_ncurses_key_fn = auto (int key) -> bool; |
16 | 16 |
|
17 | 17 | struct LibWrapper { |
18 | 18 | void* handle = nullptr; |
19 | 19 | int32_t priority = 0; |
20 | | - dfhooks_preinit_fn preinit = nullptr; |
21 | | - dfhooks_init_fn init = nullptr; |
22 | | - dfhooks_shutdown_fn shutdown = nullptr; |
23 | | - dfhooks_update_fn update = nullptr; |
24 | | - dfhooks_prerender_fn prerender = nullptr; |
25 | | - dfhooks_sdl_event_fn sdl_event = nullptr; |
26 | | - dfhooks_sdl_loop_fn sdl_loop = nullptr; |
27 | | - dfhooks_ncurses_key_fn ncurses_key = nullptr; |
| 20 | + dfhooks_preinit_fn* preinit = nullptr; |
| 21 | + dfhooks_init_fn* init = nullptr; |
| 22 | + dfhooks_shutdown_fn* shutdown = nullptr; |
| 23 | + dfhooks_update_fn* update = nullptr; |
| 24 | + dfhooks_prerender_fn* prerender = nullptr; |
| 25 | + dfhooks_sdl_event_fn* sdl_event = nullptr; |
| 26 | + dfhooks_sdl_loop_fn* sdl_loop = nullptr; |
| 27 | + dfhooks_ncurses_key_fn* ncurses_key = nullptr; |
28 | 28 |
|
29 | 29 | LibWrapper(const std::filesystem::path& fname); |
30 | 30 | virtual ~LibWrapper(); |
|
0 commit comments