From 006868c072f6bbaf995078ec4c8718aab396afd6 Mon Sep 17 00:00:00 2001
From: Randy Heit <rheit@users.noreply.github.com>
Date: Tue, 14 Apr 2015 18:00:20 -0500
Subject: [PATCH] Miscellaneous warning fixes

---
 src/gameconfigfile.cpp |  2 +-
 src/p_user.cpp         | 10 +++++-----
 src/w_wad.cpp          |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gameconfigfile.cpp b/src/gameconfigfile.cpp
index c4f970db9..30dc2276d 100644
--- a/src/gameconfigfile.cpp
+++ b/src/gameconfigfile.cpp
@@ -429,7 +429,7 @@ void FGameConfigFile::DoKeySetup(const char *gamename)
 		{ "Bindings", &Bindings },
 		{ "DoubleBindings", &DoubleBindings },
 		{ "AutomapBindings", &AutomapBindings },
-		NULL, NULL
+		{ NULL, NULL }
 	};
 	const char *key, *value;
 
diff --git a/src/p_user.cpp b/src/p_user.cpp
index 6042d5662..5f9a69c3a 100644
--- a/src/p_user.cpp
+++ b/src/p_user.cpp
@@ -295,23 +295,23 @@ player_t::player_t()
   respawn_time(0),
   camera(0),
   air_finished(0),
+  MUSINFOactor(0),
+  MUSINFOtics(-1),
+  crouching(0),
+  crouchdir(0),
   Bot(0),
   BlendR(0),
   BlendG(0),
   BlendB(0),
   BlendA(0),
   LogText(),
-  crouching(0),
-  crouchdir(0),
   crouchfactor(0),
   crouchoffset(0),
   crouchviewdelta(0),
   ConversationNPC(0),
   ConversationPC(0),
   ConversationNPCAngle(0),
-  ConversationFaceTalker(0),
-  MUSINFOactor(0),
-  MUSINFOtics(-1)
+  ConversationFaceTalker(0)
 {
 	memset (&cmd, 0, sizeof(cmd));
 	memset (frags, 0, sizeof(frags));
diff --git a/src/w_wad.cpp b/src/w_wad.cpp
index 4d0b51623..2b3413460 100644
--- a/src/w_wad.cpp
+++ b/src/w_wad.cpp
@@ -317,7 +317,7 @@ void FWadCollection::AddFile (const char *filename, FileReader *wadinfo)
 					sprintf(cksumout + (j * 2), "%02X", cksum[j]);
 				}
 
-				fprintf(hashfile, "file: %s, hash: %s, size: %d\n", filename, cksumout, reader->GetLength());
+				fprintf(hashfile, "file: %s, hash: %s, size: %ld\n", filename, cksumout, reader->GetLength());
 			}
 
 			else