diff --git a/source/gl_model.c b/source/gl_model.c index 6955500..e1211db 100644 --- a/source/gl_model.c +++ b/source/gl_model.c @@ -84,8 +84,6 @@ int mod_numknown; unsigned *model_checksum; texture_t *r_notexture_mip; -/* cvar_t gl_subdivide_size = {"gl_subdivide_size", "128", true}; - CVAR_FIXME */ cvar_t *gl_subdivide_size; /* @@ -95,8 +93,6 @@ Mod_Init */ void Mod_Init (void) { -/* Cvar_RegisterVariable (&gl_subdivide_size); - CVAR_FIXME */ gl_subdivide_size = Cvar_Get("gl_subdivide_size", "128", CVAR_ARCHIVE, "None"); memset (mod_novis, 0xff, sizeof(mod_novis)); } diff --git a/source/gl_rmain.c b/source/gl_rmain.c index 18cb034..b9b7402 100644 --- a/source/gl_rmain.c +++ b/source/gl_rmain.c @@ -1148,8 +1148,6 @@ void R_Mirror (void) glLoadMatrixf (r_base_world_matrix); -/* glColor4f (1,1,1,r_mirroralpha.value); - CVAR_FIXME */ glColor4f (1,1,1,r_mirroralpha->value); s = cl.worldmodel->textures[mirrortexturenum]->texturechain; for ( ; s ; s=s->texturechain) diff --git a/source/gl_warp.c b/source/gl_warp.c index 0a5d037..490cf59 100644 --- a/source/gl_warp.c +++ b/source/gl_warp.c @@ -99,8 +99,6 @@ void SubdividePolygon (int numverts, float *verts) for (i=0 ; i<3 ; i++) { m = (mins[i] + maxs[i]) * 0.5; -/* m = gl_subdivide_size.value * floor (m/gl_subdivide_size.value + 0.5); - CVAR_FIXME */ m = gl_subdivide_size->value * floor (m/gl_subdivide_size->value + 0.5); if (maxs[i] - m < 8) continue; diff --git a/source/in_win.c b/source/in_win.c index 18969ec..c88d677 100644 --- a/source/in_win.c +++ b/source/in_win.c @@ -64,8 +64,6 @@ static int mouse_oldbuttonstate; static POINT current_pos; static float old_mouse_x, old_mouse_y, mx_accum, my_accum; static qboolean mouseinitialized; -/* static cvar_t m_filter = {"m_filter","0"}; - CVAR_FIXME */ static cvar_t *m_filter; static qboolean restore_spi; static int originalmouseparms[3], newmouseparms[3] = {0, 0, 1}; @@ -106,62 +104,24 @@ static PDWORD pdwRawValue[JOY_MAX_AXES]; // each time. this avoids any problems with getting back to a default usage // or when changing from one controller to another. this way at least something // works. -/* static cvar_t in_joystick = {"joystick","0", true}; - CVAR_FIXME */ static cvar_t *in_joystick; -/* static cvar_t joy_name = {"joyname", "joystick"}; - CVAR_FIXME */ static cvar_t *joy_name; -/* static cvar_t joy_advanced = {"joyadvanced", "0"}; - CVAR_FIXME */ static cvar_t *joy_advanced; -/* static cvar_t joy_advaxisx = {"joyadvaxisx", "0"}; - CVAR_FIXME */ static cvar_t *joy_advaxisx; -/* static cvar_t joy_advaxisy = {"joyadvaxisy", "0"}; - CVAR_FIXME */ static cvar_t *joy_advaxisy; -/* static cvar_t joy_advaxisz = {"joyadvaxisz", "0"}; - CVAR_FIXME */ static cvar_t *joy_advaxisz; -/* static cvar_t joy_advaxisr = {"joyadvaxisr", "0"}; - CVAR_FIXME */ static cvar_t *joy_advaxisr; -/* static cvar_t joy_advaxisu = {"joyadvaxisu", "0"}; - CVAR_FIXME */ static cvar_t *joy_advaxisu; -/* static cvar_t joy_advaxisv = {"joyadvaxisv", "0"}; - CVAR_FIXME */ static cvar_t *joy_advaxisv; -/* static cvar_t joy_forwardthreshold = {"joyforwardthreshold", "0.15"}; - CVAR_FIXME */ static cvar_t *joy_forwardthreshold; -/* static cvar_t joy_sidethreshold = {"joysidethreshold", "0.15"}; - CVAR_FIXME */ static cvar_t *joy_sidethreshold; -/* static cvar_t joy_pitchthreshold = {"joypitchthreshold", "0.15"}; - CVAR_FIXME */ static cvar_t *joy_pitchthreshold; -/* static cvar_t joy_yawthreshold = {"joyyawthreshold", "0.15"}; - CVAR_FIXME */ static cvar_t *joy_yawthreshold; -/* static cvar_t joy_forwardsensitivity = {"joyforwardsensitivity", "-1.0"}; - CVAR_FIXME */ static cvar_t *joy_forwardsensitivity; -/* static cvar_t joy_sidesensitivity = {"joysidesensitivity", "-1.0"}; - CVAR_FIXME */ static cvar_t *joy_sidesensitivity; -/* static cvar_t joy_pitchsensitivity = {"joypitchsensitivity", "1.0"}; - CVAR_FIXME */ static cvar_t *joy_pitchsensitivity; -/* static cvar_t joy_yawsensitivity = {"joyyawsensitivity", "-1.0"}; - CVAR_FIXME */ static cvar_t *joy_yawsensitivity; -/* static cvar_t joy_wwhack1 = {"joywwhack1", "0.0"}; - CVAR_FIXME */ static cvar_t *joy_wwhack1; -/* static cvar_t joy_wwhack2 = {"joywwhack2", "0.0"}; - CVAR_FIXME */ static cvar_t *joy_wwhack2; static qboolean joy_avail, joy_advancedinit, joy_haspov; @@ -546,67 +506,27 @@ IN_Init void IN_Init (void) { // mouse variables -/* Cvar_RegisterVariable (&m_filter); - CVAR_FIXME */ m_filter = Cvar_Get("m_filter", "0", CVAR_NONE, "None"); // joystick variables -/* Cvar_RegisterVariable (&in_joystick); - CVAR_FIXME */ in_joystick = Cvar_Get("joystick", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&joy_name); - CVAR_FIXME */ joy_name = Cvar_Get("joyname", "joystick", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advanced); - CVAR_FIXME */ joy_advanced = Cvar_Get("joyadvanced", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advaxisx); - CVAR_FIXME */ joy_advaxisx = Cvar_Get("joyadvaxisx", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advaxisy); - CVAR_FIXME */ joy_advaxisy = Cvar_Get("joyadvaxisy", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advaxisz); - CVAR_FIXME */ joy_advaxisz = Cvar_Get("joyadvaxisz", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advaxisr); - CVAR_FIXME */ joy_advaxisr = Cvar_Get("joyadvaxisr", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advaxisu); - CVAR_FIXME */ joy_advaxisu = Cvar_Get("joyadvaxisu", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_advaxisv); - CVAR_FIXME */ joy_advaxisv = Cvar_Get("joyadvaxisv", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_forwardthreshold); - CVAR_FIXME */ joy_forwardthreshold = Cvar_Get("joyforwardthreshold", "0.15", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_sidethreshold); - CVAR_FIXME */ joy_sidethreshold = Cvar_Get("joysidethreshold", "0.15", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_pitchthreshold); - CVAR_FIXME */ joy_pitchthreshold = Cvar_Get("joypitchthreshold", "0.15", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_yawthreshold); - CVAR_FIXME */ joy_yawthreshold = Cvar_Get("joyyawthreshold", "0.15", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_forwardsensitivity); - CVAR_FIXME */ joy_forwardsensitivity = Cvar_Get("joyforwardsensitivity", "-1.0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_sidesensitivity); - CVAR_FIXME */ joy_sidesensitivity = Cvar_Get("joysidesensitivity", "-1.0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_pitchsensitivity); - CVAR_FIXME */ joy_pitchsensitivity = Cvar_Get("joypitchsensitivity", "1.0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_yawsensitivity); - CVAR_FIXME */ joy_yawsensitivity = Cvar_Get("joyyawsensitivity", "-1.0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_wwhack1); - CVAR_FIXME */ joy_wwhack1 = Cvar_Get("joywwhack1", "0.0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&joy_wwhack2); - CVAR_FIXME */ joy_wwhack2 = Cvar_Get("joywwhack2", "0.0", CVAR_NONE, "None"); Cmd_AddCommand ("force_centerview", Force_CenterView_f); @@ -779,8 +699,6 @@ void IN_MouseMove (usercmd_t *cmd) my_accum = 0; } -/* if (m_filter.value) - CVAR_FIXME */ if (m_filter->value) { mouse_x = (mx + old_mouse_x) * 0.5; @@ -795,23 +713,13 @@ void IN_MouseMove (usercmd_t *cmd) old_mouse_x = mx; old_mouse_y = my; -/* mouse_x *= sensitivity.value; - CVAR_FIXME */ mouse_x *= sensitivity->value; -/* mouse_y *= sensitivity.value; - CVAR_FIXME */ mouse_y *= sensitivity->value; // add mouse X/Y movement to cmd -/* if ( (in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1) )) - CVAR_FIXME */ if ( (in_strafe.state & 1) || (lookstrafe->value && freelook )) -/* cmd->sidemove += m_side.value * mouse_x; - CVAR_FIXME */ cmd->sidemove += m_side->value * mouse_x; else -/* cl.viewangles[YAW] -= m_yaw.value * mouse_x; - CVAR_FIXME */ cl.viewangles[YAW] -= m_yaw->value * mouse_x; if (freelook) @@ -819,8 +727,6 @@ void IN_MouseMove (usercmd_t *cmd) if ( freelook && !(in_strafe.state & 1)) { -/* cl.viewangles[PITCH] += m_pitch.value * mouse_y; - CVAR_FIXME */ cl.viewangles[PITCH] += m_pitch->value * mouse_y; if (cl.viewangles[PITCH] > 80) cl.viewangles[PITCH] = 80; @@ -830,12 +736,8 @@ void IN_MouseMove (usercmd_t *cmd) else { if ((in_strafe.state & 1) && noclip_anglehack) -/* cmd->upmove -= m_forward.value * mouse_y; - CVAR_FIXME */ cmd->upmove -= m_forward->value * mouse_y; else -/* cmd->forwardmove -= m_forward.value * mouse_y; - CVAR_FIXME */ cmd->forwardmove -= m_forward->value * mouse_y; } @@ -1018,8 +920,6 @@ static void Joy_AdvancedUpdate_f (void) pdwRawValue[i] = RawValuePointer(i); } -/* if( joy_advanced.value == 0.0) - CVAR_FIXME */ if( joy_advanced->value == 0.0) { // default joystick initialization @@ -1039,33 +939,21 @@ static void Joy_AdvancedUpdate_f (void) // advanced initialization here // data supplied by user via joy_axisn cvars -/* dwTemp = (DWORD) joy_advaxisx.value; - CVAR_FIXME */ dwTemp = (DWORD) joy_advaxisx->value; dwAxisMap[JOY_AXIS_X] = dwTemp & 0x0000000f; dwControlMap[JOY_AXIS_X] = dwTemp & JOY_RELATIVE_AXIS; -/* dwTemp = (DWORD) joy_advaxisy.value; - CVAR_FIXME */ dwTemp = (DWORD) joy_advaxisy->value; dwAxisMap[JOY_AXIS_Y] = dwTemp & 0x0000000f; dwControlMap[JOY_AXIS_Y] = dwTemp & JOY_RELATIVE_AXIS; -/* dwTemp = (DWORD) joy_advaxisz.value; - CVAR_FIXME */ dwTemp = (DWORD) joy_advaxisz->value; dwAxisMap[JOY_AXIS_Z] = dwTemp & 0x0000000f; dwControlMap[JOY_AXIS_Z] = dwTemp & JOY_RELATIVE_AXIS; -/* dwTemp = (DWORD) joy_advaxisr.value; - CVAR_FIXME */ dwTemp = (DWORD) joy_advaxisr->value; dwAxisMap[JOY_AXIS_R] = dwTemp & 0x0000000f; dwControlMap[JOY_AXIS_R] = dwTemp & JOY_RELATIVE_AXIS; -/* dwTemp = (DWORD) joy_advaxisu.value; - CVAR_FIXME */ dwTemp = (DWORD) joy_advaxisu->value; dwAxisMap[JOY_AXIS_U] = dwTemp & 0x0000000f; dwControlMap[JOY_AXIS_U] = dwTemp & JOY_RELATIVE_AXIS; -/* dwTemp = (DWORD) joy_advaxisv.value; - CVAR_FIXME */ dwTemp = (DWORD) joy_advaxisv->value; dwAxisMap[JOY_AXIS_V] = dwTemp & 0x0000000f; dwControlMap[JOY_AXIS_V] = dwTemp & JOY_RELATIVE_AXIS; @@ -1170,8 +1058,6 @@ static qboolean IN_ReadJoystick (void) // this is a hack -- there is a bug in the Logitech WingMan Warrior DirectInput Driver // rather than having 32768 be the zero point, they have the zero point at 32668 // go figure -- anyway, now we get the full resolution out of the device -/* if (joy_wwhack1.value != 0.0) - CVAR_FIXME */ if (joy_wwhack1->value != 0.0) { ji.dwUpos += 100; @@ -1210,8 +1096,6 @@ static void IN_JoyMove (usercmd_t *cmd) } // verify joystick is available and that the user wants to use it -/* if (!joy_avail || !in_joystick.value) - CVAR_FIXME */ if (!joy_avail || !in_joystick->value) { return; @@ -1224,8 +1108,6 @@ static void IN_JoyMove (usercmd_t *cmd) } if (in_speed.state & 1) -/* speed = cl_movespeedkey.value; - CVAR_FIXME */ speed = cl_movespeedkey->value; else speed = 1; @@ -1239,8 +1121,6 @@ static void IN_JoyMove (usercmd_t *cmd) // move centerpoint to zero fAxisValue -= 32768.0; -/* if (joy_wwhack2.value != 0.0) - CVAR_FIXME */ if (joy_wwhack2->value != 0.0) { if (dwAxisMap[i] == AxisTurn) @@ -1263,29 +1143,19 @@ static void IN_JoyMove (usercmd_t *cmd) switch (dwAxisMap[i]) { case AxisForward: -/* if ((joy_advanced.value == 0.0) && (in_mlook.state & 1)) - CVAR_FIXME */ if ((joy_advanced->value == 0.0) && freelook) { // user wants forward control to become look control -/* if (fabs(fAxisValue) > joy_pitchthreshold.value) - CVAR_FIXME */ if (fabs(fAxisValue) > joy_pitchthreshold->value) { // if mouse invert is on, invert the joystick pitch value // only absolute control support here (joy_advanced is false) -/* if (m_pitch.value < 0.0) - CVAR_FIXME */ if (m_pitch->value < 0.0) { -/* cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value; - CVAR_FIXME */ cl.viewangles[PITCH] -= (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value; } else { -/* cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value; - CVAR_FIXME */ cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value; } V_StopPitchDrift(); @@ -1296,69 +1166,47 @@ static void IN_JoyMove (usercmd_t *cmd) // disable pitch return-to-center unless requested by user // *** this code can be removed when the lookspring bug is fixed // *** the bug always has the lookspring feature on -/* if(lookspring.value == 0.0) - CVAR_FIXME */ - if(lookspring->value == 0.0) + if (lookspring->value == 0.0) V_StopPitchDrift(); } } else { // user wants forward control to be forward control -/* if (fabs(fAxisValue) > joy_forwardthreshold.value) - CVAR_FIXME */ if (fabs(fAxisValue) > joy_forwardthreshold->value) { -/* cmd->forwardmove += (fAxisValue * joy_forwardsensitivity.value) * speed * cl_forwardspeed.value; - CVAR_FIXME */ cmd->forwardmove += (fAxisValue * joy_forwardsensitivity->value) * speed * cl_forwardspeed->value; } } break; case AxisSide: -/* if (fabs(fAxisValue) > joy_sidethreshold.value) - CVAR_FIXME */ if (fabs(fAxisValue) > joy_sidethreshold->value) { -/* cmd->sidemove += (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; - CVAR_FIXME */ cmd->sidemove += (fAxisValue * joy_sidesensitivity->value) * speed * cl_sidespeed->value; } break; case AxisTurn: -/* if ((in_strafe.state & 1) || (lookstrafe.value && (in_mlook.state & 1))) - CVAR_FIXME */ if ((in_strafe.state & 1) || (lookstrafe->value && freelook)) { // user wants turn control to become side control -/* if (fabs(fAxisValue) > joy_sidethreshold.value) - CVAR_FIXME */ if (fabs(fAxisValue) > joy_sidethreshold->value) { -/* cmd->sidemove -= (fAxisValue * joy_sidesensitivity.value) * speed * cl_sidespeed.value; - CVAR_FIXME */ cmd->sidemove -= (fAxisValue * joy_sidesensitivity->value) * speed * cl_sidespeed->value; } } else { // user wants turn control to be turn control -/* if (fabs(fAxisValue) > joy_yawthreshold.value) - CVAR_FIXME */ if (fabs(fAxisValue) > joy_yawthreshold->value) { if(dwControlMap[i] == JOY_ABSOLUTE_AXIS) { -/* cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * aspeed * cl_yawspeed.value; - CVAR_FIXME */ cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity->value) * aspeed * cl_yawspeed->value; } else { -/* cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity.value) * speed * 180.0; - CVAR_FIXME */ cl.viewangles[YAW] += (fAxisValue * joy_yawsensitivity->value) * speed * 180.0; } @@ -1369,21 +1217,15 @@ static void IN_JoyMove (usercmd_t *cmd) case AxisLook: if (freelook) { -/* if (fabs(fAxisValue) > joy_pitchthreshold.value) - CVAR_FIXME */ if (fabs(fAxisValue) > joy_pitchthreshold->value) { // pitch movement detected and pitch movement desired by user if(dwControlMap[i] == JOY_ABSOLUTE_AXIS) { -/* cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * aspeed * cl_pitchspeed.value; - CVAR_FIXME */ cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * aspeed * cl_pitchspeed->value; } else { -/* cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity.value) * speed * 180.0; - CVAR_FIXME */ cl.viewangles[PITCH] += (fAxisValue * joy_pitchsensitivity->value) * speed * 180.0; } V_StopPitchDrift(); @@ -1394,8 +1236,6 @@ static void IN_JoyMove (usercmd_t *cmd) // disable pitch return-to-center unless requested by user // *** this code can be removed when the lookspring bug is fixed // *** the bug always has the lookspring feature on -/* if(lookspring.value == 0.0) - CVAR_FIXME */ if(lookspring->value == 0.0) V_StopPitchDrift(); } diff --git a/source/model.c b/source/model.c index c4708a0..a9ed7f0 100644 --- a/source/model.c +++ b/source/model.c @@ -63,8 +63,6 @@ int mod_numknown; unsigned *model_checksum; texture_t *r_notexture_mip; -/* cvar_t gl_subdivide_size = {"gl_subdivide_size", "128", true}; - CVAR_FIXME */ cvar_t *gl_subdivide_size; /* @@ -74,8 +72,6 @@ Mod_Init */ void Mod_Init (void) { -/* Cvar_RegisterVariable (&gl_subdivide_size); - CVAR_FIXME */ gl_subdivide_size = Cvar_Get("gl_subdivide_size", "128", CVAR_ARCHIVE, "None"); memset (mod_novis, 0xff, sizeof(mod_novis)); } diff --git a/source/pr_cmds.c b/source/pr_cmds.c index ed0043f..07ce459 100644 --- a/source/pr_cmds.c +++ b/source/pr_cmds.c @@ -1188,11 +1188,6 @@ Pick a vector for the player to shoot along vector aim(entity, missilespeed) ============= */ -/* //cvar_t sv_aim = {"sv_aim", "0.93"}; - CVAR_FIXME */ -//cvar_t *sv_aim; -/* cvar_t sv_aim = {"sv_aim", "2"}; - CVAR_FIXME */ cvar_t *sv_aim; void PF_aim (void) { @@ -1227,8 +1222,6 @@ void PF_aim (void) VectorMA (start, 2048, dir, end); tr = SV_Move (start, vec3_origin, vec3_origin, end, false, ent); if (tr.ent && tr.ent->v.takedamage == DAMAGE_AIM -/* && (!teamplay.value || ent->v.team <=0 || ent->v.team != tr.ent->v.team) ) - CVAR_FIXME */ && (!teamplay->value || ent->v.team <=0 || ent->v.team != tr.ent->v.team) ) { VectorCopy (pr_global_struct->v_forward, G_VECTOR(OFS_RETURN)); @@ -1238,8 +1231,6 @@ void PF_aim (void) // try all possible entities VectorCopy (dir, bestdir); -/* bestdist = sv_aim.value; - CVAR_FIXME */ bestdist = sv_aim->value; bestent = NULL; @@ -1250,8 +1241,6 @@ void PF_aim (void) continue; if (check == ent) continue; -/* if (teamplay.value && ent->v.team > 0 && ent->v.team == check->v.team) - CVAR_FIXME */ if (teamplay->value && ent->v.team > 0 && ent->v.team == check->v.team) continue; // don't aim at teammate for (j=0 ; j<3 ; j++) diff --git a/source/r_edge.c b/source/r_edge.c index a83a30b..78bc17b 100644 --- a/source/r_edge.c +++ b/source/r_edge.c @@ -147,8 +147,6 @@ void R_BeginEdgeFrame (void) surfaces[1].flags = SURF_DRAWBACKGROUND; // put the background behind everything in the world -/* if (r_draworder.value) - CVAR_FIXME */ if (r_draworder->value) { pdrawfunc = R_GenerateSpansBackward; diff --git a/source/r_main.c b/source/r_main.c index d94f38c..7540e57 100644 --- a/source/r_main.c +++ b/source/r_main.c @@ -130,82 +130,32 @@ float se_time1, se_time2, de_time1, de_time2, dv_time1, dv_time2; void R_MarkLeaves (void); -/* cvar_t r_draworder = {"r_draworder","0"}; - CVAR_FIXME */ cvar_t *r_draworder; -/* cvar_t r_speeds = {"r_speeds","0"}; - CVAR_FIXME */ cvar_t *r_speeds; -/* cvar_t r_timegraph = {"r_timegraph","0"}; - CVAR_FIXME */ cvar_t *r_timegraph; -/* cvar_t r_netgraph = {"r_netgraph","0"}; - CVAR_FIXME */ cvar_t *r_netgraph; -/* cvar_t r_zgraph = {"r_zgraph","0"}; - CVAR_FIXME */ cvar_t *r_zgraph; -/* cvar_t r_graphheight = {"r_graphheight","15"}; - CVAR_FIXME */ cvar_t *r_graphheight; -/* cvar_t r_clearcolor = {"r_clearcolor","2"}; - CVAR_FIXME */ cvar_t *r_clearcolor; -/* cvar_t r_waterwarp = {"r_waterwarp","1"}; - CVAR_FIXME */ cvar_t *r_waterwarp; -/* cvar_t r_fullbright = {"r_fullbright","0"}; - CVAR_FIXME */ cvar_t *r_fullbright; -/* cvar_t r_drawentities = {"r_drawentities","1"}; - CVAR_FIXME */ cvar_t *r_drawentities; -/* cvar_t r_drawviewmodel = {"r_drawviewmodel","1"}; - CVAR_FIXME */ cvar_t *r_drawviewmodel; -/* cvar_t r_aliasstats = {"r_polymodelstats","0"}; - CVAR_FIXME */ cvar_t *r_aliasstats; -/* cvar_t r_dspeeds = {"r_dspeeds","0"}; - CVAR_FIXME */ cvar_t *r_dspeeds; -/* cvar_t r_drawflat = {"r_drawflat", "0"}; - CVAR_FIXME */ cvar_t *r_drawflat; -/* cvar_t r_ambient = {"r_ambient", "0"}; - CVAR_FIXME */ cvar_t *r_ambient; -/* cvar_t r_reportsurfout = {"r_reportsurfout", "0"}; - CVAR_FIXME */ cvar_t *r_reportsurfout; -/* cvar_t r_maxsurfs = {"r_maxsurfs", "0"}; - CVAR_FIXME */ cvar_t *r_maxsurfs; -/* cvar_t r_numsurfs = {"r_numsurfs", "0"}; - CVAR_FIXME */ cvar_t *r_numsurfs; -/* cvar_t r_reportedgeout = {"r_reportedgeout", "0"}; - CVAR_FIXME */ cvar_t *r_reportedgeout; -/* cvar_t r_maxedges = {"r_maxedges", "0"}; - CVAR_FIXME */ cvar_t *r_maxedges; -/* cvar_t r_numedges = {"r_numedges", "0"}; - CVAR_FIXME */ cvar_t *r_numedges; -/* cvar_t r_aliastransbase = {"r_aliastransbase", "200"}; - CVAR_FIXME */ cvar_t *r_aliastransbase; -/* cvar_t r_aliastransadj = {"r_aliastransadj", "100"}; - CVAR_FIXME */ cvar_t *r_aliastransadj; -/* cvar_t gl_flashblend = {"gl_flashblend", "0"}; - CVAR_FIXME */ cvar_t *gl_flashblend; -/* extern cvar_t scr_fov; - CVAR_FIXME */ extern cvar_t *scr_fov; void CreatePassages (void); @@ -269,77 +219,29 @@ void R_Init (void) Cmd_AddCommand ("pointfile", R_ReadPointFile_f); Cmd_AddCommand ("loadsky", R_LoadSky_f); -/* Cvar_RegisterVariable (&r_draworder); - CVAR_FIXME */ r_draworder = Cvar_Get("r_draworder", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_speeds); - CVAR_FIXME */ r_speeds = Cvar_Get("r_speeds", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_timegraph); - CVAR_FIXME */ r_timegraph = Cvar_Get("r_timegraph", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_netgraph); - CVAR_FIXME */ r_netgraph = Cvar_Get("r_netgraph", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_zgraph); - CVAR_FIXME */ r_zgraph = Cvar_Get("r_zgraph", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_graphheight); - CVAR_FIXME */ r_graphheight = Cvar_Get("r_graphheight", "15", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_drawflat); - CVAR_FIXME */ r_drawflat = Cvar_Get("r_drawflat", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_ambient); - CVAR_FIXME */ r_ambient = Cvar_Get("r_ambient", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_clearcolor); - CVAR_FIXME */ r_clearcolor = Cvar_Get("r_clearcolor", "2", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_waterwarp); - CVAR_FIXME */ r_waterwarp = Cvar_Get("r_waterwarp", "1", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_fullbright); - CVAR_FIXME */ r_fullbright = Cvar_Get("r_fullbright", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_drawentities); - CVAR_FIXME */ r_drawentities = Cvar_Get("r_drawentities", "1", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_drawviewmodel); - CVAR_FIXME */ r_drawviewmodel = Cvar_Get("r_drawviewmodel", "1", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_aliasstats); - CVAR_FIXME */ r_aliasstats = Cvar_Get("r_polymodelstats", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_dspeeds); - CVAR_FIXME */ r_dspeeds = Cvar_Get("r_dspeeds", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_reportsurfout); - CVAR_FIXME */ r_reportsurfout = Cvar_Get("r_reportsurfout", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_maxsurfs); - CVAR_FIXME */ r_maxsurfs = Cvar_Get("r_maxsurfs", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_numsurfs); - CVAR_FIXME */ r_numsurfs = Cvar_Get("r_numsurfs", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_reportedgeout); - CVAR_FIXME */ r_reportedgeout = Cvar_Get("r_reportedgeout", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_maxedges); - CVAR_FIXME */ r_maxedges = Cvar_Get("r_maxedges", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_numedges); - CVAR_FIXME */ r_numedges = Cvar_Get("r_numedges", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_aliastransbase); - CVAR_FIXME */ r_aliastransbase = Cvar_Get("r_aliastransbase", "200", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&r_aliastransadj); - CVAR_FIXME */ r_aliastransadj = Cvar_Get("r_aliastransadj", "100", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&gl_flashblend); // FIXME: remove this! --KB - CVAR_FIXME */ gl_flashblend = Cvar_Get("gl_flashblend", "0", CVAR_NONE, "None"); // FIXME: remove this! --KB r_maxedges->value = (float)NUMSTACKEDGES; @@ -386,8 +288,6 @@ void R_NewMap (void) r_viewleaf = NULL; R_ClearParticles (); -/* r_cnumsurfs = r_maxsurfs.value; - CVAR_FIXME */ r_cnumsurfs = r_maxsurfs->value; if (r_cnumsurfs <= MINSURFACES) @@ -412,8 +312,6 @@ void R_NewMap (void) r_maxedgesseen = 0; r_maxsurfsseen = 0; -/* r_numallocatededges = r_maxedges.value; - CVAR_FIXME */ r_numallocatededges = r_maxedges->value; if (r_numallocatededges < MINEDGES) @@ -445,14 +343,10 @@ void R_SetVrect (vrect_t *pvrectin, vrect_t *pvrect, int lineadj) float size; qboolean full = false; -/* if (scr_viewsize.value >= 100.0) { - CVAR_FIXME */ if (scr_viewsize->value >= 100.0) { size = 100.0; full = true; } else -/* size = scr_viewsize.value; - CVAR_FIXME */ size = scr_viewsize->value; if (cl.intermission) @@ -463,15 +357,11 @@ void R_SetVrect (vrect_t *pvrectin, vrect_t *pvrect, int lineadj) } size /= 100.0; -/* if (!cl_sbar.value && full) - CVAR_FIXME */ if (!cl_sbar->value && full) h = pvrectin->height; else h = pvrectin->height - lineadj; -/* // h = (!cl_sbar.value && size==1.0) ? pvrectin->height : (pvrectin->height - lineadj); - CVAR_FIXME */ // h = (!cl_sbar->value && size==1.0) ? pvrectin->height : (pvrectin->height - lineadj); // h = pvrectin->height - lineadj; if (full) @@ -485,8 +375,6 @@ void R_SetVrect (vrect_t *pvrectin, vrect_t *pvrect, int lineadj) } pvrect->width &= ~7; pvrect->height = pvrectin->height * size; -/* if (cl_sbar.value || !full) { - CVAR_FIXME */ if (cl_sbar->value || !full) { if (pvrect->height > pvrectin->height - lineadj) pvrect->height = pvrectin->height - lineadj; @@ -610,15 +498,9 @@ void R_ViewChanged (vrect_t *pvrect, int lineadj, float aspect) res_scale = sqrt ((double)(r_refdef.vrect.width * r_refdef.vrect.height) / (320.0 * 152.0)) * (2.0 / r_refdef.horizontalFieldOfView); -/* r_aliastransition = r_aliastransbase.value * res_scale; - CVAR_FIXME */ r_aliastransition = r_aliastransbase->value * res_scale; -/* r_resfudge = r_aliastransadj.value * res_scale; - CVAR_FIXME */ r_resfudge = r_aliastransadj->value * res_scale; -/* if (scr_fov.value <= 90.0) - CVAR_FIXME */ if (scr_fov->value <= 90.0) r_fov_greater_than_90 = false; else @@ -697,8 +579,6 @@ void R_DrawEntitiesOnList (void) vec3_t dist; float add; -/* if (!r_drawentities.value) - CVAR_FIXME */ if (!r_drawentities->value) return; @@ -775,8 +655,6 @@ void R_DrawViewModel (void) float add; dlight_t *dl; -/* if (!r_drawviewmodel.value || r_fov_greater_than_90 || !Cam_DrawViewModel()) - CVAR_FIXME */ if (!r_drawviewmodel->value || r_fov_greater_than_90 || !Cam_DrawViewModel()) return; @@ -908,8 +786,6 @@ void R_DrawBEntitiesOnList (void) model_t *clmodel; float minmaxs[6]; -/* if (!r_drawentities.value) - CVAR_FIXME */ if (!r_drawentities->value) return; @@ -1065,8 +941,6 @@ void R_EdgeDrawing (void) R_BeginEdgeFrame (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) { rw_time1 = Sys_DoubleTime (); @@ -1081,8 +955,6 @@ void R_EdgeDrawing (void) // z writes, so have the driver turn z compares on now D_TurnZOn (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) { rw_time2 = Sys_DoubleTime (); @@ -1091,16 +963,12 @@ void R_EdgeDrawing (void) R_DrawBEntitiesOnList (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) { db_time2 = Sys_DoubleTime (); se_time1 = db_time2; } -/* if (!r_dspeeds.value) - CVAR_FIXME */ if (!r_dspeeds->value) { VID_UnlockBuffer (); @@ -1126,8 +994,6 @@ void R_RenderView_ (void) r_warpbuffer = warpbuffer; -/* if (r_timegraph.value || r_speeds.value || r_dspeeds.value) - CVAR_FIXME */ if (r_timegraph->value || r_speeds->value || r_dspeeds->value) r_time1 = Sys_DoubleTime (); @@ -1148,8 +1014,6 @@ SetVisibilityByPassages (); if (!r_worldentity.model || !cl.worldmodel) Sys_Error ("R_RenderView: NULL worldmodel"); -/* if (!r_dspeeds.value) - CVAR_FIXME */ if (!r_dspeeds->value) { VID_UnlockBuffer (); @@ -1159,8 +1023,6 @@ SetVisibilityByPassages (); R_EdgeDrawing (); -/* if (!r_dspeeds.value) - CVAR_FIXME */ if (!r_dspeeds->value) { VID_UnlockBuffer (); @@ -1168,8 +1030,6 @@ SetVisibilityByPassages (); VID_LockBuffer (); } -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) { se_time2 = Sys_DoubleTime (); @@ -1178,8 +1038,6 @@ SetVisibilityByPassages (); R_DrawEntitiesOnList (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) { de_time2 = Sys_DoubleTime (); @@ -1188,8 +1046,6 @@ SetVisibilityByPassages (); R_DrawViewModel (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) { dv_time2 = Sys_DoubleTime (); @@ -1198,8 +1054,6 @@ SetVisibilityByPassages (); R_DrawParticles (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) dp_time2 = Sys_DoubleTime (); @@ -1208,43 +1062,27 @@ SetVisibilityByPassages (); V_SetContentsColor (r_viewleaf->contents); -/* if (r_timegraph.value) - CVAR_FIXME */ if (r_timegraph->value) R_TimeGraph (); -/* if (r_netgraph.value) - CVAR_FIXME */ if (r_netgraph->value) R_NetGraph (); -/* if (r_zgraph.value) - CVAR_FIXME */ if (r_zgraph->value) R_ZGraph (); -/* if (r_aliasstats.value) - CVAR_FIXME */ if (r_aliasstats->value) R_PrintAliasStats (); -/* if (r_speeds.value) - CVAR_FIXME */ if (r_speeds->value) R_PrintTimes (); -/* if (r_dspeeds.value) - CVAR_FIXME */ if (r_dspeeds->value) R_PrintDSpeeds (); -/* if (r_reportsurfout.value && r_outofsurfaces) - CVAR_FIXME */ if (r_reportsurfout->value && r_outofsurfaces) Con_Printf ("Short %d surfaces\n", r_outofsurfaces); -/* if (r_reportedgeout.value && r_outofedges) - CVAR_FIXME */ if (r_reportedgeout->value && r_outofedges) Con_Printf ("Short roughly %d edges\n", r_outofedges * 2 / 3); diff --git a/source/r_surf.c b/source/r_surf.c index 3148044..9396cc0 100644 --- a/source/r_surf.c +++ b/source/r_surf.c @@ -157,8 +157,6 @@ void R_BuildLightMap (void) size = smax*tmax; lightmap = surf->samples; -/* if ( r_fullbright.value || !cl.worldmodel->lightdata) - CVAR_FIXME */ if (/* r_fullbright->value || */ !cl.worldmodel->lightdata) { for (i=0 ; ivalue || scr_viewsize->value<100); -/* hudswap = cl_hudswap.value; // Get that nasty float out :) - CVAR_FIXME */ hudswap = cl_hudswap->value; // Get that nasty float out :) if (!headsup) @@ -743,10 +739,8 @@ Sbar_DrawNormal */ void Sbar_DrawNormal (void) { -/* if (cl_sbar.value || scr_viewsize.value<100) - CVAR_FIXME */ if (cl_sbar->value || scr_viewsize->value<100) - Sbar_DrawPic (0, 0, sb_sbar); + Sbar_DrawPic (0, 0, sb_sbar); // armor if (cl.stats[STAT_ITEMS] & IT_INVULNERABILITY) @@ -797,8 +791,6 @@ void Sbar_Draw (void) qboolean headsup; char st[512]; -/* headsup = !(cl_sbar.value || scr_viewsize.value<100); - CVAR_FIXME */ headsup = !(cl_sbar->value || scr_viewsize->value<100); if ((sb_updates >= vid.numpages) && !headsup) return; diff --git a/source/sv_sys_win.c b/source/sv_sys_win.c index 53f9898..afe1ace 100644 --- a/source/sv_sys_win.c +++ b/source/sv_sys_win.c @@ -265,8 +265,6 @@ int main (int argc, char **argv) { // Now we want to give some processing time to other applications, // such as qw_client, running on this machine. -/* sleep_msec = sys_sleep.value; - CVAR_FIXME */ sleep_msec = sys_sleep->value; if (sleep_msec > 0) { diff --git a/source/sys_unix.c b/source/sys_unix.c index 658ad4a..e202fe4 100644 --- a/source/sys_unix.c +++ b/source/sys_unix.c @@ -48,8 +48,6 @@ /* This is unused in the client, but we need the symbol there too. */ server_static_t svs; -/* cvar_t sys_nostdout = {"sys_nostdout","0"}; - CVAR_FIXME */ cvar_t *sys_nostdout; /* The translation table between the graphical font and plain ASCII --KB */ diff --git a/source/vid_mgl.c b/source/vid_mgl.c index 664ac38..e99b3e4 100644 --- a/source/vid_mgl.c +++ b/source/vid_mgl.c @@ -93,52 +93,22 @@ extern viddef_t vid; // global video state #define MODE_FULLSCREEN_DEFAULT (MODE_WINDOWED + 3) // Note that 0 is MODE_WINDOWED -/* cvar_t vid_mode = {"vid_mode","0", false}; - CVAR_FIXME */ cvar_t *vid_mode; // Note that 0 is MODE_WINDOWED -/* cvar_t _vid_default_mode = {"_vid_default_mode","0", true}; - CVAR_FIXME */ cvar_t *_vid_default_mode; // Note that 3 is MODE_FULLSCREEN_DEFAULT -/* cvar_t _vid_default_mode_win = {"_vid_default_mode_win","3", true}; - CVAR_FIXME */ cvar_t *_vid_default_mode_win; -/* cvar_t vid_wait = {"vid_wait","0"}; - CVAR_FIXME */ cvar_t *vid_wait; -/* cvar_t vid_nopageflip = {"vid_nopageflip","0", true}; - CVAR_FIXME */ cvar_t *vid_nopageflip; -/* cvar_t _vid_wait_override = {"_vid_wait_override", "0", true}; - CVAR_FIXME */ cvar_t *_vid_wait_override; -/* cvar_t vid_config_x = {"vid_config_x","800", true}; - CVAR_FIXME */ cvar_t *vid_config_x; -/* cvar_t vid_config_y = {"vid_config_y","600", true}; - CVAR_FIXME */ cvar_t *vid_config_y; -/* cvar_t vid_stretch_by_2 = {"vid_stretch_by_2","1", true}; - CVAR_FIXME */ cvar_t *vid_stretch_by_2; -/* cvar_t _windowed_mouse = {"_windowed_mouse","0", true}; - CVAR_FIXME */ cvar_t *_windowed_mouse; -/* cvar_t vid_fullscreen_mode = {"vid_fullscreen_mode","3", true}; - CVAR_FIXME */ cvar_t *vid_fullscreen_mode; -/* cvar_t vid_windowed_mode = {"vid_windowed_mode","0", true}; - CVAR_FIXME */ cvar_t *vid_windowed_mode; -/* cvar_t block_switch = {"block_switch","0", true}; - CVAR_FIXME */ cvar_t *block_switch; -/* cvar_t vid_window_x = {"vid_window_x", "0", true}; - CVAR_FIXME */ cvar_t *vid_window_x; -/* cvar_t vid_window_y = {"vid_window_y", "0", true}; - CVAR_FIXME */ cvar_t *vid_window_y; typedef struct { @@ -247,17 +217,9 @@ VID_CheckWindowXY void VID_CheckWindowXY (void) { -/* if (((int)vid_window_x.value > (GetSystemMetrics (SM_CXSCREEN) - 160)) || - CVAR_FIXME */ if (((int)vid_window_x->value > (GetSystemMetrics (SM_CXSCREEN) - 160)) || -/* ((int)vid_window_y.value > (GetSystemMetrics (SM_CYSCREEN) - 120)) || - CVAR_FIXME */ ((int)vid_window_y->value > (GetSystemMetrics (SM_CYSCREEN) - 120)) || -/* ((int)vid_window_x.value < 0) || - CVAR_FIXME */ ((int)vid_window_x->value < 0) || -/* ((int)vid_window_y.value < 0)) - CVAR_FIXME */ ((int)vid_window_y->value < 0)) { Cvar_SetValue (vid_window_x, 0.0); @@ -419,8 +381,6 @@ int VID_Suspend (MGLDC *dc, int flags) if (flags & MGL_DEACTIVATE) { // FIXME: this doesn't currently work on NT -/* if (block_switch.value && !WinNT) - CVAR_FIXME */ if (block_switch->value && !WinNT) { return MGL_NO_DEACTIVATE; @@ -1138,30 +1098,16 @@ void VID_CheckModedescFixup (int mode) if (mode == MODE_SETTABLE_WINDOW) { -/* modelist[mode].stretched = (int)vid_stretch_by_2.value; - CVAR_FIXME */ modelist[mode].stretched = (int)vid_stretch_by_2->value; stretch = modelist[mode].stretched; -/* if (vid_config_x.value < (320 << stretch)) - CVAR_FIXME */ if (vid_config_x->value < (320 << stretch)) -/* vid_config_x.value = 320 << stretch; - CVAR_FIXME */ vid_config_x->value = 320 << stretch; -/* if (vid_config_y.value < (200 << stretch)) - CVAR_FIXME */ if (vid_config_y->value < (200 << stretch)) -/* vid_config_y.value = 200 << stretch; - CVAR_FIXME */ vid_config_y->value = 200 << stretch; -/* x = (int)vid_config_x.value; - CVAR_FIXME */ x = (int)vid_config_x->value; -/* y = (int)vid_config_y.value; - CVAR_FIXME */ y = (int)vid_config_y->value; snprintf (modelist[mode].modedesc, sizeof(modelist[mode].modedesc), "%dx%d", x, y); modelist[mode].width = x; @@ -1438,11 +1384,7 @@ qboolean VID_SetWindowedMode (int modenum) // position and show the DIB window VID_CheckWindowXY (); -/* SetWindowPos (mainwindow, NULL, (int)vid_window_x.value, - CVAR_FIXME */ SetWindowPos (mainwindow, NULL, (int)vid_window_x->value, -/* (int)vid_window_y.value, 0, 0, - CVAR_FIXME */ (int)vid_window_y->value, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME); @@ -1510,8 +1452,6 @@ qboolean VID_SetFullscreenMode (int modenum) mgldc = memdc = NULL; if ((mgldc = createDisplayDC (modelist[modenum].stretched || -/* (int)vid_nopageflip.value)) == NULL) - CVAR_FIXME */ (int)vid_nopageflip->value)) == NULL) { return false; @@ -1736,8 +1676,6 @@ int VID_SetMode (int modenum, unsigned char *palette) // Set either the fullscreen or windowed mode if (modelist[modenum].type == MS_WINDOWED) { -/* if (_windowed_mouse.value && key_dest == key_game) - CVAR_FIXME */ if (_windowed_mouse->value && key_dest == key_game) { stat = VID_SetWindowedMode(modenum); @@ -1879,8 +1817,6 @@ void VID_LockBuffer (void) else screenwidth = vid.rowbytes; -/* if (lcd_x.value) - CVAR_FIXME */ /* // disabled until someone fixes, not defined right or anything if (lcd_x->value) @@ -2136,8 +2072,6 @@ VID_Windowed_f void VID_Windowed_f (void) { -/* VID_SetMode ((int)vid_windowed_mode.value, vid_curpal); - CVAR_FIXME */ VID_SetMode ((int)vid_windowed_mode->value, vid_curpal); } @@ -2150,8 +2084,6 @@ VID_Fullscreen_f void VID_Fullscreen_f (void) { -/* VID_SetMode ((int)vid_fullscreen_mode.value, vid_curpal); - CVAR_FIXME */ VID_SetMode ((int)vid_fullscreen_mode->value, vid_curpal); } @@ -2197,50 +2129,20 @@ void VID_Init (unsigned char *palette) int basenummodes; byte *ptmp; -/* Cvar_RegisterVariable (&vid_mode); - CVAR_FIXME */ vid_mode = Cvar_Get("vid_mode", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&vid_wait); - CVAR_FIXME */ vid_wait = Cvar_Get("vid_wait", "0", CVAR_NONE, "None"); -/* Cvar_RegisterVariable (&vid_nopageflip); - CVAR_FIXME */ vid_nopageflip = Cvar_Get("vid_nopageflip", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&_vid_wait_override); - CVAR_FIXME */ _vid_wait_override = Cvar_Get("_vid_wait_override", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&_vid_default_mode); - CVAR_FIXME */ _vid_default_mode = Cvar_Get("_vid_default_mode", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&_vid_default_mode_win); - CVAR_FIXME */ _vid_default_mode_win = Cvar_Get("_vid_default_mode_win", "3", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_config_x); - CVAR_FIXME */ vid_config_x = Cvar_Get("vid_config_x", "800", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_config_y); - CVAR_FIXME */ vid_config_y = Cvar_Get("vid_config_y", "600", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_stretch_by_2); - CVAR_FIXME */ vid_stretch_by_2 = Cvar_Get("vid_stretch_by_2", "1", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&_windowed_mouse); - CVAR_FIXME */ _windowed_mouse = Cvar_Get("_windowed_mouse", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_fullscreen_mode); - CVAR_FIXME */ vid_fullscreen_mode = Cvar_Get("vid_fullscreen_mode", "3", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_windowed_mode); - CVAR_FIXME */ vid_windowed_mode = Cvar_Get("vid_windowed_mode", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&block_switch); - CVAR_FIXME */ block_switch = Cvar_Get("block_switch", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_window_x); - CVAR_FIXME */ vid_window_x = Cvar_Get("vid_window_x", "0", CVAR_ARCHIVE, "None"); -/* Cvar_RegisterVariable (&vid_window_y); - CVAR_FIXME */ vid_window_y = Cvar_Get("vid_window_y", "0", CVAR_ARCHIVE, "None"); Cmd_AddCommand ("vid_testmode", VID_TestMode_f); @@ -2484,11 +2386,7 @@ void VID_Update (vrect_t *rects) { GetWindowRect (mainwindow, &trect); -/* if ((trect.left != (int)vid_window_x.value) || - CVAR_FIXME */ if ((trect.left != (int)vid_window_x->value) || -/* (trect.top != (int)vid_window_y.value)) - CVAR_FIXME */ (trect.top != (int)vid_window_y->value)) { if (COM_CheckParm ("-resetwinpos")) @@ -2498,21 +2396,13 @@ void VID_Update (vrect_t *rects) } VID_CheckWindowXY (); -/* SetWindowPos (mainwindow, NULL, (int)vid_window_x.value, - CVAR_FIXME */ SetWindowPos (mainwindow, NULL, (int)vid_window_x->value, -/* (int)vid_window_y.value, 0, 0, - CVAR_FIXME */ (int)vid_window_y->value, 0, 0, SWP_NOSIZE | SWP_NOZORDER | SWP_SHOWWINDOW | SWP_DRAWFRAME); } } -/* if ((_vid_default_mode_win.value != vid_default) && - CVAR_FIXME */ if ((_vid_default_mode_win->value != vid_default) && -/* (!startwindowed || (_vid_default_mode_win.value < MODE_FULLSCREEN_DEFAULT))) - CVAR_FIXME */ (!startwindowed || (_vid_default_mode_win->value < MODE_FULLSCREEN_DEFAULT))) { firstupdate = 0; @@ -2523,18 +2413,12 @@ void VID_Update (vrect_t *rects) Cvar_SetValue (vid_window_y, 0.0); } -/* if ((_vid_default_mode_win.value < 0) || - CVAR_FIXME */ if ((_vid_default_mode_win->value < 0) || -/* (_vid_default_mode_win.value >= nummodes)) - CVAR_FIXME */ (_vid_default_mode_win->value >= nummodes)) { Cvar_SetValue (_vid_default_mode_win, windowed_default); } -/* Cvar_SetValue ("vid_mode", _vid_default_mode_win.value); - CVAR_FIXME */ Cvar_SetValue (vid_mode, _vid_default_mode_win->value); } } @@ -2552,12 +2436,8 @@ void VID_Update (vrect_t *rects) } else { -/* if ((int)vid_mode.value != vid_realmode) - CVAR_FIXME */ if ((int)vid_mode->value != vid_realmode) { -/* VID_SetMode ((int)vid_mode.value, vid_curpal); - CVAR_FIXME */ VID_SetMode ((int)vid_mode->value, vid_curpal); Cvar_SetValue (vid_mode, (float)vid_modenum); // so if mode set fails, we don't keep on @@ -2569,8 +2449,6 @@ void VID_Update (vrect_t *rects) // handle the mouse state when windowed if that's changed if (modestate == MS_WINDOWED) { -/* if (!_windowed_mouse.value) { - CVAR_FIXME */ if (!_windowed_mouse->value) { if (windowed_mouse) { IN_DeactivateMouse (); @@ -2952,8 +2830,6 @@ void AppActivate(BOOL fActive, BOOL minimize) IN_ActivateMouse (); IN_HideMouse (); } -/* else if ((modestate == MS_WINDOWED) && _windowed_mouse.value && key_dest == key_game) - CVAR_FIXME */ else if ((modestate == MS_WINDOWED) && _windowed_mouse->value && key_dest == key_game) { IN_ActivateMouse (); @@ -2986,8 +2862,6 @@ void AppActivate(BOOL fActive, BOOL minimize) IN_DeactivateMouse (); IN_ShowMouse (); } -/* else if ((modestate == MS_WINDOWED) && _windowed_mouse.value && mouseactive * /) - CVAR_FIXME */ else if ((modestate == MS_WINDOWED) && _windowed_mouse->value /* && mouseactive */) { IN_DeactivateMouse (); @@ -3006,8 +2880,6 @@ VID_HandlePause void VID_HandlePause (qboolean pause) { #if 0 -/* if ((modestate == MS_WINDOWED) && _windowed_mouse.value) - CVAR_FIXME */ if ((modestate == MS_WINDOWED) && _windowed_mouse->value) { if (pause) @@ -3074,8 +2946,6 @@ LONG WINAPI MainWndProc ( force_mode_set = false; } -/* VID_SetMode ((int)vid_fullscreen_mode.value, vid_curpal); - CVAR_FIXME */ VID_SetMode ((int)vid_fullscreen_mode->value, vid_curpal); break; @@ -3456,8 +3326,6 @@ void VID_MenuDraw (void) M_Print (2*8, 36 + MODE_AREA_HEIGHT * 8 + 8*5, temp); } -/* ptr = VID_GetModeDescription2 ((int)_vid_default_mode_win.value); - CVAR_FIXME */ ptr = VID_GetModeDescription2 ((int)_vid_default_mode_win->value); if (ptr)