okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Merge unified-sdl to trunk

Browse source 
* Bump Q3_VERSION to 1.35
This commit is contained in:
Tim Angus 2007-09-05 18:17:46 +00:00
parent 39abffeb3b
commit 672cfbf16f
188 changed files with 5071 additions and 41739 deletions
Download patch file Download diff file Expand all files Collapse all files

36
code/ui/ui_main.c
View file

@ -119,7 +119,7 @@ static char* netnames[] = {
NULL
};
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static char quake3worldMessage[] = "Visit www.quake3world.com - News, Community, Events, Files";
#endif
@ -203,7 +203,7 @@ intptr_t vmMain( int command, int arg0, int arg1, int arg2, int arg3, int arg4,
UI_DrawConnectScreen( arg0 );
return 0;
case UI_HASUNIQUECDKEY: // mod authors need to observe this
return qtrue; // bk010117 - change this to qfalse for mods!
return qtrue; // change this to qfalse for mods!
}
@ -312,7 +312,7 @@ int Text_Height(const char *text, float scale, int limit) {
float max;
glyphInfo_t *glyph;
float useScale;
const char *s = text; // bk001206 - unsigned
const char *s = text;
fontInfo_t *font = &uiInfo.uiDC.Assets.textFont;
if (scale <= ui_smallFont.value) {
font = &uiInfo.uiDC.Assets.smallFont;
@ -365,7 +365,7 @@ void Text_Paint(float x, float y, float scale, vec4_t color, const char *text, f
}
useScale = scale * font->glyphScale;
if (text) {
const char *s = text; // bk001206 - unsigned
const char *s = text;
trap_R_SetColor( color );
memcpy(&newColor[0], &color[0], sizeof(vec4_t));
len = strlen(text);
@ -434,7 +434,7 @@ void Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const cha
}
useScale = scale * font->glyphScale;
if (text) {
const char *s = text; // bk001206 - unsigned
const char *s = text;
trap_R_SetColor( color );
memcpy(&newColor[0], &color[0], sizeof(vec4_t));
len = strlen(text);
@ -442,7 +442,7 @@ void Text_PaintWithCursor(float x, float y, float scale, vec4_t color, const cha
len = limit;
}
count = 0;
glyph2 = &font->glyphs[ (int) cursor]; // bk001206 - possible signed char
glyph2 = &font->glyphs[ (int) cursor];
while (s && *s && count < len) {
glyph = &font->glyphs[(int)*s]; // TTimo: FIXME: getting nasty warnings without the cast, hopefully this doesn't break the VM build
//int yadj = Assets.textFont.glyphs[text[i]].bottom + Assets.textFont.glyphs[text[i]].top;
@ -524,7 +524,7 @@ static void Text_Paint_Limit(float *maxX, float x, float y, float scale, vec4_t
vec4_t newColor;
glyphInfo_t *glyph;
if (text) {
const char *s = text; // bk001206 - unsigned
const char *s = text;
float max = *maxX;
float useScale;
fontInfo_t *font = &uiInfo.uiDC.Assets.textFont;
@ -1007,7 +1007,7 @@ void UI_Load(void) {
}
static const char *handicapValues[] = {"None","95","90","85","80","75","70","65","60","55","50","45","40","35","30","25","20","15","10","5",NULL};
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static int numHandicaps = sizeof(handicapValues) / sizeof(const char*);
#endif
@ -1412,7 +1412,7 @@ static void UI_DrawTierGameType(rectDef_t *rect, float scale, vec4_t color, int
}
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static const char *UI_OpponentLeaderName(void) {
int i = UI_TeamIndexFromName(UI_Cvar_VariableString("ui_opponentName"));
return uiInfo.teamList[i].teamMembers[0];
@ -1429,7 +1429,7 @@ static const char *UI_AIFromName(const char *name) {
return "James";
}
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static const int UI_AIIndex(const char *name) {
int j;
for (j = 0; j < uiInfo.characterCount; j++) {
@ -1441,7 +1441,7 @@ static const int UI_AIIndex(const char *name) {
}
#endif
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static const int UI_AIIndexFromName(const char *name) {
int j;
for (j = 0; j < uiInfo.aliasCount; j++) {
@ -1454,14 +1454,14 @@ static const int UI_AIIndexFromName(const char *name) {
#endif
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static const char *UI_OpponentLeaderHead(void) {
const char *leader = UI_OpponentLeaderName();
return UI_AIFromName(leader);
}
#endif
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static const char *UI_OpponentLeaderModel(void) {
int i;
const char *head = UI_OpponentLeaderHead();
@ -4897,9 +4897,8 @@ static void UI_Pause(qboolean b) {
}
}
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static int UI_OwnerDraw_Width(int ownerDraw) {
// bk001205 - LCC missing return value
return 0;
}
#endif
@ -5131,7 +5130,7 @@ void _UI_Init( qboolean inGameLoad ) {
#if 0
if (uiInfo.inGameLoad) {
UI_LoadMenus("ui/ingame.txt", qtrue);
} else { // bk010222: left this: UI_LoadMenus(menuSet, qtrue);
} else {
}
#else
UI_LoadMenus(menuSet, qtrue);
@ -5697,8 +5696,6 @@ vmCvar_t ui_realCaptureLimit;
vmCvar_t ui_realWarmUp;
vmCvar_t ui_serverStatusTimeOut;
// bk001129 - made static to avoid aliasing
static cvarTable_t cvarTable[] = {
{ &ui_ffa_fraglimit, "ui_ffa_fraglimit", "20", CVAR_ARCHIVE },
{ &ui_ffa_timelimit, "ui_ffa_timelimit", "0", CVAR_ARCHIVE },
@ -5821,7 +5818,6 @@ static cvarTable_t cvarTable[] = {
};
// bk001129 - made static to avoid aliasing
static int cvarTableSize = sizeof(cvarTable) / sizeof(cvarTable[0]);
@ -5885,7 +5881,7 @@ static void UI_StopServerRefresh( void )
ArenaServers_MaxPing
=================
*/
#ifndef MISSIONPACK // bk001206
#ifndef MISSIONPACK
static int ArenaServers_MaxPing( void ) {
int maxPing;