iikorni/quakespasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More conversion

Browse Source
This commit is contained in:
iikorni
2026-08-29 19:17:46 -05:00
parent 0404d430dc
commit 70e5c02355
72 changed files with 13308 additions and 14309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Quake/cl_main.cpp
+52 -52
View File
@@ -28,27 +28,27 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
// references them even when on a unix system.
// these two are not intended to be set directly
cvar_t cl_name = {"_cl_name", "player", CVAR_ARCHIVE};
cvar_t cl_color = {"_cl_color", "0", CVAR_ARCHIVE};
convar cl_name{"_cl_name", "player", {.archive = true}};
convar cl_color{"_cl_color", "0", {.archive = true}};
cvar_t cl_shownet = {"cl_shownet","0",CVAR_NONE}; // can be 0, 1, or 2
cvar_t cl_nolerp = {"cl_nolerp","0",CVAR_NONE};
convar cl_shownet{"cl_shownet","0"}; // can be 0, 1, or 2
convar cl_nolerp{"cl_nolerp","0"};
cvar_t cfg_unbindall = {"cfg_unbindall", "1", CVAR_ARCHIVE};
convar cfg_unbindall{"cfg_unbindall", "1", {.archive = true}};
cvar_t lookspring = {"lookspring","0", CVAR_ARCHIVE};
cvar_t lookstrafe = {"lookstrafe","0", CVAR_ARCHIVE};
cvar_t sensitivity = {"sensitivity","3", CVAR_ARCHIVE};
convar lookspring{"lookspring","0", {.archive = true}};
convar lookstrafe{"lookstrafe","0", {.archive = true}};
convar sensitivity{"sensitivity","3", {.archive = true}};
cvar_t m_pitch = {"m_pitch","0.022", CVAR_ARCHIVE};
cvar_t m_yaw = {"m_yaw","0.022", CVAR_ARCHIVE};
cvar_t m_forward = {"m_forward","1", CVAR_ARCHIVE};
cvar_t m_side = {"m_side","0.8", CVAR_ARCHIVE};
convar m_pitch{"m_pitch","0.022", {.archive = true}};
convar m_yaw{"m_yaw","0.022", {.archive = true}};
convar m_forward{"m_forward","1", {.archive = true}};
convar m_side{"m_side","0.8", {.archive = true}};
cvar_t cl_maxpitch = {"cl_maxpitch", "90", CVAR_ARCHIVE}; //johnfitz -- variable pitch clamping
cvar_t cl_minpitch = {"cl_minpitch", "-90", CVAR_ARCHIVE}; //johnfitz -- variable pitch clamping
convar cl_maxpitch{"cl_maxpitch", "90", {.archive = true}}; //johnfitz -- variable pitch clamping
convar cl_minpitch{"cl_minpitch", "-90", {.archive = true}}; //johnfitz -- variable pitch clamping
cvar_t cl_startdemos = {"cl_startdemos", "1", CVAR_ARCHIVE};
convar cl_startdemos{"cl_startdemos", "1", {.archive = true}};
client_static_t cls;
client_state_t cl;
@@ -63,7 +63,7 @@ int cl_max_edicts; //johnfitz -- only changes when new map loads
int cl_numvisedicts;
entity_t *cl_visedicts[MAX_VISEDICTS];
extern cvar_t r_lerpmodels, r_lerpmove; //johnfitz
extern convar r_lerpmodels, r_lerpmove; //johnfitz
/*
=====================
@@ -651,13 +651,13 @@ int CL_ReadFromServer (void)
if (cl_numvisedicts > 256 && dev_peakstats.visedicts <= 256)
Con_DWarning ("%i visedicts exceeds standard limit of 256 (max = %d).\n", cl_numvisedicts, MAX_VISEDICTS);
dev_stats.visedicts = cl_numvisedicts;
dev_peakstats.visedicts = q_max(cl_numvisedicts, dev_peakstats.visedicts);
dev_peakstats.visedicts = std::max(cl_numvisedicts, dev_peakstats.visedicts);
//temp entities
if (num_temp_entities > 64 && dev_peakstats.tempents <= 64)
Con_DWarning ("%i tempentities exceeds standard limit of 64 (max = %d).\n", num_temp_entities, MAX_TEMP_ENTITIES);
dev_stats.tempents = num_temp_entities;
dev_peakstats.tempents = q_max(num_temp_entities, dev_peakstats.tempents);
dev_peakstats.tempents = std::max(num_temp_entities, dev_peakstats.tempents);
//beams
for (i=0, b=cl_beams ; i< MAX_BEAMS ; i++, b++)
@@ -666,7 +666,7 @@ int CL_ReadFromServer (void)
if (num_beams > 24 && dev_peakstats.beams <= 24)
Con_DWarning ("%i beams exceeded standard limit of 24 (max = %d).\n", num_beams, MAX_BEAMS);
dev_stats.beams = num_beams;
dev_peakstats.beams = q_max(num_beams, dev_peakstats.beams);
dev_peakstats.beams = std::max(num_beams, dev_peakstats.beams);
//dlights
for (i=0, l=cl_dlights ; i<MAX_DLIGHTS ; i++, l++)
@@ -675,7 +675,7 @@ int CL_ReadFromServer (void)
if (num_dlights > 32 && dev_peakstats.dlights <= 32)
Con_DWarning ("%i dlights exceeded standard limit of 32 (max = %d).\n", num_dlights, MAX_DLIGHTS);
dev_stats.dlights = num_dlights;
dev_peakstats.dlights = q_max(num_dlights, dev_peakstats.dlights);
dev_peakstats.dlights = std::max(num_dlights, dev_peakstats.dlights);
//johnfitz
@@ -798,44 +798,44 @@ void CL_Init (void)
CL_InitInput ();
CL_InitTEnts ();
Cvar_RegisterVariable (&cl_name);
Cvar_RegisterVariable (&cl_color);
Cvar_RegisterVariable (&cl_upspeed);
Cvar_RegisterVariable (&cl_forwardspeed);
Cvar_RegisterVariable (&cl_backspeed);
Cvar_RegisterVariable (&cl_sidespeed);
Cvar_RegisterVariable (&cl_movespeedkey);
Cvar_RegisterVariable (&cl_yawspeed);
Cvar_RegisterVariable (&cl_pitchspeed);
Cvar_RegisterVariable (&cl_anglespeedkey);
Cvar_RegisterVariable (&cl_shownet);
Cvar_RegisterVariable (&cl_nolerp);
Cvar_RegisterVariable (&lookspring);
Cvar_RegisterVariable (&lookstrafe);
Cvar_RegisterVariable (&sensitivity);
cl_name.inscribe();
cl_color.inscribe();
cl_upspeed.inscribe();
cl_forwardspeed.inscribe();
cl_backspeed.inscribe();
cl_sidespeed.inscribe();
cl_movespeedkey.inscribe();
cl_yawspeed.inscribe();
cl_pitchspeed.inscribe();
cl_anglespeedkey.inscribe();
cl_shownet.inscribe();
cl_nolerp.inscribe();
lookspring.inscribe();
lookstrafe.inscribe();
sensitivity.inscribe();
Cvar_RegisterVariable (&cl_alwaysrun);
cl_alwaysrun.inscribe();
Cvar_RegisterVariable (&m_pitch);
Cvar_RegisterVariable (&m_yaw);
Cvar_RegisterVariable (&m_forward);
Cvar_RegisterVariable (&m_side);
m_pitch.inscribe();
m_yaw.inscribe();
m_forward.inscribe();
m_side.inscribe();
Cvar_RegisterVariable (&cfg_unbindall);
cfg_unbindall.inscribe();
Cvar_RegisterVariable (&cl_maxpitch); //johnfitz -- variable pitch clamping
Cvar_RegisterVariable (&cl_minpitch); //johnfitz -- variable pitch clamping
cl_maxpitch.inscribe(); //johnfitz -- variable pitch clamping
cl_minpitch.inscribe(); //johnfitz -- variable pitch clamping
Cvar_RegisterVariable (&cl_startdemos);
cl_startdemos.inscribe();
Cmd_AddCommand ("entities", CL_PrintEntities_f);
Cmd_AddCommand ("disconnect", CL_Disconnect_f);
Cmd_AddCommand ("record", CL_Record_f);
Cmd_AddCommand ("stop", CL_Stop_f);
Cmd_AddCommand ("playdemo", CL_PlayDemo_f);
Cmd_AddCommand ("timedemo", CL_TimeDemo_f);
command::add ("entities", CL_PrintEntities_f);
command::add ("disconnect", CL_Disconnect_f);
command::add ("record", CL_Record_f);
command::add ("stop", CL_Stop_f);
command::add ("playdemo", CL_PlayDemo_f);
command::add ("timedemo", CL_TimeDemo_f);
Cmd_AddCommand ("tracepos", CL_Tracepos_f); //johnfitz
Cmd_AddCommand ("viewpos", CL_Viewpos_f); //johnfitz
command::add ("tracepos", CL_Tracepos_f); //johnfitz
command::add ("viewpos", CL_Viewpos_f); //johnfitz
}