sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

code cleanup: remove redundant NULL checks

Browse Source
This commit is contained in:
Campbell Barton 2013-08-04 19:13:07 +00:00
parent 5129112072
commit fdc336510a
2 changed files with 10 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/gameengine/Converter/KX_ConvertActuators.cpp
View File

@ -319,15 +319,11 @@ void BL_ConvertActuators(const char* maggiename,
/* Get the name of the properties that objects must own that /* Get the name of the properties that objects must own that
* we're sending to, if present * we're sending to, if present
*/ */
STR_String toPropName = (msgAct->toPropName STR_String toPropName = msgAct->toPropName;
? (char*) msgAct->toPropName
: "");
/* Get the Message Subject to send. /* Get the Message Subject to send.
*/ */
STR_String subject = (msgAct->subject STR_String subject = msgAct->subject;
? (char*) msgAct->subject
: "");
/* Get the bodyType /* Get the bodyType
*/ */
@ -336,9 +332,7 @@ void BL_ConvertActuators(const char* maggiename,
/* Get the body (text message or property name whose value /* Get the body (text message or property name whose value
* we'll be sending, might be empty * we'll be sending, might be empty
*/ */
STR_String body = (msgAct->body const STR_String body = msgAct->body;
? (char*) msgAct->body
: "");
KX_NetworkMessageActuator *tmpmsgact = new KX_NetworkMessageActuator( KX_NetworkMessageActuator *tmpmsgact = new KX_NetworkMessageActuator(
gameobj, // actuator controlling object gameobj, // actuator controlling object

25
source/gameengine/Converter/KX_ConvertSensors.cpp
View File

@ -177,9 +177,8 @@ void BL_ConvertSensors(struct Object* blenderobject,
bTouchPulse = (blendertouchsensor->mode & SENS_COLLISION_PULSE); bTouchPulse = (blendertouchsensor->mode & SENS_COLLISION_PULSE);
STR_String touchPropOrMatName = ( bFindMaterial ? const STR_String touchPropOrMatName = bFindMaterial ?
blendertouchsensor->materialName: blendertouchsensor->materialName : blendertouchsensor->name;
(blendertouchsensor->name ? blendertouchsensor->name: ""));
if (gameobj->GetPhysicsController()) if (gameobj->GetPhysicsController())
@ -229,9 +228,7 @@ void BL_ConvertSensors(struct Object* blenderobject,
/* Get our NetworkScene */ /* Get our NetworkScene */
NG_NetworkScene *NetworkScene = kxscene->GetNetworkScene(); NG_NetworkScene *NetworkScene = kxscene->GetNetworkScene();
/* filter on the incoming subjects, might be empty */ /* filter on the incoming subjects, might be empty */
STR_String subject = (msgSens->subject const STR_String subject = msgSens->subject;
? (char*)msgSens->subject
: "");
gamesensor = new KX_NetworkMessageSensor( gamesensor = new KX_NetworkMessageSensor(
eventmgr, // our eventmanager eventmgr, // our eventmanager
@ -247,13 +244,8 @@ void BL_ConvertSensors(struct Object* blenderobject,
SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR); SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR);
if (eventmgr) if (eventmgr)
{ {
STR_String nearpropertyname;
bNearSensor* blendernearsensor = (bNearSensor*)sens->data; bNearSensor* blendernearsensor = (bNearSensor*)sens->data;
if (blendernearsensor->name) const STR_String nearpropertyname = (char *)blendernearsensor->name;
{
// only objects that own this property will be taken into account
nearpropertyname = (char*) blendernearsensor->name;
}
//DT_ShapeHandle shape = DT_Sphere(0.0); //DT_ShapeHandle shape = DT_Sphere(0.0);
@ -453,18 +445,11 @@ void BL_ConvertSensors(struct Object* blenderobject,
SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR); SCA_EventManager* eventmgr = logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR);
if (eventmgr) if (eventmgr)
{ {
STR_String radarpropertyname;
STR_String touchpropertyname;
bRadarSensor* blenderradarsensor = (bRadarSensor*) sens->data; bRadarSensor* blenderradarsensor = (bRadarSensor*) sens->data;
const STR_String radarpropertyname = blenderradarsensor->name;
int radaraxis = blenderradarsensor->axis; int radaraxis = blenderradarsensor->axis;
if (blenderradarsensor->name)
{
// only objects that own this property will be taken into account
radarpropertyname = (char*) blenderradarsensor->name;
}
MT_Scalar coneheight = blenderradarsensor->range; MT_Scalar coneheight = blenderradarsensor->range;
// janco: the angle was doubled, so should I divide the factor in 2 // janco: the angle was doubled, so should I divide the factor in 2