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

Scripting work : the tutorial is now completely scripting-powered, nothing hardcoded anymore

Browse Source
This commit is contained in:
Marianne Gagnon 2015-05-21 20:26:28 -04:00
parent 17cfc130d0
commit 0a3daf9484
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scriptengine/script_track.cpp
View File

@ -101,6 +101,12 @@ namespace Scripting
tobj->setID(*triggerID); tobj->setID(*triggerID);
World::getWorld()->getTrack()->getTrackObjectManager()->insertObject(tobj); World::getWorld()->getTrack()->getTrackObjectManager()->insertObject(tobj);
} }
/** Exits the race to the main menu */
void exitRace()
{
World::getWorld()->scheduleExitRace();
}
} }
/** \cond DOXYGEN_IGNORE */ /** \cond DOXYGEN_IGNORE */
@ -245,6 +251,7 @@ namespace Scripting
r = engine->RegisterGlobalFunction("void createTrigger(const string &in, const Vec3 &in, float distance)", r = engine->RegisterGlobalFunction("void createTrigger(const string &in, const Vec3 &in, float distance)",
asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0); asFUNCTION(createTrigger), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0); r = engine->RegisterGlobalFunction("TrackObject@ getTrackObject(const string &in)", asFUNCTION(getTrackObject), asCALL_CDECL); assert(r >= 0);
r = engine->RegisterGlobalFunction("void exitRace()", asFUNCTION(exitRace), asCALL_CDECL); assert(r >= 0);
// TrackObject // TrackObject
r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0); r = engine->RegisterObjectMethod("TrackObject", "void setEnable(bool status)", asMETHOD(TrackObject, setEnable), asCALL_THISCALL); assert(r >= 0);

6
src/tracks/track_object_presentation.cpp
View File

@ -940,12 +940,6 @@ void TrackObjectPresentationActionTrigger::onTriggerItemApproached(Item* who)
_("Complete all challenges to unlock the big door!"), true); _("Complete all challenges to unlock the big door!"), true);
} }
} }
else if (m_action == "tutorial_exit")
{
// TODO: move to scripting
World::getWorld()->scheduleExitRace();
return;
}
else else
{ {
Scripting::ScriptEngine* script_engine = Scripting::ScriptEngine* script_engine =