@@ -979,7 +979,7 @@ discard block |
||
979 | 979 | /** |
980 | 980 | * Set current resource list from array of units |
981 | 981 | * |
982 | - * @param array $resource_list |
|
982 | + * @param integer[] $resource_list |
|
983 | 983 | */ |
984 | 984 | public function resourcesSet($resource_list) { |
985 | 985 | if (!empty($this->propertiesAdjusted['resource_list'])) { |
@@ -1027,7 +1027,7 @@ discard block |
||
1027 | 1027 | } |
1028 | 1028 | |
1029 | 1029 | /** |
1030 | - * @param array $rate |
|
1030 | + * @param integer[] $rate |
|
1031 | 1031 | * |
1032 | 1032 | * @return float |
1033 | 1033 | */ |
@@ -1058,8 +1058,6 @@ discard block |
||
1058 | 1058 | * Restores fleet or resources to planet |
1059 | 1059 | * |
1060 | 1060 | * @param bool $start |
1061 | - * @param bool $only_resources |
|
1062 | - * @param int $result |
|
1063 | 1061 | */ |
1064 | 1062 | public function resourcesUnload($start = true) { |
1065 | 1063 | sn_db_transaction_check(true); |
@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php |
2 | 2 | use DBStatic\DBStaticFleetACS; |
3 | -use DBStatic\DBStaticNote; |
|
4 | 3 | use DBStatic\DBStaticPlanet; |
5 | 4 | use DBStatic\DBStaticUnit; |
6 | 5 | use DBStatic\DBStaticUser; |
@@ -401,31 +401,31 @@ discard block |
||
401 | 401 | |
402 | 402 | return classSupernova::$db->doSelect( |
403 | 403 | // Блокировка самого флота |
404 | - "SELECT 1 FROM {{fleets}} AS f " . |
|
404 | + "SELECT 1 FROM {{fleets}} AS f ". |
|
405 | 405 | |
406 | 406 | // Блокировка всех юнитов, принадлежащих этому флоту |
407 | - "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = " . static::$locationType . " AND unit.unit_location_id = f.fleet_id " . |
|
407 | + "LEFT JOIN {{unit}} as unit ON unit.unit_location_type = ".static::$locationType." AND unit.unit_location_id = f.fleet_id ". |
|
408 | 408 | |
409 | 409 | // Блокировка всех прилетающих и улетающих флотов, если нужно |
410 | 410 | // TODO - lock fleets by COORDINATES |
411 | - ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : '') . |
|
411 | + ($mission_data['dst_fleets'] ? "LEFT JOIN {{fleets}} AS fd ON fd.fleet_end_planet_id = f.fleet_end_planet_id OR fd.fleet_start_planet_id = f.fleet_end_planet_id " : ''). |
|
412 | 412 | // Блокировка всех юнитов, принадлежащих прилетающим и улетающим флотам - ufd = unit_fleet_destination |
413 | - ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = " . static::$locationType . " AND ufd.unit_location_id = fd.fleet_id " : '') . |
|
413 | + ($mission_data['dst_fleets'] ? "LEFT JOIN {{unit}} AS ufd ON ufd.unit_location_type = ".static::$locationType." AND ufd.unit_location_id = fd.fleet_id " : ''). |
|
414 | 414 | |
415 | - ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : '') . |
|
415 | + ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{users}} AS ud ON ud.id = f.fleet_target_owner " : ''). |
|
416 | 416 | // Блокировка всех юнитов, принадлежащих владельцу планеты-цели |
417 | - ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : '') . |
|
417 | + ($mission_data['dst_user'] || $mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS unit_player_dest ON unit_player_dest.unit_player_id = ud.id " : ''). |
|
418 | 418 | // Блокировка планеты-цели |
419 | - ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : '') . |
|
419 | + ($mission_data['dst_planet'] ? "LEFT JOIN {{planets}} AS pd ON pd.id = f.fleet_end_planet_id " : ''). |
|
420 | 420 | // Блокировка всех юнитов, принадлежащих планете-цели - НЕ НУЖНО. Уже залочили ранее, как принадлежащие игроку-цели |
421 | 421 | // ($mission_data['dst_planet'] ? "LEFT JOIN {{unit}} AS upd ON upd.unit_location_type = " . LOC_PLANET . " AND upd.unit_location_id = pd.id " : '') . |
422 | 422 | |
423 | 423 | |
424 | - ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : '') . |
|
424 | + ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{users}} AS us ON us.id = f.fleet_owner " : ''). |
|
425 | 425 | // Блокировка всех юнитов, принадлежащих владельцу флота |
426 | - ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : '') . |
|
426 | + ($mission_data['src_user'] || $mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS unit_player_src ON unit_player_src.unit_player_id = us.id " : ''). |
|
427 | 427 | // Блокировка планеты отправления |
428 | - ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : '') . |
|
428 | + ($mission_data['src_planet'] ? "LEFT JOIN {{planets}} AS ps ON ps.id = f.fleet_start_planet_id " : ''). |
|
429 | 429 | // Блокировка всех юнитов, принадлежащих планете с которой юниты были отправлены - НЕ НУЖНО. Уже залочили ранее, как принадлежащие владельцу флота |
430 | 430 | // ($mission_data['src_planet'] ? "LEFT JOIN {{unit}} AS ups ON ups.unit_location_type = " . LOC_PLANET . " AND ups.unit_location_id = ps.id " : '') . |
431 | 431 | |
@@ -442,11 +442,11 @@ discard block |
||
442 | 442 | public function dbGetLockById($dbId) { |
443 | 443 | classSupernova::$db->doSelect( |
444 | 444 | // Блокировка самого флота |
445 | - "SELECT 1 FROM {{fleets}} AS FLEET0 " . |
|
445 | + "SELECT 1 FROM {{fleets}} AS FLEET0 ". |
|
446 | 446 | // Lock fleet owner |
447 | - "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner " . |
|
447 | + "LEFT JOIN {{users}} as USER0 on USER0.id = FLEET0.fleet_owner ". |
|
448 | 448 | // Блокировка всех юнитов, принадлежащих этому флоту |
449 | - "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = " . LOC_FLEET . " AND UNIT0.unit_location_id = FLEET0.fleet_id " . |
|
449 | + "LEFT JOIN {{unit}} as UNIT0 ON UNIT0.unit_location_type = ".LOC_FLEET." AND UNIT0.unit_location_id = FLEET0.fleet_id ". |
|
450 | 450 | |
451 | 451 | // Без предварительной выборки неизвестно - куда летит этот флот. |
452 | 452 | // Поэтому надо выбирать флоты, чьи координаты прибытия ИЛИ отбытия совпадают с координатами прибытия ИЛИ отбытия текущего флота. |
@@ -462,9 +462,9 @@ discard block |
||
462 | 462 | FLEET1.fleet_end_planet = FLEET0.fleet_end_planet |
463 | 463 | " . |
464 | 464 | // Блокировка всех юнитов, принадлежащих этим флотам |
465 | - "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = " . LOC_FLEET . " AND UNIT1.unit_location_id = FLEET1.fleet_id " . |
|
465 | + "LEFT JOIN {{unit}} as UNIT1 ON UNIT1.unit_location_type = ".LOC_FLEET." AND UNIT1.unit_location_id = FLEET1.fleet_id ". |
|
466 | 466 | // Lock fleet owner |
467 | - "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner " . |
|
467 | + "LEFT JOIN {{users}} as USER1 on USER1.id = FLEET1.fleet_owner ". |
|
468 | 468 | |
469 | 469 | "LEFT JOIN {{fleets}} AS FLEET2 ON |
470 | 470 | FLEET2.fleet_mess = 1 AND FLEET0.fleet_mess = 0 AND |
@@ -474,7 +474,7 @@ discard block |
||
474 | 474 | " . |
475 | 475 | // Блокировка всех юнитов, принадлежащих этим флотам |
476 | 476 | "LEFT JOIN {{unit}} as UNIT2 ON |
477 | - UNIT2.unit_location_type = " . LOC_FLEET . " AND |
|
477 | + UNIT2.unit_location_type = " . LOC_FLEET." AND |
|
478 | 478 | UNIT2.unit_location_id = FLEET2.fleet_id |
479 | 479 | " . |
480 | 480 | // Lock fleet owner |
@@ -491,11 +491,11 @@ discard block |
||
491 | 491 | " . |
492 | 492 | // Блокировка всех юнитов, принадлежащих этим флотам |
493 | 493 | "LEFT JOIN {{unit}} as UNIT3 ON |
494 | - UNIT3.unit_location_type = " . LOC_FLEET . " AND |
|
494 | + UNIT3.unit_location_type = " . LOC_FLEET." AND |
|
495 | 495 | UNIT3.unit_location_id = FLEET3.fleet_id |
496 | 496 | " . |
497 | 497 | // Lock fleet owner |
498 | - "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner " . |
|
498 | + "LEFT JOIN {{users}} as USER3 on USER3.id = FLEET3.fleet_owner ". |
|
499 | 499 | |
500 | 500 | "LEFT JOIN {{fleets}} AS FLEET4 ON |
501 | 501 | FLEET4.fleet_mess = 1 AND FLEET0.fleet_mess = 1 AND |
@@ -505,7 +505,7 @@ discard block |
||
505 | 505 | " . |
506 | 506 | // Блокировка всех юнитов, принадлежащих этим флотам |
507 | 507 | "LEFT JOIN {{unit}} as UNIT4 ON |
508 | - UNIT4.unit_location_type = " . LOC_FLEET . " AND |
|
508 | + UNIT4.unit_location_type = " . LOC_FLEET." AND |
|
509 | 509 | UNIT4.unit_location_id = FLEET4.fleet_id |
510 | 510 | " . |
511 | 511 | // Lock fleet owner |
@@ -527,7 +527,7 @@ discard block |
||
527 | 527 | " . |
528 | 528 | // Блокировка всех юнитов, принадлежащих этой планете |
529 | 529 | "LEFT JOIN {{unit}} as UNIT5 ON |
530 | - UNIT5.unit_location_type = " . LOC_PLANET . " AND |
|
530 | + UNIT5.unit_location_type = " . LOC_PLANET." AND |
|
531 | 531 | UNIT5.unit_location_id = PLANETS5.id |
532 | 532 | " . |
533 | 533 | |
@@ -545,7 +545,7 @@ discard block |
||
545 | 545 | " . |
546 | 546 | // Блокировка всех юнитов, принадлежащих этой планете |
547 | 547 | "LEFT JOIN {{unit}} as UNIT6 ON |
548 | - UNIT6.unit_location_type = " . LOC_PLANET . " AND |
|
548 | + UNIT6.unit_location_type = " . LOC_PLANET." AND |
|
549 | 549 | UNIT6.unit_location_id = PLANETS6.id |
550 | 550 | " . |
551 | 551 | "WHERE FLEET0.fleet_id = {$dbId} GROUP BY 1 FOR UPDATE" |
@@ -657,7 +657,7 @@ discard block |
||
657 | 657 | } elseif ($this->isResource($unit_id)) { |
658 | 658 | $this->resource_list[$unit_id] = $unit_count; |
659 | 659 | } else { |
660 | - throw new Exception('Trying to pass to fleet non-resource and non-ship ' . var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG); |
|
660 | + throw new Exception('Trying to pass to fleet non-resource and non-ship '.var_export($unit_array, true), FLIGHT_SHIPS_UNIT_WRONG); |
|
661 | 661 | } |
662 | 662 | } |
663 | 663 | } |
@@ -791,7 +791,7 @@ discard block |
||
791 | 791 | * @param int $unit_count |
792 | 792 | */ |
793 | 793 | public function shipSetCount($unit_id, $unit_count = 0) { |
794 | - pdump(__CLASS__ . '->' . __FUNCTION__); |
|
794 | + pdump(__CLASS__.'->'.__FUNCTION__); |
|
795 | 795 | $this->shipAdjustCount($unit_id, $unit_count, true); |
796 | 796 | } |
797 | 797 | |
@@ -983,7 +983,7 @@ discard block |
||
983 | 983 | */ |
984 | 984 | public function resourcesSet($resource_list) { |
985 | 985 | if (!empty($this->propertiesAdjusted['resource_list'])) { |
986 | - throw new ExceptionPropertyAccess('Property "resource_list" already was adjusted so no SET is possible until dbSave in ' . get_called_class() . '::unitSetResourceList', ERR_ERROR); |
|
986 | + throw new ExceptionPropertyAccess('Property "resource_list" already was adjusted so no SET is possible until dbSave in '.get_called_class().'::unitSetResourceList', ERR_ERROR); |
|
987 | 987 | } |
988 | 988 | $this->resourcesAdjust($resource_list, true); |
989 | 989 | } |
@@ -1017,7 +1017,7 @@ discard block |
||
1017 | 1017 | // Check for negative unit value |
1018 | 1018 | if ($this->resource_list[$resource_id] < 0) { |
1019 | 1019 | // TODO |
1020 | - throw new Exception('Resource ' . $resource_id . ' will become negative in ' . get_called_class() . '::unitAdjustResourceList', ERR_ERROR); |
|
1020 | + throw new Exception('Resource '.$resource_id.' will become negative in '.get_called_class().'::unitAdjustResourceList', ERR_ERROR); |
|
1021 | 1021 | } |
1022 | 1022 | } |
1023 | 1023 | } |
@@ -1325,14 +1325,14 @@ discard block |
||
1325 | 1325 | if (FLIGHT_ALLOWED == $validateResult[$missionType]) { |
1326 | 1326 | $this->allowed_missions[$missionType] = $mission; |
1327 | 1327 | } else { |
1328 | - if($missionType == $this->mission_type) { |
|
1328 | + if ($missionType == $this->mission_type) { |
|
1329 | 1329 | } |
1330 | 1330 | unset($this->allowed_missions[$missionType]); |
1331 | 1331 | } |
1332 | 1332 | } |
1333 | 1333 | |
1334 | - if(empty($this->allowed_missions)) { |
|
1335 | - if($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) { |
|
1334 | + if (empty($this->allowed_missions)) { |
|
1335 | + if ($this->mission_type != MT_NONE && isset($validateResult[$this->mission_type])) { |
|
1336 | 1336 | throw new ExceptionFleetInvalid($validateResult[$this->mission_type], $validateResult[$this->mission_type]); |
1337 | 1337 | } else { |
1338 | 1338 | throw new ExceptionFleetInvalid(FLIGHT_MISSION_IMPOSSIBLE, FLIGHT_MISSION_IMPOSSIBLE); |
@@ -1570,7 +1570,7 @@ discard block |
||
1570 | 1570 | $template_result['.']['fleets'][] = $this->fleetRenderer->renderFleet($this, SN_TIME_NOW, $timeMissionJob); |
1571 | 1571 | |
1572 | 1572 | $template_result += array( |
1573 | - 'mission' => classLocale::$lang['type_mission'][$this->_mission_type] . ($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' ' . pretty_time($timeMissionJob) : ''), |
|
1573 | + 'mission' => classLocale::$lang['type_mission'][$this->_mission_type].($this->_mission_type == MT_EXPLORE || $this->_mission_type == MT_HOLD ? ' '.pretty_time($timeMissionJob) : ''), |
|
1574 | 1574 | 'dist' => pretty_number($this->travelData['distance']), |
1575 | 1575 | 'speed' => pretty_number($this->travelData['fleet_speed']), |
1576 | 1576 | 'deute_need' => pretty_number($this->travelData['consumption']), |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | $this->rowOperator = $gc->dbGlobalRowOperator; |
76 | 76 | $this->accessors = new Accessors(); |
77 | 77 | |
78 | - if(property_exists($this, 'newProperties') && !empty($this->newProperties)) { |
|
78 | + if (property_exists($this, 'newProperties') && !empty($this->newProperties)) { |
|
79 | 79 | $this->extendProperties($this->newProperties); |
80 | 80 | } |
81 | 81 | } |
@@ -221,7 +221,7 @@ discard block |
||
221 | 221 | * @throws \Exception |
222 | 222 | */ |
223 | 223 | protected function delete($cEntity) { |
224 | - throw new \Exception(__CLASS__ . '::delete() in ' . get_called_class() . 'is not yet implemented'); |
|
224 | + throw new \Exception(__CLASS__.'::delete() in '.get_called_class().'is not yet implemented'); |
|
225 | 225 | } |
226 | 226 | |
227 | 227 | /** |
@@ -242,7 +242,7 @@ discard block |
||
242 | 242 | // Generate changeset row |
243 | 243 | // Foreach all rows. If there is change and no delta - then put delta. Otherwise put change |
244 | 244 | // If row not empty - update |
245 | - throw new \Exception(__CLASS__ . '::update() in ' . get_called_class() . 'is not yet implemented'); |
|
245 | + throw new \Exception(__CLASS__.'::update() in '.get_called_class().'is not yet implemented'); |
|
246 | 246 | } |
247 | 247 | |
248 | 248 | /** |
@@ -250,10 +250,10 @@ discard block |
||
250 | 250 | * |
251 | 251 | * @throws \Exception |
252 | 252 | */ |
253 | - protected function unchanged($cEntity){ |
|
253 | + protected function unchanged($cEntity) { |
|
254 | 254 | // TODO - or just save nothing ????? |
255 | 255 | // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!'); |
256 | - throw new \Exception(__CLASS__ . '::unchanged() in ' . get_called_class() . 'is not yet implemented'); |
|
256 | + throw new \Exception(__CLASS__.'::unchanged() in '.get_called_class().'is not yet implemented'); |
|
257 | 257 | } |
258 | 258 | |
259 | 259 | /** |
@@ -264,7 +264,7 @@ discard block |
||
264 | 264 | protected function emptyAction($cEntity) { |
265 | 265 | // Just created container and doesn't use it |
266 | 266 | // throw new \Exception('EntityModel isEmpty but not loaded! It can\'t be!'); |
267 | - throw new \Exception(__CLASS__ . '::emptyAction() in ' . get_called_class() . 'is not yet implemented'); |
|
267 | + throw new \Exception(__CLASS__.'::emptyAction() in '.get_called_class().'is not yet implemented'); |
|
268 | 268 | } |
269 | 269 | |
270 | 270 | protected function save(EntityContainer $cEntity) { |
@@ -96,7 +96,7 @@ |
||
96 | 96 | /** |
97 | 97 | * @param KeyedContainer $cEntity |
98 | 98 | */ |
99 | - protected function unchanged($cEntity){ |
|
99 | + protected function unchanged($cEntity) { |
|
100 | 100 | // TODO - or just save nothing ????? |
101 | 101 | // throw new \Exception('EntityModel isNotEmpty, have dbId and not CHANGED! It can\'t be!'); |
102 | 102 | // Do nothing |
@@ -52,82 +52,82 @@ |
||
52 | 52 | $gc = $this; |
53 | 53 | |
54 | 54 | // Default db |
55 | - $gc->db = function ($c) { |
|
55 | + $gc->db = function($c) { |
|
56 | 56 | classSupernova::$db = $db = new \db_mysql($c); |
57 | 57 | |
58 | 58 | return $db; |
59 | 59 | }; |
60 | 60 | |
61 | - $gc->debug = function ($c) { |
|
61 | + $gc->debug = function($c) { |
|
62 | 62 | return new \debug(); |
63 | 63 | }; |
64 | 64 | |
65 | - $gc->types = function ($c) { |
|
65 | + $gc->types = function($c) { |
|
66 | 66 | return new \Common\Types(); |
67 | 67 | }; |
68 | 68 | |
69 | - $gc->cache = function ($c) { |
|
69 | + $gc->cache = function($c) { |
|
70 | 70 | return new \classCache(classSupernova::$cache_prefix); |
71 | 71 | }; |
72 | 72 | |
73 | - $gc->config = function ($c) { |
|
73 | + $gc->config = function($c) { |
|
74 | 74 | return new \classConfig(classSupernova::$cache_prefix); |
75 | 75 | }; |
76 | 76 | |
77 | - $gc->localePlayer = function (GlobalContainer $c) { |
|
77 | + $gc->localePlayer = function(GlobalContainer $c) { |
|
78 | 78 | return new \classLocale($c->config->server_locale_log_usage); |
79 | 79 | }; |
80 | 80 | |
81 | - $gc->dbGlobalRowOperator = function (GlobalContainer $c) { |
|
81 | + $gc->dbGlobalRowOperator = function(GlobalContainer $c) { |
|
82 | 82 | return new \DbRowDirectOperator($c->db); |
83 | 83 | }; |
84 | 84 | |
85 | - $gc->query = $gc->factory(function (GlobalContainer $c) { |
|
85 | + $gc->query = $gc->factory(function(GlobalContainer $c) { |
|
86 | 86 | return new \DbQueryConstructor($c->db); |
87 | 87 | }); |
88 | 88 | |
89 | - $gc->cacheOperator = function (GlobalContainer $gc) { |
|
89 | + $gc->cacheOperator = function(GlobalContainer $gc) { |
|
90 | 90 | return new \SnDbCachedOperator($gc); |
91 | 91 | }; |
92 | 92 | |
93 | 93 | $gc->snCacheClass = 'SnCache'; |
94 | - $gc->snCache = function (GlobalContainer $gc) { |
|
94 | + $gc->snCache = function(GlobalContainer $gc) { |
|
95 | 95 | return $gc->db->snCache; |
96 | 96 | }; |
97 | 97 | |
98 | 98 | $gc->buddyClass = 'Buddy\BuddyModel'; |
99 | - $gc->buddyModel = function (GlobalContainer $c) { |
|
99 | + $gc->buddyModel = function(GlobalContainer $c) { |
|
100 | 100 | return new $c->buddyClass($c); |
101 | 101 | }; |
102 | 102 | |
103 | - $gc->unitModel = function (GlobalContainer $c) { |
|
103 | + $gc->unitModel = function(GlobalContainer $c) { |
|
104 | 104 | return new \V2Unit\V2UnitModel($c); |
105 | 105 | }; |
106 | - $gc->unitList = $this->factory(function (GlobalContainer $c) { |
|
106 | + $gc->unitList = $this->factory(function(GlobalContainer $c) { |
|
107 | 107 | return new \V2Unit\V2UnitList($c); |
108 | 108 | }); |
109 | 109 | |
110 | - $gc->fleetModel = function (GlobalContainer $c) { |
|
110 | + $gc->fleetModel = function(GlobalContainer $c) { |
|
111 | 111 | return new V2FleetModel($c); |
112 | 112 | }; |
113 | 113 | |
114 | - $gc->planetRenderer = function (GlobalContainer $c) { |
|
114 | + $gc->planetRenderer = function(GlobalContainer $c) { |
|
115 | 115 | return new PlanetRenderer($c); |
116 | 116 | }; |
117 | 117 | |
118 | - $gc->fleetRenderer = function (GlobalContainer $c) { |
|
118 | + $gc->fleetRenderer = function(GlobalContainer $c) { |
|
119 | 119 | return new \FleetRenderer($c); |
120 | 120 | }; |
121 | 121 | |
122 | - $gc->groupFleet = function (GlobalContainer $c) { |
|
122 | + $gc->groupFleet = function(GlobalContainer $c) { |
|
123 | 123 | return sn_get_groups('fleet'); |
124 | 124 | }; |
125 | 125 | |
126 | - $gc->groupFleetAndMissiles = function (GlobalContainer $c) { |
|
126 | + $gc->groupFleetAndMissiles = function(GlobalContainer $c) { |
|
127 | 127 | return sn_get_groups(array('fleet', GROUP_STR_MISSILES)); |
128 | 128 | }; |
129 | 129 | |
130 | - $gc->groupRecyclers = function (GlobalContainer $c) { |
|
130 | + $gc->groupRecyclers = function(GlobalContainer $c) { |
|
131 | 131 | return sn_get_groups('flt_recyclers'); |
132 | 132 | }; |
133 | 133 |
@@ -47,7 +47,7 @@ |
||
47 | 47 | public function renderFleet(Fleet $fleet, $missionStartTimeStamp = SN_TIME_NOW, $timeMissionJob = 0) { |
48 | 48 | $unitList = $fleet->getUnitList(); |
49 | 49 | if ($unitList->unitsCount() <= 0) { |
50 | - message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet' . DOT_PHP_EX, 5); |
|
50 | + message(classLocale::$lang['fl_err_no_ships'], classLocale::$lang['fl_error'], 'fleet'.DOT_PHP_EX, 5); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | $timeToReturn = $fleet->travelData['duration'] * 2 + $timeMissionJob; |