diff options
Diffstat (limited to 'source/gameengine/Physics/common')
13 files changed, 8 insertions, 29 deletions
diff --git a/source/gameengine/Physics/common/CMakeLists.txt b/source/gameengine/Physics/common/CMakeLists.txt index 3618725c2bf..0f8f59f3b78 100644 --- a/source/gameengine/Physics/common/CMakeLists.txt +++ b/source/gameengine/Physics/common/CMakeLists.txt @@ -33,4 +33,3 @@ SET(INC ) BLENDERLIB(bf_common "${SRC}" "${INC}") -#env.BlenderLib ( 'bf_common', Split(sources), Split(incs), [], libtype=['game', 'game2','player'], priority=[20, 35, 95] ) diff --git a/source/gameengine/Physics/common/Makefile b/source/gameengine/Physics/common/Makefile index f87da383520..369699e1b90 100644 --- a/source/gameengine/Physics/common/Makefile +++ b/source/gameengine/Physics/common/Makefile @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # # The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. # All rights reserved. diff --git a/source/gameengine/Physics/common/PHY_IController.cpp b/source/gameengine/Physics/common/PHY_IController.cpp index 5f7f5a1b8a9..577e25b4336 100644 --- a/source/gameengine/Physics/common/PHY_IController.cpp +++ b/source/gameengine/Physics/common/PHY_IController.cpp @@ -28,10 +28,6 @@ */ #include "PHY_IController.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - PHY_IController::~PHY_IController() { diff --git a/source/gameengine/Physics/common/PHY_IController.h b/source/gameengine/Physics/common/PHY_IController.h index 8fd9a37dea0..de2e53c3613 100644 --- a/source/gameengine/Physics/common/PHY_IController.h +++ b/source/gameengine/Physics/common/PHY_IController.h @@ -54,7 +54,7 @@ class PHY_IController #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.cpp b/source/gameengine/Physics/common/PHY_IGraphicController.cpp index 118aa5c01a1..dc4b31d9a76 100644 --- a/source/gameengine/Physics/common/PHY_IGraphicController.cpp +++ b/source/gameengine/Physics/common/PHY_IGraphicController.cpp @@ -28,10 +28,6 @@ */ #include "PHY_IGraphicController.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - PHY_IGraphicController::~PHY_IGraphicController() { diff --git a/source/gameengine/Physics/common/PHY_IGraphicController.h b/source/gameengine/Physics/common/PHY_IGraphicController.h index adca10cc1b4..aeccdb573b4 100644 --- a/source/gameengine/Physics/common/PHY_IGraphicController.h +++ b/source/gameengine/Physics/common/PHY_IGraphicController.h @@ -51,7 +51,7 @@ class PHY_IGraphicController : public PHY_IController virtual PHY_IGraphicController* GetReplica(class PHY_IMotionState* motionstate) {return 0;} #ifdef WITH_CXX_GUARDEDALLOC - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IController"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; diff --git a/source/gameengine/Physics/common/PHY_IMotionState.cpp b/source/gameengine/Physics/common/PHY_IMotionState.cpp index 9d4d1e6c003..78505231895 100644 --- a/source/gameengine/Physics/common/PHY_IMotionState.cpp +++ b/source/gameengine/Physics/common/PHY_IMotionState.cpp @@ -28,10 +28,6 @@ */ #include "PHY_IMotionState.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - PHY_IMotionState::~PHY_IMotionState() { diff --git a/source/gameengine/Physics/common/PHY_IMotionState.h b/source/gameengine/Physics/common/PHY_IMotionState.h index 41dc45e6e32..a644bb319ae 100644 --- a/source/gameengine/Physics/common/PHY_IMotionState.h +++ b/source/gameengine/Physics/common/PHY_IMotionState.h @@ -59,7 +59,7 @@ class PHY_IMotionState #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IMotionState"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IMotionState"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.cpp b/source/gameengine/Physics/common/PHY_IPhysicsController.cpp index 0c96363d0e4..00c0bbe6477 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.cpp +++ b/source/gameengine/Physics/common/PHY_IPhysicsController.cpp @@ -28,10 +28,6 @@ */ #include "PHY_IPhysicsController.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - PHY_IPhysicsController::~PHY_IPhysicsController() { diff --git a/source/gameengine/Physics/common/PHY_IPhysicsController.h b/source/gameengine/Physics/common/PHY_IPhysicsController.h index 07ae3a01c91..82baa8c47e1 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsController.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsController.h @@ -101,7 +101,7 @@ class PHY_IPhysicsController : public PHY_IController #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsController"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsController"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp index 9088a22cd5f..f56dc5c0aa7 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.cpp @@ -29,10 +29,6 @@ #include "PHY_IPhysicsEnvironment.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - /** * Physics Environment takes care of stepping the simulation and is a container for physics entities (rigidbodies,constraints, materials etc.) * A derived class may be able to 'construct' entities by loading and/or converting diff --git a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h index b557d4edc07..abce2769f2a 100644 --- a/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h +++ b/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h @@ -88,7 +88,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IRayCastFilterCallback"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IRayCastFilterCallback"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; @@ -179,7 +179,7 @@ class PHY_IPhysicsEnvironment #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsEnvironment"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IPhysicsEnvironment"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; diff --git a/source/gameengine/Physics/common/PHY_IVehicle.h b/source/gameengine/Physics/common/PHY_IVehicle.h index 261bae480f5..7c00b5d0bef 100644 --- a/source/gameengine/Physics/common/PHY_IVehicle.h +++ b/source/gameengine/Physics/common/PHY_IVehicle.h @@ -58,7 +58,7 @@ public: #ifdef WITH_CXX_GUARDEDALLOC public: - void *operator new( unsigned int num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IVehicle"); } + void *operator new(size_t num_bytes) { return MEM_mallocN(num_bytes, "GE:PHY_IVehicle"); } void operator delete( void *mem ) { MEM_freeN(mem); } #endif }; |