diff -r 7aeebcf2ea3c src/m_options.cpp
--- a/src/m_options.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/m_options.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -3318,7 +3318,7 @@
 	countof(SkirmishItems),
 	0,
 	SkirmishItems,
-	NULL,
+	0,
 	0,
 	0,
 	NULL,
@@ -3598,7 +3598,7 @@
 	countof(BotSetupItems),
 	0,
 	BotSetupItems,
-	NULL,
+	0,
 	0,
 	0,
 	NULL,
@@ -3657,7 +3657,7 @@
 	countof(TeamBotSetupItems),
 	0,
 	TeamBotSetupItems,
-	NULL,
+	0,
 	0,
 	0,
 	NULL,
diff -r 7aeebcf2ea3c src/networkshared.h
--- a/src/networkshared.h	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/networkshared.h	Mon Jan 06 18:05:57 2014 +0100
@@ -455,7 +455,7 @@
 	void put ( DataType Entry )
 	{
 		_data[_position] = Entry;
-		_position = ( ++_position % Length );
+		_position = (_position+1) % Length;
 	}
 	DataType getOldestEntry ( unsigned int Offset = 0 ) const
 	{
diff -r 7aeebcf2ea3c src/p_acs.cpp
--- a/src/p_acs.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/p_acs.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -1987,7 +1987,7 @@
 			if (( NETWORK_GetState( ) == NETSTATE_SERVER ) &&
 				ACS_IsScriptClientSide( ptr ))
 			{
-				SERVERCOMMANDS_ACSScriptExecute( ptr->Number, activator, NULL, level.mapname, 0, arg1, 0, 0, always );
+				SERVERCOMMANDS_ACSScriptExecute( ptr->Number, activator, 0, level.mapname, 0, arg1, 0, 0, always );
 				continue;
 			}
 
diff -r 7aeebcf2ea3c src/team.cpp
--- a/src/team.cpp	Sat Jan 04 13:48:46 2014 +0100
+++ b/src/team.cpp	Mon Jan 06 18:05:57 2014 +0100
@@ -114,9 +114,9 @@
 		TEAM_SetAnnouncedLeadState( i, false );
 		TEAM_SetAssistPlayer( i, MAXPLAYERS );
 
-		teams[i].g_Origin.x = NULL;
-		teams[i].g_Origin.y = NULL;
-		teams[i].g_Origin.z = NULL;
+		teams[i].g_Origin.x = 0;
+		teams[i].g_Origin.y = 0;
+		teams[i].g_Origin.z = 0;
 
 		switch ( i )
 		{
@@ -178,9 +178,9 @@
 		TEAM_SetAnnouncedLeadState( i, false );
 		TEAM_SetAssistPlayer( i, MAXPLAYERS );
 
-		teams[i].g_Origin.x = NULL;
-		teams[i].g_Origin.y = NULL;
-		teams[i].g_Origin.z = NULL;
+		teams[i].g_Origin.x = 0;
+		teams[i].g_Origin.y = 0;
+		teams[i].g_Origin.z = 0;
 
 		switch ( i )
 		{
@@ -932,7 +932,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lPlayerColor );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -991,7 +991,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lRailColor );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1009,7 +1009,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lScore );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1251,7 +1251,7 @@
 	else if ( ulTeamIdx == teams.Size( ) )
 		return ( g_ulWhiteFlagReturnTicks );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1275,7 +1275,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lFragCount );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1314,7 +1314,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lDeathCount );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
@@ -1335,7 +1335,7 @@
 	if ( TEAM_CheckIfValid( ulTeamIdx ))
 		return ( teams[ulTeamIdx].lWinCount );
 	else
-		return ( NULL );
+		return ( 0 );
 }
 
 //*****************************************************************************
diff -r 2ffa89ccc8d0 upnpnat/upnpnat.cpp
--- a/upnpnat/upnpnat.cpp	Fri Apr 04 01:28:30 2014 +0300
+++ b/upnpnat/upnpnat.cpp	Sun Apr 06 22:36:46 2014 +0200
@@ -106,7 +106,7 @@
 *******************************************************************/
 #define HTTP_HEADER_ACTION "POST %s HTTP/1.1\r\n"                         \
                            "HOST: %s:%u\r\n"                                  \
-                           "Content-Length: %d \r\n" \
+                           "Content-Length: %ud \r\n" \
                            "CONTENT-TYPE: text/xml\r\n"             \
                            "SOAPACTION:\"%s#%s\"\r\n"   \
 						   "\r\n"
@@ -478,7 +478,7 @@
 	std::string soap_message=buff;
 
 	const char *pathString = ( ( path.c_str()[0] == '/' ) && ( path.c_str()[1] == '/' ) ) ? ( path.c_str() + 1 ) : path.c_str();
-	sprintf(buff,HTTP_HEADER_ACTION,pathString,host.c_str(),port,soap_message.size(),service_type.c_str(),ACTION_ADD);
+	sprintf(buff,HTTP_HEADER_ACTION,pathString,host.c_str(),port,static_cast<unsigned int>(soap_message.size()),service_type.c_str(),ACTION_ADD);
 	std::string action_message=buff;
 
 	std::string http_request=action_message+soap_message;