- Cleared GCC warnings.

SVN r4159 (trunk)
This commit is contained in:
Braden Obrzut 2013-02-22 18:16:23 +00:00
parent 6eb10a8079
commit 356bfe81e3
3 changed files with 4 additions and 4 deletions

View file

@ -7856,7 +7856,7 @@ static void ShowProfileData(TArray<ProfileCollector> &profiles, long ilimit,
}
// Module name
mysnprintf(modname, sizeof(modname), prof->Module->GetModuleName());
mysnprintf(modname, sizeof(modname), "%s", prof->Module->GetModuleName());
// Script/function name
if (functions)
@ -7932,7 +7932,7 @@ CCMD(acsprofile)
// If it's a name, set the sort method. We accept partial matches for
// options that are shorter than the sort name.
size_t optlen = strlen(argv[i]);
int j;
unsigned int j;
for (j = 0; j < countof(sort_names); ++j)
{
if (optlen < sort_match_len[j] || optlen > strlen(sort_names[j]))

View file

@ -908,7 +908,7 @@ bool PIT_CheckThing (AActor *thing, FCheckPosition &tm)
if (!(tm.thing->flags & MF_MISSILE) ||
!(tm.thing->flags2 & MF2_RIP) ||
(thing->flags5 & MF5_DONTRIP) ||
(tm.thing->flags6 & MF6_NOBOSSRIP) && (thing->flags2 & MF2_BOSS))
((tm.thing->flags6 & MF6_NOBOSSRIP) && (thing->flags2 & MF2_BOSS)))
{
if (tm.thing->flags3 & thing->flags3 & MF3_DONTOVERLAP)
{ // Some things prefer not to overlap each other, if possible

View file

@ -244,10 +244,10 @@ player_t::player_t()
lastkilltime(0),
multicount(0),
spreecount(0),
WeaponState(0),
ReadyWeapon(0),
PendingWeapon(0),
cheats(0),
WeaponState(0),
timefreezer(0),
refire(0),
inconsistant(0),