TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-15 08:34:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

shift setWheelSpring script command to use a char*, not a wheeledvehicle*

Browse source 
need to be able to tell what the attempted assignment is for reporting
This commit is contained in:
AzaezelX 2023-03-26 09:47:31 -05:00
parent c6a1a42cf0
commit 416a35b2b9
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Engine/source/T3D/vehicles/wheeledVehicle.cpp
View file

@ -1644,7 +1644,7 @@ DefineEngineMethod( WheeledVehicle, setWheelTire, bool, ( S32 wheel, WheeledVehi
} }
} }
DefineEngineMethod( WheeledVehicle, setWheelSpring, bool, ( S32 wheel, WheeledVehicleSpring* spring ),, DefineEngineMethod( WheeledVehicle, setWheelSpring, bool, ( S32 wheel, const char* spring ),,
"@brief Set the WheeledVehicleSpring datablock for this wheel.\n" "@brief Set the WheeledVehicleSpring datablock for this wheel.\n"
"@param wheel index of the wheel to set (hub node #)\n" "@param wheel index of the wheel to set (hub node #)\n"
"@param spring WheeledVehicleSpring datablock\n" "@param spring WheeledVehicleSpring datablock\n"
@ -1653,15 +1653,19 @@ DefineEngineMethod( WheeledVehicle, setWheelSpring, bool, ( S32 wheel, WheeledVe
"%obj.setWheelSpring( 0, FrontSpring );\n" "%obj.setWheelSpring( 0, FrontSpring );\n"
"@endtsexample\n" ) "@endtsexample\n" )
{ {
if (spring && wheel >= 0 && wheel < object->getWheelCount()) { WheeledVehicleSpring* springObj = NULL;
object->setWheelSpring(wheel,spring); if (wheel < 0 || wheel > object->getWheelCount())
return true; {
} Con::warnf("setWheelSpring: invalid wheel index %d, vehicle has %d hubs", wheel, object->getWheelCount());
else {
Con::warnf("setWheelSpring: invalid spring datablock or wheel index, vehicle has %d hubs",
object->getWheelCount());
return false; return false;
} }
else if (!Sim::findObject(spring, springObj))
{
Con::warnf("setWheelSpring: invalid spring %s", spring);
return false;
}
object->setWheelSpring(wheel, springObj);
return true;
} }
DefineEngineMethod( WheeledVehicle, getWheelCount, S32, (),, DefineEngineMethod( WheeledVehicle, getWheelCount, S32, (),,