memset(&msg, 0, sizeof(msg));
msg.data = buf;
msg.maxsize = sizeof(buf);
- MSG_WriteChar(&msg, svc_nop);
+ MSG_WriteChar(&msg, clc_nop);
NetConn_SendUnreliableMessage(cls.netcon, &msg, cls.protocol);
}
}
// now that we have a world model, set up the world entity, renderer
// modules and csqc
cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_BoundingBoxForEntity(&cl.entities[0].render);
+ CL_UpdateRenderEntity(&cl.entities[0].render);
R_Modules_NewMap();
if (nummodels==MAX_MODELS)
Host_Error("Server sent too many model precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy(cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels]));
}
if (numsounds==MAX_SOUNDS)
Host_Error("Server sent too many sound precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy(cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds]));
}
str = MSG_ReadString();
Con_Printf("server gamedir is %s\n", str);
-#if 0
- // FIXME: change gamedir if needed!
- if (strcasecmp(gamedirfile, str))
- {
- Host_SaveConfig_f();
- cflag = 1;
- }
- Com_Gamedir(str); // change gamedir
-
- if (cflag)
- {
- // exec the new config stuff
- }
-#endif
+ // change gamedir if needed
+ FS_ChangeGameDir(str);
cl.gametype = GAME_DEATHMATCH;
cl.maxclients = 32;
// parse player number
i = MSG_ReadByte();
- cl.qw_spectator = (i & 128) != 0;
+ // cl.qw_spectator is an unneeded flag, cl.scores[cl.playerentity].qw_spectator works better (it can be updated by the server during the game)
+ //cl.qw_spectator = (i & 128) != 0;
cl.playerentity = cl.viewentity = (i & 127) + 1;
cl.scores = (scoreboard_t *)Mem_Alloc(cls.levelmempool, cl.maxclients*sizeof(*cl.scores));
if (nummodels==MAX_MODELS)
Host_Error ("Server sent too many model precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error ("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error ("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy (cl.model_name[nummodels], str, sizeof (cl.model_name[nummodels]));
}
// parse sound precache list
if (numsounds==MAX_SOUNDS)
Host_Error("Server sent too many sound precaches");
if (strlen(str) >= MAX_QPATH)
- Host_Error("Server sent a precache name of %i characters (max %i)", strlen(str), MAX_QPATH - 1);
+ Host_Error("Server sent a precache name of %i characters (max %i)", (int)strlen(str), MAX_QPATH - 1);
strlcpy (cl.sound_name[numsounds], str, sizeof (cl.sound_name[numsounds]));
}
// we now have the worldmodel so we can set up the game world
cl.entities[0].render.model = cl.worldmodel = cl.model_precache[1];
- CL_BoundingBoxForEntity(&cl.entities[0].render);
+ CL_UpdateRenderEntity(&cl.entities[0].render);
R_Modules_NewMap();
}
// viewzoom interpolation
cl.mviewzoom[0] = (float) max(cl.stats[STAT_VIEWZOOM], 2) * (1.0f / 255.0f);
+
+ // force a recalculation of the player prediction
+ cl.movement_replay = true;
}
/*
ent->render.skinnum = ent->state_baseline.skin;
ent->render.effects = ent->state_baseline.effects;
ent->render.alpha = 1;
- //ent->render.scale = 1;
//VectorCopy (ent->state_baseline.origin, ent->render.origin);
//VectorCopy (ent->state_baseline.angles, ent->render.angles);
Matrix4x4_CreateFromQuakeEntity(&ent->render.matrix, ent->state_baseline.origin[0], ent->state_baseline.origin[1], ent->state_baseline.origin[2], ent->state_baseline.angles[0], ent->state_baseline.angles[1], ent->state_baseline.angles[2], 1);
- Matrix4x4_Invert_Simple(&ent->render.inversematrix, &ent->render.matrix);
- CL_BoundingBoxForEntity(&ent->render);
+ CL_UpdateRenderEntity(&ent->render);
// This is definitely cheating...
if (ent->render.model == NULL)
if (!strcmp(text, "Client ping times:\n"))
{
cl.parsingtextmode = CL_PARSETEXTMODE_PING;
- cl.parsingtextplayerindex = 0;
+ for(cl.parsingtextplayerindex = 0; cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0]; cl.parsingtextplayerindex++)
+ ;
+ if (cl.parsingtextplayerindex >= cl.maxclients) // should never happen, since the client itself should be in cl.scores
+ {
+ Con_Printf("ping reply but empty scoreboard?!?\n");
+ cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
+ cl.parsingtextexpectingpingforscores = 0;
+ }
+ cl.parsingtextexpectingpingforscores = cl.parsingtextexpectingpingforscores ? 2 : 0;
return !cl.parsingtextexpectingpingforscores;
}
if (!strncmp(text, "host: ", 9))
{
- cl.parsingtextexpectingpingforscores = false;
+ // cl.parsingtextexpectingpingforscores = false; // really?
cl.parsingtextmode = CL_PARSETEXTMODE_STATUS;
cl.parsingtextplayerindex = 0;
return true;
{
// if anything goes wrong, we'll assume this is not a ping report
qboolean expected = cl.parsingtextexpectingpingforscores;
- cl.parsingtextexpectingpingforscores = false;
+ cl.parsingtextexpectingpingforscores = 0;
cl.parsingtextmode = CL_PARSETEXTMODE_NONE;
t = text;
while (*t == ' ')
t++;
- if (*t >= '0' && *t <= '9')
+ if ((*t >= '0' && *t <= '9') || *t == '-')
{
int ping = atoi(t);
- while (*t >= '0' && *t <= '9')
+ while ((*t >= '0' && *t <= '9') || *t == '-')
t++;
if (*t == ' ')
{
int charindex = 0;
t++;
- for (charindex = 0;cl.scores[cl.parsingtextplayerindex].name[charindex] == t[charindex];charindex++)
- ;
- if (cl.scores[cl.parsingtextplayerindex].name[charindex] == 0 && t[charindex] == '\n')
+ if(cl.parsingtextplayerindex < cl.maxclients)
{
- cl.scores[cl.parsingtextplayerindex].qw_ping = bound(0, ping, 9999);
- for (cl.parsingtextplayerindex++;cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0];cl.parsingtextplayerindex++)
+ for (charindex = 0;cl.scores[cl.parsingtextplayerindex].name[charindex] == t[charindex];charindex++)
;
- if (cl.parsingtextplayerindex < cl.maxclients)
+ if (cl.scores[cl.parsingtextplayerindex].name[charindex] == 0 && t[charindex] == '\n')
{
- // we parsed a valid ping entry, so expect another to follow
- cl.parsingtextmode = CL_PARSETEXTMODE_PING;
- cl.parsingtextexpectingpingforscores = expected;
+ cl.scores[cl.parsingtextplayerindex].qw_ping = bound(0, ping, 9999);
+ for (cl.parsingtextplayerindex++;cl.parsingtextplayerindex < cl.maxclients && !cl.scores[cl.parsingtextplayerindex].name[0];cl.parsingtextplayerindex++)
+ ;
+ //if (cl.parsingtextplayerindex < cl.maxclients) // we could still get unconnecteds!
+ {
+ // we parsed a valid ping entry, so expect another to follow
+ cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+ cl.parsingtextexpectingpingforscores = expected;
+ }
+ return !expected;
}
+ }
+ if (!strncmp(t, "unconnected\n", 12))
+ {
+ // just ignore
+ cl.parsingtextmode = CL_PARSETEXTMODE_PING;
+ cl.parsingtextexpectingpingforscores = expected;
return !expected;
}
+ else
+ Con_DPrintf("player names '%s' and '%s' didn't match\n", cl.scores[cl.parsingtextplayerindex].name, t);
}
}
}
if (!cls.demoplayback)
VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+ // force a recalculation of the player prediction
+ cl.movement_replay = true;
+
// slightly kill qw player entities each frame
for (i = 1;i < cl.maxclients;i++)
cl.entities_active[i] = false;
projects / xonotic / darkplaces.git / blobdiff