Address Discord comments

- Remove SuspecisionActs for no boat process. - Add `relative_direction` to boat move sysevent.
polserver · Nov 8, 2023 · 1bc934e · 1bc934e
1 parent 5679494
commit 1bc934e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 25 deletions.
diff --git a/pol-core/pol/miscmsg.cpp b/pol-core/pol/miscmsg.cpp
@@ -431,22 +431,24 @@ void handle_msg_BF( Client* client, PKTBI_BF* msg )
       break;
     }
 
-    Module::UOExecutorModule* process = multi->process();
-    if ( !process )
+    if ( msg->boatmove.direction > 7 || msg->boatmove.speed > 2 )
     {
-      SuspiciousActs::BoatMoveMultiNoRunningScript( client, multi->serial );
+      SuspiciousActs::BoatMoveOutOfRangeParameters( client, multi->serial, msg->boatmove.direction,
+                                                    msg->boatmove.speed );
       break;
     }
 
-    if ( msg->boatmove.direction > 7 || msg->boatmove.speed > 2 )
+    Module::UOExecutorModule* process = multi->process();
+    if ( !process )
     {
-      SuspiciousActs::BoatMoveOutOfRangeParameters( client, multi->serial, msg->boatmove.direction,
-                                                    msg->boatmove.speed );
       break;
     }
 
-    process->uoexec().signal_event(
-        new Module::BoatMovementEvent( chr, msg->boatmove.speed, msg->boatmove.direction ) );
+    auto relative_direction =
+        static_cast<Core::UFACING>( ( msg->boatmove.direction + boat->boat_facing() ) & 7 );
+
+    process->uoexec().signal_event( new Module::BoatMovementEvent(
+        chr, msg->boatmove.speed, msg->boatmove.direction, relative_direction ) );
 
     break;
   }

diff --git a/pol-core/pol/systems/suspiciousacts.cpp b/pol-core/pol/systems/suspiciousacts.cpp
@@ -147,17 +147,6 @@ void SuspiciousActs::BoatMoveNotBoatMulti( Network::Client* client )
   }
 }
 
-void SuspiciousActs::BoatMoveMultiNoRunningScript( Network::Client* client, u32 multi_serial )
-{
-  if ( Plib::systemstate.config.show_warning_boat_move )
-  {
-    POLLOG_ERROR.Format(
-        "{}/{} tried to use a boat movement packet on a boat multi (serial 0x{:X}) that has no "
-        "running script.\n" )
-        << client->acct->name() << client->chr->name() << multi_serial;
-  }
-}
-
 void SuspiciousActs::BoatMoveNotPilot( Network::Client* client, u32 multi_serial )
 {
   if ( Plib::systemstate.config.show_warning_boat_move )

diff --git a/pol-core/pol/systems/suspiciousacts.h b/pol-core/pol/systems/suspiciousacts.h
@@ -41,9 +41,7 @@ void BoatMoveNotBoatMulti( Network::Client* client );
 // boat movement packet without being on a boat multi
 void BoatMoveNotPilot( Network::Client* client, u32 multi_serial );
 
-// boat movement packet on boat multi with no running script
-void BoatMoveMultiNoRunningScript( Network::Client* client, u32 multi_serial );
-
+// boat movement packet used packet with direction > 7 or speed > 2
 void BoatMoveOutOfRangeParameters( Network::Client* client, u32 multi_serial, u8 direction,
                                    u8 speed );
 }  // namespace Pol::SuspiciousActs

diff --git a/pol-core/pol/uoscrobj.cpp b/pol-core/pol/uoscrobj.cpp
@@ -4770,13 +4770,14 @@ BObjectImp* EClientRefObjImp::call_polmethod_id( const int id, Core::UOExecutor&
   return base::call_polmethod_id( id, ex );
 }
 
-BoatMovementEvent::BoatMovementEvent( Mobile::Character* source, const u8 speed,
-                                      const u8 direction )
+BoatMovementEvent::BoatMovementEvent( Mobile::Character* source, const u8 speed, const u8 direction,
+                                      const u8 relative_direction )
 {
   addMember( "type", new BLong( Core::EVID_BOAT_MOVEMENT ) );
   addMember( "source", new Module::EOfflineCharacterRefObjImp( source ) );
   addMember( "speed", new BLong( static_cast<int>( speed ) ) );
   addMember( "direction", new BLong( static_cast<int>( direction ) ) );
+  addMember( "relative_direction", new BLong( static_cast<int>( relative_direction ) ) );
 }
 
 SourcedEvent::SourcedEvent( Core::EVENTID type, Mobile::Character* source )

diff --git a/pol-core/pol/uoscrobj.h b/pol-core/pol/uoscrobj.h
@@ -263,7 +263,8 @@ class DamageEvent final : public Bscript::BStruct
 class BoatMovementEvent : public Bscript::BStruct
 {
 public:
-  BoatMovementEvent( Mobile::Character* source, const u8 speed, const u8 direction );
+  BoatMovementEvent( Mobile::Character* source, const u8 speed, const u8 direction,
+                     const u8 relative_direction );
 };
 
 class SourcedEvent : public Bscript::BStruct