Revision: 58910
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58910
Author: campbellbarton
Date: 2013-08-04 19:13:07 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
code cleanup: remove redundant NULL checks
Modified Paths:
--------------
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2013-08-04 18:50:00 UTC (rev 58909)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2013-08-04 19:13:07 UTC (rev 58910)
@@ -319,26 +319,20 @@
/* Get the name of the properties that objects
must own that
* we're sending to, if present
*/
- STR_String toPropName = (msgAct->toPropName
- ? (char*) msgAct->toPropName
- : "");
+ STR_String toPropName = msgAct->toPropName;
/* Get the Message Subject to send.
*/
- STR_String subject = (msgAct->subject
- ? (char*) msgAct->subject
- : "");
+ STR_String subject = msgAct->subject;
/* Get the bodyType
*/
int bodyType = msgAct->bodyType;
-
+
/* Get the body (text message or property name
whose value
* we'll be sending, might be empty
*/
- STR_String body = (msgAct->body
- ? (char*) msgAct->body
- : "");
+ const STR_String body = msgAct->body;
KX_NetworkMessageActuator *tmpmsgact = new
KX_NetworkMessageActuator(
gameobj,
// actuator controlling object
Modified: trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
2013-08-04 18:50:00 UTC (rev 58909)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
2013-08-04 19:13:07 UTC (rev 58910)
@@ -177,9 +177,8 @@
bTouchPulse = (blendertouchsensor->mode
& SENS_COLLISION_PULSE);
- STR_String touchPropOrMatName = (
bFindMaterial ?
-
blendertouchsensor->materialName:
- (blendertouchsensor->name ?
blendertouchsensor->name: ""));
+ const STR_String touchPropOrMatName =
bFindMaterial ?
+
blendertouchsensor->materialName : blendertouchsensor->name;
if (gameobj->GetPhysicsController())
@@ -229,9 +228,7 @@
/* Get our NetworkScene */
NG_NetworkScene *NetworkScene =
kxscene->GetNetworkScene();
/* filter on the incoming subjects,
might be empty */
- STR_String subject = (msgSens->subject
- ? (char*)msgSens->subject
- : "");
+ const STR_String subject =
msgSens->subject;
gamesensor = new
KX_NetworkMessageSensor(
eventmgr, // our
eventmanager
@@ -247,14 +244,9 @@
SCA_EventManager* eventmgr =
logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR);
if (eventmgr)
{
- STR_String nearpropertyname;
bNearSensor* blendernearsensor =
(bNearSensor*)sens->data;
- if (blendernearsensor->name)
- {
- // only objects that own this
property will be taken into account
- nearpropertyname = (char*)
blendernearsensor->name;
- }
-
+ const STR_String nearpropertyname =
(char *)blendernearsensor->name;
+
//DT_ShapeHandle shape =
DT_Sphere(0.0);
// this sumoObject is not deleted by a
gameobj, so delete it ourself
@@ -453,18 +445,11 @@
SCA_EventManager* eventmgr =
logicmgr->FindEventManager(SCA_EventManager::TOUCH_EVENTMGR);
if (eventmgr)
{
- STR_String radarpropertyname;
- STR_String touchpropertyname;
bRadarSensor* blenderradarsensor =
(bRadarSensor*) sens->data;
+ const STR_String radarpropertyname =
blenderradarsensor->name;
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;
// janco: the angle was doubled, so
should I divide the factor in 2
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
