fte/fteqw
2
0
Fork 1
Code Issues Pull requests Releases 1 Activity Actions

LOTS OF CHANGES. was hoping to get revision 5000 perfect, but really that's never going to happen. this has gone on for too long now.

Browse source 
vulkan, wasapi, quake injector features added.
irc, avplug, cef plugins/drivers reworked/updated/added
openal reverb, doppler effects added.
'dir' console command now attempts to view clicked files.
lots of warning fixes, should now only be deprecation warnings for most targets (depending on compiler version anyway...).
SendEntity finally reworked to use flags properly.
effectinfo improved, other smc-targetted fixes.
mapcluster stuff now has support for linux.
.basebone+.baseframe now exist in ssqc.
qcc: -Fqccx supports qccx syntax, including qccx hacks. don't expect these to work in fteqw nor dp though.
qcc: rewrote function call handling to use refs rather than defs. this makes struct passing more efficient and makes the __out keyword usable with fields etc.
qccgui: can cope a little better with non-unicode files. can now represent most quake chars.
qcc: suppressed warnings from *extensions.qc

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5000 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2016-07-12 00:40:13 +00:00
parent 5920bf05fb
commit 27a59a0cbc
271 changed files with 101001 additions and 64352 deletions
Download patch file Download diff file Expand all files Collapse all files

45
engine/client/m_master.c
View file

@ -405,7 +405,7 @@ static void SL_PreDraw (menu_t *menu)
}
info->numslots = Master_NumSorted();
snprintf(info->refreshtext, sizeof(info->refreshtext), "Refresh - %u/%u/%u\n", info->numslots, Master_NumPolled(), Master_TotalCount());
snprintf(info->refreshtext, sizeof(info->refreshtext), "Refresh - %u/%u/%u\n", info->numslots, Master_NumAlive(), Master_TotalCount());
}
static void SL_PostDraw (menu_t *menu)
{
@ -442,6 +442,7 @@ static void SL_PostDraw (menu_t *menu)
if (server && server->moreinfo)
{
int lx, x, y, i;
int skins = 0;
if (serverpreview == 4)
{
//count the number of proxies the best route will need
@ -466,7 +467,19 @@ static void SL_PostDraw (menu_t *menu)
}
}
else
{
h += server->moreinfo->numplayers+2;
for (i = 0; i < server->moreinfo->numplayers; i++)
{
if (*server->moreinfo->players[i].skin && strcmp(server->moreinfo->players[i].skin, "base"))
{
skins = true;
w += 8*8+8;
break;
}
}
}
h += 4;
h *= 8;
@ -540,19 +553,22 @@ static void SL_PostDraw (menu_t *menu)
Draw_FunStringWidth (x, y, "^mTeam", 4*8, false, false);
x += 4*8+8;
Draw_FunStringWidth (x, y, "^mName", 12*8, false, false);
x += 12*8+8;
}
else
{
Draw_FunStringWidth (x, y, "^mName", 16*8, false, false);
x += 16*8+8;
}
if (skins)
{
Draw_FunStringWidth (lx+w-(8*8+8), y, "^mSkin", 8*8, false, false);
x = lx+w;
}
y+=8;
for (i = 0; i < server->moreinfo->numplayers; i++)
{
x = lx;
if (server->moreinfo->players[i].isspec)
if (server->moreinfo->players[i].isspec&1)
Draw_FunStringWidth (x, y, "spec", 32, true, false);
else
{
@ -564,7 +580,10 @@ static void SL_PostDraw (menu_t *menu)
Draw_FunStringWidth (x, y, va("%3i", server->moreinfo->players[i].frags), 32-4, true, false);
}
x += 32+8;
Draw_FunStringWidth (x, y, va("%3i", server->moreinfo->players[i].ping), 28, true, false);
if (server->moreinfo->players[i].isspec&2)
Draw_FunStringWidth (x-8, y, "bot", 3*8+8, true, false);
else
Draw_FunStringWidth (x-8, y, va("%3i", server->moreinfo->players[i].ping), 3*8+8, true, false);
x += 3*8+8;
if (teamplay)
@ -573,7 +592,14 @@ static void SL_PostDraw (menu_t *menu)
x += 4*8+8;
}
Draw_FunStringWidth (x, y, server->moreinfo->players[i].name, lx+w-x, false, false);
if (skins)
{
Draw_FunStringWidth (x, y, server->moreinfo->players[i].name, lx+w-(8*8+8)-x, false, false);
x += lx+w-(8*8+8)-x;
Draw_FunStringWidth (x, y, server->moreinfo->players[i].skin, 8*8, false, false);
}
else
Draw_FunStringWidth (x, y, server->moreinfo->players[i].name, lx+w-x, false, false);
y += 8;
}
@ -660,6 +686,11 @@ static void SL_PostDraw (menu_t *menu)
Draw_FunStringWidth(0, vid.height/2 - 8, "No servers found", vid.width, 2, false);
Draw_FunStringWidth(0, vid.height/2 + 0, "Check internet connection", vid.width, 2, false);
}
else if (!Master_NumAlive())
{
Draw_FunStringWidth(0, vid.height/2 - 8, "No servers responding", vid.width, 2, false);
Draw_FunStringWidth(0, vid.height/2 + 0, "Check udp internet connection", vid.width, 2, false);
}
else
{
Draw_FunStringWidth(0, vid.height/2 - 8, "All servers were filtered out", vid.width, 2, false);
@ -866,7 +897,7 @@ static void SL_ServerPlayer (int x, int y, menucustom_t *ths, menu_t *menu)
if (ths->dint < selectedserver.detail->numplayers)
{
int i = ths->dint;
if (selectedserver.detail->players[i].isspec)
if (selectedserver.detail->players[i].isspec&1)
Draw_FunStringWidth (x, y, "spectator", 32, false, false);
else
{