Commit 19f9e4f0 authored by Maxim Schedriviy's avatar Maxim Schedriviy

refactoring

parent f93ae467
Pipeline #106239923 passed with stage
in 0 seconds
......@@ -75,19 +75,6 @@ def _PlayerAvatar_onBecomeNonPlayer(base, self):
def _PlayerAvatar_vehicle_onEnterWorld(self, vehicle):
g_markers.updatePlayerState(vehicle.id, INV.ALL)
# add attackerID if XVM markers are active
@overrideMethod(VehicleMarkerPlugin, '_VehicleMarkerPlugin__updateVehicleHealth')
def _VehicleMarkerPlugin__updateVehicleHealth(base, self, handle, newHealth, aInfo, attackReasonID):
if g_markers.active:
if not (g_replayCtrl.isPlaying and g_replayCtrl.isTimeWarpInProgress):
self._invokeMarker(handle,
'updateHealth',
newHealth,
self._VehicleMarkerPlugin__getVehicleDamageType(aInfo),
constants.ATTACK_REASONS[attackReasonID],
aInfo.vehicleID)
return
base(self, handle, newHealth, aInfo, attackReasonID)
#####################################################################
# handlers
......@@ -150,6 +137,20 @@ def _MarkersManager_as_setShowExInfoFlagS(base, self, flag):
else:
base(self, flag)
# add attackerID if XVM markers are active
@overrideMethod(VehicleMarkerPlugin, '_VehicleMarkerPlugin__updateVehicleHealth')
def _VehicleMarkerPlugin__updateVehicleHealth(base, self, handle, newHealth, aInfo, attackReasonID):
if g_markers.active:
if not (g_replayCtrl.isPlaying and g_replayCtrl.isTimeWarpInProgress):
self._invokeMarker(handle,
'updateHealth',
newHealth,
self._VehicleMarkerPlugin__getVehicleDamageType(aInfo),
constants.ATTACK_REASONS[attackReasonID],
aInfo.vehicleID)
return
base(self, handle, newHealth, aInfo, attackReasonID)
def as_xvm_cmdS(self, *args):
if self._isDAAPIInited():
return self.flashObject.as_xvm_cmd(*args)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment