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

Merge pull request #1001 from Azaezel/alpha41/springString

Browse source 
shift setWheelSpring script command to use a char*, not a  wheeledvehicleSpring*
This commit is contained in:
Brian Roberts 2023-03-28 16:46:18 -05:00 • committed by GitHub
commit 5c8be2bea5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 24 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1624,7 +1624,7 @@ DefineEngineMethod( WheeledVehicle, setWheelPowered, bool, ( S32 wheel, bool pow
return false; return false;
} }
DefineEngineMethod( WheeledVehicle, setWheelTire, bool, ( S32 wheel, WheeledVehicleTire* tire ),, DefineEngineMethod( WheeledVehicle, setWheelTire, bool, ( S32 wheel, const char* tire ),,
"@brief Set the WheeledVehicleTire datablock for this wheel.\n" "@brief Set the WheeledVehicleTire 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 tire WheeledVehicleTire datablock\n" "@param tire WheeledVehicleTire datablock\n"
@ -1633,18 +1633,22 @@ DefineEngineMethod( WheeledVehicle, setWheelTire, bool, ( S32 wheel, WheeledVehi
"%obj.setWheelTire( 0, FrontTire );\n" "%obj.setWheelTire( 0, FrontTire );\n"
"@endtsexample\n" ) "@endtsexample\n" )
{ {
if (wheel >= 0 && wheel < object->getWheelCount()) { WheeledVehicleTire* tireObj = NULL;
object->setWheelTire(wheel,tire); if (wheel < 0 || wheel > object->getWheelCount())
return true; {
} Con::warnf("setWheelTire: invalid wheel index %d, vehicle has %d hubs", wheel, object->getWheelCount());
else {
Con::warnf("setWheelTire: invalid tire datablock or wheel index, vehicle has %d hubs",
object->getWheelCount());
return false; return false;
} }
else if (!Sim::findObject(tire, tireObj))
{
Con::warnf("setWheelSpring: invalid spring %s", tire);
return false;
}
object->setWheelTire(wheel, tireObj);
return true;
} }
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 +1657,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, (),,