fix various post-rebase issues
authorTaylor Richards <taylor@icculus.org>
Sat, 17 Mar 2018 15:55:25 +0000 (11:55 -0400)
committerTaylor Richards <taylor@icculus.org>
Sat, 17 Mar 2018 15:55:25 +0000 (11:55 -0400)
include/mouse.h
src/freespace2/freespace.cpp
src/gamesequence/gamesequence.cpp

index 9f5ae54..b5675d1 100644 (file)
@@ -128,7 +128,7 @@ int mouse_is_visible();                             // returns 1 if mouse is visible, 0 otherwise
 void mouse_grab(int grab);
 void mouse_eval_deltas();
 void mouse_get_delta(int *dx = NULL, int *dy = NULL, int *dz = NULL);
-
+void mouse_force_pos(int x, int y);
 void mouse_update_pos(int x, int y, int dx, int dy);
 
 #endif
index a452551..565984a 100644 (file)
@@ -4467,8 +4467,6 @@ void game_set_frametime(int state)
        SDL_assert( frame_cap > 0 );
 
 #ifndef __EMSCRIPTEN__
-       float frame_cap_diff;
-
        // Cap the framerate so it doesn't get too high.
        {
                fix cap;
@@ -6781,7 +6779,6 @@ int game_main(const char *szCmdLine)
 
        #ifndef NDEBUG                          
        {
-               extern void windebug_memwatch_init();
                windebug_memwatch_init();
        }
        #endif
index cdf3c73..9f864dc 100644 (file)
@@ -391,7 +391,7 @@ const char *GS_state_text[] =
        "GS_STATE_END_DEMO",
        "GS_STATE_LOOP_BRIEF",
        "GS_STATE_PXO",
-       "GS_STATE_PXO_HELP",                                    // 50
+       "GS_STATE_PXO_HELP",                            // 50
        "GS_STATE_DEMO_UPSELL"
 };
 //XSTR:ON