- Apparently, YASM is not a suitable substitute for NASM when doing Win32 builds.

- Removed extraneous printf parameter for Texman.Init startup message.
- Added newlines to the ends of a few headers that were missing them.
- Fixed more GCC errors/warnings.

SVN r1232 (trunk)

src/CMakeLists.txt

@@ -181,21 +181,21 @@ if( NOT NO_ASM )
 		find_program( NASM_PATH NAMES ${NASM_NAMES} )
 		find_program( YASM_PATH yasm )
 
-		if( YASM_PATH )
-			set( ASSEMBLER ${YASM_PATH} )
-		else( YASM_PATH )
-			if( X64 )
+		if( X64 )
+			if( YASM_PATH )
+				set( ASSEMBLER ${YASM_PATH} )
+			else( YASM_PATH )
 				message( STATUS "Could not find YASM. Disabling assembly code." )
 				set( NO_ASM ON )
-			else( X64 )
-				if( NOT NASM_PATH )
-					message( STATUS "Could not find YASM or NASM. Disabling assembly code." )
-					set( NO_ASM ON )
-				else( NOT NASM_PATH )
-					set( ASSEMBLER ${NASM_PATH} )
-				endif( NOT NASM_PATH )
-			endif( X64 )
-		endif( YASM_PATH )
+			endif( YASM_PATH )
+		else( X64 )
+			if( NASM_PATH )
+				set( ASSEMBLER ${NASM_PATH} )
+			else( NASM_PATH )
+				message( STATUS "Could not find NASM. Disabling assembly code." )
+				set( NO_ASM ON )
+			endif( NASM_PATH )
+		endif( X64 )
 	endif( UNIX AND X64 )
 
 	# I think the only reason there was a version requirement was because the

src/basictypes.h

@@ -95,4 +95,4 @@ typedef DWORD							dsfixed_t;				// fixedpt used by span drawer
 #endif
 
 
-#endif
+#endif

src/d_main.cpp

@@ -2481,7 +2481,7 @@ void D_DoomMain (void)
 		StartScreen->AppendStatusLine(temp);
 	}
 
-	Printf ("Texman.Init: Init texture manager.\n", GameNames[gameinfo.gametype]);
+	Printf ("Texman.Init: Init texture manager.\n");
 	TexMan.Init();
 
 	// [RH] Parse through all loaded mapinfo lumps

src/g_shared/a_randomspawner.cpp

@@ -23,7 +23,7 @@ class ARandomSpawner : public AActor
 
 	void PostBeginPlay()
 	{
-		AActor *newmobj;
+		AActor *newmobj = NULL;
 		FDropItem *di;   // di will be our drop item list iterator
 		FDropItem *drop; // while drop stays as the reference point.
 		int n=0;

src/m_png.h

@@ -36,8 +36,6 @@
 #include <stdio.h>
 #include "doomtype.h"
 
-enum ESSType;
-
 // PNG Writing --------------------------------------------------------------
 
 // Start writing an 8-bit palettized PNG file.
@@ -116,4 +114,4 @@ class FTexture;
 
 FTexture *PNGTexture_CreateFromFile(PNGHandle *png, const FString &filename);
 
-#endif
+#endif

src/p_user.cpp

@@ -221,8 +221,8 @@ player_t::player_t()
   momy(0),
   centering(0),
   turnticks(0),
-  oldbuttons(0),
   attackdown(0),
+  oldbuttons(0),
   health(0),
   inventorytics(0),
   CurrentPlayerClass(0),

src/s_advsound.cpp

@@ -342,7 +342,10 @@ int S_PickReplacement (int refid)
 
 unsigned int S_GetMSLength(FSoundID sound)
 {
-	if (sound < 0 || sound >= S_sfx.Size()) return 0;
+	if ((unsigned int)sound >= S_sfx.Size())
+	{
+		return 0;
+	}
 
 	sfxinfo_t *sfx = &S_sfx[sound];
 

src/sound/fmodsound.cpp

@@ -44,6 +44,7 @@ extern HWND Window;
 #define FALSE 0
 #define TRUE 1
 #endif
+#include <malloc.h>
 
 #include "templates.h"
 #include "fmodsound.h"

src/sound/i_soundinternal.h

@@ -101,4 +101,4 @@ struct FISoundChannel
 
 
 
-#endif
+#endif

src/sound/music_mus_midiout.cpp

@@ -33,6 +33,7 @@
 
 // HEADER FILES ------------------------------------------------------------
 
+#include <malloc.h>
 #include "i_musicinterns.h"
 #include "templates.h"
 #include "doomdef.h"

src/st_stuff.cpp

@@ -346,7 +346,7 @@ bool ST_Responder (event_t *ev)
 		static int counts[] = { countof(DoomCheats), countof(HereticCheats), countof(HexenCheats), 
 								countof(StrifeCheats), countof(ChexCheats), countof(SpecialCheats) };
 
-		for (int i=0; i<countof(cheatlists); i++)
+		for (size_t i=0; i<countof(cheatlists); i++)
 		{
 			if (CheatCheckList(ev, cheatlists[i], counts[i])) return true;
 		}

src/textures/warptexture.cpp

@@ -41,7 +41,7 @@
 
 
 FWarpTexture::FWarpTexture (FTexture *source)
-: SourcePic (source), Pixels (0), Spans (0), GenTime (0), Speed (1.f)
+: GenTime (0), SourcePic (source), Pixels (0), Spans (0), Speed (1.f)
 {
 	CopySize(source);
 	bNoDecals = source->bNoDecals;

src/thingdef/thingdef.cpp

@@ -409,7 +409,8 @@ static void ParseActionDef (FScanner &sc, PClass *cls)
 	if (hasdefaults)
 	{
 		sym->defaultparameterindex = StateParameters.Size();
-		for(int i = 0; i < DefaultParams.Size(); i++) StateParameters.Push(DefaultParams[i]);
+		for(unsigned int i = 0; i < DefaultParams.Size(); i++)
+			StateParameters.Push(DefaultParams[i]);
 	}
 	else
 	{

src/v_font.cpp

@@ -1768,7 +1768,7 @@ void V_InitCustomFonts()
 	return;
 
 wrong:
-	sc.ScriptError ("Invalid combination of properties in font '%s'", namebuffer);
+	sc.ScriptError ("Invalid combination of properties in font '%s'", namebuffer.GetChars());
 }
 
 //==========================================================================

src/v_video.h

@@ -114,13 +114,6 @@ enum
 	HUD_HorizCenter
 };
 
-// Screenshot buffer image data types
-enum ESSType
-{
-	SS_PAL,
-	SS_RGB,
-	SS_BGRA
-};
 
 class FFont;
 struct FRemapTable;