PonyMirrors/libsuperderpy
1
0
Fork 0
mirror of https://gitlab.com/dosowisko.net/libsuperderpy.git synced 2025-02-12 16:14:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

better handling of joystick, mouse and font initialization failures

Browse source 
Now libsuperderpy works on FreeBSD \o/
This commit is contained in:
Sebastian Krzyszkowiak 2018-07-03 00:41:57 +02:00
parent 4b4e6cc023
commit 23ffcae034
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/libsuperderpy.c
View file

@ -129,9 +129,9 @@ SYMBOL_EXPORT struct Game* libsuperderpy_init(int argc, char** argv, const char*
return NULL; return NULL;
} }
if (!al_install_mouse()) { game->mouse = al_install_mouse();
if (!game->mouse) {
fprintf(stderr, "failed to initialize the mouse!\n"); fprintf(stderr, "failed to initialize the mouse!\n");
return NULL;
} }
if (!al_init_video_addon()) { if (!al_init_video_addon()) {
@ -139,9 +139,7 @@ SYMBOL_EXPORT struct Game* libsuperderpy_init(int argc, char** argv, const char*
return NULL; return NULL;
} }
al_init_font_addon(); if (!al_init_font_addon() || !al_init_ttf_addon()) {
if (!al_init_ttf_addon()) {
fprintf(stderr, "failed to initialize fonts!\n"); fprintf(stderr, "failed to initialize fonts!\n");
return NULL; return NULL;
} }
@ -158,7 +156,11 @@ SYMBOL_EXPORT struct Game* libsuperderpy_init(int argc, char** argv, const char*
} }
#endif #endif
al_install_joystick(); game->joystick = false;
if (!strtol(GetConfigOptionDefault(game, "SuperDerpy", "disableJoystick", "0"), NULL, 10)) {
game->joystick = al_install_joystick();
}
al_set_new_display_flags((game->config.fullscreen ? (ALLEGRO_FULLSCREEN_WINDOW | ALLEGRO_FRAMELESS) : ALLEGRO_WINDOWED) | ALLEGRO_RESIZABLE | ALLEGRO_OPENGL | ALLEGRO_PROGRAMMABLE_PIPELINE); al_set_new_display_flags((game->config.fullscreen ? (ALLEGRO_FULLSCREEN_WINDOW | ALLEGRO_FRAMELESS) : ALLEGRO_WINDOWED) | ALLEGRO_RESIZABLE | ALLEGRO_OPENGL | ALLEGRO_PROGRAMMABLE_PIPELINE);
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
@ -278,9 +280,13 @@ SYMBOL_EXPORT struct Game* libsuperderpy_init(int argc, char** argv, const char*
SYMBOL_EXPORT int libsuperderpy_run(struct Game* game) { SYMBOL_EXPORT int libsuperderpy_run(struct Game* game) {
al_register_event_source(game->_priv.event_queue, al_get_display_event_source(game->display)); al_register_event_source(game->_priv.event_queue, al_get_display_event_source(game->display));
al_register_event_source(game->_priv.event_queue, al_get_mouse_event_source());
al_register_event_source(game->_priv.event_queue, al_get_keyboard_event_source()); al_register_event_source(game->_priv.event_queue, al_get_keyboard_event_source());
al_register_event_source(game->_priv.event_queue, al_get_joystick_event_source()); if (game->mouse) {
al_register_event_source(game->_priv.event_queue, al_get_mouse_event_source());
}
if (game->joystick) {
al_register_event_source(game->_priv.event_queue, al_get_joystick_event_source());
}
if (game->touch) { if (game->touch) {
al_register_event_source(game->_priv.event_queue, al_get_touch_input_event_source()); al_register_event_source(game->_priv.event_queue, al_get_touch_input_event_source());
#ifdef LIBSUPERDERPY_MOUSE_EMULATION #ifdef LIBSUPERDERPY_MOUSE_EMULATION

2
src/libsuperderpy.h
View file

@ -151,6 +151,8 @@ struct Game {
bool shutting_down; /*!< If true then shut down of the game is pending. */ bool shutting_down; /*!< If true then shut down of the game is pending. */
bool restart; /*!< If true then restart of the game is pending. */ bool restart; /*!< If true then restart of the game is pending. */
bool touch; bool touch;
bool joystick;
bool mouse;
bool show_loading_on_launch; bool show_loading_on_launch;