Remaining fixes

photogabble · Jun 10, 2016 · b723ae1 · b723ae1
1 parent 9f3cbdf
commit b723ae1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/classes/Planet.php b/classes/Planet.php
@@ -125,7 +125,7 @@ public static function planetBombing($pdo_db, $db, $lang, $langvars, \Tki\Reg $t
         \Tki\Db::logDbErrors($pdo_db, $db, $res, __LINE__, __FILE__);
     }
 
-    public static function planetCombat($pdo_db, $db, $lang, $langvars, \Tki\Reg $tkireg)
+    public static function planetCombat($pdo_db, $db, $lang, $langvars, \Tki\Reg $tkireg, $template)
     {
         global $playerinfo, $ownerinfo, $planetinfo;
         global $planetbeams, $planetfighters, $planetshields, $planettorps, $attackerbeams, $attackerfighters, $attackershields;
@@ -621,7 +621,7 @@ public static function planetCombat($pdo_db, $db, $lang, $langvars, \Tki\Reg $tk
 
     public static function shipToShip($pdo_db, $db, $langvars, $ship_id, \Tki\Reg $tkireg, $playerinfo)
     {
-        global $attackerbeams, $attackerfighters, $attackershields, $attackertorps, $attackerarmor, $attackertorpdamage, $armor_lost, $fighters_lost;
+        global $attackerbeams, $attackerfighters, $attackershields, $attackertorps, $attackerarmor, $attackertorpdamage;
 
         $resx = $db->Execute("LOCK TABLES {$db->prefix}ships WRITE, {$db->prefix}planets WRITE, {$db->prefix}sector_defence WRITE, {$db->prefix}universe WRITE, {$db->prefix}adodb_logsql WRITE, {$db->prefix}logs WRITE, {$db->prefix}bounty WRITE, {$db->prefix}news WRITE, {$db->prefix}zones READ");
         \Tki\Db::logDbErrors($pdo_db, $db, $resx, __LINE__, __FILE__);

diff --git a/planet.php b/planet.php
@@ -598,7 +598,7 @@
                 }
                 else
                 {
-                    BadPlanet::planetCombat($pdo_db, $db, $lang, $langvars, $tkireg);
+                    BadPlanet::planetCombat($pdo_db, $db, $lang, $langvars, $tkireg, $template);
                 }
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -598,7 +598,7 @@ @@
                     }
                     else
                     {
-                        BadPlanet::planetCombat($pdo_db, $db, $lang, $langvars, $tkireg);
+                        BadPlanet::planetCombat($pdo_db, $db, $lang, $langvars, $tkireg, $template);
                     }
                 }
             }
@@ Expand Down @@