rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-08 17:32:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing compiler warnings

Browse source
This commit is contained in:
Richard Allen 2012-10-13 18:56:19 +00:00
parent 0fd659c5c2
commit d0021605af
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
reaction/code/ui/ui_main.c
View file

@ -8427,7 +8427,7 @@ static void UI_BuildQ3Model_List(void)
if (Q_stricmpn(skinname, "icon_", 5) == 0 if (Q_stricmpn(skinname, "icon_", 5) == 0
&& !(Q_stricmp(skinname, "icon_blue") == 0 || Q_stricmp(skinname, "icon_red") == 0)) { && !(Q_stricmp(skinname, "icon_blue") == 0 || Q_stricmp(skinname, "icon_red") == 0)) {
if (Q_stricmp(skinname, "icon_default") == 0) { if (Q_stricmp(skinname, "icon_default") == 0) {
Com_sprintf(scratch, sizeof(scratch), dirptr); Com_sprintf(scratch, sizeof(scratch), "%s", dirptr);
} else { } else {
Com_sprintf(scratch, sizeof(scratch), "%s/%s", dirptr, skinname + 5); Com_sprintf(scratch, sizeof(scratch), "%s/%s", dirptr, skinname + 5);
} }
@ -8441,7 +8441,7 @@ static void UI_BuildQ3Model_List(void)
} }
if (!dirty) { if (!dirty) {
Com_sprintf(uiInfo.q3HeadNames[uiInfo.q3HeadCount], Com_sprintf(uiInfo.q3HeadNames[uiInfo.q3HeadCount],
sizeof(uiInfo.q3HeadNames[uiInfo.q3HeadCount]), scratch); sizeof(uiInfo.q3HeadNames[uiInfo.q3HeadCount]), "%s", scratch);
//Makro - see if this model is the selected one //Makro - see if this model is the selected one
if (!strcmp(currentSkin, scratch)) { if (!strcmp(currentSkin, scratch)) {
uiInfo.q3SelectedHead = uiInfo.q3HeadCount; uiInfo.q3SelectedHead = uiInfo.q3HeadCount;
@ -8574,7 +8574,7 @@ void _UI_Init(qboolean inGameLoad)
//Makro - added //Makro - added
char info[MAX_INFO_STRING]; char info[MAX_INFO_STRING];
// //
int start; // int start;
qboolean needRestart = qfalse; qboolean needRestart = qfalse;
//uiInfo.inGameLoad = inGameLoad; //uiInfo.inGameLoad = inGameLoad;
@ -8713,7 +8713,7 @@ void _UI_Init(qboolean inGameLoad)
uiInfo.uiDC.max[0] = SCREEN_WIDTH - uiInfo.uiDC.min[0]; uiInfo.uiDC.max[0] = SCREEN_WIDTH - uiInfo.uiDC.min[0];
uiInfo.uiDC.max[1] = SCREEN_HEIGHT; uiInfo.uiDC.max[1] = SCREEN_HEIGHT;
start = trap_Milliseconds(); // start = trap_Milliseconds();
UI_ExportSymbols(); UI_ExportSymbols();

12
reaction/code/ui/ui_shared.c
View file

@ -416,7 +416,7 @@ void String_Init( void )
================= =================
PC_SourceWarning PC_SourceWarning
================= =================
*/
static __attribute__ ((format (printf, 2, 3))) void PC_SourceWarning(int handle, char *format, ...) { static __attribute__ ((format (printf, 2, 3))) void PC_SourceWarning(int handle, char *format, ...) {
int line; int line;
char filename[128]; char filename[128];
@ -433,7 +433,7 @@ static __attribute__ ((format (printf, 2, 3))) void PC_SourceWarning(int handle,
Com_Printf(S_COLOR_YELLOW "WARNING: %s, line %d: %s\n", filename, line, string); Com_Printf(S_COLOR_YELLOW "WARNING: %s, line %d: %s\n", filename, line, string);
} }
*/
/* /*
================= =================
PC_SourceError PC_SourceError
@ -2520,17 +2520,17 @@ int Item_Slider_OverSlider(itemDef_t * item, float x, float y)
int Item_ListBox_OverLB(itemDef_t * item, float x, float y) int Item_ListBox_OverLB(itemDef_t * item, float x, float y)
{ {
rectDef_t r; rectDef_t r;
listBoxDef_t *listPtr; // listBoxDef_t *listPtr;
int thumbstart; int thumbstart;
int count; // int count;
float p[2]; float p[2];
r.hasVectors = item->window.rect.hasVectors; r.hasVectors = item->window.rect.hasVectors;
Vector2Copy(item->window.rect.u, r.u); Vector2Copy(item->window.rect.u, r.u);
Vector2Copy(item->window.rect.v, r.v); Vector2Copy(item->window.rect.v, r.v);
count = DC->feederCount(item->special); // count = DC->feederCount(item->special);
listPtr = (listBoxDef_t *) item->typeData; // listPtr = (listBoxDef_t *) item->typeData;
//horizontal //horizontal
if (item->window.flags & WINDOW_HORIZONTAL) { if (item->window.flags & WINDOW_HORIZONTAL) {
//vectors? //vectors?