diff --git a/core/Configurator/Configurator.php b/core/Configurator/Configurator.php index 20ddb826..b58c6a2e 100644 --- a/core/Configurator/Configurator.php +++ b/core/Configurator/Configurator.php @@ -199,11 +199,11 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn $frame = new Frame(); $manialink->add($frame); - $frame->setPosition($menuPosX, $menuPosY, 10); + $frame->setPosition($menuPosX, $menuPosY, 34); $backgroundQuad = new Quad(); $frame->add($backgroundQuad); - $backgroundQuad->setZ(-10)->setSize($menuWidth, $menuHeight)->setStyles($quadStyle, $quadSubstyle); + $backgroundQuad->setZ(-2)->setSize($menuWidth, $menuHeight)->setStyles($quadStyle, $quadSubstyle); $menuItemsFrame = new Frame(); $frame->add($menuItemsFrame); @@ -211,7 +211,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn $itemsBackgroundQuad = new Quad(); $menuItemsFrame->add($itemsBackgroundQuad); - $backgroundQuad->setZ(-9); + $backgroundQuad->setZ(-1); $itemsBackgroundQuad->setSize($menuListWidth, $menuHeight)->setStyles($quadStyle, $quadSubstyle); $menusFrame = new Frame(); diff --git a/core/Manialinks/StyleManager.php b/core/Manialinks/StyleManager.php index 7409067a..999f730b 100644 --- a/core/Manialinks/StyleManager.php +++ b/core/Manialinks/StyleManager.php @@ -164,7 +164,7 @@ class StyleManager { //TODO remove: (just temporary fix for tm bug) if ($this->maniaControl->getMapManager()->getCurrentMap()->getGame() === 'tm' ) { - $frame->setSize($width, $height)->setZ(30); + $frame->setSize($width, $height)->setZ(32); } diff --git a/core/Players/PlayerList.php b/core/Players/PlayerList.php index 253a01df..1ec75615 100644 --- a/core/Players/PlayerList.php +++ b/core/Players/PlayerList.php @@ -165,8 +165,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer $headFrame->setY($posY - 5); $labelLineArray = array('Id' => $posX + 5, 'Nickname' => $posX + 18, 'Login' => $posX + 70, 'Location' => $posX + 101); - if ($this->maniaControl->getAuthenticationManager()->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR) - ) { + if ($this->maniaControl->getAuthenticationManager()->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) { $labelLineArray['Actions'] = $posX + 135; } $this->maniaControl->getManialinkManager()->labelLine($headFrame, $labelLineArray); @@ -306,8 +305,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer $description = 'View Player Profile of $<' . $listPlayer->nickname . '$>'; $playerQuad->addTooltipLabelFeature($descriptionLabel, $description); - if ($this->maniaControl->getAuthenticationManager()->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR) - ) { + if ($this->maniaControl->getAuthenticationManager()->checkRight($player, AuthenticationManager::AUTH_LEVEL_MODERATOR)) { // Further Player actions Quad $playerQuad = new Quad_Icons64x64_1(); $playerFrame->add($playerQuad); @@ -322,10 +320,8 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer $playerQuad->addTooltipLabelFeature($descriptionLabel, $description); } - if ($this->maniaControl->getServer()->isTeamMode() - ) { - if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_TEAM) - ) { + if ($this->maniaControl->getServer()->isTeamMode()) { + if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_TEAM)) { // Force to Red-Team Quad $redQuad = new Quad_Emblems(); $playerFrame->add($redQuad); @@ -352,8 +348,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer $description = 'Force $<' . $listPlayer->nickname . '$> to Blue Team!'; $blueQuad->addTooltipLabelFeature($descriptionLabel, $description); - } else if ($this->maniaControl->getPluginManager()->isPluginActive(self::DEFAULT_CUSTOM_VOTE_PLUGIN) - ) { + } else if ($this->maniaControl->getPluginManager()->isPluginActive(self::DEFAULT_CUSTOM_VOTE_PLUGIN)) { // Kick Player Vote $kickQuad = new Quad_UIConstruction_Buttons(); $playerFrame->add($kickQuad); @@ -367,8 +362,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer $kickQuad->addTooltipLabelFeature($descriptionLabel, $description); } } else { - if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_PLAY) - ) { + if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_PLAY)) { // Force to Play $playQuad = new Quad_Emblems(); $playerFrame->add($playQuad); @@ -383,8 +377,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer } } - if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_SPEC) - ) { + if ($this->maniaControl->getAuthenticationManager()->checkPermission($player, PlayerActions::SETTING_PERMISSION_FORCE_PLAYER_SPEC)) { // Force to Spectator Quad $spectatorQuad = new Quad_BgRaceScore2(); $playerFrame->add($spectatorQuad); @@ -397,8 +390,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer // Force to Spectator Description Label $description = 'Force $<' . $listPlayer->nickname . '$> to Spectator!'; $spectatorQuad->addTooltipLabelFeature($descriptionLabel, $description); - } else if ($this->maniaControl->getPluginManager()->isPluginActive(self::DEFAULT_CUSTOM_VOTE_PLUGIN) - ) { + } else if ($this->maniaControl->getPluginManager()->isPluginActive(self::DEFAULT_CUSTOM_VOTE_PLUGIN)) { // Force to Spectator Quad $spectatorQuad = new Quad_BgRaceScore2(); $playerFrame->add($spectatorQuad); @@ -453,7 +445,7 @@ class PlayerList implements ManialinkPageAnswerListener, CallbackListener, Timer // mainframe $frame = new Frame(); $frame->setSize($width, $height); - $frame->setPosition($posX + $width / 2, 0); + $frame->setPosition($posX + $width / 2, 0, 31); // Add Close Quad (X) $closeQuad = new Quad_Icons64x64_1();