smrealms / smr

src/lib/Default/AbstractSmrPlayer.class.php

Spacing +10 added lines, -10 removed lines

@@ -1703,7 +1703,7 @@ 
 			create_error('The saved sector must be in the box!');
 		}
 
-		$storedDestinations =& $this->getStoredDestinations();
+		$storedDestinations = & $this->getStoredDestinations();
 		foreach ($storedDestinations as &$sd) {
 			if ($sd['SectorID'] == $sectorID) {
 				$sd['OffsetTop'] = $offsetTop;
@@ -2030,13 +2030,13 @@ 
 			$this->db->query('SELECT type,amount FROM player_hof WHERE ' . $this->SQL);
 			$this->HOF = array();
 			while ($this->db->nextRecord()) {
-				$hof =& $this->HOF;
+				$hof = & $this->HOF;
 				$typeList = explode(':', $this->db->getField('type'));
 				foreach ($typeList as $type) {
 					if (!isset($hof[$type])) {
 						$hof[$type] = array();
 					}
-					$hof =& $hof[$type];
+					$hof = & $hof[$type];
 				}
 				$hof = $this->db->getFloat('amount');
 			}
@@ -2115,8 +2115,8 @@ 
 		}
 		self::$HOFVis[$hofType] = $visibility;
 
-		$hof =& $this->HOF;
-		$hofChanged =& $this->hasHOFChanged;
+		$hof = & $this->HOF;
+		$hofChanged = & $this->hasHOFChanged;
 		$new = false;
 		foreach ($typeList as $type) {
 			if (!isset($hofChanged[$type])) {
@@ -2126,8 +2126,8 @@ 
 				$hof[$type] = array();
 				$new = true;
 			}
-			$hof =& $hof[$type];
-			$hofChanged =& $hofChanged[$type];
+			$hof = & $hof[$type];
+			$hofChanged = & $hofChanged[$type];
 		}
 		if ($hofChanged == null) {
 			$hofChanged = self::HOF_CHANGED;
@@ -2730,7 +2730,7 @@ 
 	}
 
 	private function setupMissionStep($missionID) {
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission['On Step'] >= count(MISSIONS[$missionID]['Steps'])) {
 			// Nothing to do if this mission is already completed
 			return;
@@ -2779,7 +2779,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -2829,7 +2829,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

src/lib/Default/SmrPlanetType.class.php

Spacing +25 added lines, -25 removed lines

@@ -79,12 +79,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	public function name()         { return "Terran Planet"; }
-	public function imageLink()    { return "images/planet1.png"; }
-	public function description()  { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; }
+	public function name() { return "Terran Planet"; }
+	public function imageLink() { return "images/planet1.png"; }
+	public function description() { return "A lush world, with forests, seas, sweeping meadows, and indigenous lifeforms."; }
 	public function maxAttackers() { return 10; }
-	public function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class AridPlanet extends SmrPlanetType {
@@ -108,12 +108,12 @@ 
 			'exp_gain' => 180,
 		],
 	];
-	public function name()         { return "Arid Planet"; }
-	public function imageLink()    { return "images/planet2.png"; }
-	public function description()  { return "A world mostly devoid of surface water, but capable of supporting life."; }
+	public function name() { return "Arid Planet"; }
+	public function imageLink() { return "images/planet2.png"; }
+	public function description() { return "A world mostly devoid of surface water, but capable of supporting life."; }
 	public function maxAttackers() { return 5; }
-	public function maxLanded()    { return 5; }
-	public function menuOptions()  { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; }
+	public function maxLanded() { return 5; }
+	public function menuOptions() { return ['CONSTRUCTION', 'DEFENSE', 'STOCKPILE', 'OWNERSHIP']; }
 }
 
 class DwarfPlanet extends SmrPlanetType {
@@ -137,12 +137,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	public function name()         { return "Dwarf Planet"; }
-	public function imageLink()    { return "images/planet3.png"; }
-	public function description()  { return "A smaller than usual planet, with no native life present."; }
+	public function name() { return "Dwarf Planet"; }
+	public function imageLink() { return "images/planet3.png"; }
+	public function description() { return "A smaller than usual planet, with no native life present."; }
 	public function maxAttackers() { return 5; }
-	public function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class ProtoPlanet extends SmrPlanetType {
@@ -178,12 +178,12 @@ 
 			'exp_gain' => 540,
 		],
 	];
-	public function name()         { return "Protoplanet"; }
-	public function imageLink()    { return "images/planet5.png"; }
-	public function description()  { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; }
+	public function name() { return "Protoplanet"; }
+	public function imageLink() { return "images/planet5.png"; }
+	public function description() { return "A developing planet, not yet able to support the infrastructure of advanced technologies."; }
 	public function maxAttackers() { return 5; }
-	public function maxLanded()    { return 5; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return 5; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }
 
 class DefenseWorld extends SmrPlanetType {
@@ -213,10 +213,10 @@ 
 			'exp_gain' => 9,
 		],
 	];
-	public function name()         { return "Defense World"; }
-	public function imageLink()    { return "images/planet4.png"; }
-	public function description()  { return "A fully armed and operational battle station loaded with excessive firepower."; }
+	public function name() { return "Defense World"; }
+	public function imageLink() { return "images/planet4.png"; }
+	public function description() { return "A fully armed and operational battle station loaded with excessive firepower."; }
 	public function maxAttackers() { return 10; }
-	public function maxLanded()    { return self::MAX_LANDED_UNLIMITED; }
-	public function menuOptions()  { return self::DEFAULT_MENU_OPTIONS; }
+	public function maxLanded() { return self::MAX_LANDED_UNLIMITED; }
+	public function menuOptions() { return self::DEFAULT_MENU_OPTIONS; }
 }

src/lib/Default/SmrMines.class.php

Spacing +4 added lines, -4 removed lines

@@ -93,7 +93,7 @@ 
 			$return = array('MaxDamage' => 0, 'Shield' => 0, 'Armour' => 0, 'Rollover' => $this->isDamageRollover());
 			return $return;
 		}
-		$damage =& $this->getModifiedDamage();
+		$damage = & $this->getModifiedDamage();
 		if ($targetPlayer->getShip()->isFederal()) { // do less damage to fed ships
 			$damage['MaxDamage'] = IRound($damage['MaxDamage'] * self::FED_SHIP_DAMAGE_MODIFIER);
 			$damage['Shield'] = IRound($damage['Shield'] * self::FED_SHIP_DAMAGE_MODIFIER);
@@ -130,12 +130,12 @@ 
 	}
 
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer, $minesAreAttacker = false) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer, $minesAreAttacker);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doMinesDamage($return['WeaponDamage']);
 		$return['ActualDamage']['Launched'] = ICeil($return['WeaponDamage']['Launched'] * $return['ActualDamage']['TotalDamage'] / $return['WeaponDamage']['MaxDamage']);
 
 		if ($return['ActualDamage']['KillingShot']) {
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		}
 		return $return;
 	}

src/lib/Default/Rankings.class.php

Spacing +1 added lines, -1 removed lines

@@ -98,7 +98,7 @@
 		global $player, $db;
 		$offset = $minRank - 1;
 		$limit = $maxRank - $offset;
-		$db->query('SELECT alliance_id, alliance_' . $stat . ' AS amount FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, alliance_name LIMIT ' . $offset. ', ' . $limit);
+		$db->query('SELECT alliance_id, alliance_' . $stat . ' AS amount FROM alliance WHERE game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, alliance_name LIMIT ' . $offset . ', ' . $limit);
 		return self::collectAllianceRankings($db, $player, $offset);
 	}
 

src/engine/Default/rankings_alliance_experience.php

Spacing +1 added lines, -1 removed lines

@@ -25,7 +25,7 @@
 	$template->assign('OurRank', $ourRank);
 }
 
-$expRanks = function (int $minRank, int $maxRank) use ($player, $db) : array {
+$expRanks = function(int $minRank, int $maxRank) use ($player, $db) : array {
 	$offset = $minRank - 1;
 	$limit = $maxRank - $offset;
 	$db->query('SELECT alliance_id, COALESCE(SUM(experience), 0) amount

src/engine/Default/rankings_alliance_profit.php

Spacing +1 added lines, -1 removed lines

@@ -28,7 +28,7 @@
 	$template->assign('OurRank', $ourRank);
 }
 
-$profitRanks = function (int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
+$profitRanks = function(int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
 	$offset = $minRank - 1;
 	$limit = $maxRank - $offset;
 	$db->query('SELECT alliance_id, COALESCE(SUM(amount), 0) amount

src/engine/Default/rankings_player_profit.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 
 $totalPlayers = $player->getGame()->getTotalPlayers();
 
-$profitRanks = function (int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
+$profitRanks = function(int $minRank, int $maxRank) use ($player, $db, $profitTypeEscaped) : array {
 	$offset = $minRank - 1;
 	$limit = $maxRank - $offset;
 	$db->query('SELECT p.*, COALESCE(ph.amount,0) amount FROM player p LEFT JOIN player_hof ph ON p.account_id = ph.account_id AND p.game_id = ph.game_id AND ph.type = ' . $profitTypeEscaped . ' WHERE p.game_id = ' . $db->escapeNumber($player->getGameID()) . ' ORDER BY amount DESC, player_name ASC LIMIT ' . $offset . ', ' . $limit);

src/admin/Default/notify_view.php

Spacing +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
 	/**
 	 * @var $messagePlayer SmrPlayer | string
 	 */
-	$getName = function ($messagePlayer) use ($container, $account) : string {
+	$getName = function($messagePlayer) use ($container, $account) : string {
 		$name = $messagePlayer;
 		if ($messagePlayer instanceof SmrPlayer) {
 			$name = $messagePlayer->getAccount()->getLogin();

src/lib/Default/AbstractSmrShip.class.php

Spacing +9 added lines, -9 removed lines

@@ -310,7 +310,7 @@ 
 	public function setWeaponLocations(array $orderArray) {
 		$weapons = $this->weapons;
 		foreach ($orderArray as $newOrder => $oldOrder) {
-			$this->weapons[$newOrder] =& $weapons[$oldOrder];
+			$this->weapons[$newOrder] = & $weapons[$oldOrder];
 		}
 		$this->hasChangedWeapons = true;
 	}
@@ -939,14 +939,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlayer($thisPlayer, array_rand_value($targetPlayers));
+			$results['Weapons'][$orderID] = & $weapon->shootPlayer($thisPlayer, array_rand_value($targetPlayers));
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlayer($thisPlayer, array_rand_value($targetPlayers));
+			$results['Drones'] = & $thisCDs->shootPlayer($thisPlayer, array_rand_value($targetPlayers));
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLAYER));
@@ -964,7 +964,7 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootForces($thisPlayer, $forces);
+			$results['Weapons'][$orderID] = & $weapon->shootForces($thisPlayer, $forces);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 				$thisPlayer->increaseHOF($results['Weapons'][$orderID]['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
@@ -978,7 +978,7 @@ 
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootForces($thisPlayer, $forces);
+			$results['Drones'] = & $thisCDs->shootForces($thisPlayer, $forces);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['NumMines'], array('Combat', 'Forces', 'Mines', 'Killed'), HOF_PUBLIC);
 			$thisPlayer->increaseHOF($results['Drones']['ActualDamage']['Mines'], array('Combat', 'Forces', 'Mines', 'Damage Done'), HOF_PUBLIC);
@@ -1003,14 +1003,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPort($thisPlayer, $port);
+			$results['Weapons'][$orderID] = & $weapon->shootPort($thisPlayer, $port);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPort($thisPlayer, $port);
+			$results['Drones'] = & $thisCDs->shootPort($thisPlayer, $port);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PORT));
@@ -1041,14 +1041,14 @@ 
 		}
 		$results['DeadBeforeShot'] = false;
 		foreach ($this->weapons as $orderID => $weapon) {
-			$results['Weapons'][$orderID] =& $weapon->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Weapons'][$orderID] = & $weapon->shootPlanet($thisPlayer, $planet, $delayed);
 			if ($results['Weapons'][$orderID]['Hit']) {
 				$results['TotalDamage'] += $results['Weapons'][$orderID]['ActualDamage']['TotalDamage'];
 			}
 		}
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Drones'] =& $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
+			$results['Drones'] = & $thisCDs->shootPlanet($thisPlayer, $planet, $delayed);
 			$results['TotalDamage'] += $results['Drones']['ActualDamage']['TotalDamage'];
 		}
 		$thisPlayer->increaseExperience(IRound($results['TotalDamage'] * self::EXP_PER_DAMAGE_PLANET));