Merge branch 'onPlayerWeaponFire' from @lopezloo into master (fixes #47)

multitheftauto · Sep 6, 2016 · e95b136 · lopezloo · Sep 6, 2016 · e95b136
2 parents 2f7e78b + 633fc89
commit e95b136
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/Server/mods/deathmatch/logic/CGame.cpp b/Server/mods/deathmatch/logic/CGame.cpp
@@ -1535,6 +1535,7 @@ void CGame::AddBuiltInEvents ( void )
 
     // Weapon events
     m_Events.AddEvent ( "onWeaponFire", "", NULL, false );
+    m_Events.AddEvent ( "onPlayerWeaponFire", "weapon, endX, endY, endZ, hitElement, startX, startY, startZ", NULL, false );
 }
 
 void CGame::ProcessTrafficLights ( long long llCurrentTime )
@@ -2302,6 +2303,27 @@ void CGame::Packet_Bulletsync ( CBulletsyncPacket& Packet )
         }
         // Relay to other players
         RelayNearbyPacket ( Packet );
+
+        // Call event
+        CLuaArguments Arguments;
+        Arguments.PushNumber ( Packet.m_WeaponType );
+        Arguments.PushNumber ( Packet.m_vecEnd.fX );
+        Arguments.PushNumber ( Packet.m_vecEnd.fY );
+        Arguments.PushNumber ( Packet.m_vecEnd.fZ );
+
+        if ( Packet.m_DamagedPlayerID == INVALID_ELEMENT_ID )
+        {
+            Arguments.PushNil ();
+        }
+        else
+        {
+            Arguments.PushElement ( CElementIDs::GetElement ( Packet.m_DamagedPlayerID ) );
+        }
+
+        Arguments.PushNumber ( Packet.m_vecStart.fX );
+        Arguments.PushNumber ( Packet.m_vecStart.fY );
+        Arguments.PushNumber ( Packet.m_vecStart.fZ );
+        pPlayer->CallEvent ( "onPlayerWeaponFire", Arguments );
     }
 }