teambeef/ioq3quest
0
0
Fork 0
mirror of https://github.com/DrBeef/ioq3quest.git synced 2024-11-23 12:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix handling too many characters or aliases in Team Arena UI

Browse source
This commit is contained in:
Zack Middleton 2015-01-12 19:17:05 -06:00
parent 07eb0f6dc9
commit f74479afe8
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/ui/ui_main.c
View file

@ -4628,6 +4628,11 @@ static qboolean Character_Parse(char **p) {
} }
if (token[0] == '{') { if (token[0] == '{') {
if (uiInfo.characterCount == MAX_HEADS) {
uiInfo.characterCount--;
Com_Printf("Too many characters, last character replaced!\n");
}
// two tokens per line, character name and sex // two tokens per line, character name and sex
if (!String_Parse(p, &uiInfo.characterList[uiInfo.characterCount].name) || !String_Parse(p, &tempStr)) { if (!String_Parse(p, &uiInfo.characterList[uiInfo.characterCount].name) || !String_Parse(p, &tempStr)) {
return qfalse; return qfalse;
@ -4645,11 +4650,7 @@ static qboolean Character_Parse(char **p) {
} }
Com_Printf("Loaded %s character %s.\n", uiInfo.characterList[uiInfo.characterCount].base, uiInfo.characterList[uiInfo.characterCount].name); Com_Printf("Loaded %s character %s.\n", uiInfo.characterList[uiInfo.characterCount].base, uiInfo.characterList[uiInfo.characterCount].name);
if (uiInfo.characterCount < MAX_HEADS) {
uiInfo.characterCount++; uiInfo.characterCount++;
} else {
Com_Printf("Too many characters, last character replaced!\n");
}
token = COM_ParseExt(p, qtrue); token = COM_ParseExt(p, qtrue);
if (token[0] != '}') { if (token[0] != '}') {
@ -4683,17 +4684,18 @@ static qboolean Alias_Parse(char **p) {
} }
if (token[0] == '{') { if (token[0] == '{') {
if (uiInfo.aliasCount == MAX_ALIASES) {
uiInfo.aliasCount--;
Com_Printf("Too many aliases, last alias replaced!\n");
}
// three tokens per line, character name, bot alias, and preferred action a - all purpose, d - defense, o - offense // three tokens per line, character name, bot alias, and preferred action a - all purpose, d - defense, o - offense
if (!String_Parse(p, &uiInfo.aliasList[uiInfo.aliasCount].name) || !String_Parse(p, &uiInfo.aliasList[uiInfo.aliasCount].ai) || !String_Parse(p, &uiInfo.aliasList[uiInfo.aliasCount].action)) { if (!String_Parse(p, &uiInfo.aliasList[uiInfo.aliasCount].name) || !String_Parse(p, &uiInfo.aliasList[uiInfo.aliasCount].ai) || !String_Parse(p, &uiInfo.aliasList[uiInfo.aliasCount].action)) {
return qfalse; return qfalse;
} }
Com_Printf("Loaded character alias %s using character ai %s.\n", uiInfo.aliasList[uiInfo.aliasCount].name, uiInfo.aliasList[uiInfo.aliasCount].ai); Com_Printf("Loaded character alias %s using character ai %s.\n", uiInfo.aliasList[uiInfo.aliasCount].name, uiInfo.aliasList[uiInfo.aliasCount].ai);
if (uiInfo.aliasCount < MAX_ALIASES) {
uiInfo.aliasCount++; uiInfo.aliasCount++;
} else {
Com_Printf("Too many aliases, last alias replaced!\n");
}
token = COM_ParseExt(p, qtrue); token = COM_ParseExt(p, qtrue);
if (token[0] != '}') { if (token[0] != '}') {