diff options
author | Nick Samarin <nicks1987@bigmir.net> | 2011-02-16 20:07:18 +0300 |
---|---|---|
committer | Nick Samarin <nicks1987@bigmir.net> | 2011-02-16 20:07:18 +0300 |
commit | c5f6a01dd5998976addd2085470bb73a150579e5 (patch) | |
tree | 42b3345fb3ea2e7607a6d1eec379b8ce23b5ffbc /source/gameengine/GameLogic | |
parent | 4cf62f1e7e2bb28b47f79e4bd7c1482ab742ebbd (diff) | |
parent | 9e9e028f059f29d493dc020dda965a9bea8ffd6b (diff) |
synched with trunk at revision 34793
Diffstat (limited to 'source/gameengine/GameLogic')
45 files changed, 225 insertions, 193 deletions
diff --git a/source/gameengine/GameLogic/CMakeLists.txt b/source/gameengine/GameLogic/CMakeLists.txt index 84d915847e9..793b8e7eed8 100644 --- a/source/gameengine/GameLogic/CMakeLists.txt +++ b/source/gameengine/GameLogic/CMakeLists.txt @@ -24,9 +24,7 @@ # # ***** END GPL LICENSE BLOCK ***** -FILE(GLOB SRC *.cpp Joystick/*.cpp) - -SET(INC +set(INC . ../../../source/kernel/gen_system ../../../intern/string @@ -36,16 +34,99 @@ SET(INC ../../../source/gameengine/Rasterizer ) -IF(WITH_SDL) - SET(INC ${INC} ${SDL_INCLUDE_DIR}) -ELSE(WITH_SDL) - ADD_DEFINITIONS(-DDISABLE_SDL) -ENDIF(WITH_SDL) +set(SRC + Joystick/SCA_Joystick.cpp + Joystick/SCA_JoystickEvents.cpp + SCA_2DFilterActuator.cpp + SCA_ANDController.cpp + SCA_ActuatorEventManager.cpp + SCA_ActuatorSensor.cpp + SCA_AlwaysEventManager.cpp + SCA_AlwaysSensor.cpp + SCA_BasicEventManager.cpp + SCA_DelaySensor.cpp + SCA_EventManager.cpp + SCA_ExpressionController.cpp + SCA_IActuator.cpp + SCA_IController.cpp + SCA_IInputDevice.cpp + SCA_ILogicBrick.cpp + SCA_IObject.cpp + SCA_IScene.cpp + SCA_ISensor.cpp + SCA_JoystickManager.cpp + SCA_JoystickSensor.cpp + SCA_KeyboardManager.cpp + SCA_KeyboardSensor.cpp + SCA_LogicManager.cpp + SCA_MouseManager.cpp + SCA_MouseSensor.cpp + SCA_NANDController.cpp + SCA_NORController.cpp + SCA_ORController.cpp + SCA_PropertyActuator.cpp + SCA_PropertyEventManager.cpp + SCA_PropertySensor.cpp + SCA_PythonController.cpp + SCA_PythonKeyboard.cpp + SCA_PythonMouse.cpp + SCA_RandomActuator.cpp + SCA_RandomEventManager.cpp + SCA_RandomNumberGenerator.cpp + SCA_RandomSensor.cpp + SCA_TimeEventManager.cpp + SCA_XNORController.cpp + SCA_XORController.cpp + + Joystick/SCA_Joystick.h + Joystick/SCA_JoystickDefines.h + Joystick/SCA_JoystickPrivate.h + SCA_2DFilterActuator.h + SCA_ANDController.h + SCA_ActuatorEventManager.h + SCA_ActuatorSensor.h + SCA_AlwaysEventManager.h + SCA_AlwaysSensor.h + SCA_BasicEventManager.h + SCA_DelaySensor.h + SCA_EventManager.h + SCA_ExpressionController.h + SCA_IActuator.h + SCA_IController.h + SCA_IInputDevice.h + SCA_ILogicBrick.h + SCA_IObject.h + SCA_IScene.h + SCA_ISensor.h + SCA_JoystickManager.h + SCA_JoystickSensor.h + SCA_KeyboardManager.h + SCA_KeyboardSensor.h + SCA_LogicManager.h + SCA_MouseManager.h + SCA_MouseSensor.h + SCA_NANDController.h + SCA_NORController.h + SCA_ORController.h + SCA_PropertyActuator.h + SCA_PropertyEventManager.h + SCA_PropertySensor.h + SCA_PythonController.h + SCA_PythonKeyboard.h + SCA_PythonMouse.h + SCA_RandomActuator.h + SCA_RandomEventManager.h + SCA_RandomNumberGenerator.h + SCA_RandomSensor.h + SCA_TimeEventManager.h + SCA_XNORController.h + SCA_XORController.h +) -IF(WITH_PYTHON) - LIST(APPEND INC ${PYTHON_INC}) -ELSE(WITH_PYTHON) - ADD_DEFINITIONS(-DDISABLE_PYTHON) -ENDIF(WITH_PYTHON) +if(WITH_SDL) + set(INC ${INC} ${SDL_INCLUDE_DIR}) +else() + add_definitions(-DDISABLE_SDL) +endif() -BLENDERLIB(bf_logic "${SRC}" "${INC}") +blender_add_lib(ge_logic "${SRC}" "${INC}") diff --git a/source/gameengine/GameLogic/Joystick/Makefile b/source/gameengine/GameLogic/Joystick/Makefile deleted file mode 100644 index 5ab297824dd..00000000000 --- a/source/gameengine/GameLogic/Joystick/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# 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., 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. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = Joystick -DIR = $(OCGDIR)/gameengine/logic/$(LIBNAME) - -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I../Expressions -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -CPPFLAGS += $(NAN_SDLCFLAGS) -CPPFLAGS += -I../../SceneGraph -CPPFLAGS += -I../../../kernel/gen_system diff --git a/source/gameengine/GameLogic/Makefile b/source/gameengine/GameLogic/Makefile deleted file mode 100644 index 9c8bd73cdc0..00000000000 --- a/source/gameengine/GameLogic/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# $Id$ -# -# ***** BEGIN GPL LICENSE BLOCK ***** -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# 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., 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. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = logic -SOURCEDIR = source/gameengine/gameengine/GameLogic -DIR = $(OCGDIR)/gameengine/$(LIBNAME) -DIRS = Joystick - -include nan_subdirs.mk -include nan_compile.mk - -CCFLAGS += $(LEVEL_1_CPP_WARNINGS) - -CPPFLAGS += -I../Expressions -CPPFLAGS += -I../SceneGraph -CPPFLAGS += -I../Rasterizer -CPPFLAGS += -I$(NAN_STRING)/include -CPPFLAGS += -I$(NAN_MOTO)/include -CPPFLAGS += -I../../blender/makesdna -CPPFLAGS += -I$(NAN_PYTHON)/include/python$(NAN_PYTHON_VERSION) -CPPFLAGS += $(NAN_SDLCFLAGS) - -CPPFLAGS += -I../../kernel/gen_system diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp index f6d24af0e67..6fe996992c8 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp @@ -23,6 +23,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_IActuator.h" #include "SCA_2DFilterActuator.h" @@ -96,7 +98,7 @@ void SCA_2DFilterActuator::SetShaderText(const char *text) m_shaderText = text; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_ANDController.cpp b/source/gameengine/GameLogic/SCA_ANDController.cpp index 53c9be5215e..7e2c5bdb350 100644 --- a/source/gameengine/GameLogic/SCA_ANDController.cpp +++ b/source/gameengine/GameLogic/SCA_ANDController.cpp @@ -87,7 +87,7 @@ CValue* SCA_ANDController::GetReplica() return replica; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -123,5 +123,5 @@ PyMethodDef SCA_ANDController::Methods[] = { PyAttributeDef SCA_ANDController::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp index c77e58d2f3b..a93ac2207e1 100644 --- a/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp +++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include <iostream> #include "SCA_ActuatorSensor.h" #include "SCA_EventManager.h" @@ -110,7 +112,7 @@ void SCA_ActuatorSensor::Update() } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -160,6 +162,6 @@ int SCA_ActuatorSensor::CheckActuator(void *self, const PyAttributeDef*) return 1; } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_ActuatorSensor.h b/source/gameengine/GameLogic/SCA_ActuatorSensor.h index 323746889bf..eb52d365079 100644 --- a/source/gameengine/GameLogic/SCA_ActuatorSensor.h +++ b/source/gameengine/GameLogic/SCA_ActuatorSensor.h @@ -56,7 +56,7 @@ public: virtual void ReParent(SCA_IObject* parent); void Update(); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ @@ -64,7 +64,7 @@ public: static int CheckActuator(void *self, const PyAttributeDef*); -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; #endif diff --git a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp index e364225af3d..88f5855b223 100644 --- a/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp +++ b/source/gameengine/GameLogic/SCA_AlwaysSensor.cpp @@ -94,7 +94,7 @@ bool SCA_AlwaysSensor::Evaluate() return result; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_DelaySensor.cpp b/source/gameengine/GameLogic/SCA_DelaySensor.cpp index 6cad801e429..e23135eb14f 100644 --- a/source/gameengine/GameLogic/SCA_DelaySensor.cpp +++ b/source/gameengine/GameLogic/SCA_DelaySensor.cpp @@ -35,6 +35,8 @@ #pragma warning( disable : 4786 ) #endif +#include <stddef.h> + #include "SCA_DelaySensor.h" #include "SCA_LogicManager.h" #include "SCA_EventManager.h" @@ -120,7 +122,7 @@ bool SCA_DelaySensor::Evaluate() return trigger; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -160,6 +162,6 @@ PyAttributeDef SCA_DelaySensor::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_IController.cpp b/source/gameengine/GameLogic/SCA_IController.cpp index c291ff091aa..6134b229266 100644 --- a/source/gameengine/GameLogic/SCA_IController.cpp +++ b/source/gameengine/GameLogic/SCA_IController.cpp @@ -26,6 +26,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_IController.h" #include "SCA_LogicManager.h" #include "SCA_IActuator.h" @@ -194,7 +196,7 @@ void SCA_IController::ApplyState(unsigned int state) } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* Python api */ @@ -247,4 +249,4 @@ PyObject* SCA_IController::pyattr_get_actuators(void *self_v, const KX_PYATTRIBU { return KX_PythonSeq_CreatePyObject((static_cast<SCA_IController*>(self_v))->m_proxy, KX_PYGENSEQ_CONT_TYPE_ACTUATORS); } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON diff --git a/source/gameengine/GameLogic/SCA_IController.h b/source/gameengine/GameLogic/SCA_IController.h index e23a0d7dc92..2d19770be4a 100644 --- a/source/gameengine/GameLogic/SCA_IController.h +++ b/source/gameengine/GameLogic/SCA_IController.h @@ -99,11 +99,11 @@ public: } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON static PyObject* pyattr_get_state(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_sensors(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); static PyObject* pyattr_get_actuators(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; #endif diff --git a/source/gameengine/GameLogic/SCA_IInputDevice.h b/source/gameengine/GameLogic/SCA_IInputDevice.h index a13efee1316..0dbfe424e2c 100644 --- a/source/gameengine/GameLogic/SCA_IInputDevice.h +++ b/source/gameengine/GameLogic/SCA_IInputDevice.h @@ -47,7 +47,6 @@ public: KX_JUSTACTIVATED, KX_ACTIVE, KX_JUSTRELEASED, - KX_MAX_INPUTSTATUS }; SCA_InputEvent(SCA_EnumInputs status=KX_NO_INPUTSTATUS,int eventval=0) diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp index f2e1a8dd151..6fa83994bd6 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.cpp +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.cpp @@ -26,6 +26,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_ILogicBrick.h" #include "PyObjectPlus.h" @@ -169,7 +171,7 @@ CValue* SCA_ILogicBrick::GetEvent() -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* python stuff */ @@ -253,4 +255,4 @@ PyObject* SCA_ILogicBrick::BoolToPyArg(bool boolarg) return PyLong_FromSsize_t(boolarg? KX_TRUE: KX_FALSE); } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON diff --git a/source/gameengine/GameLogic/SCA_ILogicBrick.h b/source/gameengine/GameLogic/SCA_ILogicBrick.h index 3225c245550..a444210e8d9 100644 --- a/source/gameengine/GameLogic/SCA_ILogicBrick.h +++ b/source/gameengine/GameLogic/SCA_ILogicBrick.h @@ -133,7 +133,7 @@ public: virtual void Replace_IScene(SCA_IScene *val) {}; virtual void Replace_NetworkScene(NG_NetworkScene *val) {}; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON // python methods static PyObject* pyattr_get_owner(void *self_v, const KX_PYATTRIBUTE_DEF *attrdef); @@ -157,7 +157,7 @@ protected: /** Convert a a c++ value to KX_TRUE, KX_FALSE in Python. */ PyObject* BoolToPyArg(bool); -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; diff --git a/source/gameengine/GameLogic/SCA_IObject.cpp b/source/gameengine/GameLogic/SCA_IObject.cpp index 7c0a5b2db15..ff71d1bf96b 100644 --- a/source/gameengine/GameLogic/SCA_IObject.cpp +++ b/source/gameengine/GameLogic/SCA_IObject.cpp @@ -303,7 +303,7 @@ void SCA_IObject::SetState(unsigned int state) } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -342,4 +342,4 @@ PyAttributeDef SCA_IObject::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON diff --git a/source/gameengine/GameLogic/SCA_IObject.h b/source/gameengine/GameLogic/SCA_IObject.h index 0178da5f343..591be6fe53b 100644 --- a/source/gameengine/GameLogic/SCA_IObject.h +++ b/source/gameengine/GameLogic/SCA_IObject.h @@ -41,7 +41,7 @@ class SCA_ISensor; class SCA_IController; class SCA_IActuator; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON template<class T> T PyVecTo(PyObject*); #endif diff --git a/source/gameengine/GameLogic/SCA_ISensor.cpp b/source/gameengine/GameLogic/SCA_ISensor.cpp index fada69848b2..bb86b3735bc 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.cpp +++ b/source/gameengine/GameLogic/SCA_ISensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_ISensor.h" #include "SCA_EventManager.h" #include "SCA_LogicManager.h" @@ -300,7 +302,7 @@ void SCA_ISensor::Activate(class SCA_LogicManager* logicmgr) } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ----------------------------------------------- */ /* Python Functions */ @@ -427,6 +429,6 @@ int SCA_ISensor::pyattr_check_tap(void *self_v, const KX_PYATTRIBUTE_DEF *attrde self->m_level = false; return 0; } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_ISensor.h b/source/gameengine/GameLogic/SCA_ISensor.h index 2d3a3ef08a0..f31dd83343b 100644 --- a/source/gameengine/GameLogic/SCA_ISensor.h +++ b/source/gameengine/GameLogic/SCA_ISensor.h @@ -190,7 +190,7 @@ public: bool IsNoLink() const { return !m_links; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* Python functions: */ KX_PYMETHOD_DOC_NOARGS(SCA_ISensor,reset); @@ -210,7 +210,7 @@ public: KX_SENSOR_JUST_DEACTIVATED }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; #endif //__SCA_ISENSOR diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp index 29a6a73b865..cace4198ed8 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp @@ -241,7 +241,7 @@ bool SCA_JoystickSensor::isValid(SCA_JoystickSensor::KX_JOYSENSORMODE m) return res; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -296,7 +296,7 @@ PyAttributeDef SCA_JoystickSensor::Attributes[] = { /* get button active list -------------------------------------------------- */ const char SCA_JoystickSensor::GetButtonActiveList_doc[] = "getButtonActiveList\n" -"\tReturns a list containing the indicies of the button currently pressed.\n"; +"\tReturns a list containing the indices of the button currently pressed.\n"; PyObject* SCA_JoystickSensor::PyGetButtonActiveList( ) { SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex); PyObject *ls = PyList_New(0); diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.h b/source/gameengine/GameLogic/SCA_JoystickSensor.h index 90fb16de747..39f826dfe02 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.h +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.h @@ -117,7 +117,7 @@ public: return m_joyindex; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ @@ -157,7 +157,7 @@ public: return 0; } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp index c49d65226dc..7368869bc2d 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp @@ -27,6 +27,9 @@ * ***** END GPL LICENSE BLOCK ***** * Sensor for keyboard input */ + +#include <stddef.h> + #include "SCA_KeyboardSensor.h" #include "SCA_KeyboardManager.h" #include "SCA_LogicManager.h" @@ -156,6 +159,9 @@ bool SCA_KeyboardSensor::Evaluate() case SCA_InputEvent::KX_ACTIVE: active = true; break; + case SCA_InputEvent::KX_NO_INPUTSTATUS: + /* do nothing */ + break; } } @@ -221,6 +227,9 @@ bool SCA_KeyboardSensor::Evaluate() break; case SCA_InputEvent::KX_JUSTACTIVATED: qual_change = true; + case SCA_InputEvent::KX_ACTIVE: + /* do nothing */ + break; } } if (m_qual2 > 0 && qual==true) { @@ -236,6 +245,9 @@ bool SCA_KeyboardSensor::Evaluate() break; case SCA_InputEvent::KX_JUSTACTIVATED: qual_change = true; + case SCA_InputEvent::KX_ACTIVE: + /* do nothing */ + break; } } /* done reading qualifiers */ @@ -399,7 +411,7 @@ void SCA_KeyboardSensor::LogKeystrokes(void) } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python Functions */ @@ -492,7 +504,7 @@ PyObject* SCA_KeyboardSensor::pyattr_get_events(void *self_v, const KX_PYATTRIBU return resultlist; } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* Accessed from python */ diff --git a/source/gameengine/GameLogic/SCA_KeyboardSensor.h b/source/gameengine/GameLogic/SCA_KeyboardSensor.h index 5ca329b0846..0a3b25ac361 100644 --- a/source/gameengine/GameLogic/SCA_KeyboardSensor.h +++ b/source/gameengine/GameLogic/SCA_KeyboardSensor.h @@ -103,7 +103,7 @@ public: virtual bool IsPositiveTrigger(); bool TriggerOnAllKeys(); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ /* --------------------------------------------------------------------- */ diff --git a/source/gameengine/GameLogic/SCA_LogicManager.cpp b/source/gameengine/GameLogic/SCA_LogicManager.cpp index d003c5618f1..ab06fe7f9ef 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.cpp +++ b/source/gameengine/GameLogic/SCA_LogicManager.cpp @@ -307,7 +307,7 @@ void SCA_LogicManager::AddTriggeredController(SCA_IController* controller, SCA_I { controller->Activate(m_triggeredControllerSet); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON // so that the controller knows which sensor has activited it // only needed for python controller diff --git a/source/gameengine/GameLogic/SCA_LogicManager.h b/source/gameengine/GameLogic/SCA_LogicManager.h index 9ddb62df361..f92b27f641a 100644 --- a/source/gameengine/GameLogic/SCA_LogicManager.h +++ b/source/gameengine/GameLogic/SCA_LogicManager.h @@ -127,6 +127,7 @@ public: void RegisterMeshName(const STR_String& meshname,void* mesh); void UnregisterMeshName(const STR_String& meshname,void* mesh); GEN_Map<STR_HashedString,void*>& GetMeshMap() { return m_mapStringToMeshes; }; + GEN_Map<STR_HashedString,void*>& GetActionMap() { return m_mapStringToActions; }; void RegisterActionName(const STR_String& actname,void* action); diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.cpp b/source/gameengine/GameLogic/SCA_MouseSensor.cpp index 9f4b25986b0..257a67ad947 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.cpp +++ b/source/gameengine/GameLogic/SCA_MouseSensor.cpp @@ -30,6 +30,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_MouseSensor.h" #include "SCA_EventManager.h" #include "SCA_MouseManager.h" @@ -232,7 +234,7 @@ bool SCA_MouseSensor::isValid(SCA_MouseSensor::KX_MOUSESENSORMODE m) return ((m > KX_MOUSESENSORMODE_NODEF) && (m < KX_MOUSESENSORMODE_MAX)); } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -305,6 +307,6 @@ PyAttributeDef SCA_MouseSensor::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_MouseSensor.h b/source/gameengine/GameLogic/SCA_MouseSensor.h index f52b57a3e11..dc0e9a11d39 100644 --- a/source/gameengine/GameLogic/SCA_MouseSensor.h +++ b/source/gameengine/GameLogic/SCA_MouseSensor.h @@ -104,7 +104,7 @@ class SCA_MouseSensor : public SCA_ISensor static void UpdateHotkey(void *self); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ /* --------------------------------------------------------------------- */ diff --git a/source/gameengine/GameLogic/SCA_NANDController.cpp b/source/gameengine/GameLogic/SCA_NANDController.cpp index c09a53d8ac7..bcb2c84a083 100644 --- a/source/gameengine/GameLogic/SCA_NANDController.cpp +++ b/source/gameengine/GameLogic/SCA_NANDController.cpp @@ -87,7 +87,7 @@ CValue* SCA_NANDController::GetReplica() return replica; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_NORController.cpp b/source/gameengine/GameLogic/SCA_NORController.cpp index 8ebd79efcfa..5711fb5751b 100644 --- a/source/gameengine/GameLogic/SCA_NORController.cpp +++ b/source/gameengine/GameLogic/SCA_NORController.cpp @@ -87,7 +87,7 @@ CValue* SCA_NORController::GetReplica() return replica; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -124,6 +124,6 @@ PyAttributeDef SCA_NORController::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_ORController.cpp b/source/gameengine/GameLogic/SCA_ORController.cpp index a638147e211..72c368d632f 100644 --- a/source/gameengine/GameLogic/SCA_ORController.cpp +++ b/source/gameengine/GameLogic/SCA_ORController.cpp @@ -83,7 +83,7 @@ void SCA_ORController::Trigger(SCA_LogicManager* logicmgr) } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -120,6 +120,6 @@ PyAttributeDef SCA_ORController::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp index c1b49d32712..bc6604bebd8 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_PropertyActuator.h" #include "InputParser.h" #include "Operator2Expr.h" @@ -217,7 +219,7 @@ void SCA_PropertyActuator::Relink(GEN_Map<GEN_HashedPtr, void*> *obj_map) } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.cpp b/source/gameengine/GameLogic/SCA_PropertySensor.cpp index be86b976a70..55cd2713c35 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.cpp +++ b/source/gameengine/GameLogic/SCA_PropertySensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include <iostream> #include "SCA_PropertySensor.h" #include "Operator2Expr.h" @@ -304,7 +306,7 @@ CValue* SCA_PropertySensor::FindIdentifier(const STR_String& identifiername) return GetParent()->FindIdentifier(identifiername); } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -378,6 +380,6 @@ PyAttributeDef SCA_PropertySensor::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_PropertySensor.h b/source/gameengine/GameLogic/SCA_PropertySensor.h index 9a5c4762558..5a29c526fc0 100644 --- a/source/gameengine/GameLogic/SCA_PropertySensor.h +++ b/source/gameengine/GameLogic/SCA_PropertySensor.h @@ -84,7 +84,7 @@ public: virtual bool IsPositiveTrigger(); virtual CValue* FindIdentifier(const STR_String& identifiername); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ diff --git a/source/gameengine/GameLogic/SCA_PythonController.cpp b/source/gameengine/GameLogic/SCA_PythonController.cpp index 1f05846abe4..bf481b8e799 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.cpp +++ b/source/gameengine/GameLogic/SCA_PythonController.cpp @@ -29,16 +29,18 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_PythonController.h" #include "SCA_LogicManager.h" #include "SCA_ISensor.h" #include "SCA_IActuator.h" #include "PyObjectPlus.h" -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON #include "compile.h" #include "eval.h" -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON #include <algorithm> @@ -49,7 +51,7 @@ SCA_PythonController* SCA_PythonController::m_sCurrentController = NULL; SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode) : SCA_IController(gameobj), -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON m_bytecode(NULL), m_function(NULL), #endif @@ -57,7 +59,7 @@ SCA_PythonController::SCA_PythonController(SCA_IObject* gameobj, int mode) m_bModified(true), m_debug(false), m_mode(mode) -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON , m_pythondictionary(NULL) #endif @@ -84,7 +86,7 @@ int SCA_PythonController::Release() SCA_PythonController::~SCA_PythonController() { -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON //printf("released python byte script\n"); Py_XDECREF(m_bytecode); @@ -104,7 +106,7 @@ CValue* SCA_PythonController::GetReplica() { SCA_PythonController* replica = new SCA_PythonController(*this); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* why is this needed at all??? - m_bytecode is NULL'd below so this doesnt make sense * but removing it crashes blender (with YoFrankie). so leave in for now - Campbell */ Py_XINCREF(replica->m_bytecode); @@ -146,7 +148,7 @@ void SCA_PythonController::SetScriptName(const STR_String& name) } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON void SCA_PythonController::SetNamespace(PyObject* pythondictionary) { if (m_pythondictionary) @@ -171,7 +173,7 @@ int SCA_PythonController::IsTriggered(class SCA_ISensor* sensor) return 0; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* warning, self is not the SCA_PythonController, its a PyObjectPlus_Proxy */ PyObject* SCA_PythonController::sPyGetCurrentController(PyObject *self) @@ -214,7 +216,7 @@ SCA_IActuator* SCA_PythonController::LinkedActuatorFromPy(PyObject *value) PyErr_Format(PyExc_ValueError, "'%s' not in this python controllers actuator list", _PyUnicode_AsString(value_str)); Py_DECREF(value_str); - return false; + return NULL; } const char* SCA_PythonController::sPyGetCurrentController__doc__ = "getCurrentController()"; @@ -408,7 +410,13 @@ void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr) */ excdict= PyDict_Copy(m_pythondictionary); - resultobj = PyEval_EvalCode((PyCodeObject*)m_bytecode, excdict, excdict); + +#if PY_VERSION_HEX >= 0x03020000 + resultobj = PyEval_EvalCode((PyObject *)m_bytecode, excdict, excdict); +#else + resultobj = PyEval_EvalCode((PyCodeObject *)m_bytecode, excdict, excdict); +#endif + /* PyRun_SimpleString(m_scriptText.Ptr()); */ break; } @@ -527,13 +535,13 @@ int SCA_PythonController::pyattr_set_script(void *self_v, const KX_PYATTRIBUTE_D return PY_SET_ATTR_SUCCESS; } -#else // DISABLE_PYTHON +#else // WITH_PYTHON void SCA_PythonController::Trigger(SCA_LogicManager* logicmgr) { /* intentionally blank */ } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_PythonController.h b/source/gameengine/GameLogic/SCA_PythonController.h index bd78014038c..602b5e27e47 100644 --- a/source/gameengine/GameLogic/SCA_PythonController.h +++ b/source/gameengine/GameLogic/SCA_PythonController.h @@ -42,7 +42,7 @@ class SCA_IObject; class SCA_PythonController : public SCA_IController { Py_Header; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON struct _object * m_bytecode; /* SCA_PYEXEC_SCRIPT only */ PyObject* m_function; /* SCA_PYEXEC_MODULE only */ #endif @@ -55,7 +55,7 @@ class SCA_PythonController : public SCA_IController protected: STR_String m_scriptText; STR_String m_scriptName; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON PyObject* m_pythondictionary; /* for SCA_PYEXEC_SCRIPT only */ PyObject* m_pythonfunction; /* for SCA_PYEXEC_MODULE only */ #endif @@ -83,7 +83,7 @@ class SCA_PythonController : public SCA_IController void SetScriptText(const STR_String& text); void SetScriptName(const STR_String& name); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON void SetNamespace(PyObject* pythondictionary); #endif void SetDebug(bool debug) { m_debug = debug; } @@ -94,7 +94,7 @@ class SCA_PythonController : public SCA_IController bool Import(); void ErrorPrint(const char *error_msg); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON static const char* sPyGetCurrentController__doc__; static PyObject* sPyGetCurrentController(PyObject* self); static const char* sPyAddActiveActuator__doc__; diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp b/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp index 3d5d3568335..213446935b6 100644 --- a/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp +++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp @@ -33,20 +33,20 @@ SCA_PythonKeyboard::SCA_PythonKeyboard(SCA_IInputDevice* keyboard) : PyObjectPlus(), m_keyboard(keyboard) { -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON m_event_dict = PyDict_New(); #endif } SCA_PythonKeyboard::~SCA_PythonKeyboard() { -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON PyDict_Clear(m_event_dict); Py_DECREF(m_event_dict); #endif } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_PythonKeyboard.h b/source/gameengine/GameLogic/SCA_PythonKeyboard.h index 260835155e6..6a89ba7de76 100644 --- a/source/gameengine/GameLogic/SCA_PythonKeyboard.h +++ b/source/gameengine/GameLogic/SCA_PythonKeyboard.h @@ -32,14 +32,14 @@ class SCA_PythonKeyboard : public PyObjectPlus Py_Header; private: class SCA_IInputDevice *m_keyboard; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON PyObject* m_event_dict; #endif public: SCA_PythonKeyboard(class SCA_IInputDevice* keyboard); virtual ~SCA_PythonKeyboard(); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON static PyObject* pyattr_get_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); #endif }; diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.cpp b/source/gameengine/GameLogic/SCA_PythonMouse.cpp index 936ee2ff5c4..7267eb74594 100644 --- a/source/gameengine/GameLogic/SCA_PythonMouse.cpp +++ b/source/gameengine/GameLogic/SCA_PythonMouse.cpp @@ -35,20 +35,20 @@ SCA_PythonMouse::SCA_PythonMouse(SCA_IInputDevice* mouse, RAS_ICanvas* canvas) m_mouse(mouse), m_canvas(canvas) { -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON m_event_dict = PyDict_New(); #endif } SCA_PythonMouse::~SCA_PythonMouse() { -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON PyDict_Clear(m_event_dict); Py_DECREF(m_event_dict); #endif } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_PythonMouse.h b/source/gameengine/GameLogic/SCA_PythonMouse.h index 9e1085e6bec..15a7e19c602 100644 --- a/source/gameengine/GameLogic/SCA_PythonMouse.h +++ b/source/gameengine/GameLogic/SCA_PythonMouse.h @@ -33,7 +33,7 @@ class SCA_PythonMouse : public PyObjectPlus private: class SCA_IInputDevice *m_mouse; class RAS_ICanvas *m_canvas; -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON PyObject* m_event_dict; #endif public: @@ -42,7 +42,7 @@ public: void Show(bool visible); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON KX_PYMETHOD_DOC(SCA_PythonMouse, show); static PyObject* pyattr_get_events(void* self_v, const KX_PYATTRIBUTE_DEF *attrdef); diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.cpp b/source/gameengine/GameLogic/SCA_RandomActuator.cpp index 4b90ca7dadf..76bcf52c295 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.cpp +++ b/source/gameengine/GameLogic/SCA_RandomActuator.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "BoolValue.h" #include "IntValue.h" #include "FloatValue.h" @@ -305,7 +307,7 @@ void SCA_RandomActuator::enforceConstraints() { } } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ diff --git a/source/gameengine/GameLogic/SCA_RandomActuator.h b/source/gameengine/GameLogic/SCA_RandomActuator.h index 41d19f5b4c4..1fd2180f32c 100644 --- a/source/gameengine/GameLogic/SCA_RandomActuator.h +++ b/source/gameengine/GameLogic/SCA_RandomActuator.h @@ -92,7 +92,7 @@ class SCA_RandomActuator : public SCA_IActuator virtual CValue* GetReplica(); virtual void ProcessReplica(); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ @@ -112,7 +112,7 @@ class SCA_RandomActuator : public SCA_IActuator KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNormal); KX_PYMETHOD_DOC_VARARGS(SCA_RandomActuator, setFloatNegativeExponential); -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON }; /* end of class KX_EditObjectActuator : public SCA_PropertyActuator */ diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.cpp b/source/gameengine/GameLogic/SCA_RandomSensor.cpp index a7d18ff40d4..8b18641c165 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.cpp +++ b/source/gameengine/GameLogic/SCA_RandomSensor.cpp @@ -29,6 +29,8 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stddef.h> + #include "SCA_RandomSensor.h" #include "SCA_EventManager.h" #include "SCA_RandomEventManager.h" @@ -120,7 +122,7 @@ bool SCA_RandomSensor::Evaluate() return evaluateResult; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -176,6 +178,6 @@ int SCA_RandomSensor::pyattr_set_seed(void *self_v, const KX_PYATTRIBUTE_DEF *at return PY_SET_ATTR_SUCCESS; } -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_RandomSensor.h b/source/gameengine/GameLogic/SCA_RandomSensor.h index 3be17943d84..af5a767c1c1 100644 --- a/source/gameengine/GameLogic/SCA_RandomSensor.h +++ b/source/gameengine/GameLogic/SCA_RandomSensor.h @@ -56,7 +56,7 @@ public: virtual bool IsPositiveTrigger(); virtual void Init(); -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* --------------------------------------------------------------------- */ /* Python interface ---------------------------------------------------- */ diff --git a/source/gameengine/GameLogic/SCA_XNORController.cpp b/source/gameengine/GameLogic/SCA_XNORController.cpp index 9f54e41d110..f1f76c83718 100644 --- a/source/gameengine/GameLogic/SCA_XNORController.cpp +++ b/source/gameengine/GameLogic/SCA_XNORController.cpp @@ -91,7 +91,7 @@ CValue* SCA_XNORController::GetReplica() return replica; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -128,6 +128,6 @@ PyAttributeDef SCA_XNORController::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SCA_XORController.cpp b/source/gameengine/GameLogic/SCA_XORController.cpp index a58f30a3bed..ee63b72e455 100644 --- a/source/gameengine/GameLogic/SCA_XORController.cpp +++ b/source/gameengine/GameLogic/SCA_XORController.cpp @@ -91,7 +91,7 @@ CValue* SCA_XORController::GetReplica() return replica; } -#ifndef DISABLE_PYTHON +#ifdef WITH_PYTHON /* ------------------------------------------------------------------------- */ /* Python functions */ @@ -127,6 +127,6 @@ PyMethodDef SCA_XORController::Methods[] = { PyAttributeDef SCA_XORController::Attributes[] = { { NULL } //Sentinel }; -#endif // DISABLE_PYTHON +#endif // WITH_PYTHON /* eof */ diff --git a/source/gameengine/GameLogic/SConscript b/source/gameengine/GameLogic/SConscript index 507bb7f0bdd..a8d3ee65f4c 100644 --- a/source/gameengine/GameLogic/SConscript +++ b/source/gameengine/GameLogic/SConscript @@ -16,11 +16,14 @@ else: if env['WITH_BF_PYTHON']: incs += ' ' + env['BF_PYTHON_INC'] -else: - defs.append('DISABLE_PYTHON') + defs.append('WITH_PYTHON') if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'): if env['BF_DEBUG']: defs.append('_DEBUG') -env.BlenderLib ( 'bf_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS']) +if env['WITH_BF_CXX_GUARDEDALLOC']: + defs.append('WITH_CXX_GUARDEDALLOC') + incs += ' #/intern/guardedalloc' + +env.BlenderLib ( 'ge_logic', sources, Split(incs), defs, libtype=['core','player'], priority=[330,65], cxx_compileflags=env['BGE_CXXFLAGS']) |