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

fixed leftover maniascript logging

Browse Source
This commit is contained in:
Steffen Schröder 2014-04-28 18:42:50 +02:00
parent 2442177166
commit 2cdb00131a
3 changed files with 41 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/Libs/FML/Script/Features/Paging.php
View File

@ -254,7 +254,6 @@ Void {$updatePageFunction}(Text _PagingId, Text _PageLabelId, Integer _BrowseAct
PageFound = True; PageFound = True;
} }
} }
log(Now^PageFound^CurrentPage^_Pages);
if (!PageFound && _BrowseAction != 0) { if (!PageFound && _BrowseAction != 0) {
declare Text ChunkAction; declare Text ChunkAction;
if (_BrowseAction < 0) { if (_BrowseAction < 0) {
@ -265,7 +264,6 @@ Void {$updatePageFunction}(Text _PagingId, Text _PageLabelId, Integer _BrowseAct
if (_ChunkActionAppendPageNumber) { if (_ChunkActionAppendPageNumber) {
ChunkAction ^= CurrentPage; ChunkAction ^= CurrentPage;
} }
log(Now^ChunkAction);
TriggerPageAction(ChunkAction); TriggerPageAction(ChunkAction);
} }
if (_PageLabelId == \"\") return; if (_PageLabelId == \"\") return;

17
application/core/Manialinks/ManialinkManager.php
View File

@ -158,6 +158,23 @@ class ManialinkManager implements ManialinkPageAnswerListener, CallbackListener
} }
} }
/**
* Hide the Manialink with the given Id
*
* @param mixed $manialinkId
* @param mixed $logins
*/
public function hideManialink($manialinkId, $logins = null) {
if (is_array($manialinkId)) {
foreach ($manialinkId as $mlId) {
$this->hideManialink($mlId, $logins);
}
} else {
$emptyManialink = new ManiaLink($manialinkId);
$this->sendManialink($emptyManialink, $logins);
}
}
/** /**
* Send the given manialink to players * Send the given manialink to players
* *

8
application/plugins/Karma.php
View File

@ -68,6 +68,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
private $maniaControl = null; private $maniaControl = null;
private $updateManialink = false; private $updateManialink = false;
/** /**
*
* @var ManiaLink $manialink * @var ManiaLink $manialink
*/ */
private $manialink = null; private $manialink = null;
@ -126,6 +127,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
// Open MX-Karma Session // Open MX-Karma Session
$this->mxKarmaOpenSession(); $this->mxKarmaOpenSession();
$this->mxKarma['startTime'] = time(); $this->mxKarma['startTime'] = time();
return true; return true;
} }
@ -134,8 +136,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
* @see \ManiaControl\Plugins\Plugin::unload() * @see \ManiaControl\Plugins\Plugin::unload()
*/ */
public function unload() { public function unload() {
$emptyManialink = new ManiaLink(self::MLID_KARMA); $this->maniaControl->manialinkManager->hideManialink(self::MLID_KARMA);
$this->maniaControl->manialinkManager->sendManialink($emptyManialink);
$this->maniaControl->callbackManager->unregisterCallbackListener($this); $this->maniaControl->callbackManager->unregisterCallbackListener($this);
$this->maniaControl->timerManager->unregisterTimerListenings($this); $this->maniaControl->timerManager->unregisterTimerListenings($this);
unset($this->maniaControl); unset($this->maniaControl);
@ -220,10 +221,12 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
// Update karma gauge & label // Update karma gauge & label
/** /**
*
* @var Gauge $karmaGauge * @var Gauge $karmaGauge
*/ */
$karmaGauge = $this->manialink->karmaGauge; $karmaGauge = $this->manialink->karmaGauge;
/** /**
*
* @var Label $karmaLabel * @var Label $karmaLabel
*/ */
$karmaLabel = $this->manialink->karmaLabel; $karmaLabel = $this->manialink->karmaLabel;
@ -775,6 +778,7 @@ class KarmaPlugin implements CallbackListener, TimerListener, Plugin {
$properties['playerlogins'] = array(); $properties['playerlogins'] = array();
foreach ($this->maniaControl->playerManager->getPlayers() as $plyr) { foreach ($this->maniaControl->playerManager->getPlayers() as $plyr) {
/** /**
*
* @var Player $player * @var Player $player
*/ */
$properties['playerlogins'][] = $plyr->login; $properties['playerlogins'][] = $plyr->login;