blendo/thirtyflightsofloving
0
0
Fork 0
mirror of https://github.com/blendogames/thirtyflightsofloving.git synced 2025-01-18 22:41:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

More cleanup of string handling in CTF code.

Browse source 
Increased MAX_ARENAS to 4096.
This commit is contained in:
Knightmare66 2019-11-20 21:13:27 -05:00
parent 92ef67ef44
commit 8ac9e3c693
4 changed files with 225 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

329
game/g_ctf.c
View file

@ -158,18 +158,18 @@ char *ctf_statusbar =
"pic 9 "
"endif "
// help / weapon icon
// help / weapon icon
"if 11 "
"xv 148 "
"pic 11 "
"endif "
// frags
// frags
"xr -50 "
"yt 2 "
"num 3 14 "
//tech
// tech
"yb -129 "
"if 26 "
"xr -26 "
@ -184,7 +184,7 @@ char *ctf_statusbar =
"endif "
"xr -62 "
"num 2 18 "
//joined overlay
// joined overlay
"if 22 "
"yb -104 "
"xr -28 "
@ -199,6 +199,7 @@ char *ctf_statusbar =
"endif "
"xr -62 "
"num 2 20 "
// joined overlay
"if 23 "
"yb -77 "
"xr -28 "
@ -297,18 +298,18 @@ char *ttctf_statusbar =
"pic 9 "
"endif "
// help / weapon icon
// help / weapon icon
"if 11 "
"xv 148 "
"pic 11 "
"endif "
// frags
// frags
"xr -50 "
"yt 2 "
"num 3 14 "
//tech
// tech
"yb -129 "
"if 26 "
"xr -26 "
@ -323,7 +324,7 @@ char *ttctf_statusbar =
"endif "
"xr -62 "
"num 2 18 "
//joined overlay
// joined overlay
"if 22 "
"yb -104 "
"xr -28 "
@ -338,7 +339,7 @@ char *ttctf_statusbar =
"endif "
"xr -62 "
"num 2 20 "
//joined overlay
// joined overlay
"if 23 "
"yb -77 "
"xr -28 "
@ -353,7 +354,7 @@ char *ttctf_statusbar =
"endif "
"xr -62 "
"num 2 33 "
//joined overlay
// joined overlay
"if 34 "
"yb -50 "
"xr -28 "
@ -2456,6 +2457,7 @@ CTFScoreboardMessage
void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
{
char entry[1024];
char tmp[128]; // Knightmare added
char string[1400];
int len;
int i, j, k, n;
@ -2532,7 +2534,7 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
totalscore[0], total[0],
totalscore[1], total[1]);
len = strlen(string);
len = (int)strlen(string);
for (i=0; i<16; i++)
{
@ -2547,51 +2549,69 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
cl = &game.clients[sorted[0][i]];
cl_ent = g_edicts + 1 + sorted[0][i];
if (ttctf->value)
sprintf(entry+strlen(entry),
#ifdef KMQUAKE2_ENGINE_MOD
"3tctf -72 %d %d %d %d ",
#else
"ctf -72 %d %d %d %d ",
#endif
42 + i * 8,
sorted[0][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
else
sprintf(entry+strlen(entry),
"ctf 0 %d %d %d %d ",
42 + i * 8,
sorted[0][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
if (ttctf->value) {
// sprintf(entry+strlen(entry),
Com_sprintf(tmp, sizeof(tmp),
#ifdef KMQUAKE2_ENGINE_MOD
"3tctf -72 %d %d %d %d ",
#else
"ctf -72 %d %d %d %d ",
#endif
42 + i * 8,
sorted[0][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
Q_strncatz (entry, tmp, sizeof(entry));
}
else {
// sprintf(entry+strlen(entry),
Com_sprintf(tmp, sizeof(tmp),
"ctf 0 %d %d %d %d ",
42 + i * 8,
sorted[0][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
Q_strncatz (entry, tmp, sizeof(entry));
}
if (ttctf->value)
{
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)]
&& cl_ent->client->pers.inventory[ITEM_INDEX(flag3_item)])
{
sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf2 "
// sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf2 "
Com_sprintf(tmp, sizeof(tmp), "xv -16 yv %d picn sbfctf2 "
"xv -8 yv %d picn sbfctf3 ", 42 + i * 8, 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
/*if (level.framenum & 1)
sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf2 ", 42 + i * 8);
Com_sprintf(tmp, sizeof(tmp), "xv -16 yv %d picn sbfctf2 ", 42 + i * 8);
else
sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf3 ", 42 + i * 8);*/
Com_sprintf(tmp, sizeof(tmp), "xv -16 yv %d picn sbfctf3 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
*/
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)]) {
// sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf2 ", 42 + i * 8);
Com_sprintf(tmp, sizeof(tmp), "xv -16 yv %d picn sbfctf2 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag3_item)]) {
// sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf3 ", 42 + i * 8);
Com_sprintf(tmp, sizeof(tmp), "xv -16 yv %d picn sbfctf3 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)])
sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf2 ", 42 + i * 8);
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag3_item)])
sprintf(entry + strlen(entry), "xv -16 yv %d picn sbfctf3 ", 42 + i * 8);
}
else
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)])
sprintf(entry + strlen(entry), "xv 56 yv %d picn sbfctf2 ",
42 + i * 8);
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)]) {
// sprintf(entry + strlen(entry), "xv 56 yv %d picn sbfctf2 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 56 yv %d picn sbfctf2 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
if (maxsize - len > strlen(entry)) {
// strncat(string, entry);
Q_strncatz(string, entry, sizeof(string));
len = strlen(string);
len = (int)strlen(string);
last[0] = i;
}
}
@ -2602,50 +2622,69 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
cl = &game.clients[sorted[1][i]];
cl_ent = g_edicts + 1 + sorted[1][i];
if (ttctf->value)
sprintf(entry+strlen(entry),
#ifdef KMQUAKE2_ENGINE_MOD
"3tctf 88 %d %d %d %d ",
#else
"ctf 88 %d %d %d %d ",
#endif
42 + i * 8,
sorted[1][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
else
sprintf(entry+strlen(entry),
"ctf 160 %d %d %d %d ",
42 + i * 8,
sorted[1][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
if (ttctf->value) {
// sprintf(entry+strlen(entry),
Com_sprintf (tmp, sizeof(tmp),
#ifdef KMQUAKE2_ENGINE_MOD
"3tctf 88 %d %d %d %d ",
#else
"ctf 88 %d %d %d %d ",
#endif
42 + i * 8,
sorted[1][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
Q_strncatz (entry, tmp, sizeof(entry));
}
else {
// sprintf(entry+strlen(entry),
Com_sprintf (tmp, sizeof(tmp),
"ctf 160 %d %d %d %d ",
42 + i * 8,
sorted[1][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
Q_strncatz (entry, tmp, sizeof(entry));
}
if (ttctf->value)
{
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)]
&& cl_ent->client->pers.inventory[ITEM_INDEX(flag3_item)])
{
sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf1 "
// sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf1 "
Com_sprintf (tmp, sizeof(tmp), "xv 144 yv %d picn sbfctf1 "
"xv 152 yv %d picn sbfctf3 ", 42 + i * 8, 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
/*if (level.framenum & 1)
sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf1 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 144 yv %d picn sbfctf1 ", 42 + i * 8);
else
sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf3", 42 + i * 8);*/
Com_sprintf (tmp, sizeof(tmp), "xv 144 yv %d picn sbfctf3", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
*/
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)]) {
// sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf1 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 144 yv %d picn sbfctf1 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag3_item)]) {
// sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf3 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 144 yv %d picn sbfctf3 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)])
sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf1 ", 42 + i * 8);
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag3_item)])
sprintf(entry + strlen(entry), "xv 144 yv %d picn sbfctf3 ", 42 + i * 8);
}
else
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)])
sprintf(entry + strlen(entry), "xv 216 yv %d picn sbfctf1 ", 42 + i * 8);
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)]) {
// sprintf(entry + strlen(entry), "xv 216 yv %d picn sbfctf1 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 216 yv %d picn sbfctf1 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
if (maxsize - len > strlen(entry)) {
// strncat(string, entry);
Q_strncatz(string, entry, sizeof(string));
len = strlen(string);
len = (int)strlen(string);
last[1] = i;
}
}
@ -2656,7 +2695,8 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
cl = &game.clients[sorted[2][i]];
cl_ent = g_edicts + 1 + sorted[2][i];
sprintf(entry+strlen(entry),
// sprintf(entry+strlen(entry),
Com_sprintf (tmp, sizeof(tmp),
#ifdef KMQUAKE2_ENGINE_MOD
"3tctf 248 %d %d %d %d ",
#else
@ -2666,26 +2706,37 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
sorted[2][i],
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
Q_strncatz (entry, tmp, sizeof(entry));
if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)]
&& cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)])
{
sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf1 "
// sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf1 "
Com_sprintf (tmp, sizeof(tmp), "xv 304 yv %d picn sbfctf1 "
"xv 312 yv %d picn sbfctf2 ", 42 + i * 8, 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
/*if (level.framenum & 1)
sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf1 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 304 yv %d picn sbfctf1 ", 42 + i * 8);
else
sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf2", 42 + i * 8);*/
Com_sprintf (tmp, sizeof(tmp), "xv 304 yv %d picn sbfctf2", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
*/
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)]) {
// sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf1 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 304 yv %d picn sbfctf1 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)]) {
// sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf2 ", 42 + i * 8);
Com_sprintf (tmp, sizeof(tmp), "xv 304 yv %d picn sbfctf2 ", 42 + i * 8);
Q_strncatz (entry, tmp, sizeof(entry));
}
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag1_item)])
sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf1 ", 42 + i * 8);
else if (cl_ent->client->pers.inventory[ITEM_INDEX(flag2_item)])
sprintf(entry + strlen(entry), "xv 304 yv %d picn sbfctf2 ", 42 + i * 8);
if (maxsize - len > strlen(entry)) {
// strncat(string, entry);
Q_strncatz(string, entry, sizeof(string));
len = strlen(string);
len = (int)strlen(string);
last[2] = i;
}
}
@ -2725,24 +2776,27 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
if (!k)
{
k = 1;
sprintf(entry, "xv 0 yv %d string2 \"Spectators\" ", j);
// sprintf(entry, "xv 0 yv %d string2 \"Spectators\" ", j);
Com_sprintf (entry, sizeof(entry), "xv 0 yv %d string2 \"Spectators\" ", j);
// strncat(string, entry);
Q_strncatz(string, entry, sizeof(string));
len = strlen(string);
len = (int)strlen(string);
j += 8;
}
sprintf(entry+strlen(entry),
// sprintf(entry+strlen(entry),
Com_sprintf (tmp, sizeof(tmp),
"ctf %d %d %d %d %d ",
(n & 1) ? 160 : 0, // x
j, // y
i, // playernum
cl->resp.score,
cl->ping > 999 ? 999 : cl->ping);
Q_strncatz (entry, tmp, sizeof(entry));
if (maxsize - len > strlen(entry)) {
// strncat(string, entry);
Q_strncatz(string, entry, sizeof(string));
len = strlen(string);
len = (int)strlen(string);
}
if (n & 1)
@ -2753,24 +2807,39 @@ void CTFScoreboardMessage (edict_t *ent, edict_t *killer)
if (ttctf->value)
{
if (total[0] - last[0] > 1) // couldn't fit everyone
sprintf(string + strlen(string), "xv -64 yv %d string \"..and %d more\" ",
42 + (last[0]+1)*8, total[0] - last[0] - 1);
if (total[1] - last[1] > 1) // couldn't fit everyone
sprintf(string + strlen(string), "xv 96 yv %d string \"..and %d more\" ",
42 + (last[1]+1)*8, total[1] - last[1] - 1);
if (total[2] - last[2] > 1) // couldn't fit everyone
sprintf(string + strlen(string), "xv 256 yv %d string \"..and %d more\" ",
42 + (last[2]+1)*8, total[2] - last[2] - 1);
if (total[0] - last[0] > 1) { // couldn't fit everyone
// sprintf(string + strlen(string), "xv -64 yv %d string \"..and %d more\" ",
Com_sprintf (tmp, sizeof(tmp), "xv -64 yv %d string \"..and %d more\" ",
42 + (last[0]+1)*8, total[0] - last[0] - 1);
Q_strncatz (string, tmp, sizeof(string));
}
if (total[1] - last[1] > 1) { // couldn't fit everyone
// sprintf(string + strlen(string), "xv 96 yv %d string \"..and %d more\" ",
Com_sprintf (tmp, sizeof(tmp), "xv 96 yv %d string \"..and %d more\" ",
42 + (last[1]+1)*8, total[1] - last[1] - 1);
Q_strncatz (string, tmp, sizeof(string));
}
if (total[2] - last[2] > 1) { // couldn't fit everyone
// sprintf(string + strlen(string), "xv 256 yv %d string \"..and %d more\" ",
Com_sprintf (tmp, sizeof(tmp), "xv 256 yv %d string \"..and %d more\" ",
42 + (last[2]+1)*8, total[2] - last[2] - 1);
Q_strncatz (string, tmp, sizeof(string));
}
}
else
{
if (total[0] - last[0] > 1) // couldn't fit everyone
sprintf(string + strlen(string), "xv 8 yv %d string \"..and %d more\" ",
42 + (last[0]+1)*8, total[0] - last[0] - 1);
if (total[1] - last[1] > 1) // couldn't fit everyone
sprintf(string + strlen(string), "xv 168 yv %d string \"..and %d more\" ",
42 + (last[1]+1)*8, total[1] - last[1] - 1);
if (total[0] - last[0] > 1) { // couldn't fit everyone
// sprintf(string + strlen(string), "xv 8 yv %d string \"..and %d more\" ",
Com_sprintf (tmp, sizeof(tmp), "xv 8 yv %d string \"..and %d more\" ",
42 + (last[0]+1)*8, total[0] - last[0] - 1);
Q_strncatz (string, tmp, sizeof(string));
}
if (total[1] - last[1] > 1) { // couldn't fit everyone
// sprintf(string + strlen(string), "xv 168 yv %d string \"..and %d more\" ",
Com_sprintf (tmp, sizeof(tmp), "xv 168 yv %d string \"..and %d more\" ",
42 + (last[1]+1)*8, total[1] - last[1] - 1);
Q_strncatz (string, tmp, sizeof(string));
}
}
gi.WriteByte (svc_layout);
@ -2964,7 +3033,7 @@ void CTFDeadDropTech (edict_t *ent)
// hack the velocity to make it bounce random
dropped->velocity[0] = (rand() % 600) - 300;
dropped->velocity[1] = (rand() % 600) - 300;
dropped->nextthink = level.time + tech_life->value; //was CTF_TECH_TIMEOUT
dropped->nextthink = level.time + tech_life->value; // was CTF_TECH_TIMEOUT
dropped->think = TechThink;
dropped->owner = NULL;
ent->client->pers.inventory[ITEM_INDEX(tech)] = 0;
@ -3156,7 +3225,7 @@ void CheckNumTechs (void)
gi.cvar_forceset("tech_flags", "15");
}
//count number of tech types enabled
// count number of tech types enabled
i = 0;
while (tnames[i]) {
if ((int)(tech_flags->value) & (0x1 << i))
@ -3164,7 +3233,7 @@ void CheckNumTechs (void)
i++;
}
//count num. of clients
// count num of clients
numclients = 0;
for (i = 0; i < game.maxclients; i++)
{
@ -3174,19 +3243,19 @@ void CheckNumTechs (void)
}
newtechcount = tech_perplayer->value * numclients;
if (newtechcount > tech_max->value) //cap at tech_max
if (newtechcount > tech_max->value) // cap at tech_max
newtechcount = tech_max->value;
if (newtechcount < numtechtypes) //leave at least 1 of each enabled tech
if (newtechcount < numtechtypes) // leave at least 1 of each enabled tech
newtechcount = numtechtypes;
numtechs = TechCount();
if (newtechcount > numtechs)
{
//gi.dprintf ("Number of techs to spawn: %d\n", newtechcount);
// gi.dprintf ("Number of techs to spawn: %d\n", newtechcount);
SpawnMoreTechs (numtechs, newtechcount, numtechtypes);
}
if (newtechcount < numtechs)
{
//gi.dprintf ("Number of techs to spawn: %d\n", newtechcount);
// gi.dprintf ("Number of techs to spawn: %d\n", newtechcount);
RemoveTechs (numtechs, newtechcount, numtechtypes);
}
}
@ -3224,7 +3293,7 @@ void CheckNumTechs (void)
VectorScale (forward, 100, ent->velocity);
ent->velocity[2] = 300;
//ent->nextthink = level.time + CTF_TECH_TIMEOUT;
// ent->nextthink = level.time + CTF_TECH_TIMEOUT;
ent->nextthink = level.time + tech_life->value;
ent->think = TechThink;
@ -3609,7 +3678,7 @@ struct {
};
/*static*/ void CTFSay_Team_Location (edict_t *who, char *buf, int bufSize)
/*static*/ void CTFSay_Team_Location (edict_t *who, char *buf, size_t bufSize)
{
edict_t *what = NULL;
edict_t *hot = NULL;
@ -3725,11 +3794,12 @@ struct {
Q_strncatz(buf, item->pickup_name, bufSize);
}
/*static*/ void CTFSay_Team_Armor (edict_t *who, char *buf, int bufSize)
/*static*/ void CTFSay_Team_Armor (edict_t *who, char *buf, size_t bufSize)
{
gitem_t *item;
int index, cells;
int power_armor_type;
char tmp[128]; // Knightmare added
*buf = 0;
@ -3737,10 +3807,13 @@ struct {
if (power_armor_type)
{
cells = who->client->pers.inventory[ITEM_INDEX(FindItem ("cells"))];
if (cells)
sprintf(buf+strlen(buf), "%s with %i cells ",
if (cells) {
// sprintf(buf+strlen(buf), "%s with %i cells ",
Com_sprintf (tmp, sizeof(tmp), "%s with %i cells ",
(power_armor_type == POWER_ARMOR_SCREEN) ?
"Power Screen" : "Power Shield", cells);
Q_strncatz (buf, tmp, bufSize);
}
}
index = ArmorIndex (who);
@ -3751,8 +3824,10 @@ struct {
if (*buf)
// strncat(buf, "and ");
Q_strncatz(buf, "and ", bufSize);
sprintf(buf+strlen(buf), "%i units of %s",
// sprintf(buf+strlen(buf), "%i units of %s",
Com_sprintf (tmp, sizeof(tmp), "%i units of %s",
who->client->pers.inventory[index], item->pickup_name);
Q_strncatz (buf, tmp, bufSize);
}
}
@ -3761,7 +3836,7 @@ struct {
Q_strncpyz(buf, "no armor", bufSize);
}
/*static*/ void CTFSay_Team_Health (edict_t *who, char *buf, int bufSize)
/*static*/ void CTFSay_Team_Health (edict_t *who, char *buf, size_t bufSize)
{
if (who->health <= 0)
// strncpy(buf, "dead", bufSize);
@ -3770,7 +3845,7 @@ struct {
Com_sprintf(buf, bufSize, "%i health", who->health);
}
/*static*/ void CTFSay_Team_Tech (edict_t *who, char *buf, int bufSize)
/*static*/ void CTFSay_Team_Tech (edict_t *who, char *buf, size_t bufSize)
{
gitem_t *tech;
int i;
@ -3789,7 +3864,7 @@ struct {
Q_strncpyz(buf, "no powerup", bufSize);
}
/*static*/ void CTFSay_Team_Weapon (edict_t *who, char *buf, int bufSize)
/*static*/ void CTFSay_Team_Weapon (edict_t *who, char *buf, size_t bufSize)
{
if (who->client->pers.weapon)
// strncpy(buf, who->client->pers.weapon->pickup_name, bufSize);
@ -3799,7 +3874,7 @@ struct {
Q_strncpyz(buf, "none", bufSize);
}
/*static*/ void CTFSay_Team_Sight (edict_t *who, char *buf, int bufSize)
/*static*/ void CTFSay_Team_Sight (edict_t *who, char *buf, size_t bufSize)
{
int i;
edict_t *targ;
@ -5684,11 +5759,12 @@ void CTFAdmin(edict_t *ent)
void CTFStats(edict_t *ent)
{
int i, e;
int i, e;
ghost_t *g;
char st[80];
char text[1024];
edict_t *e2;
char st[80];
char text[1024];
char tmp[128]; // Knightmare added
edict_t *e2;
*text = 0;
if (ctfgame.match == MATCH_SETUP)
@ -5743,7 +5819,9 @@ void CTFStats(edict_t *ent)
e);
if (strlen(text) + strlen(st) > sizeof(text) - 50)
{
sprintf(text+strlen(text), "And more...\n");
// sprintf(text+strlen(text), "And more...\n");
Com_sprintf(tmp, sizeof(tmp), "And more...\n");
Q_strncatz (text, tmp, sizeof(text));
safe_cprintf(ent, PRINT_HIGH, "%s", text);
return;
}
@ -5755,10 +5833,11 @@ void CTFStats(edict_t *ent)
void CTFPlayerList(edict_t *ent)
{
int i;
char st[80];
char text[1400];
edict_t *e2;
int i;
char st[80];
char text[1400];
char tmp[128]; // Knightmare added
edict_t *e2;
#if 0
*text = 0;
@ -5799,7 +5878,9 @@ void CTFPlayerList(edict_t *ent)
e2->client->resp.admin ? " (admin)" : "");
if (strlen(text) + strlen(st) > sizeof(text) - 50) {
sprintf(text+strlen(text), "And more...\n");
// sprintf(text+strlen(text), "And more...\n");
Com_sprintf (tmp, sizeof(tmp), "And more...\n");
Q_strncatz (text, tmp, sizeof(text));
safe_cprintf(ent, PRINT_HIGH, "%s", text);
return;
}

22
game/g_func_decs.h
View file

@ -11,7 +11,11 @@ extern void Q_strncatz ( char * dst , const char * src , size_t dstSize ) ;
extern void Q_strncpyz ( char * dst , const char * src , size_t dstSize ) ;
extern int Q_strcasecmp ( char * s1 , char * s2 ) ;
extern int Q_strncasecmp ( char * s1 , char * s2 , int n ) ;
extern int Q_SortStrcmp ( const char * * arg1 , const char * * arg2 ) ;
extern int Q_strcmp ( const char * string1 , const char * string2 ) ;
extern int Q_strncmp ( const char * string1 , const char * string2 , int n ) ;
extern int Q_stricmp ( char * s1 , char * s2 ) ;
extern qboolean Q_GlobMatch ( const char * pattern , const char * text , qboolean caseSensitive ) ;
extern void Com_PageInMemory ( byte * buffer , int size ) ;
extern char * COM_ParseExt ( char * * data_p , qboolean allowNewLines ) ;
extern char * COM_Parse ( char * * data_p ) ;
@ -37,10 +41,10 @@ extern int BigLong ( int l ) ;
extern short LittleShort ( short l ) ;
extern short BigShort ( short l ) ;
extern void COM_DefaultExtension ( char * path , size_t pathSize , char * extension ) ;
extern void COM_FilePath ( char * in , char * out ) ;
extern void COM_FileBase ( char * in , char * out ) ;
extern void COM_FilePath ( char * in , char * out , size_t outSize ) ;
extern void COM_FileBase ( char * in , char * out , size_t outSize ) ;
extern char * COM_FileExtension ( char * in ) ;
extern void COM_StripExtension ( char * in , char * out ) ;
extern void COM_StripExtension ( char * in , char * out , size_t outSize ) ;
extern char * COM_SkipPath ( char * pathname ) ;
extern qboolean AxisCompare ( const vec3_t axis1 [ 3 ] , const vec3_t axis2 [ 3 ] ) ;
extern void AxisCopy ( const vec3_t in [ 3 ] , vec3_t out [ 3 ] ) ;
@ -1531,12 +1535,12 @@ extern void SP_misc_ctf_small_banner ( edict_t * ent ) ;
extern void SP_misc_ctf_banner ( edict_t * ent ) ;
extern void misc_ctf_banner_think ( edict_t * ent ) ;
extern void CTFSay_Team ( edict_t * who , char * msg ) ;
extern void CTFSay_Team_Sight ( edict_t * who , char * buf , int bufSize ) ;
extern void CTFSay_Team_Weapon ( edict_t * who , char * buf , int bufSize ) ;
extern void CTFSay_Team_Tech ( edict_t * who , char * buf , int bufSize ) ;
extern void CTFSay_Team_Health ( edict_t * who , char * buf , int bufSize ) ;
extern void CTFSay_Team_Armor ( edict_t * who , char * buf , int bufSize ) ;
extern void CTFSay_Team_Location ( edict_t * who , char * buf , int bufSize ) ;
extern void CTFSay_Team_Sight ( edict_t * who , char * buf , size_t bufSize ) ;
extern void CTFSay_Team_Weapon ( edict_t * who , char * buf , size_t bufSize ) ;
extern void CTFSay_Team_Tech ( edict_t * who , char * buf , size_t bufSize ) ;
extern void CTFSay_Team_Health ( edict_t * who , char * buf , size_t bufSize ) ;
extern void CTFSay_Team_Armor ( edict_t * who , char * buf , size_t bufSize ) ;
extern void CTFSay_Team_Location ( edict_t * who , char * buf , size_t bufSize ) ;
extern void CTFApplyAmmogenSound ( edict_t * ent ) ;
extern void CTFApplyAmmogen ( edict_t * attacker , edict_t * targ ) ;
extern void CTFApplyVampireSound ( edict_t * ent ) ;

4
game/g_func_list.h
View file

@ -11,7 +11,11 @@
{"Q_strncpyz", (byte *)Q_strncpyz},
{"Q_strcasecmp", (byte *)Q_strcasecmp},
{"Q_strncasecmp", (byte *)Q_strncasecmp},
{"Q_SortStrcmp", (byte *)Q_SortStrcmp},
{"Q_strcmp", (byte *)Q_strcmp},
{"Q_strncmp", (byte *)Q_strncmp},
{"Q_stricmp", (byte *)Q_stricmp},
{"Q_GlobMatch", (byte *)Q_GlobMatch},
{"Com_PageInMemory", (byte *)Com_PageInMemory},
{"COM_ParseExt", (byte *)COM_ParseExt},
{"COM_Parse", (byte *)COM_Parse},

6
ui/ui_mp_startserver.c
View file

@ -73,7 +73,7 @@ gametype_names_t gametype_names[] =
{MAP_3TCTF, "3tctf"},
};
#define MAX_ARENAS 1024
#define MAX_ARENAS 4096
#define MAX_ARENAS_TEXT 8192
static maptype_t ui_svr_maptype;
@ -215,8 +215,8 @@ UI_LoadArenas
void UI_LoadArenas (void)
{
char *p, *s, *s2, *tok, *tok2;
char **arenafiles;
char **tmplist = 0;
char **arenafiles = NULL;
char **tmplist = NULL;
char *path = NULL;
// char findName[1024];
char shortname[MAX_TOKEN_CHARS];