- extra shootmania callback class for parsing script callbacks

- timeattack local records support

application/core/Callbacks/CallbackManager.php

@@ -43,8 +43,13 @@ class CallbackManager {
 	const CB_TM_PLAYERFINISH = 'TrackMania.PlayerFinish';
 	const CB_TM_PLAYERINCOHERENCE = 'TrackMania.PlayerIncoherence';
 	
-	/**
-	 * Private Properties
+	/*
+	 * Public proeprties
+	 */
+	public $shootManiaCallbacks = null;
+	
+	/*
+	 * Private properties
 	 */
 	private $maniaControl = null;
 	private $callbackListeners = array();
@@ -57,6 +62,8 @@ class CallbackManager {
 	 */
 	public function __construct(ManiaControl $maniaControl) {
 		$this->maniaControl = $maniaControl;
+		
+		$this->shootManiaCallbacks = new ShootManiaCallbacks($maniaControl, $this);
 	}
 
 	/**
@@ -107,8 +114,8 @@ class CallbackManager {
 	 */
 	public function unregisterCallbackListener(CallbackListener $listener) {
 		$removed = false;
-		foreach($this->callbackListeners as &$listeners) {
-			foreach($listeners as $key => &$listenerCallback) {
+		foreach ($this->callbackListeners as &$listeners) {
+			foreach ($listeners as $key => &$listenerCallback) {
 				if ($listenerCallback[0] != $listener) {
 					continue;
 				}
@@ -127,8 +134,8 @@ class CallbackManager {
 	 */
 	public function unregisterScriptCallbackListener(CallbackListener $listener) {
 		$removed = false;
-		foreach($this->scriptCallbackListener as &$listeners) {
-			foreach($listeners as $key => &$listenerCallback) {
+		foreach ($this->scriptCallbackListener as &$listeners) {
+			foreach ($listeners as $key => &$listenerCallback) {
 				if ($listenerCallback[0] != $listener) {
 					continue;
 				}
@@ -150,7 +157,7 @@ class CallbackManager {
 		}
 		$params = func_get_args();
 		$params = array_slice($params, 1, count($params), true);
-		foreach($this->callbackListeners[$callbackName] as $listener) {
+		foreach ($this->callbackListeners[$callbackName] as $listener) {
 			call_user_func_array(array($listener[0], $listener[1]), $params);
 		}
 	}
@@ -166,7 +173,7 @@ class CallbackManager {
 		}
 		$params = func_get_args();
 		$params = array_slice($params, 1, count($params), true);
-		foreach($this->scriptCallbackListener[$callbackName] as $listener) {
+		foreach ($this->scriptCallbackListener[$callbackName] as $listener) {
 			call_user_func_array(array($listener[0], $listener[1]), $params);
 		}
 	}
@@ -186,9 +193,19 @@ class CallbackManager {
 		$callbacks = $this->maniaControl->client->executeCallbacks();
 		
 		// Handle callbacks
-		foreach($callbacks as $callback) {
+		foreach ($callbacks as $callback) {
+			$this->handleCallback($callback);
+		}
+	}
+
+	/**
+	 * Handle the given Callback
+	 *
+	 * @param array $callback
+	 */
+	private function handleCallback(array $callback) {
 		$callbackName = $callback[0];
-			switch($callbackName) {
+		switch ($callbackName) {
 			case 'ManiaPlanet.BeginMatch':
 				if ($this->maniaControl->mapManager->getCurrentMap()->getGame() == 'sm') {
 					$this->triggerCallback($callbackName, $callback);
@@ -198,7 +215,7 @@ class CallbackManager {
 				$this->maniaControl->mapManager->handleBeginMap($callback);
 				$this->triggerCallback($callbackName, $callback);
 				break;
-				case 'ManiaPlanet.EndMatch': //TODO temporary fix
+			case 'ManiaPlanet.EndMatch': // TODO temporary fix
 				if ($this->maniaControl->mapManager->getCurrentMap()->getGame() == 'sm') {
 					$this->triggerCallback($callbackName, $callback);
 					break;
@@ -220,7 +237,6 @@ class CallbackManager {
 				break;
 		}
 	}
-	}
 
 	/**
 	 * Handle the given Script Callback
@@ -230,20 +246,6 @@ class CallbackManager {
 	private function handleScriptCallback(array $callback) {
 		$scriptCallbackData = $callback[1];
 		$scriptCallbackName = $scriptCallbackData[0];
-		switch($scriptCallbackName) {
-			case 'BeginMap':
-			case 'LibXmlRpc_BeginMap':
-				$this->maniaControl->mapManager->handleScriptBeginMap($callback);
 		$this->triggerScriptCallback($scriptCallbackName, $scriptCallbackData);
-				break;
-			case 'EndMap':
-			case 'LibXmlRpc_EndMap':
-				$this->maniaControl->mapManager->handleScriptEndMap($callback);
-				$this->triggerScriptCallback($scriptCallbackName, $scriptCallbackData);
-				break;
-			default:
-				$this->triggerScriptCallback($scriptCallbackName, $scriptCallbackData);
-				break;
-		}
 	}
 }

application/core/Callbacks/ShootManiaCallbacks.php

@@ -0,0 +1,101 @@
+<?php
+
+namespace ManiaControl\Callbacks;
+
+use ManiaControl\ManiaControl;
+
+/**
+ * Class handling and parsing ShootMania Callbacks
+ *
+ * @author steeffeen
+ */
+class ShootManiaCallbacks implements CallbackListener {
+	/*
+	 * Constants
+	 */
+	const SCB_LIBXMLRPC_BEGINMAP = 'LibXmlRpc_BeginMap';
+	const SCB_LIBXMLRPC_ENDMAP = 'LibXmlRpc_EndMap';
+	const SCB_OLD_BEGINMAP = 'BeginMap';
+	const SCB_OLD_ENDMAP = 'EndMap';
+	const SCB_TIMEATTACK_ONSTART = 'TimeAttack_OnStart';
+	const SCB_TIMEATTACK_ONRESTART = 'TimeAttack_OnRestart';
+	const SCB_TIMEATTACK_ONCHECKPOINT = 'TimeAttack_OnCheckpoint';
+	const SCB_TIMEATTACK_ONFINISH = 'TimeAttack_OnFinish';
+	
+	/*
+	 * Private properties
+	 */
+	private $maniaControl = null;
+
+	/**
+	 * Create a new ShootMania Callbacks Instance
+	 *
+	 * @param ManiaControl $maniaControl
+	 */
+	public function __construct(ManiaControl $maniaControl, CallbackManager $callbackManager) {
+		$this->maniaControl = $maniaControl;
+		
+		// Register for script callbacks
+		$callbackManager->registerScriptCallbackListener(self::SCB_LIBXMLRPC_BEGINMAP, $this, 'callback_LibXmlRpc_BeginMap');
+		$callbackManager->registerScriptCallbackListener(self::SCB_OLD_BEGINMAP, $this, 'callback_LibXmlRpc_BeginMap');
+		$callbackManager->registerScriptCallbackListener(self::SCB_LIBXMLRPC_ENDMAP, $this, 'callback_LibXmlRpc_EndMap');
+		$callbackManager->registerScriptCallbackListener(self::SCB_OLD_ENDMAP, $this, 'callback_LibXmlRpc_EndMap');
+		
+		$callbackManager->registerScriptCallbackListener(self::SCB_TIMEATTACK_ONCHECKPOINT, $this, 'callback_TimeAttack_OnCheckpoint');
+		$callbackManager->registerScriptCallbackListener(self::SCB_TIMEATTACK_ONFINISH, $this, 'callback_TimeAttack_OnFinish');
+	}
+
+	/**
+	 * Handle LibXmlRpc BeginMap Script Callback
+	 *
+	 * @param array $callback
+	 */
+	public function callback_LibXmlRpc_BeginMap(array $callback) {
+		$this->maniaControl->mapManager->handleScriptBeginMap($callback);
+	}
+
+	/**
+	 * Handle LibXmlRpc EndMap Script Callback
+	 *
+	 * @param array $callback
+	 */
+	public function callback_LibXmlRpc_EndMap(array $callback) {
+		$this->maniaControl->mapManager->handleScriptEndMap($callback);
+	}
+
+	/**
+	 * Handle TimeAttack OnCheckpoint Script Callback
+	 *
+	 * @param array $callback
+	 */
+	public function callback_TimeAttack_OnCheckpoint(array $callback) {
+		$login = $callback[1][0];
+		$time = (int) $callback[1][1];
+		$player = $this->maniaControl->playerManager->getPlayer($login);
+		if (!$player || $time <= 0) {
+			return;
+		}
+		// Trigger trackmania player checkpoint callback
+		$checkpointCallback = array($player->pid, $player->login, $time, 0, 0);
+		$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERCHECKPOINT, 
+				array(CallbackManager::CB_TM_PLAYERCHECKPOINT, $checkpointCallback));
+	}
+
+	/**
+	 * Handle TimeAttack OnFinish Script Callback
+	 *
+	 * @param array $callback
+	 */
+	public function callback_TimeAttack_OnFinish(array $callback) {
+		$login = $callback[1][0];
+		$time = (int) $callback[1][1];
+		$player = $this->maniaControl->playerManager->getPlayer($login);
+		if (!$player || $time <= 0) {
+			return;
+		}
+		// Trigger trackmania player finish callback
+		$finishCallback = array($player->pid, $player->login, $time);
+		$this->maniaControl->callbackManager->triggerCallback(CallbackManager::CB_TM_PLAYERFINISH, 
+				array(CallbackManager::CB_TM_PLAYERFINISH, $finishCallback));
+	}
+}

application/core/ManiaControl.php

@@ -32,7 +32,6 @@ require_once __DIR__ . '/Libs/FML/autoload.php';
 require_once __DIR__ . '/Libs/Symfony/autoload.php';
 require_once __DIR__ . '/Libs/curl-easy/autoload.php';
 
-
 /**
  * ManiaControl Server Controller for ManiaPlanet Server
  *