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

Changed Internal Callbacks formats to use objects directly instead of an array

Browse Source
This commit is contained in:
Steffen Schröder
2014-02-19 15:44:00 +01:00
parent 36fc15c7b1
commit ff9c21a8af
31 changed files with 176 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/core/Players/PlayerCommands.php
View File

@ -65,7 +65,7 @@ class PlayerCommands implements CommandListener, ManialinkPageAnswerListener, Ca
$this->maniaControl->authenticationManager->definePermissionLevel(self::SETTING_PERMISSION_TEAM_BALANCE, AuthenticationManager::AUTH_LEVEL_MODERATOR);
//CallbackManager
$this->maniaControl->callbackManager->registerCallbackListener(Server::CB_TEAM_STATUS_CHANGED, $this, 'teamStatusChanged');
$this->maniaControl->callbackManager->registerCallbackListener(Server::CB_TEAM_MODE_CHANGED, $this, 'teamStatusChanged');
// Action Open Playerlist
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_OPEN_PLAYERLIST, $this, 'command_playerList');
@ -77,12 +77,12 @@ class PlayerCommands implements CommandListener, ManialinkPageAnswerListener, Ca
/**
* Handle TeamStatusChanged
* @param array $callback
*
* @param bool $teamMode
*/
public function teamStatusChanged(array $callback) {
$status = $callback[1];
public function teamStatusChanged($teamMode) {
//Add Balance Team Icon if it's a teamMode
if ($status) {
if ($teamMode) {
// Action Balance Teams
$this->maniaControl->manialinkManager->registerManialinkPageAnswerListener(self::ACTION_BALANCE_TEAMS, $this, 'command_TeamBalance');
$itemQuad = new Quad_Icons128x32_1();

4
application/core/Players/PlayerList.php
View File

@ -761,9 +761,9 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer
/**
* Reopen the widget on PlayerInfoChanged / Player Connect and Disconnect
*
* @param array $callback
* @param Player $player
*/
public function updateWidget(array $callback) {
public function updateWidget(Player $player) {
foreach($this->playersListShown as $login => $shown) {
if ($shown) {
// Check if Shown player still exists

14
application/core/Players/PlayerManager.php
View File

@ -104,10 +104,8 @@ class PlayerManager implements CallbackListener {
/**
* Handle OnInit callback
*
* @param array $callback
*/
public function onInit(array $callback) {
public function onInit() {
// Add all players
$players = $this->maniaControl->client->getPlayerList(300, 0, 2);
foreach($players as $playerItem) {
@ -139,7 +137,8 @@ class PlayerManager implements CallbackListener {
}
// Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_ONINIT, array(self::CB_ONINIT));
// TODO: what for?
$this->maniaControl->callbackManager->triggerCallback(self::CB_ONINIT);
}
/**
@ -168,7 +167,7 @@ class PlayerManager implements CallbackListener {
return;
}
// Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERDISCONNECT, array(self::CB_PLAYERDISCONNECT, $player));
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERDISCONNECT, $player);
if ($player->isFakePlayer()) {
return;
@ -194,7 +193,6 @@ class PlayerManager implements CallbackListener {
return;
}
$player->ladderRank = $callback[1][0]["LadderRanking"];
$player->teamId = $callback[1][0]["TeamId"];
@ -224,11 +222,11 @@ class PlayerManager implements CallbackListener {
$this->maniaControl->statisticManager->incrementStat(self::STAT_JOIN_COUNT, $player, $this->maniaControl->server->index);
// Trigger own PlayerJoined callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERCONNECT, array(self::CB_PLAYERCONNECT, $player));
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERCONNECT, $player);
}
// Trigger own callback
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERINFOCHANGED, array(self::CB_PLAYERINFOCHANGED));
$this->maniaControl->callbackManager->triggerCallback(self::CB_PLAYERINFOCHANGED, $player);
}