beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

- removed unnecessary files

Browse Source 
- cleaned up database class
- plugin and plugin handler class
- improved player and player handler classes
- other cleanup and improvements
This commit is contained in:
Steffen Schröder
2013-11-10 02:55:08 +01:00
parent d1818680d5
commit d2744a5157
35 changed files with 588 additions and 3563 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
application/core/callbacks.php
View File

@ -3,7 +3,7 @@
namespace ManiaControl;
/**
* Class for handling server callbacks
* Class for handling server and controller callbacks
*
* @author steeffeen
*/
@ -12,14 +12,14 @@ class Callbacks {
* Constants
*/
// ManiaControl callbacks
const CB_IC_1_SECOND = 'ManiaControl.1Second';
const CB_IC_5_SECOND = 'ManiaControl.5Second';
const CB_IC_1_MINUTE = 'ManiaControl.1Minute';
const CB_IC_3_MINUTE = 'ManiaControl.3Minute';
const CB_IC_ONINIT = 'ManiaControl.OnInit';
const CB_IC_CLIENTUPDATED = 'ManiaControl.ClientUpdated';
const CB_IC_BEGINMAP = 'ManiaControl.BeginMap';
const CB_IC_ENDMAP = 'ManiaControl.EndMap';
const CB_MC_1_SECOND = 'ManiaControl.1Second';
const CB_MC_5_SECOND = 'ManiaControl.5Second';
const CB_MC_1_MINUTE = 'ManiaControl.1Minute';
const CB_MC_3_MINUTE = 'ManiaControl.3Minute';
const CB_MC_ONINIT = 'ManiaControl.OnInit';
const CB_MC_CLIENTUPDATED = 'ManiaControl.ClientUpdated';
const CB_MC_BEGINMAP = 'ManiaControl.BeginMap';
const CB_MC_ENDMAP = 'ManiaControl.EndMap';
// ManiaPlanet callbacks
const CB_MP_SERVERSTART = 'ManiaPlanet.ServerStart';
const CB_MP_SERVERSTOP = 'ManiaPlanet.ServerStop';
@ -45,27 +45,24 @@ class Callbacks {
const CB_TM_PLAYERCHECKPOINT = 'TrackMania.PlayerCheckpoint';
const CB_TM_PLAYERFINISH = 'TrackMania.PlayerFinish';
const CB_TM_PLAYERINCOHERENCE = 'TrackMania.PlayerIncoherence';
/**
* Private properties
*/
private $mc = null;
private $maniaControl = null;
private $callbackHandlers = array();
private $last1Second = -1;
private $last5Second = -1;
private $last1Minute = -1;
private $last3Minute = -1;
/**
* Construct callbacks handler
*
* @param ManiaControl $maniaControl
*/
public function __construct($mc) {
$this->mc = $mc;
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
// Init values
$this->last1Second = time();
@ -79,12 +76,12 @@ class Callbacks {
*/
public function onInit() {
// On init callback
$this->triggerCallback(self::CB_IC_ONINIT, array(self::CB_IC_ONINIT));
$this->triggerCallback(self::CB_MC_ONINIT, array(self::CB_MC_ONINIT));
// Simulate begin map
$map = $this->mc->server->getMap();
$map = $this->maniaControl->server->getMap();
if ($map) {
$this->triggerCallback(self::CB_IC_BEGINMAP, array(self::CB_IC_BEGINMAP, array($map)));
$this->triggerCallback(self::CB_MC_BEGINMAP, array(self::CB_MC_BEGINMAP, array($map)));
}
}
@ -97,37 +94,39 @@ class Callbacks {
$this->last1Second = time();
// 1 second
$this->triggerCallback(self::CB_IC_1_SECOND, array(self::CB_IC_1_SECOND));
$this->triggerCallback(self::CB_MC_1_SECOND, array(self::CB_MC_1_SECOND));
if ($this->last5Second <= time() - 5) {
$this->last5Second = time();
// 5 second
$this->triggerCallback(self::CB_IC_5_SECOND, array(self::CB_IC_5_SECOND));
$this->triggerCallback(self::CB_MC_5_SECOND, array(self::CB_MC_5_SECOND));
if ($this->last1Minute <= time() - 60) {
$this->last1Minute = time();
// 1 minute
$this->triggerCallback(self::CB_IC_1_MINUTE, array(self::CB_IC_1_MINUTE));
$this->triggerCallback(self::CB_MC_1_MINUTE, array(self::CB_MC_1_MINUTE));
if ($this->last3Minute <= time() - 180) {
$this->last3Minute = time();
// 3 minute
$this->triggerCallback(self::CB_IC_3_MINUTE, array(self::CB_IC_3_MINUTE));
$this->triggerCallback(self::CB_MC_3_MINUTE, array(self::CB_MC_3_MINUTE));
}
}
}
}
// Get server callbacks
if (!$this->mc->client) return;
$this->mc->client->resetError();
$this->mc->client->readCB();
$callbacks = $this->mc->client->getCBResponses();
if (!is_array($callbacks) || $this->mc->client->isError()) {
trigger_error("Error reading server callbacks. " . $this->mc->getClientErrorText());
if (!$this->maniaControl->client) {
return;
}
$this->maniaControl->client->resetError();
$this->maniaControl->client->readCB();
$callbacks = $this->maniaControl->client->getCBResponses();
if (!is_array($callbacks) || $this->maniaControl->client->isError()) {
trigger_error("Error reading server callbacks. " . $this->maniaControl->getClientErrorText());
return;
}
@ -139,14 +138,14 @@ class Callbacks {
{
// Map begin
$this->triggerCallback($callbackName, $callback);
$this->triggerCallback(self::CB_IC_BEGINMAP, $callback);
$this->triggerCallback(self::CB_MC_BEGINMAP, $callback);
break;
}
case self::CB_MP_ENDMAP:
{
// Map end
$this->triggerCallback($callbackName, $callback);
$this->triggerCallback(self::CB_IC_ENDMAP, $callback);
$this->triggerCallback(self::CB_MC_ENDMAP, $callback);
break;
}
default:
@ -162,12 +161,14 @@ class Callbacks {
* Trigger a specific callback
*
* @param string $callbackName
* @param mixed $data
* @param array $data
*/
public function triggerCallback($callbackName, $data) {
if (!array_key_exists($callbackName, $this->callbackHandlers) || !is_array($this->callbackHandlers[$callbackName])) return;
public function triggerCallback($callbackName, array $callback) {
if (!array_key_exists($callbackName, $this->callbackHandlers)) {
return;
}
foreach ($this->callbackHandlers[$callbackName] as $handler) {
call_user_func(array($handler[0], $handler[1]), $data);
call_user_func(array($handler[0], $handler[1]), $callback);
}
}
@ -176,7 +177,7 @@ class Callbacks {
*/
public function registerCallbackHandler($callback, $handler, $method) {
if (!is_object($handler) || !method_exists($handler, $method)) {
trigger_error("Given handler can't handle callback '" . $callback . "' (no method '" . $method . "')!");
trigger_error("Given handler can't handle callback '{$callback}' (no method '{$method}')!");
return;
}
if (!array_key_exists($callback, $this->callbackHandlers) || !is_array($this->callbackHandlers[$callback])) {