Skip to content

Commit

Permalink
Fix regression from #924
Browse files Browse the repository at this point in the history
The `SmrShip::checkPowerLevel` function was erroneously re-added
during merge conflict resolution. It is now removed again.
  • Loading branch information
hemberger committed Dec 13, 2020
1 parent fc4bd93 commit b249ee0
Showing 1 changed file with 0 additions and 7 deletions.
7 changes: 0 additions & 7 deletions lib/Default/SmrShip.class.php
Original file line number Diff line number Diff line change
Expand Up @@ -160,13 +160,6 @@ public function update() {
$this->getPlayer()->update();
}

/**
* given power level of new weapon, return whether there is enough power available to install it on this ship
*/
public function checkPowerAvailable($powerLevel) {
return $this->getRemainingPower() >= $powerLevel;
}

public function isCloaked() {
if (!$this->hasCloak()) {
return false;
Expand Down

0 comments on commit b249ee0

Please sign in to comment.