just commit of changes^^

This commit is contained in:
kremsy
2013-12-29 22:52:07 +01:00
parent 321eb11385
commit 590fd658e2
5 changed files with 222 additions and 11 deletions

View File

@ -199,6 +199,7 @@ class CallbackManager {
// Handle callbacks
foreach ($callbacks as $callback) {
$callbackName = $callback[0];
switch ($callbackName) {
case 'ManiaPlanet.BeginMap':

View File

@ -14,7 +14,6 @@ use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager;
use ManiaControl\Plugins\PluginManager;
use ManiaControl\Server\Server;
require_once __DIR__ . '/Callbacks/CallbackListener.php';
require_once __DIR__ . '/Commands/CommandListener.php';
require_once __DIR__ . '/Manialinks/ManialinkPageAnswerListener.php';

View File

@ -62,10 +62,8 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this,
'closeWidget');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this,
'handleManialinkPageAnswer');
$this->maniaControl->callbackManager->registerCallbackListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this,'closeWidget');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this,'handleManialinkPageAnswer');
//Update Widget actions
$this->maniaControl->callbackManager->registerCallbackListener(Jukebox::CB_JUKEBOX_CHANGED, $this, 'updateWidget');
@ -427,9 +425,9 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
/**
* Closes the widget
* @param array $callback
* @param Player $player
*/
public function closeWidget(array $callback, Player $player) {
public function closeWidget(array $callback) {
$player = $callback[1];
unset($this->mapListShown[$player->login]);
}

View File

@ -66,8 +66,8 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
public function __construct(ManiaControl $maniaControl) {
$this->maniaControl = $maniaControl;
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this, 'closeWidget');
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_CLOSE_PLAYER_ADV , $this, 'closePlayerAdvancedWidget');
$this->maniaControl->callbackManager->registerCallbackListener(ManialinkManager::CB_MAIN_WINDOW_CLOSED, $this, 'closeWidget');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_PLAYERMANIALINKPAGEANSWER, $this, 'handleManialinkPageAnswer');
//Update Widget Events
@ -544,13 +544,14 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
return $frame;
}
/**
* Closes the widget
* @param array $callback
* @param Player $player
*/
public function closeWidget(array $callback, Player $player) {
$this->playersListShown[$player->login] = false;
public function closeWidget(array $callback) {
$player = $callback[1];
unset($this->playersListShown[$player->login]);
}