diff options
Diffstat (limited to 'apps/plugins/solitaire.c')
-rw-r--r-- | apps/plugins/solitaire.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/apps/plugins/solitaire.c b/apps/plugins/solitaire.c index 0a9bf99f51..2f5f2dc4a8 100644 --- a/apps/plugins/solitaire.c +++ b/apps/plugins/solitaire.c | |||
@@ -30,7 +30,6 @@ | |||
30 | 30 | ||
31 | PLUGIN_HEADER | 31 | PLUGIN_HEADER |
32 | 32 | ||
33 | static const struct plugin_api* rb; | ||
34 | #define min(a,b) (a<b?a:b) | 33 | #define min(a,b) (a<b?a:b) |
35 | 34 | ||
36 | /** | 35 | /** |
@@ -795,7 +794,7 @@ int solitaire_menu(bool in_game) | |||
795 | items[i++].desc = "Quit"; | 794 | items[i++].desc = "Quit"; |
796 | 795 | ||
797 | create_draw_option_string(); | 796 | create_draw_option_string(); |
798 | m = menu_init(rb, items, i, NULL, NULL, NULL, NULL); | 797 | m = menu_init(items, i, NULL, NULL, NULL, NULL); |
799 | while (result < 0) | 798 | while (result < 0) |
800 | { | 799 | { |
801 | switch (menu_show(m)) | 800 | switch (menu_show(m)) |
@@ -831,7 +830,7 @@ int solitaire_menu(bool in_game) | |||
831 | break; | 830 | break; |
832 | 831 | ||
833 | case 3: | 832 | case 3: |
834 | playback_control(rb, NULL); | 833 | playback_control(NULL); |
835 | break; | 834 | break; |
836 | 835 | ||
837 | case 4: | 836 | case 4: |
@@ -1904,17 +1903,15 @@ int solitaire( int skipmenu ) | |||
1904 | * Plugin entry point | 1903 | * Plugin entry point |
1905 | */ | 1904 | */ |
1906 | 1905 | ||
1907 | enum plugin_status plugin_start( const struct plugin_api* api, const void* parameter ) | 1906 | enum plugin_status plugin_start(const void* parameter ) |
1908 | { | 1907 | { |
1909 | int result; | 1908 | int result; |
1910 | 1909 | ||
1911 | /* plugin init */ | 1910 | /* plugin init */ |
1912 | (void)parameter; | 1911 | (void)parameter; |
1913 | rb = api; | ||
1914 | 1912 | ||
1915 | rb->splash( HZ, "Welcome to Solitaire!" ); | 1913 | rb->splash( HZ, "Welcome to Solitaire!" ); |
1916 | 1914 | ||
1917 | configfile_init(rb); | ||
1918 | configfile_load(CONFIG_FILENAME, config, | 1915 | configfile_load(CONFIG_FILENAME, config, |
1919 | sizeof(config) / sizeof(config[0]), CFGFILE_VERSION); | 1916 | sizeof(config) / sizeof(config[0]), CFGFILE_VERSION); |
1920 | rb->memcpy(&sol, &sol_disk, sizeof(sol)); /* copy to running config */ | 1917 | rb->memcpy(&sol, &sol_disk, sizeof(sol)); /* copy to running config */ |