From 356bfe81e3d6f26cc45b5f0ee074f558b50671d2 Mon Sep 17 00:00:00 2001
From: Braden Obrzut <admin@maniacsvault.net>
Date: Fri, 22 Feb 2013 18:16:23 +0000
Subject: [PATCH] - Cleared GCC warnings.
SVN r4159 (trunk)
---
src/p_acs.cpp | 4 ++--
src/p_map.cpp | 2 +-
src/p_user.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/p_acs.cpp b/src/p_acs.cpp
index 1527ba849..e2a844d61 100644
--- a/src/p_acs.cpp
+++ b/src/p_acs.cpp
@@ -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]))
diff --git a/src/p_map.cpp b/src/p_map.cpp
index 7da07d5eb..233d45285 100644
--- a/src/p_map.cpp
+++ b/src/p_map.cpp
@@ -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
diff --git a/src/p_user.cpp b/src/p_user.cpp
index 76aecdc39..a3e848fe1 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -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),