smrealms / smr

engine/Default/hall_of_fame_player_detail.php

Spacing +2 added lines, -2 removed lines

@@ -20,13 +20,13 @@
 const USER_SCORE_NAME = 'User Score';
 $hofTypes = array(DONATION_NAME=>true, USER_SCORE_NAME=>true);
 while ($db->nextRecord()) {
-	$hof =& $hofTypes;
+	$hof = & $hofTypes;
 	$typeList = explode(':', $db->getField('type'));
 	foreach ($typeList as $type) {
 		if (!isset($hof[$type])) {
 			$hof[$type] = array();
 		}
-		$hof =& $hof[$type];
+		$hof = & $hof[$type];
 	}
 	$hof = true;
 }

htdocs/weapon_list.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 	$weapons = [];
 	$db->query('SELECT * FROM weapon_type JOIN race USING(race_id)');
 	while ($db->nextRecord()) {
-		switch($db->getInt('buyer_restriction')) {
+		switch ($db->getInt('buyer_restriction')) {
 			case BUYER_RESTRICTION_GOOD:
 				$restriction = '<span class="dgreen">Good</span>';
 			break;
@@ -46,15 +46,15 @@ 
 
 	$template->display('weapon_list.php');
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 
 function buildSelector($db, $name, $table) {
 	$selector = '<select onchange="filterSelect(this)"><option>All</option>';
-	$db->query("SELECT DISTINCT ".$name." FROM ".$table." ORDER BY ".$name);
+	$db->query("SELECT DISTINCT " . $name . " FROM " . $table . " ORDER BY " . $name);
 	while ($db->nextRecord()) {
-		$selector .= '<option>'.$db->getField($name).'</option>';
+		$selector .= '<option>' . $db->getField($name) . '</option>';
 	}
 	$selector .= '</select>';
 	return $selector;
@@ -66,8 +66,8 @@ 
 	foreach (Globals::getRaces() as $raceID => $raceData) {
 		$raceName = $raceData['Race Name'];
 		$racebox .= '
-			<input type="checkbox" id="race'.$raceID.'" name="races" value="'.$raceName.'" onClick="raceToggle()">
-			<label for="race'.$raceID.'" class="race'.$raceID.'">'.$raceName.'</label>&thinsp;';
+			<input type="checkbox" id="race'.$raceID . '" name="races" value="' . $raceName . '" onClick="raceToggle()">
+			<label for="race'.$raceID . '" class="race' . $raceID . '">' . $raceName . '</label>&thinsp;';
 	}
 	$racebox .= '</form>';
 	return $racebox;

htdocs/ship_list.php

Spacing +2 added lines, -2 removed lines

@@ -17,7 +17,7 @@ 
 
 	$template->display('ship_list.php');
 }
-catch(Throwable $e) {
+catch (Throwable $e) {
 	handleException($e);
 }
 
@@ -25,7 +25,7 @@ 
 	$selector = '<select onchange="filterSelect(this)"><option>All</option>';
 	$db->query('SELECT DISTINCT ' . $name . ' FROM ' . $table . ' ORDER BY ' . $name);
 	while ($db->nextRecord()) {
-		$selector .= '<option>'.$db->getField($name).'</option>';
+		$selector .= '<option>' . $db->getField($name) . '</option>';
 	}
 	$selector .= '</select>';
 	return $selector;

lib/Default/AbstractSmrPlayer.class.php

Spacing +7 added lines, -7 removed lines

@@ -896,8 +896,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]))
@@ -906,8 +906,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;
@@ -1059,7 +1059,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;
@@ -1103,7 +1103,7 @@ 
 			'Starting Sector' => $this->getSectorID()
 		);
 
-		$this->missions[$missionID] =& $mission;
+		$this->missions[$missionID] = & $mission;
 		$this->setupMissionStep($missionID);
 		$this->rebuildMission($missionID);
 
@@ -1162,7 +1162,7 @@ 
 
 	public function claimMissionReward($missionID) {
 		$this->getMissions();
-		$mission =& $this->missions[$missionID];
+		$mission = & $this->missions[$missionID];
 		if ($mission === false) {
 			throw new Exception('Unknown mission: ' . $missionID);
 		}

lib/Default/ChessPiece.class.php

Spacing +84 added lines, -84 removed lines

@@ -52,10 +52,10 @@ 
 	}
 	
 	public function isAttacking(array &$board, array &$hasMoved, $king, $x = -1, $y = -1) {
-		$moves =& $this->getPossibleMoves($board, $hasMoved, null, true);
-		foreach($moves as &$move) {
-			$p =& $board[$move[1]][$move[0]];
-			if(($move[0] == $x && $move[1] == $y) || ($king === true && $p != null && $p->pieceID == self::KING && $this->colour != $p->colour)) {
+		$moves = & $this->getPossibleMoves($board, $hasMoved, null, true);
+		foreach ($moves as &$move) {
+			$p = & $board[$move[1]][$move[0]];
+			if (($move[0] == $x && $move[1] == $y) || ($king === true && $p != null && $p->pieceID == self::KING && $this->colour != $p->colour)) {
 				return true;
 			}
 		}
@@ -64,130 +64,130 @@ 
 
 	public function &getPossibleMoves(array &$board, array &$hasMoved, $forAccountID = null, $attackingCheck = false) {
 		$moves = array();
-		if($forAccountID == null || $this->accountID == $forAccountID) {
-			if($this->pieceID==self::PAWN) {
-				$dirY = $this->colour==ChessGame::PLAYER_BLACK ? 1 : -1;
-				$moveY = $this->y+$dirY;
+		if ($forAccountID == null || $this->accountID == $forAccountID) {
+			if ($this->pieceID == self::PAWN) {
+				$dirY = $this->colour == ChessGame::PLAYER_BLACK ? 1 : -1;
+				$moveY = $this->y + $dirY;
 				//Pawn forward movement is not attacking - so don't check it if doing an attacking check.
-				if(!$attackingCheck) {
-					if(ChessGame::isValidCoord($this->x, $moveY, $board) && $board[$moveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $moveY)) {
-						$moves[] = array($this->x,$moveY);
+				if (!$attackingCheck) {
+					if (ChessGame::isValidCoord($this->x, $moveY, $board) && $board[$moveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $moveY)) {
+						$moves[] = array($this->x, $moveY);
 					}
 					$doubleMoveY = $moveY + $dirY;
-					if($this->y-$dirY == 0 || $this->y-$dirY*2 == count($board)) { //Double move first move
-						if($board[$moveY][$this->x] == null && $board[$doubleMoveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $doubleMoveY)) {
-							$moves[] = array($this->x,$doubleMoveY);
+					if ($this->y - $dirY == 0 || $this->y - $dirY * 2 == count($board)) { //Double move first move
+						if ($board[$moveY][$this->x] == null && $board[$doubleMoveY][$this->x] == null && $this->isSafeMove($board, $hasMoved, $this->x, $doubleMoveY)) {
+							$moves[] = array($this->x, $doubleMoveY);
 						}
 					}
 				}
-				for($i=-1;$i<2;$i+=2) {
-					$moveX = $this->x+$i;
-					if(ChessGame::isValidCoord($moveX, $moveY, $board)) {
-						if($attackingCheck || 
+				for ($i = -1; $i < 2; $i += 2) {
+					$moveX = $this->x + $i;
+					if (ChessGame::isValidCoord($moveX, $moveY, $board)) {
+						if ($attackingCheck || 
 							((($hasMoved[ChessPiece::PAWN][0] == $moveX && $hasMoved[ChessPiece::PAWN][1] == $this->y) || 
-							($board[$moveY][$moveX] != null && $board[$moveY][$moveX]->colour!=$this->colour))
+							($board[$moveY][$moveX] != null && $board[$moveY][$moveX]->colour != $this->colour))
 							&& $this->isSafeMove($board, $hasMoved, $moveX, $moveY))) {
-							$moves[] = array($moveX,$moveY);
+							$moves[] = array($moveX, $moveY);
 						}
 					}
 				}
 			}
-			else if($this->pieceID==self::KING) {
-				for($i = -1; $i < 2; $i++) {
-					for($j = -1; $j < 2; $j++) {
-						if($i!=0 || $j!=0) {
-							$this->addMove($this->x+$i, $this->y+$j, $board, $moves, $hasMoved, $attackingCheck);
+			else if ($this->pieceID == self::KING) {
+				for ($i = -1; $i < 2; $i++) {
+					for ($j = -1; $j < 2; $j++) {
+						if ($i != 0 || $j != 0) {
+							$this->addMove($this->x + $i, $this->y + $j, $board, $moves, $hasMoved, $attackingCheck);
 						}
 					}
 				}
 				//Castling is not attacking - so don't check it if doing an attacking check.
-				if(!$attackingCheck && !$hasMoved[$this->colour][ChessPiece::KING] && !ChessGame::isPlayerChecked($board, $hasMoved, $this->colour)) {
-					if(!$hasMoved[$this->colour][ChessPiece::ROOK]['Queen'] && 
-							ChessGame::isValidCoord($this->x-1, $this->y, $board) && $board[$this->y][$this->x-1] == null &&
-							ChessGame::isValidCoord($this->x-3, $this->y, $board) && $board[$this->y][$this->x-3] == null &&
-							$this->isSafeMove($board, $hasMoved, $this->x-1, $this->y)) {
-						$this->addMove($this->x-2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
+				if (!$attackingCheck && !$hasMoved[$this->colour][ChessPiece::KING] && !ChessGame::isPlayerChecked($board, $hasMoved, $this->colour)) {
+					if (!$hasMoved[$this->colour][ChessPiece::ROOK]['Queen'] && 
+							ChessGame::isValidCoord($this->x - 1, $this->y, $board) && $board[$this->y][$this->x - 1] == null &&
+							ChessGame::isValidCoord($this->x - 3, $this->y, $board) && $board[$this->y][$this->x - 3] == null &&
+							$this->isSafeMove($board, $hasMoved, $this->x - 1, $this->y)) {
+						$this->addMove($this->x - 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
-					if(!$hasMoved[$this->colour][ChessPiece::ROOK]['King'] &&
-							ChessGame::isValidCoord($this->x+1, $this->y, $board) && $board[$this->y][$this->x+1] == null &&
-							$this->isSafeMove($board, $hasMoved, $this->x+1, $this->y)) {
-						$this->addMove($this->x+2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
+					if (!$hasMoved[$this->colour][ChessPiece::ROOK]['King'] &&
+							ChessGame::isValidCoord($this->x + 1, $this->y, $board) && $board[$this->y][$this->x + 1] == null &&
+							$this->isSafeMove($board, $hasMoved, $this->x + 1, $this->y)) {
+						$this->addMove($this->x + 2, $this->y, $board, $moves, $hasMoved, $attackingCheck);
 					}
 				}
 			}
-			else if($this->pieceID==self::QUEEN) {
+			else if ($this->pieceID == self::QUEEN) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
+				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
+				while ($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
+				while ($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
+				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
+				while ($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
+				while ($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 			}
-			else if($this->pieceID==self::ROOK) {
+			else if ($this->pieceID == self::ROOK) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
+				while ($this->addMove(--$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
+				while ($this->addMove(++$moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
+				while ($this->addMove($moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
+				while ($this->addMove($moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down
 			}
-			else if($this->pieceID==self::BISHOP) {
+			else if ($this->pieceID == self::BISHOP) {
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(--$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
+				while ($this->addMove(++$moveX, --$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Right
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
+				while ($this->addMove(--$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Down-Left
 				$moveX = $this->x;
 				$moveY = $this->y;
-				while($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
+				while ($this->addMove(++$moveX, ++$moveY, $board, $moves, $hasMoved, $attackingCheck) && $board[$moveY][$moveX] == null); //Up-Left
 			}
-			else if($this->pieceID==self::KNIGHT) {
-				$moveX = $this->x-1;
-				$moveY = $this->y-2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-left
+			else if ($this->pieceID == self::KNIGHT) {
+				$moveX = $this->x - 1;
+				$moveY = $this->y - 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-left
 				$moveX += 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2up-right
-				$moveY = $this->y+2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2down-right
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2up-right
+				$moveY = $this->y + 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2down-right
 				$moveX -= 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2down-left
-				$moveX = $this->x-2;
-				$moveY = $this->y-1;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2left-up
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2down-left
+				$moveX = $this->x - 2;
+				$moveY = $this->y - 1;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2left-up
 				$moveY += 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2left-down
-				$moveX = $this->x+2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2right-down
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2left-down
+				$moveX = $this->x + 2;
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2right-down
 				$moveY -= 2;
-				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck);//2right-up
+				$this->addMove($moveX, $moveY, $board, $moves, $hasMoved, $attackingCheck); //2right-up
 			}
 		}
 		
@@ -195,11 +195,11 @@ 
 	}
 	
 	private function addMove($toX, $toY, array &$board, array &$moves, array &$hasMoved = null, $attackingCheck = true) {
-		if(ChessGame::isValidCoord($toX, $toY, $board)) {
-			if(($board[$toY][$toX] == null || $board[$toY][$toX]->colour!=$this->colour)) {
+		if (ChessGame::isValidCoord($toX, $toY, $board)) {
+			if (($board[$toY][$toX] == null || $board[$toY][$toX]->colour != $this->colour)) {
 				//We can only actually move to this position if it is safe to do so, however we can pass through it looking for a safe move so we still want to return true.
-				if(($attackingCheck == true || $this->isSafeMove($board, $hasMoved, $toX, $toY))) {
-					$moves[] = array($toX,$toY);
+				if (($attackingCheck == true || $this->isSafeMove($board, $hasMoved, $toX, $toY))) {
+					$moves[] = array($toX, $toY);
 				}
 				return true;
 			}
@@ -208,30 +208,30 @@ 
 	}
 	
 	public function promote($pawnPromotionPieceID, array &$board) {
-		if($pawnPromotionPieceID==null) {
+		if ($pawnPromotionPieceID == null) {
 			throw new Exception('Promotion piece cannot be null on a promote.');
 		}
 		$takenNos = array();
-		foreach($board as $row) {
-			foreach($row as $piece) {
-				if($piece != null && $piece->pieceID == $pawnPromotionPieceID && $piece->colour == $this->colour) {
+		foreach ($board as $row) {
+			foreach ($row as $piece) {
+				if ($piece != null && $piece->pieceID == $pawnPromotionPieceID && $piece->colour == $this->colour) {
 					$takenNos[$piece->pieceNo] = true;
 				}
 			}
 		}
-		$i=0;
-		while(isset($takenNos[$i])) {
+		$i = 0;
+		while (isset($takenNos[$i])) {
 			$i++;
 		}
 		return array('PieceID' => $pawnPromotionPieceID, 'PieceNo' => $i);
 	}
 
 	public function getPieceLetter() {
-		return self::getLetterForPiece($this->pieceID,$this->colour);
+		return self::getLetterForPiece($this->pieceID, $this->colour);
 	}
 
 	public function getPieceSymbol() {
-		return self::getSymbolForPiece($this->pieceID,$this->colour);
+		return self::getSymbolForPiece($this->pieceID, $this->colour);
 	}
 
 	public static function getSymbolForPiece($pieceID, $colour) {
@@ -239,7 +239,7 @@ 
 	}
 
 	public static function getLetterForPiece($pieceID, $colour) {
-		switch($pieceID) {
+		switch ($pieceID) {
 			case self::KING:
 				$letter = 'k';
 			break;
@@ -260,14 +260,14 @@ 
 				$letter = 'p';
 			break;
 		}
-		if($colour == ChessGame::PLAYER_WHITE) {
+		if ($colour == ChessGame::PLAYER_WHITE) {
 			$letter = strtoupper($letter);
 		}
 		return $letter;
 	}
 
 	public static function getPieceForLetter($letter) {
-		switch($letter) {
+		switch ($letter) {
 			case 'k':
 			case 'K':
 				return self::KING;

lib/Default/SmrForce.class.php

Spacing +3 added lines, -3 removed lines

@@ -446,20 +446,20 @@
 
 		if ($this->hasMines()) {
 			$thisMines = new SmrMines($this->getGameID(), $this->getMines());
-			$results['Results']['Mines'] =& $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
+			$results['Results']['Mines'] = & $thisMines->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)], $minesAreAttacker);
 			$results['TotalDamage'] += $results['Results']['Mines']['ActualDamage']['TotalDamage'];
 		}
 
 		if ($this->hasCDs()) {
 			$thisCDs = new SmrCombatDrones($this->getGameID(), $this->getCDs());
-			$results['Results']['Drones'] =& $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+			$results['Results']['Drones'] = & $thisCDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 			$results['TotalDamage'] += $results['Results']['Drones']['ActualDamage']['TotalDamage'];
 		}
 
 		if (!$minesAreAttacker) {
 			if ($this->hasSDs()) {
 				$thisSDs = new SmrScoutDrones($this->getGameID(), $this->getSDs());
-				$results['Results']['Scouts'] =& $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
+				$results['Results']['Scouts'] = & $thisSDs->shootPlayerAsForce($this, $targetPlayers[array_rand($targetPlayers)]);
 				$results['TotalDamage'] += $results['Results']['Scouts']['ActualDamage']['TotalDamage'];
 			}
 		}

lib/Default/AbstractSmrCombatWeapon.class.php

Spacing +29 added lines, -29 removed lines

@@ -12,7 +12,7 @@ 
 	protected $maxDamage;
 	protected $shieldDamage;
 	protected $armourDamage;
-	protected $empDamage=0;
+	protected $empDamage = 0;
 	protected $accuracy;
 	protected $damageRollover;
 	protected $raidWeapon;
@@ -85,62 +85,62 @@ 
 	abstract public function &getModifiedForceDamageAgainstPlayer(SmrForce $forces, AbstractSmrPlayer $targetPlayer);
 	
 	protected function &doPlayerDamageToForce(array &$return, AbstractSmrPlayer $weaponPlayer, SmrForce $forces) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstForces($weaponPlayer,$forces);
-		$return['ActualDamage'] =& $forces->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $forces->killForcesByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstForces($weaponPlayer, $forces);
+		$return['ActualDamage'] = & $forces->doWeaponDamage($return['WeaponDamage']);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $forces->killForcesByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlayer(array &$return, AbstractSmrPlayer $weaponPlayer, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlayer($weaponPlayer,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlayer($weaponPlayer, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlayer($weaponPlayer);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPort(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPort $port) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPort($weaponPlayer,$port);
-		$return['ActualDamage'] =& $port->doWeaponDamage($return['WeaponDamage']);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $port->killPortByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPort($weaponPlayer, $port);
+		$return['ActualDamage'] = & $port->doWeaponDamage($return['WeaponDamage']);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $port->killPortByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPlayerDamageToPlanet(array &$return, AbstractSmrPlayer $weaponPlayer, SmrPlanet $planet, $delayed) {
-		$return['WeaponDamage'] =& $this->getModifiedDamageAgainstPlanet($weaponPlayer,$planet);
-		$return['ActualDamage'] =& $planet->doWeaponDamage($return['WeaponDamage'],$delayed);
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $planet->killPlanetByPlayer($weaponPlayer);
+		$return['WeaponDamage'] = & $this->getModifiedDamageAgainstPlanet($weaponPlayer, $planet);
+		$return['ActualDamage'] = & $planet->doWeaponDamage($return['WeaponDamage'], $delayed);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $planet->killPlanetByPlayer($weaponPlayer);
 		return $return;
 	}
 	
 	protected function &doPortDamageToPlayer(array &$return, SmrPort $port, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPortDamageAgainstPlayer($port,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPortDamageAgainstPlayer($port, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPort($port);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPort($port);
 		return $return;
 	}
 	
 	protected function &doPlanetDamageToPlayer(array &$return, SmrPlanet $planet, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedPlanetDamageAgainstPlayer($planet,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedPlanetDamageAgainstPlayer($planet, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByPlanet($planet);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByPlanet($planet);
 		return $return;
 	}
 	
 	protected function &doForceDamageToPlayer(array &$return, SmrForce $forces, AbstractSmrPlayer $targetPlayer) {
-		$return['WeaponDamage'] =& $this->getModifiedForceDamageAgainstPlayer($forces,$targetPlayer);
-		$return['ActualDamage'] =& $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
+		$return['WeaponDamage'] = & $this->getModifiedForceDamageAgainstPlayer($forces, $targetPlayer);
+		$return['ActualDamage'] = & $targetPlayer->getShip()->doWeaponDamage($return['WeaponDamage']);
 
-		if($return['ActualDamage']['KillingShot'])
-			$return['KillResults'] =& $targetPlayer->killPlayerByForces($forces);
+		if ($return['ActualDamage']['KillingShot'])
+			$return['KillResults'] = & $targetPlayer->killPlayerByForces($forces);
 		return $return;
 	}
 	

lib/Default/Menu.class.php

Spacing +2 added lines, -2 removed lines

@@ -12,7 +12,7 @@ 
 		$menuItems[] = array('Link'=>Globals::getPlanetListHREF($alliance_id), 'Text'=>'Defense');
 		$menuItems[] = array('Link'=>Globals::getPlanetListFinancialHREF($alliance_id), 'Text'=>'Financial');
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<span class="bold">' . $boldItem . '</span>';
 		$template->assign('MenuItems', $menuItems);
 	}
@@ -107,7 +107,7 @@ 
 		$menuItems[] = ['Link' => SmrSession::getNewHREF($container),
 		                'Text' => 'Game News'];
 		// make the selected index bold
-		$boldItem =& $menuItems[$selected_index]['Text'];
+		$boldItem = & $menuItems[$selected_index]['Text'];
 		$boldItem = '<b>' . $boldItem . '</b>';
 		$template->assign('MenuItems', $menuItems);
 	}

lib/Default/SmrPlanetType.class.php

Spacing +26 added lines, -26 removed lines

@@ -40,7 +40,7 @@ 
 	/**
 	 * Access properties of structures that this planet type can build.
 	 */
-	public function structureTypes($structureID=false) {
+	public function structureTypes($structureID = false) {
 		if (!isset($this->structures)) {
 			foreach (static::STRUCTURES as $ID => $Info) {
 				$this->structures[$ID] = new SmrPlanetStructureType($ID, $Info);
@@ -77,12 +77,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 {
@@ -106,12 +106,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 {
@@ -135,12 +135,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 {
@@ -170,12 +170,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 {
@@ -205,10 +205,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; }
 }