rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-26 22:21:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixing warnings

Browse source
This commit is contained in:
Richard Allen 2011-07-18 18:26:05 +00:00
parent e10f277476
commit 2b2b396744
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/code/cgame/cg_main.c
View file

@ -2691,7 +2691,7 @@ void CG_ReplaceModels(void)
bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_mp5_model; bg_itemlist[item - bg_itemlist].world_model[0] = (char *)&RQ3_mp5_model;
bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_mp5_icon; bg_itemlist[item - bg_itemlist].icon = (char *)&RQ3_mp5_icon;
} else } else
CG_Printf("^1Error loading mp5 replacement model\n", model); CG_Printf("^1Error loading mp5 replacement model %s\n", model);
} }
if (strcmp(skin, "default")) { if (strcmp(skin, "default")) {
Com_sprintf(RQ3_mp5_icon, MAX_MODEL_LEN, "icons/iconw_%s", skin); Com_sprintf(RQ3_mp5_icon, MAX_MODEL_LEN, "icons/iconw_%s", skin);

9
reaction/code/game/g_main.c
View file

@ -1170,7 +1170,7 @@ void G_InitMoveParents( void )
//Makro - determine moveparent order //Makro - determine moveparent order
void G_SetMoveParentOrder( void ) void G_SetMoveParentOrder( void )
{ {
int i, j; int i, j, x;
char info[MAX_INFO_STRING], *p; char info[MAX_INFO_STRING], *p;
for (i=0; i<MAX_GENTITIES; i++) for (i=0; i<MAX_GENTITIES; i++)
@ -1218,15 +1218,16 @@ void G_SetMoveParentOrder( void )
// JBravo: apparently unused // JBravo: apparently unused
// gentity_t *ent = g_parentOrder[i]; // gentity_t *ent = g_parentOrder[i];
Com_sprintf(p, 4, "%03i", g_parentOrder[i]-g_entities); x = g_parentOrder[i]-g_entities;
Com_sprintf(p, 4, "%03i", x);
p += 3; p += 3;
//SetIntBytes(((g_parentOrder[i] - g_entities) << 1) | 1, p, 2); //SetIntBytes(((g_parentOrder[i] - g_entities) << 1) | 1, p, 2);
//p += 2; //p += 2;
Com_sprintf(p, 4, "%03i", g_parentOrder[i]->moveParent_rank); Com_sprintf(p, 4, "%03i", g_parentOrder[i]->moveParent_rank);
p+=3; p += 3;
//SetIntBytes(((g_parentOrder[i]->moveParent_rank) << 1) | 1, p, 2); //SetIntBytes(((g_parentOrder[i]->moveParent_rank) << 1) | 1, p, 2);
//p += 2; //p += 2;
G_Printf("%i (%i)> %s, rank %i\n", i, g_parentOrder[i]-g_entities, G_Printf("%i (%i)> %s, rank %i\n", i, x,
g_parentOrder[i]->classname, g_parentOrder[i]->moveParent_rank); g_parentOrder[i]->classname, g_parentOrder[i]->moveParent_rank);
} }
//trailing zero //trailing zero