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

added variable comments

Browse Source
This commit is contained in:
kremsy 2013-12-30 16:45:26 +01:00
parent 5c6533f37b
commit 765e648cb8
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/ManiaControl.php
View File

@ -2,6 +2,7 @@
namespace ManiaControl; namespace ManiaControl;
use IXR_Client_Gbx;
use ManiaControl\Admin\AdminMenu; use ManiaControl\Admin\AdminMenu;
use ManiaControl\Admin\AuthenticationManager; use ManiaControl\Admin\AuthenticationManager;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
@ -71,6 +72,7 @@ class ManiaControl implements CommandListener {
public $callbackManager = null; public $callbackManager = null;
public $chat = null; public $chat = null;
public $configurator = null; public $configurator = null;
/** @var IXR_Client_Gbx */
public $client = null; public $client = null;
public $commandManager = null; public $commandManager = null;
public $database = null; public $database = null;

2
application/core/Maps/MapManager.php
View File

@ -212,7 +212,7 @@ class MapManager implements CallbackListener {
} }
/** /**
* @return currentMap * @return Map currentMap
*/ */
public function getCurrentMap(){ public function getCurrentMap(){
return $this->currentMap; return $this->currentMap;

20
application/plugins/WidgetPlugin.php
View File

@ -4,15 +4,14 @@ use FML\Controls\Frame;
use FML\Controls\Labels\Label_Text; use FML\Controls\Labels\Label_Text;
use FML\Controls\Quad; use FML\Controls\Quad;
use FML\ManiaLink; use FML\ManiaLink;
use FML\Script\Script;
use FML\Script\Tooltips;
use ManiaControl\Callbacks\CallbackListener; use ManiaControl\Callbacks\CallbackListener;
use ManiaControl\ManiaControl; use ManiaControl\ManiaControl;
use ManiaControl\Maps\Jukebox; use ManiaControl\Players\Player;
use ManiaControl\Players\PlayerManager; use ManiaControl\Players\PlayerManager;
use ManiaControl\Plugins\Plugin; use ManiaControl\Plugins\Plugin;
use ManiaControl\Callbacks\CallbackManager; use ManiaControl\Callbacks\CallbackManager;
/** /**
* ManiaControl Widget Plugin * ManiaControl Widget Plugin
* *
@ -55,6 +54,7 @@ class WidgetPlugin implements CallbackListener, Plugin {
/** /**
* Private Properties * Private Properties
*/ */
/** @var maniaControl */
private $maniaControl = null; private $maniaControl = null;
/** /**
@ -159,7 +159,7 @@ class WidgetPlugin implements CallbackListener, Plugin {
$labelStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultLabelStyle(); $labelStyle = $this->maniaControl->manialinkManager->styleManager->getDefaultLabelStyle();
$maniaLink = new ManiaLink(self::MLID_NEXTMAPWIDGET); $maniaLink = new ManiaLink(self::MLID_NEXTMAPWIDGET);
// mainframe // mainframe
$frame = new Frame(); $frame = new Frame();
$maniaLink->add($frame); $maniaLink->add($frame);
@ -174,7 +174,8 @@ class WidgetPlugin implements CallbackListener, Plugin {
// Check if the Next Map is a juked Map // Check if the Next Map is a juked Map
$jukedMap = $this->maniaControl->mapManager->jukebox->getNextMap(); $jukedMap = $this->maniaControl->mapManager->jukebox->getNextMap();
/** @var Player $requester */
$requester = null; $requester = null;
// if the nextmap is not a juked map, get it from map info // if the nextmap is not a juked map, get it from map info
if ($jukedMap == null) { if ($jukedMap == null) {
@ -189,7 +190,7 @@ class WidgetPlugin implements CallbackListener, Plugin {
$name = $map->name; $name = $map->name;
$author = $map->authorLogin; $author = $map->authorLogin;
} }
$label = new Label_Text(); $label = new Label_Text();
$frame->add($label); $frame->add($label);
$label->setY($height / 2 - 2.3); $label->setY($height / 2 - 2.3);
@ -245,8 +246,7 @@ class WidgetPlugin implements CallbackListener, Plugin {
/** /**
* Displays the Map Widget * Displays the Map Widget
* *
* @param * @param String $login
* $login
*/ */
public function displayMapWidget($login = false) { public function displayMapWidget($login = false) {
$pos_x = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MAP_WIDGET_POSX); $pos_x = $this->maniaControl->settingManager->getSetting($this, self::SETTING_MAP_WIDGET_POSX);
@ -269,7 +269,7 @@ class WidgetPlugin implements CallbackListener, Plugin {
$frame->add($backgroundQuad); $frame->add($backgroundQuad);
$backgroundQuad->setSize($width, $height); $backgroundQuad->setSize($width, $height);
$backgroundQuad->setStyles($quadStyle, $quadSubstyle); $backgroundQuad->setStyles($quadStyle, $quadSubstyle);
$map = $this->maniaControl->mapManager->getCurrentMap(); $map = $this->maniaControl->mapManager->getCurrentMap();
$label = new Label_Text(); $label = new Label_Text();
@ -293,7 +293,7 @@ class WidgetPlugin implements CallbackListener, Plugin {
$label->setScale(0.8); $label->setScale(0.8);
$label->setText($map->authorLogin); $label->setText($map->authorLogin);
$label->setTextColor("FFF"); $label->setTextColor("FFF");
// Send manialink // Send manialink
$manialinkText = $maniaLink->render()->saveXML(); $manialinkText = $maniaLink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $login); $this->maniaControl->manialinkManager->sendManialink($manialinkText, $login);