ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added enable method specific to Physical Objects to allow previously disabled track objects to be renabled

Browse Source
This commit is contained in:
Sachith Hasaranga Seneviratne 2014-08-05 20:20:26 +05:30
parent f83a524f61
commit e7585906ea
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/scripts/farm/triggers.as
View File

@ -29,6 +29,11 @@ void haybail_deactivate()
*/ */
displayMessage("Haybail reactivated"); displayMessage("Haybail reactivated");
//enable("hayBail.b3d"); //enable("hayBail.b3d");
TrackObject @t_obj2 = getTrackObject("hayBail.b3d");
//t_obj2.setEnable(false);
PhysicalObject @haybail = t_obj2.getPhysicalObject();
haybail.enable();
squashKart(0,35.0); //id of kart,time to squash squashKart(0,35.0); //id of kart,time to squash
TrackObject @t_obj = getTrackObject("hayBail.b3d"); TrackObject @t_obj = getTrackObject("hayBail.b3d");
Animator @haybailAnimator = t_obj.getAnimator(); Animator @haybailAnimator = t_obj.getAnimator();

5
src/scriptengine/script_track.cpp
View File

@ -65,6 +65,10 @@ namespace Scripting
{ {
((PhysicalObject*)(memory))->removeBody(); ((PhysicalObject*)(memory))->removeBody();
} }
void enable(void *memory)
{
((PhysicalObject*)(memory))->addBody();
}
void setPaused(bool mode, void *memory) void setPaused(bool mode, void *memory)
{ {
((ThreeDAnimation*)(memory))->setPaused(mode); ((ThreeDAnimation*)(memory))->setPaused(mode);
@ -217,6 +221,7 @@ namespace Scripting
r = engine->RegisterObjectMethod("TrackObject", "PhysicalObject @getPhysicalObject()", asMETHOD(TrackObject, getPhysicalObjectForScript), asCALL_THISCALL); assert(r >= 0); r = engine->RegisterObjectMethod("TrackObject", "PhysicalObject @getPhysicalObject()", asMETHOD(TrackObject, getPhysicalObjectForScript), asCALL_THISCALL); assert(r >= 0);
r = engine->RegisterObjectMethod("PhysicalObject", "bool isFlattener()", asMETHOD(PhysicalObject, isFlattenKartObject), asCALL_THISCALL); assert(r >= 0); r = engine->RegisterObjectMethod("PhysicalObject", "bool isFlattener()", asMETHOD(PhysicalObject, isFlattenKartObject), asCALL_THISCALL); assert(r >= 0);
r = engine->RegisterObjectMethod("PhysicalObject", "void disable()", asFUNCTION(disable), asCALL_CDECL_OBJLAST); assert(r >= 0); r = engine->RegisterObjectMethod("PhysicalObject", "void disable()", asFUNCTION(disable), asCALL_CDECL_OBJLAST); assert(r >= 0);
r = engine->RegisterObjectMethod("PhysicalObject", "void enable()", asFUNCTION(enable), asCALL_CDECL_OBJLAST); assert(r >= 0);
//Mesh or Skeletal Animation //Mesh or Skeletal Animation