mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-10 23:01:50 +00:00
- Removed a few new warnings spewed by GCC.
SVN r641 (trunk)
This commit is contained in:
parent
1acc3d00c4
commit
813b59edee
6 changed files with 13 additions and 18 deletions
|
@ -602,7 +602,7 @@ bool DCajunMaster::LoadBots ()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
teamnum = TEAM_None;
|
teamnum = TEAM_None;
|
||||||
for (int i = 0; i < teams.Size (); ++i)
|
for (int i = 0; i < int(teams.Size()); ++i)
|
||||||
{
|
{
|
||||||
if (stricmp (teams[i].name, sc_String) == 0)
|
if (stricmp (teams[i].name, sc_String) == 0)
|
||||||
{
|
{
|
||||||
|
|
|
@ -720,7 +720,7 @@ void AddCommandString (char *cmd, int keynum)
|
||||||
//
|
//
|
||||||
// Special processing:
|
// Special processing:
|
||||||
// Inside quoted strings, \" becomes just "
|
// Inside quoted strings, \" becomes just "
|
||||||
// \\ becomes just \
|
// \\ becomes just a single backslash
|
||||||
// \c becomes just TEXTCOLOR_ESCAPE
|
// \c becomes just TEXTCOLOR_ESCAPE
|
||||||
// $<cvar> is replaced by the contents of <cvar>
|
// $<cvar> is replaced by the contents of <cvar>
|
||||||
|
|
||||||
|
|
|
@ -152,7 +152,7 @@ static void HU_DoDrawScores (player_t *player, player_t *sortedplayers[MAXPLAYER
|
||||||
{
|
{
|
||||||
int color;
|
int color;
|
||||||
int height = screen->Font->GetHeight() * CleanYfac;
|
int height = screen->Font->GetHeight() * CleanYfac;
|
||||||
int i;
|
unsigned int i;
|
||||||
int maxwidth = 0;
|
int maxwidth = 0;
|
||||||
int numTeams = 0;
|
int numTeams = 0;
|
||||||
int x ,y;
|
int x ,y;
|
||||||
|
|
|
@ -3407,7 +3407,7 @@ void P_SetupLevel (char *lumpname, int position)
|
||||||
players[i].mo = NULL;
|
players[i].mo = NULL;
|
||||||
}
|
}
|
||||||
// [RH] Clear any scripted translation colors the previous level may have set.
|
// [RH] Clear any scripted translation colors the previous level may have set.
|
||||||
for (i = 0; i < translationtables[TRANSLATION_LevelScripted].Size(); ++i)
|
for (i = 0; i < int(translationtables[TRANSLATION_LevelScripted].Size()); ++i)
|
||||||
{
|
{
|
||||||
FRemapTable *table = translationtables[TRANSLATION_LevelScripted][i];
|
FRemapTable *table = translationtables[TRANSLATION_LevelScripted][i];
|
||||||
if (table != NULL)
|
if (table != NULL)
|
||||||
|
|
|
@ -389,6 +389,10 @@ int FJPEGTexture::CopyTrueColorPixels(BYTE * buffer, int buf_width, int buf_heig
|
||||||
screen->CopyPixelDataRGB(buffer, buf_width, buf_height, x, y, buff, cinfo.output_width, cinfo.output_height,
|
screen->CopyPixelDataRGB(buffer, buf_width, buf_height, x, y, buff, cinfo.output_width, cinfo.output_height,
|
||||||
4, cinfo.output_width * cinfo.output_components, CF_CMYK);
|
4, cinfo.output_width * cinfo.output_components, CF_CMYK);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
default:
|
||||||
|
assert(0);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
jpeg_finish_decompress(&cinfo);
|
jpeg_finish_decompress(&cinfo);
|
||||||
}
|
}
|
||||||
|
|
|
@ -2098,25 +2098,16 @@ void A_SetGravity(AActor * self)
|
||||||
//===========================================================================
|
//===========================================================================
|
||||||
|
|
||||||
void A_ClearTarget(AActor * self)
|
void A_ClearTarget(AActor * self)
|
||||||
{
|
|
||||||
if (self->target != NULL)
|
|
||||||
{
|
{
|
||||||
self->target = NULL;
|
self->target = NULL;
|
||||||
}
|
|
||||||
if (self->LastHeard != NULL)
|
|
||||||
{
|
|
||||||
self->LastHeard = NULL;
|
self->LastHeard = NULL;
|
||||||
}
|
|
||||||
if (self->lastenemy != NULL)
|
|
||||||
{
|
|
||||||
self->lastenemy = NULL;
|
self->lastenemy = NULL;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
//
|
//
|
||||||
// A_JumpIfTargetInLOS (fixed fov, state label)
|
// A_JumpIfTargetInLOS (fixed fov, state label)
|
||||||
// Jumps if the actor can see it's target, or if the player has a linetarget.
|
// Jumps if the actor can see its target, or if the player has a linetarget.
|
||||||
//
|
//
|
||||||
//==========================================================================
|
//==========================================================================
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue