Reset observer when starting game

[mercenary-reloaded.git] / src / mercenary / main.c

diff --git a/src/mercenary/main.c b/src/mercenary/main.c
index 1fa655a..e654f28 100644 (file)
--- a/src/mercenary/main.c
+++ b/src/mercenary/main.c
@@ -55,7 +55,7 @@
 
 static int config_ctrl_c = 0;
 static int config_amiga_speed = 0; /* fast speed */
-static double config_fps = 16.0;
+static double config_fps = 10.0;
 #if !defined(_WIN32)
 static const char *config_gamesave_dir = ".mercenary";
 #endif
@@ -765,6 +765,8 @@ static void main_loop(void)
                        /* for amiga speed: set delay by the number of cycles */
                        if (config_amiga_speed)
                                render_delay += (double)cycle_count / CPU_SPEED;
+                       /* reset joystick after rendering */
+                       reset_joystick();
                }
 
                /* STEP 2: transfer legacy image (or just benson) in memory to OpenGL texture */
@@ -1441,7 +1443,7 @@ int main(int argc, char *argv[])
                "        Press `CTRL' + `I' to skip intro (approaching to Eris).\n"
                "        Press `CTRL' + `1' or `2' to insert or `0' to remove mission disk.\n"
 #ifdef HAVE_OVR
-               "        Press `CTRL' + `O' (or both triggers) to reset observer position.\n"
+               "        Press `CTRL' + `O' to reset observer position.\n"
 #endif
                "\n"
                "Answer to a Question:\n"
@@ -1486,7 +1488,7 @@ int main(int argc, char *argv[])
                "        To have a virtual keyboard, point below benson (control pannel).\n"
                "        Point to a key on keyboard. The key will highlight.\n"
                "        Pull `Trigger' on right controller to enter the highlighted key.\n"
-               "        Press thumb stick on left controller to reset observer position.\n"
+               "        Press thumb stick on right controller to reset observer position.\n"
                "\n"
                "Walking / Driving / Flying using Controller:\n"
                "        Use thumb stick on right controller, to move player / craft.\n"