git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6993
d7cf8633-e32d-0410-b094-
e92efae38249
CL_Locs_Reload_f();
R_Modules_NewMap();
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
+
// add pmodel/emodel CRCs to userinfo
CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true);
CL_SetInfo("emodel", va("%i", FS_CRCFile("progs/eyes.mdl", NULL)), true, true, true, true);
// add pmodel/emodel CRCs to userinfo
CL_SetInfo("pmodel", va("%i", FS_CRCFile("progs/player.mdl", NULL)), true, true, true, true);
CL_SetInfo("emodel", va("%i", FS_CRCFile("progs/eyes.mdl", NULL)), true, true, true, true);
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
CL_UpdateRenderEntity(&cl.entities[0].render);
CL_Locs_Reload_f();
R_Modules_NewMap();
+ cl.foundtalk2wav = FS_FileExists("sound/misc/talk2.wav");
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
// check memory integrity
Mem_CheckSentinelsGlobal();
if (!cl.loadfinished && cl_joinbeforedownloadsfinish.integer)
{
model_t *model = Mod_ForName(s, false, false, i == 1);
if (!model)
{
model_t *model = Mod_ForName(s, false, false, i == 1);
if (!model)
- Con_Printf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
+ Con_DPrintf("svc_precache: Mod_ForName(\"%s\") failed\n", s);
cl.model_precache[i] = model;
}
else
cl.model_precache[i] = model;
}
else
{
sfx_t *sfx = S_PrecacheSound (s, true, false);
if (!sfx && snd_initialized.integer)
{
sfx_t *sfx = S_PrecacheSound (s, true, false);
if (!sfx && snd_initialized.integer)
- Con_Printf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
+ Con_DPrintf("svc_precache: S_PrecacheSound(\"%s\") failed\n", s);
cl.sound_precache[i] = sfx;
}
else
cl.sound_precache[i] = sfx;
}
else
sfx_t *sfx_ric2;
sfx_t *sfx_ric3;
sfx_t *sfx_r_exp3;
sfx_t *sfx_ric2;
sfx_t *sfx_ric3;
sfx_t *sfx_r_exp3;
+ // indicates that the file "sound/misc/talk2.wav" was found (for use by team chat messages)
+ qboolean foundtalk2wav;
{
// play talk wav
if (*msg == 1)
{
// play talk wav
if (*msg == 1)
- S_LocalSound ("sound/misc/talk.wav");
+ {
+ if (msg[1] == '(' && cl.foundtalk2wav)
+ S_LocalSound ("sound/misc/talk2.wav");
+ else
+ S_LocalSound ("sound/misc/talk.wav");
+ }
line[index++] = STRING_COLOR_TAG;
line[index++] = '3';
msg++;
line[index++] = STRING_COLOR_TAG;
line[index++] = '3';
msg++;
p1++;
}
// note this uses the chat prefix \001
p1++;
}
// note this uses the chat prefix \001
+ if (!fromServer && !teamonly)
dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1);
dpsnprintf (text, sizeof(text), "\001%s" STRING_COLOR_DEFAULT_STR ": %s", host_client->name, p1);
+ else if (!fromServer && teamonly)
+ dpsnprintf (text, sizeof(text), "\001(%s" STRING_COLOR_DEFAULT_STR "): %s", host_client->name, p1);
else if(*(sv_adminnick.string))
dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", sv_adminnick.string, p1);
else
else if(*(sv_adminnick.string))
dpsnprintf (text, sizeof(text), "\001<%s" STRING_COLOR_DEFAULT_STR "> %s", sv_adminnick.string, p1);
else