diff options
Diffstat (limited to 'source/gameengine')
18 files changed, 52 insertions, 27 deletions
diff --git a/source/gameengine/Converter/BL_ActionActuator.cpp b/source/gameengine/Converter/BL_ActionActuator.cpp index 1d4edb45242..b06d85f2356 100644 --- a/source/gameengine/Converter/BL_ActionActuator.cpp +++ b/source/gameengine/Converter/BL_ActionActuator.cpp @@ -175,7 +175,8 @@ void BL_ActionActuator::ResetStartTime(float curtime) //SetLocalTime(curtime); } -CValue* BL_ActionActuator::GetReplica() { +CValue* BL_ActionActuator::GetReplica() +{ BL_ActionActuator* replica = new BL_ActionActuator(*this);//m_float,GetName()); replica->ProcessReplica(); return replica; diff --git a/source/gameengine/Converter/BL_BlenderDataConversion.cpp b/source/gameengine/Converter/BL_BlenderDataConversion.cpp index 3eb00a35904..8fb87025fe8 100644 --- a/source/gameengine/Converter/BL_BlenderDataConversion.cpp +++ b/source/gameengine/Converter/BL_BlenderDataConversion.cpp @@ -2140,7 +2140,8 @@ KX_IPhysicsController* getPhId(CListValue* sumolist,STR_String busc){//not used } -KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist){ +KX_GameObject* getGameOb(STR_String busc,CListValue* sumolist) +{ for (int j=0;j<sumolist->GetCount();j++) { diff --git a/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp b/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp index 343cf023417..37960e5c2f7 100644 --- a/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp +++ b/source/gameengine/Converter/KX_BlenderScalarInterpolator.cpp @@ -41,12 +41,14 @@ extern "C" { #include "BKE_fcurve.h" } -float BL_ScalarInterpolator::GetValue(float currentTime) const { +float BL_ScalarInterpolator::GetValue(float currentTime) const +{ // XXX 2.4x IPO_GetFloatValue(m_blender_adt, m_channel, currentTime); return evaluate_fcurve(m_fcu, currentTime); } -BL_InterpolatorList::BL_InterpolatorList(bAction *action) { +BL_InterpolatorList::BL_InterpolatorList(bAction *action) +{ if(action==NULL) return; @@ -59,7 +61,8 @@ BL_InterpolatorList::BL_InterpolatorList(bAction *action) { } } -BL_InterpolatorList::~BL_InterpolatorList() { +BL_InterpolatorList::~BL_InterpolatorList() +{ BL_InterpolatorList::iterator i; for (i = begin(); !(i == end()); ++i) { delete *i; diff --git a/source/gameengine/Expressions/IntValue.cpp b/source/gameengine/Expressions/IntValue.cpp index cf0aed181bb..c03c97311c7 100644 --- a/source/gameengine/Expressions/IntValue.cpp +++ b/source/gameengine/Expressions/IntValue.cpp @@ -308,7 +308,8 @@ const STR_String & CIntValue::GetText() -CValue* CIntValue::GetReplica() { +CValue* CIntValue::GetReplica() +{ CIntValue* replica = new CIntValue(*this); replica->ProcessReplica(); replica->m_pstrRep = NULL; diff --git a/source/gameengine/Expressions/ListValue.cpp b/source/gameengine/Expressions/ListValue.cpp index cdd87235fd2..4e048b1a875 100644 --- a/source/gameengine/Expressions/ListValue.cpp +++ b/source/gameengine/Expressions/ListValue.cpp @@ -71,7 +71,8 @@ const STR_String & CListValue::GetText() -CValue* CListValue::GetReplica() { +CValue* CListValue::GetReplica() +{ CListValue* replica = new CListValue(*this); replica->ProcessReplica(); @@ -214,7 +215,7 @@ CValue* CListValue::Calc(VALUE_OPERATOR op,CValue *val) //assert(false); // todo: implement me! static int error_printed = 0; if (error_printed==0) { - fprintf(stderr, "CValueList::Calc not yet implimented\n"); + fprintf(stderr, "CValueList::Calc not yet implemented\n"); error_printed = 1; } return NULL; @@ -227,7 +228,7 @@ CValue* CListValue::CalcFinal(VALUE_DATA_TYPE dtype, //assert(false); // todo: implement me! static int error_printed = 0; if (error_printed==0) { - fprintf(stderr, "CValueList::CalcFinal not yet implimented\n"); + fprintf(stderr, "CValueList::CalcFinal not yet implemented\n"); error_printed = 1; } return NULL; diff --git a/source/gameengine/Expressions/Operator1Expr.cpp b/source/gameengine/Expressions/Operator1Expr.cpp index 4e93ee0cb09..98228dfbe7d 100644 --- a/source/gameengine/Expressions/Operator1Expr.cpp +++ b/source/gameengine/Expressions/Operator1Expr.cpp @@ -103,7 +103,8 @@ bool COperator1Expr::NeedsRecalculated() return m_lhs->NeedsRecalculated(); } -CExpression* COperator1Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks) { +CExpression* COperator1Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks) +{ CExpression* newlhs = m_lhs->CheckLink(brokenlinks); diff --git a/source/gameengine/Expressions/Operator2Expr.cpp b/source/gameengine/Expressions/Operator2Expr.cpp index 11a509e59d0..f11d0670d15 100644 --- a/source/gameengine/Expressions/Operator2Expr.cpp +++ b/source/gameengine/Expressions/Operator2Expr.cpp @@ -197,7 +197,8 @@ bool COperator2Expr::NeedsRecalculated() -CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks) { +CExpression* COperator2Expr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks) +{ // if both children are 'dead', return NULL // if only one child is alive, return that child // if both childresn are alive, return this diff --git a/source/gameengine/Expressions/VectorValue.cpp b/source/gameengine/Expressions/VectorValue.cpp index 96cc5b48338..07a2743b19f 100644 --- a/source/gameengine/Expressions/VectorValue.cpp +++ b/source/gameengine/Expressions/VectorValue.cpp @@ -47,7 +47,8 @@ CVectorValue::CVectorValue(float x,float y,float z, AllocationTYPE alloctype) m_vec[KX_Z] = m_transformedvec[KX_Z] = z; } -CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype) { +CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctype) +{ SetCustomFlag1(false);//FancyOutput=false; @@ -64,7 +65,8 @@ CVectorValue::CVectorValue(double vec[],const char *name,AllocationTYPE alloctyp SetName(name); } -CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype) { +CVectorValue::CVectorValue(double vec[],AllocationTYPE alloctype) +{ SetCustomFlag1(false);//FancyOutput=false; @@ -201,7 +203,8 @@ const STR_String & CVectorValue::GetText() return gstrVectorStr; } -CValue* CVectorValue::GetReplica() { +CValue* CVectorValue::GetReplica() +{ CVectorValue* replica = new CVectorValue(*this); replica->ProcessReplica(); return replica; diff --git a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp index 6aee6bd19e7..3612115f90e 100644 --- a/source/gameengine/GameLogic/SCA_JoystickSensor.cpp +++ b/source/gameengine/GameLogic/SCA_JoystickSensor.cpp @@ -303,7 +303,8 @@ PyAttributeDef SCA_JoystickSensor::Attributes[] = { const char SCA_JoystickSensor::GetButtonActiveList_doc[] = "getButtonActiveList\n" "\tReturns a list containing the indices of the button currently pressed.\n"; -PyObject* SCA_JoystickSensor::PyGetButtonActiveList( ) { +PyObject* SCA_JoystickSensor::PyGetButtonActiveList( ) +{ SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex); PyObject *ls = PyList_New(0); PyObject *value; @@ -325,7 +326,8 @@ PyObject* SCA_JoystickSensor::PyGetButtonActiveList( ) { const char SCA_JoystickSensor::GetButtonStatus_doc[] = "getButtonStatus(buttonIndex)\n" "\tReturns a bool of the current pressed state of the specified button.\n"; -PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args ) { +PyObject* SCA_JoystickSensor::PyGetButtonStatus( PyObject* args ) +{ SCA_Joystick *joy = ((SCA_JoystickManager *)m_eventmgr)->GetJoystickDevice(m_joyindex); int index; diff --git a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp index 544b1da76af..5413638391f 100644 --- a/source/gameengine/GameLogic/SCA_PropertyActuator.cpp +++ b/source/gameengine/GameLogic/SCA_PropertyActuator.cpp @@ -183,7 +183,8 @@ isValid( SCA_PropertyActuator:: -GetReplica() { +GetReplica() +{ SCA_PropertyActuator* replica = new SCA_PropertyActuator(*this); diff --git a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp index a12619aa925..eca678f4e89 100644 --- a/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp +++ b/source/gameengine/GameLogic/SCA_RandomNumberGenerator.cpp @@ -54,14 +54,16 @@ #define TEMPERING_SHIFT_T(y) (y << 15) #define TEMPERING_SHIFT_L(y) (y >> 18) -SCA_RandomNumberGenerator::SCA_RandomNumberGenerator(long seed) { +SCA_RandomNumberGenerator::SCA_RandomNumberGenerator(long seed) +{ // int mti = N + 1; /*unused*/ m_seed = seed; m_refcount = 1; SetStartVector(); } -SCA_RandomNumberGenerator::~SCA_RandomNumberGenerator() { +SCA_RandomNumberGenerator::~SCA_RandomNumberGenerator() +{ /* intentionally empty */ } diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp index f548eaee38a..a39c8ede6c1 100644 --- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp +++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp @@ -72,7 +72,8 @@ KX_NetworkMessageSensor::~KX_NetworkMessageSensor() { } -CValue* KX_NetworkMessageSensor::GetReplica() { +CValue* KX_NetworkMessageSensor::GetReplica() +{ // This is the standard sensor implementation of GetReplica // There may be more network message sensor specific stuff to do here. CValue* replica = new KX_NetworkMessageSensor(*this); diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index 519ff97a2a2..3739ad0d712 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -104,7 +104,8 @@ KX_FontObject::~KX_FontObject() //it's handled in KX_Scene::NewRemoveObject } -CValue* KX_FontObject::GetReplica() { +CValue* KX_FontObject::GetReplica() +{ KX_FontObject* replica = new KX_FontObject(*this); replica->ProcessReplica(); return replica; @@ -116,7 +117,8 @@ void KX_FontObject::ProcessReplica() KX_GetActiveScene()->AddFont(this); } -int GetFontId (VFont *font) { +int GetFontId (VFont *font) +{ PackedFile *packedfile=NULL; int fontid = -1; diff --git a/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp b/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp index 4e0e04beca4..d2468d0317d 100644 --- a/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp +++ b/source/gameengine/Ketsji/KX_OrientationInterpolator.cpp @@ -34,7 +34,8 @@ #include "MT_Matrix3x3.h" #include "KX_IScalarInterpolator.h" -void KX_OrientationInterpolator::Execute(float currentTime) const { +void KX_OrientationInterpolator::Execute(float currentTime) const +{ MT_Vector3 eul(m_ipos[0]->GetValue(currentTime), m_ipos[1]->GetValue(currentTime), m_ipos[2]->GetValue(currentTime)); diff --git a/source/gameengine/Ketsji/KX_PositionInterpolator.cpp b/source/gameengine/Ketsji/KX_PositionInterpolator.cpp index be70ee8ced5..1e217ecf616 100644 --- a/source/gameengine/Ketsji/KX_PositionInterpolator.cpp +++ b/source/gameengine/Ketsji/KX_PositionInterpolator.cpp @@ -34,7 +34,8 @@ #include "MT_Point3.h" #include "KX_IScalarInterpolator.h" -void KX_PositionInterpolator::Execute(float currentTime) const { +void KX_PositionInterpolator::Execute(float currentTime) const +{ m_target.setValue(m_ipos[0]->GetValue(currentTime), m_ipos[1]->GetValue(currentTime), m_ipos[2]->GetValue(currentTime)); diff --git a/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp b/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp index 2b0f112a63f..e234a9621b8 100644 --- a/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp +++ b/source/gameengine/Ketsji/KX_ScalarInterpolator.cpp @@ -33,6 +33,7 @@ #include "KX_ScalarInterpolator.h" #include "KX_IScalarInterpolator.h" -void KX_ScalarInterpolator::Execute(float currentTime) const { +void KX_ScalarInterpolator::Execute(float currentTime) const +{ *m_target = m_ipo->GetValue(currentTime); } diff --git a/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp b/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp index 51c2a87d14d..dd40cbd22fd 100644 --- a/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp +++ b/source/gameengine/Ketsji/KX_ScalingInterpolator.cpp @@ -34,7 +34,8 @@ #include "MT_Vector3.h" #include "KX_IScalarInterpolator.h" -void KX_ScalingInterpolator::Execute(float currentTime) const { +void KX_ScalingInterpolator::Execute(float currentTime) const +{ m_target.setValue(m_ipos[0]->GetValue(currentTime), m_ipos[1]->GetValue(currentTime), m_ipos[2]->GetValue(currentTime)); diff --git a/source/gameengine/Network/NG_NetworkScene.cpp b/source/gameengine/Network/NG_NetworkScene.cpp index 4c5206ea2f1..3dbfb53d03d 100644 --- a/source/gameengine/Network/NG_NetworkScene.cpp +++ b/source/gameengine/Network/NG_NetworkScene.cpp @@ -144,7 +144,8 @@ void NG_NetworkScene::RemoveAllObjects() /** * get a single network object given its name */ -NG_NetworkObject* NG_NetworkScene::FindNetworkObject(const STR_String& objname) { +NG_NetworkObject* NG_NetworkScene::FindNetworkObject(const STR_String& objname) +{ NG_NetworkObject *nwobj = NULL; if (! m_networkdevice->IsOnline()) return nwobj; |