X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=vid_sdl.c;h=1ddf7a399fce5a24096da6b3d4d5540f21250de9;hb=a5e8522bdacd29c436bacd4f563939e350fb5d0f;hp=581234825fa2f6d5da50a6cbeecd710bcc3f59be;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb;p=xonotic%2Fdarkplaces.git

diff --git a/vid_sdl.c b/vid_sdl.c
index 58123482..1ddf7a39 100644
--- a/vid_sdl.c
+++ b/vid_sdl.c
@@ -30,17 +30,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <IOKit/hidsystem/IOHIDLib.h>
 #include <IOKit/hidsystem/IOHIDParameter.h>
 #include <IOKit/hidsystem/event_status_driver.h>
-static cvar_t apple_mouse_noaccel = {CVAR_CLIENT | CVAR_SAVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"};
+static cvar_t apple_mouse_noaccel = {CF_CLIENT | CF_ARCHIVE, "apple_mouse_noaccel", "1", "disables mouse acceleration while DarkPlaces is active"};
 static qbool vid_usingnoaccel;
 static double originalMouseSpeed = -1.0;
-io_connect_t IN_GetIOHandle(void)
+static io_connect_t IN_GetIOHandle(void)
 {
 	io_connect_t iohandle = MACH_PORT_NULL;
 	kern_return_t status;
 	io_service_t iohidsystem = MACH_PORT_NULL;
 	mach_port_t masterport;
 
-	status = IOMasterPort(MACH_PORT_NULL, &masterport);
+	status = IOMainPort(MACH_PORT_NULL, &masterport);
 	if(status != KERN_SUCCESS)
 		return 0;
 
@@ -73,7 +73,7 @@ static qbool vid_isfullscreen;
 static qbool vid_usingvsync = false;
 static SDL_Joystick *vid_sdljoystick = NULL;
 static SDL_GameController *vid_sdlgamecontroller = NULL;
-static cvar_t joy_sdl2_trigger_deadzone = {CVAR_SAVE | CVAR_CLIENT, "joy_sdl2_trigger_deadzone", "0.5", "deadzone for triggers to be registered as key presses"};
+static cvar_t joy_sdl2_trigger_deadzone = {CF_ARCHIVE | CF_CLIENT, "joy_sdl2_trigger_deadzone", "0.5", "deadzone for triggers to be registered as key presses"};
 // GAME_STEELSTORM specific
 static cvar_t *steelstorm_showing_map = NULL; // detect but do not create the cvar
 static cvar_t *steelstorm_showing_mousecursor = NULL; // detect but do not create the cvar
@@ -894,7 +894,7 @@ static void IN_Move_TouchScreen_Quake(void)
 		if (!VID_ShowingKeyboard())
 		{
 			// user entered a command, close the console now
-			Con_ToggleConsole_f(&cmd_client);
+			Con_ToggleConsole_f(cmd_local);
 		}
 		VID_TouchscreenArea( 0,   0,   0,   0,   0, NULL                         , 0.0f, NULL, NULL, &buttons[15], (keynum_t)0, NULL, 0, 0, 0, true);
 		VID_TouchscreenArea( 0,   0,   0,   0,   0, NULL                         , 0.0f, NULL, move, &buttons[0], K_MOUSE4, NULL, 0, 0, 0, true);
@@ -1179,7 +1179,7 @@ void Sys_SendKeyEvents( void )
 							// so, let's better queue it for next frame
 							if(!sdl_needs_restart)
 							{
-								Cbuf_AddText(&cmd_client, "\nr_restart\n");
+								Cbuf_AddText(cmd_local, "\nr_restart\n");
 								sdl_needs_restart = true;
 							}
 #endif