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

optimation on playerlist

Browse Source
This commit is contained in:
kremsy 2013-12-26 17:27:21 +01:00
parent 52c6a677e4
commit 890d72d8f4
3 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/core/Maps/MapList.php
View File

@ -133,7 +133,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
//Headline //Headline
$headFrame = new Frame(); $headFrame = new Frame();
$frame->add($headFrame); $frame->add($headFrame);
$headFrame->setY($y - 3); $headFrame->setY($y - 5);
$array = array("Id" => $x + 5, "Name" => $x + 17, "Author" => $x + 65, "Mood" => $x + 100, "Type" => $x + 115); $array = array("Id" => $x + 5, "Name" => $x + 17, "Author" => $x + 65, "Mood" => $x + 100, "Type" => $x + 115);
$this->maniaControl->manialinkManager->labelLine($headFrame,$array); $this->maniaControl->manialinkManager->labelLine($headFrame,$array);
@ -226,7 +226,7 @@ class MapList implements ManialinkPageAnswerListener, CallbackListener {
//Headline //Headline
$headFrame = new Frame(); $headFrame = new Frame();
$frame->add($headFrame); $frame->add($headFrame);
$headFrame->setY($this->height / 2 - 3); $headFrame->setY($this->height / 2 - 5);
$x = -$this->width / 2; $x = -$this->width / 2;
$array = array("Id" => $x + 5, "Mx ID" => $x + 10, "MapName" => $x + 20, "Author" => $x + 70); $array = array("Id" => $x + 5, "Mx ID" => $x + 10, "MapName" => $x + 20, "Author" => $x + 70);
$this->maniaControl->manialinkManager->labelLine($headFrame,$array); $this->maniaControl->manialinkManager->labelLine($headFrame,$array);

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

@ -224,6 +224,7 @@ class PlayerCommands implements CommandListener {
* @param Player $player * @param Player $player
*/ */
public function command_playerList(array $chatCallback, Player $player) { public function command_playerList(array $chatCallback, Player $player) {
$this->playerList->addPlayerToShownList($player, PlayerList::SHOWN_MAIN_WINDOW);
$this->playerList->showPlayerList($player); $this->playerList->showPlayerList($player);
} }
} }

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

@ -47,6 +47,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
const ACTION_ADD_AS_MOD = 'PlayerList.PlayerAddAsModerator'; const ACTION_ADD_AS_MOD = 'PlayerList.PlayerAddAsModerator';
const ACTION_REVOKE_RIGHTS = 'PlayerList.RevokeRights'; const ACTION_REVOKE_RIGHTS = 'PlayerList.RevokeRights';
const SHOWN_MAIN_WINDOW = -1;
/** /**
* Private properties * Private properties
*/ */
@ -83,9 +84,11 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
} }
public function showPlayerList(Player $player){ public function addPlayerToShownList(Player $player, $showStatus = self::SHOWN_MAIN_WINDOW){
$this->playersListShown[$player->login] = true; $this->playersListShown[$player->login] = $showStatus;
}
public function showPlayerList(Player $player){
$maniaLink = new ManiaLink(ManialinkManager::MAIN_MLID); $maniaLink = new ManiaLink(ManialinkManager::MAIN_MLID);
@ -293,6 +296,12 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$y -= 4; $y -= 4;
} }
//show advanced window
if($this->playersListShown[$player->login] != self::SHOWN_MAIN_WINDOW){
$frame = $this->showAdvancedPlayerWidget($player, $this->playersListShown[$player->login], $maniaLink);
$maniaLink->add($frame);
}
//render and display xml //render and display xml
$this->maniaControl->manialinkManager->displayWidget($maniaLink, $player); $this->maniaControl->manialinkManager->displayWidget($maniaLink, $player);
@ -300,15 +309,26 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
return $maniaLink; return $maniaLink;
} }
/** /**
* Extra window with special actions on players like warn,kick, ban, authorization levels... * Displays the Advanced Player Window
* @param array $callback
* @param Player $caller * @param Player $caller
* @param $login * @param $login
*/ */
public function advancedPlayerWidget(array $callback, Player $caller, $login){ public function advancedPlayerWidget(Player $caller, $login){
$maniaLink = $this->showPlayerList($caller); $this->playersListShown[$caller->login] = $login; //Show a certain player
$this->showPlayerList($caller); //reoppen playerlist
}
/**
* Extra window with special actions on players like warn,kick, ban, authorization levels...
* @param Player $player
* @param $login
* @param $maniaLink
* @return Frame
*/
public function showAdvancedPlayerWidget(Player $player, $login, $maniaLink){
//$maniaLink = $this->showPlayerList($caller);
//todo all configurable or as constants //todo all configurable or as constants
$x = $this->width / 2 + 2.5; $x = $this->width / 2 + 2.5;
@ -322,7 +342,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
//mainframe //mainframe
$frame = new Frame(); $frame = new Frame();
$maniaLink->add($frame);
$frame->setSize($width,$height); $frame->setSize($width,$height);
$frame->setPosition($x + $width / 2, 0); $frame->setPosition($x + $width / 2, 0);
@ -372,7 +391,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_WARN_PLAYER . "." .$login); $quad->setAction(self::ACTION_WARN_PLAYER . "." .$login);
@ -392,7 +411,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_KICK_PLAYER . "." .$login); $quad->setAction(self::ACTION_KICK_PLAYER . "." .$login);
@ -412,7 +431,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_BAN_PLAYER . "." .$login); $quad->setAction(self::ACTION_BAN_PLAYER . "." .$login);
@ -432,7 +451,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_ADD_AS_MASTER . "." .$login); $quad->setAction(self::ACTION_ADD_AS_MASTER . "." .$login);
@ -454,7 +473,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_ADD_AS_ADMIN . "." .$login); $quad->setAction(self::ACTION_ADD_AS_ADMIN . "." .$login);
@ -474,7 +493,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_ADD_AS_MOD . "." .$login); $quad->setAction(self::ACTION_ADD_AS_MOD . "." .$login);
@ -496,7 +515,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
$frame->add($quad); $frame->add($quad);
$quad->setX(0); $quad->setX(0);
$quad->setY($y); $quad->setY($y);
$quad->setSubStyle($quad::SUBSTYLE_BgPlayerCard); $quad->setSubStyle($quad::SUBSTYLE_BgPlayerCardBig);
$quad->setSize($quadWidth, 5); $quad->setSize($quadWidth, 5);
$quad->setAction(self::ACTION_REVOKE_RIGHTS . "." .$login); $quad->setAction(self::ACTION_REVOKE_RIGHTS . "." .$login);
@ -512,8 +531,8 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
} }
//render and display xml //render and display xml
$this->maniaControl->manialinkManager->displayWidget($maniaLink, $caller); //$this->maniaControl->manialinkManager->displayWidget($maniaLink, $caller);
return $frame;
} }
/** /**
* Closes the widget * Closes the widget
@ -532,7 +551,6 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
*/ */
public function closePlayerAdvancedWidget(array $callback, Player $player) { public function closePlayerAdvancedWidget(array $callback, Player $player) {
$this->showPlayerList($player); //overwrite the manialink $this->showPlayerList($player); //overwrite the manialink
//TODO remove double rendering
} }
@ -566,7 +584,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener {
break; break;
case self::ACTION_PLAYER_ADV: case self::ACTION_PLAYER_ADV:
$player = $this->maniaControl->playerManager->getPlayer($callback[1][1]); $player = $this->maniaControl->playerManager->getPlayer($callback[1][1]);
$this->advancedPlayerWidget($callback, $player, $actionArray[2]); $this->advancedPlayerWidget($player, $actionArray[2]);
break; break;
case self::ACTION_ADD_AS_MASTER: case self::ACTION_ADD_AS_MASTER:
$this->maniaControl->playerManager->playerActions->grandAuthLevel($callback[1][1], $actionArray[2], AuthenticationManager::AUTH_LEVEL_SUPERADMIN); $this->maniaControl->playerManager->playerActions->grandAuthLevel($callback[1][1], $actionArray[2], AuthenticationManager::AUTH_LEVEL_SUPERADMIN);