From 865442419e483faede7c00710c0830d4cc0ac5a3 Mon Sep 17 00:00:00 2001 From: Dan Hemberger Date: Thu, 22 Mar 2018 01:18:16 -0700 Subject: [PATCH] AbstractSmrPlayer: remove internal references See #317. --- lib/Default/AbstractSmrPlayer.class.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/Default/AbstractSmrPlayer.class.inc b/lib/Default/AbstractSmrPlayer.class.inc index cba973f62..9b2c8efe6 100644 --- a/lib/Default/AbstractSmrPlayer.class.inc +++ b/lib/Default/AbstractSmrPlayer.class.inc @@ -201,12 +201,12 @@ abstract class AbstractSmrPlayer { } public function hasFederalProtection() { - $sector =& SmrSector::getSector($this->getGameID(),$this->getSectorID()); + $sector = SmrSector::getSector($this->getGameID(),$this->getSectorID()); if (!$sector->offersFederalProtection()) { return false; } - $ship =& $this->getShip(); + $ship = $this->getShip(); if ($ship->hasIllegalGoods()) return false; @@ -224,7 +224,7 @@ abstract class AbstractSmrPlayer { public function canBeProtectedByRace($raceID) { if(!isset($this->canFed)) { $this->canFed = array(); - $RACES =& Globals::getRaces(); + $RACES = Globals::getRaces(); foreach($RACES as $raceID2 => $raceName) { $this->canFed[$raceID2] = $this->getRelation($raceID2) >= ALIGN_FED_PROTECTION; } @@ -647,7 +647,7 @@ abstract class AbstractSmrPlayer { if(!isset($this->relations)) { //get relations $RACES = Globals::getRaces(); - $raceRelations =& Globals::getRaceRelations($this->getGameID(),$this->getRaceID()); + $raceRelations = Globals::getRaceRelations($this->getGameID(),$this->getRaceID()); $pureRels = $this->getPureRelations(); // make sure they're initialised. $this->relations = array(); foreach ($RACES as $raceID => $raceName) { @@ -1133,7 +1133,7 @@ abstract class AbstractSmrPlayer { if($realX === false) { throw new Exception('Invalid PickSector definition in mission: ' . $missionID); } - $path =& Plotter::findDistanceToX($realX, $this->getSector(), true, null, $this); + $path = Plotter::findDistanceToX($realX, $this->getSector(), true, null, $this); if($path === false) { throw new Exception('Cannot find location: ' . $missionID); }