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

code refactoring

Browse Source 
- improved comparing & checking
- improved string composition
This commit is contained in:
Steffen Schröder
2014-06-14 14:32:29 +02:00
parent bd6e0b5151
commit 9985b814d2
41 changed files with 337 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/core/Configurators/Configurator.php
View File

@ -207,7 +207,7 @@ class Configurator implements CallbackListener, CommandListener, ManialinkPageAn
$menuItemLabel->setAction(self::ACTION_SELECTMENU . '.' . $menuId);
//Show a Menu
if ($menuId == $menuIdShown) {
if ($menuId === $menuIdShown) {
$menuControl = $menu->getMenu($subMenuWidth, $subMenuHeight, $script, $player);
$menusFrame->add($menuControl);
}

19
application/core/Configurators/ManiaControlSettings.php
View File

@ -128,11 +128,11 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$index = 0;
$y = 0;
foreach ($settings as $setting) {
if (!$pageFrame) {
if ($index % $pageMaxCount === 0) {
$pageFrame = new Frame();
$frame->add($pageFrame);
$y = $height * 0.41;
$paging->addPage($pageFrame);
$y = $height * 0.41;
}
$settingFrame = new Frame();
@ -195,10 +195,6 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
}
$y -= $settingHeight;
if ($index % $pageMaxCount == $pageMaxCount - 1) {
$pageFrame = null;
}
$index++;
}
@ -255,7 +251,7 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$pageFrame = null;
$index = 0;
foreach ($settingClasses as $settingClass) {
if (!$pageFrame) {
if ($index % $pageMaxCount === 0) {
$pageFrame = new Frame();
$frame->add($pageFrame);
$y = $height * 0.41;
@ -265,9 +261,9 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$classLabel = new Label_Text();
$settingClassArray = explode('\\', $settingClass);
$className = "";
$className = '';
for ($i = 1; $i < count($settingClassArray); $i++) {
$className .= $settingClassArray[$i] . " - ";
$className .= $settingClassArray[$i] . ' - ';
}
$className = substr($className, 0, -3);
@ -282,11 +278,6 @@ class ManiaControlSettings implements ConfiguratorMenu, CallbackListener {
$classLabel->setAction(self::ACTION_PREFIX_SETTINGCLASS . $settingClass);
$y -= $settingHeight;
if ($index % $pageMaxCount == $pageMaxCount - 1) {
$pageFrame = null;
}
$index++;
}

2
application/core/Configurators/ScriptSettings.php
View File

@ -249,7 +249,7 @@ class ScriptSettings implements ConfiguratorMenu, CallbackListener {
$substyle = Quad_Icons64x64_1::SUBSTYLE_LvlGreen;
}
if ($substyle != '') {
if ($substyle) {
$quad = new Quad_Icons64x64_1();
$settingFrame->add($quad);
$quad->setX($width / 2 * 0.545);

4
application/core/Configurators/ServerSettings.php
View File

@ -211,7 +211,6 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$quad = new Quad();
$quad->setPosition($width * 0.23, 0, -0.01);
$quad->setSize(4, 4);
$checkBox = new CheckBox(self::ACTION_PREFIX_SETTING . $name, $value, $quad);
$settingFrame->add($checkBox);
} else {
@ -225,11 +224,12 @@ class ServerSettings implements ConfiguratorMenu, CallbackListener {
$entry->setName(self::ACTION_PREFIX_SETTING . $name);
$entry->setDefault($value);
if ($name == "Comment") { //
if ($name === 'Comment') {
$entry->setAutoNewLine(true);
$entry->setSize($width * 0.48, $settingHeight * 3 + $settingHeight * 0.9);
$settingFrame->setY($y - $settingHeight * 1.5);
// dummy:
// TODO: "dummy:" what? remove?
$y -= $settingHeight * 3;
$id += 3;
}