if(cvar("sv_fragmessage_information_ping")) {
if(clienttype(enPlayer) == CLIENTTYPE_BOT) // Bots have no ping
- strMessage = strcat(strMessage, "\n^7(^2Bot");
+ strMessage = strcat(strMessage, " ^7(^2Bot");
else
- strMessage = strcat(strMessage, "\n^7(Ping ", strPlayerPingColor, ftos(nPlayerPing), "ms");
+ strMessage = strcat(strMessage, " ^7(Ping ", strPlayerPingColor, ftos(nPlayerPing), "ms");
if(cvar("sv_fragmessage_information_handicap"))
if(cvar("sv_fragmessage_information_handicap") == 2)
if(nPlayerHandicap <= 1)
" ", ftos(tstart), " ", ftos(dt), "\n"));
}
-vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter)
+vector shotorg_adjustfromclient(vector vecs, float y_is_right, float allowcenter, float algn)
{
- switch(self.owner.cvar_cl_gunalign)
+ switch(algn)
{
case 1: // right
break;
return vecs;
}
-vector shotorg_adjust(vector vecs, float y_is_right, float visual)
+vector shotorg_adjust_values(vector vecs, float y_is_right, float visual, float algn)
{
string s;
vector v;
{
if (visual)
{
- vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE);
+ vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE, algn);
}
else
{
{
if (visual)
{
- vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE);
+ vecs = shotorg_adjustfromclient(vecs, y_is_right, TRUE, algn);
}
else
{
}
else if (cvar("g_shootfromclient"))
{
- vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2));
+ vecs = shotorg_adjustfromclient(vecs, y_is_right, (cvar("g_shootfromclient") >= 2), algn);
}
return vecs;
}
+vector shotorg_adjust(vector vecs, float y_is_right, float visual)
+{
+ return shotorg_adjust_values(vecs, y_is_right, visual, self.owner.cvar_cl_gunalign);
+}
void attach_sameorigin(entity e, entity to, string tag)