Even more conversion, lots of superfluous macro removal
This commit is contained in:
+9
-9
@@ -98,9 +98,9 @@ const char *svc_strings[] =
|
||||
"svc_backtolobby", // 55
|
||||
"svc_localsound" // 56
|
||||
};
|
||||
#define NUM_SVC_STRINGS Q_COUNTOF(svc_strings)
|
||||
#define NUM_SVC_STRINGS std::size(svc_strings)
|
||||
|
||||
qboolean warn_about_nehahra_protocol; //johnfitz
|
||||
bool warn_about_nehahra_protocol; //johnfitz
|
||||
|
||||
extern vec3_t v_punchangles[2]; //johnfitz
|
||||
|
||||
@@ -432,7 +432,7 @@ void CL_ParseUpdate(int bits) {
|
||||
int i;
|
||||
qmodel_t *model;
|
||||
int modnum;
|
||||
qboolean forcelink;
|
||||
bool forcelink;
|
||||
entity_t *ent;
|
||||
int num;
|
||||
int skin;
|
||||
@@ -1034,7 +1034,7 @@ void CL_ParseServerMessage(void) {
|
||||
break;
|
||||
|
||||
case svc_stufftext:
|
||||
Cbuf_AddText(MSG_ReadString());
|
||||
command::buffer::add_text(MSG_ReadString());
|
||||
break;
|
||||
|
||||
case svc_damage:
|
||||
@@ -1060,7 +1060,7 @@ void CL_ParseServerMessage(void) {
|
||||
if (i >= MAX_LIGHTSTYLES)
|
||||
Sys_Error("svc_lightstyle > MAX_LIGHTSTYLES");
|
||||
q_strlcpy(cl_lightstyle[i].map, MSG_ReadString(), MAX_STYLESTRING);
|
||||
cl_lightstyle[i].length = Q_strlen(cl_lightstyle[i].map);
|
||||
cl_lightstyle[i].length = std::strlen(cl_lightstyle[i].map);
|
||||
//johnfitz -- save extra info
|
||||
if (cl_lightstyle[i].length) {
|
||||
total = 0;
|
||||
@@ -1131,10 +1131,10 @@ void CL_ParseServerMessage(void) {
|
||||
cl.paused = MSG_ReadByte();
|
||||
if (cl.paused) {
|
||||
CDAudio_Pause();
|
||||
BGM_Pause();
|
||||
music::pause();
|
||||
} else {
|
||||
CDAudio_Resume();
|
||||
BGM_Resume();
|
||||
music::resume();
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -1177,9 +1177,9 @@ void CL_ParseServerMessage(void) {
|
||||
cl.cdtrack = MSG_ReadByte();
|
||||
cl.looptrack = MSG_ReadByte();
|
||||
if ((cls.demoplayback || cls.demorecording) && (cls.forcetrack != -1))
|
||||
BGM_PlayCDtrack((byte) cls.forcetrack, true);
|
||||
music::play_cd_track((byte) cls.forcetrack, true);
|
||||
else
|
||||
BGM_PlayCDtrack((byte) cl.cdtrack, true);
|
||||
music::play_cd_track((byte) cl.cdtrack, true);
|
||||
break;
|
||||
|
||||
case svc_intermission:
|
||||
|
||||
Reference in New Issue
Block a user