fix gun handling in enhancement mode

[pcsx_rearmed.git] / maemo / main.c

diff --git a/maemo/main.c b/maemo/main.c
index 4531704..24db87a 100644 (file)
--- a/maemo/main.c
+++ b/maemo/main.c
@@ -16,14 +16,14 @@
 #include "plugin_lib.h"
 #include "../libpcsxcore/misc.h"
 #include "../libpcsxcore/new_dynarec/new_dynarec.h"
-#include "../plugins/dfinput/main.h"
+#include "../plugins/dfinput/externals.h"
 #include "maemo_common.h"
 
-// sound plugin
-extern int iUseTimer;
-
 int g_opts = OPT_SHOWFPS;
 int g_maemo_opts;
+int g_scaler, soft_filter;
+int g_menuscreen_w, g_menuscreen_h;
+
 char file_name[MAXPATHLEN];
 
 enum sched_action emu_action;
@@ -41,20 +41,29 @@ static void ChangeWorkingDirectory(char *exe)
        }
 }
 
-int maemo_main(int argc, char **argv)
+int main(int argc, char **argv)
 {
-       ChangeWorkingDirectory("c");
        char file[MAXPATHLEN] = "";
        char path[MAXPATHLEN];
        const char *cdfile = NULL;
        int loadst = 0;
        int i;
 
+       emu_core_preinit();
+       ChangeWorkingDirectory("c");
+
        strcpy(Config.BiosDir, "/home/user/MyDocs");
        strcpy(Config.PluginsDir, "/opt/maemo/usr/games/plugins");
        snprintf(Config.PatchesDir, sizeof(Config.PatchesDir), "/opt/maemo/usr/games" PATCHES_DIR);
        Config.PsxAuto = 1;
-       
+
+       g_menuscreen_w = 800;
+       g_menuscreen_h = 480;
+
+       pl_init();
+
+       emu_core_init();
+
        // read command line options
        for (i = 1; i < argc; i++) {
                     if (!strcmp(argv[i], "-psxout")) Config.PsxOut = 1;
@@ -81,7 +90,6 @@ int maemo_main(int argc, char **argv)
                }
                else if (!strcmp(argv[i],"-fullscreen"))                g_maemo_opts |= 2;
                else if (!strcmp(argv[i],"-accel"))                             g_maemo_opts |= 4;
-               else if (!strcmp(argv[i],"-sputhreaded"))               iUseTimer=1;
                else if (!strcmp(argv[i],"-nosound"))           strcpy(Config.Spu, "spunull.so");
                else if (!strcmp(argv[i], "-bdir"))                     sprintf(Config.BiosDir, "%s", argv[++i]);
                else if (!strcmp(argv[i], "-bios"))                     sprintf(Config.Bios, "%s", argv[++i]);
@@ -101,11 +109,6 @@ int maemo_main(int argc, char **argv)
                strcpy(file_name, strrchr(cdfile,'/'));
        }
 
-       if (SysInit() == -1)
-               return 1;
-
-       pl_init();
-
        if (LoadPlugins() == -1) {
                SysMessage("Failed loading plugins!");
                return 1;
@@ -129,6 +132,7 @@ int maemo_main(int argc, char **argv)
                                printf(_("Could not load CD-ROM!\n"));
                                return -1;
                        }
+                       emu_on_new_cd(0);
                        ready_to_go = 1;
                }
        }