Blob Blame Raw
diff -up vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp~ vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp
--- vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp~	2010-12-23 21:16:48.000000000 +0100
+++ vegastrike-src-0.5.1.r1/objconv/basemaker/base_maker.cpp	2016-02-22 15:06:26.685860746 +0100
@@ -2060,7 +2060,7 @@ void Base::DrawWin()
 int main( int argc, char **argv )
 {
     printf( "Loading...\n" );
-    Base::CurrentBase   = false;
+    Base::CurrentBase = NULL;
     glutInit( &argc, argv );
     glutInitWindowSize( 800, 600 );
     g_game.x_resolution = 800;
diff -up vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp~ vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp
--- vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp~	2012-03-19 09:20:14.000000000 +0100
+++ vegastrike-src-0.5.1.r1/src/cmd/unit_generic.cpp	2016-02-22 14:52:31.923323837 +0100
@@ -630,14 +630,6 @@ void Unit::DeactivateJumpDrive()
         jump.drive = -1;
 }
 
-float copysign( float x, float y )
-{
-    if (y > 0)
-        return x;
-    else
-        return -x;
-}
-
 float rand01()
 {
     return (float) rand()/(float) RAND_MAX;
diff -up vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h~ vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h
--- vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h~	2012-03-19 09:20:14.000000000 +0100
+++ vegastrike-src-0.5.1.r1/src/cmd/unit_physics.h	2016-02-22 14:48:18.098979895 +0100
@@ -41,8 +41,6 @@
 #include "networking/lowlevel/vsnet_clientstate.h"
 #include "networking/netclient.h"
 
-extern float copysign( float x, float y );
-
 extern unsigned int apply_float_to_unsigned_int( float tmp ); //short fix
 
 template < class UnitType >
diff -up vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp~ vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp
--- vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp~	2010-12-15 09:53:40.000000000 +0100
+++ vegastrike-src-0.5.1.r1/src/gfx/cockpit_xml.cpp	2016-02-22 15:01:47.384341654 +0100
@@ -315,7 +315,7 @@ void GameCockpit::beginElement( const st
         for (counter = 0; counter < 4; ++counter)
             if (!replaced[counter]) {
                 delete Pit[counter];
-                Pit[counter] = false;
+                Pit[counter] = NULL;
             }
         break;
     case UnitImages< void >::SHIELD4:
diff -up vegastrike-src-0.5.1.r1/src/physics.h~ vegastrike-src-0.5.1.r1/src/physics.h
--- vegastrike-src-0.5.1.r1/src/physics.h~	2011-02-12 04:19:03.000000000 +0100
+++ vegastrike-src-0.5.1.r1/src/physics.h	2016-02-22 14:48:24.803015392 +0100
@@ -27,7 +27,6 @@
 static const float oocc = (float) 0.0000000000000000111265005605; //1/c^2
 static const float c    = (float) 299792458.0;
 static const float co10 = (float) 29979245.8;
-float copysign( float x, float y );
 
 struct Force
 {
diff -up vegastrike-src-0.5.1.r1/src/pk3.cpp~ vegastrike-src-0.5.1.r1/src/pk3.cpp
--- vegastrike-src-0.5.1.r1/src/pk3.cpp~	2012-03-19 09:20:14.000000000 +0100
+++ vegastrike-src-0.5.1.r1/src/pk3.cpp	2016-02-22 14:55:07.605167298 +0100
@@ -356,7 +356,7 @@ char* CPK3::ExtractFile( const char *lpn
     }
     //if the file isn't in the archive
     if (index == -1)
-        return false;
+        return NULL;
     int flength = GetFileLen( index );
 
     buffer = new char[flength];
diff -up vegastrike-src-0.5.1.r1/src/ship_commands.cpp~ vegastrike-src-0.5.1.r1/src/ship_commands.cpp
--- vegastrike-src-0.5.1.r1/src/ship_commands.cpp~	2012-03-19 09:20:14.000000000 +0100
+++ vegastrike-src-0.5.1.r1/src/ship_commands.cpp	2016-02-22 14:57:46.631032223 +0100
@@ -5,15 +5,6 @@
 #include "universe_util.h"
 #include "gldrv/winsys.h"
 
-static inline float fmin( float a, float b )
-{
-    return (a < b) ? a : b;
-}
-static inline float fmax( float a, float b )
-{
-    return (a > b) ? a : b;
-}
-
 class ShipCommands
 {
     Functor< ShipCommands > *csetkps;