onTurnBoat Event

source/boats.cpp

@@ -7,6 +7,9 @@
 #include "cEffects.h"
 #include "Dictionary.h"
 #include "StringUtility.hpp"
+#include "CJSMapping.h"
+#include "cScript.h"
+#include "CJSEngine.h"
 
 
 #define XP 0
@@ -898,6 +901,20 @@ void TurnBoat( CBoatObj *b, bool rightTurn, bool disableChecks )
 	{
 		tSock->Send( &prSend );
 	}
+
+	auto scriptTriggers = b->GetScriptTriggers();
+    for( auto scriptTrig : scriptTriggers )
+    {
+        auto toExecute = JSMapping->GetScript( scriptTrig );
+        if( toExecute )
+        {
+            if( toExecute->OnBoatTurn( b, olddir, b->GetDir() ) == 1 )
+            {
+                // A script with the event returned true; prevent other scripts from running
+                break;
+            }
+        }
+    }
 }
 
 void TurnBoat( CSocket *mSock, CBoatObj *myBoat, CItem *tiller, UI08 dir, bool rightTurn )

source/cScript.cpp

@@ -1624,6 +1624,38 @@ SI08 cScript::OnMultiLogout( CMultiObj *iMulti, CChar *cPlayer )
 	return TryParseJSVal( rval );
 }
 
+//o------------------------------------------------------------------------------------------------o
+//|    Function    -    cScript::OnBoatTurn()
+//o------------------------------------------------------------------------------------------------o
+//|    Purpose        -    Triggers for Boat after it has turned successfully
+//o------------------------------------------------------------------------------------------------o
+SI08 cScript::OnBoatTurn( CBoatObj *iBoat, UI08 oldDir, UI08 newDir )
+{
+    const SI08 RV_NOFUNC = -1;
+    if( !ValidateObject( iBoat ))
+        return RV_NOFUNC;
+
+    if( !ExistAndVerify( seOnBoatTurn, "onBoatTurn" ))
+        return RV_NOFUNC;
+
+    jsval params[3], rval;
+    JSObject *myBoat = JSEngine->AcquireObject( IUE_ITEM, iBoat, runTime );
+
+
+    params[0] = OBJECT_TO_JSVAL( myBoat );
+    params[1] = INT_TO_JSVAL( oldDir );
+    params[2] = INT_TO_JSVAL( newDir );
+
+    JSBool retVal = JS_CallFunctionName( targContext, targObject, "onBoatTurn", 3, params, &rval );
+    if( retVal == JS_FALSE )
+    {
+        SetEventExists( seOnBoatTurn, false );
+        return RV_NOFUNC;
+    }
+
+    return TryParseJSVal( rval );
+}
+
 //o------------------------------------------------------------------------------------------------o
 //|	Function	-	cScript::OnEquipAttempt()
 //o------------------------------------------------------------------------------------------------o

source/cScript.h

@@ -40,6 +40,7 @@ enum ScriptEvent
 	seOnEntrance,			//	**
 	seOnLeaving,			//	**
 	seOnMultiLogout,		//	**
+	seOnBoatTurn,           //  **
 	seOnEquipAttempt,		//	**
 	seOnEquip,				//	**
 	seOnUnequipAttempt,		//	**
@@ -216,6 +217,7 @@ class cScript
 	SI08		OnEntrance( CMultiObj *left, CBaseObject *leaving );
 	SI08		OnLeaving( CMultiObj *left, CBaseObject *leaving );
 	SI08		OnMultiLogout( CMultiObj* iMulti, CChar* cPlayer );
+	SI08        OnBoatTurn( CBoatObj* iMulti, UI08 oldDir, UI08 newDir );
 	SI08		OnEquipAttempt( CChar *equipper, CItem *equipping );
 	SI08		OnEquip( CChar *equipper, CItem *equipping );
 	SI08		OnUnequipAttempt( CChar *equipper, CItem *equipping );