xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-09-04 09:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: some undefined variables

Browse Source 
more are left here with warnings but the code is spaghetti, so it's
a lot of hide-and-seek fun for later time
This commit is contained in:
Martin Ambruš
2017-10-05 16:42:17 +02:00
parent 4d176084ee
commit 61b6d6b2e8
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Automation.php
+8 -3
View File
@@ -958,6 +958,10 @@ class Automation {
$to = $database->getMInfo($data['to']); $to = $database->getMInfo($data['to']);
$from = $database->getMInfo($data['from']); $from = $database->getMInfo($data['from']);
$ownally = $database->getUserField($database->getVillageField($data['from'],"owner"),"alliance",0);
$targetally = $database->getUserField($database->getVillageField($data['to'],"owner"),"alliance",0);
$database->addNotice($to['owner'],$to['wref'],$targetally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']); $database->addNotice($to['owner'],$to['wref'],$targetally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']);
if($from['owner'] != $to['owner']) { if($from['owner'] != $to['owner']) {
$database->addNotice($from['owner'],$to['wref'],$ownally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']); $database->addNotice($from['owner'],$to['wref'],$ownally,$sort_type,''.addslashes($from['name']).' send resources to '.addslashes($to['name']).'',''.$from['owner'].','.$from['wref'].','.$data['wood'].','.$data['clay'].','.$data['iron'].','.$data['crop'].'',$data['endtime']);
@@ -1068,8 +1072,8 @@ class Automation {
$cannotsend = 0; $cannotsend = 0;
$movements = $database->getMovement("34",$data['to'],1); $movements = $database->getMovement("34",$data['to'],1);
for($y=0;$y < count($movements);$y++){ for($y=0;$y < count($movements);$y++){
$returntime = $unit[$y]['endtime']-time(); $returntime = $units[$y]['endtime']-time();
if($unit[$y]['sort_type'] == 4 && $unit[$y]['from'] != 0 && $returntime <= 10){ if($units[$y]['sort_type'] == 4 && $units[$y]['from'] != 0 && $returntime <= 10){
$cannotsend = 1; $cannotsend = 1;
} }
} }
@@ -1211,6 +1215,7 @@ class Automation {
$def_ab[$ud+8] = $armory['a8']; $def_ab[$ud+8] = $armory['a8'];
//rams attack //rams attack
//TODO: where did dead7 & traped7 come from??/
if(($data['t7']-$dead7-$traped7)>0 and $type=='3'){ if(($data['t7']-$dead7-$traped7)>0 and $type=='3'){
$basearraywall = $database->getMInfo($data['to']); $basearraywall = $database->getMInfo($data['to']);
if($database->getFieldLevel($basearraywall['wref'],40)>'0'){ if($database->getFieldLevel($basearraywall['wref'],40)>'0'){
@@ -3442,7 +3447,7 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
if(file_exists("GameEngine/Prevention/settlers.txt")) { if(file_exists("GameEngine/Prevention/settlers.txt")) {
unlink("GameEngine/Prevention/settlers.txt"); unlink("GameEngine/Prevention/settlers.txt");
} }
if ($reload) header("Location: ".$_SERVER['PHP_SELF']); //if ($reload) header("Location: ".$_SERVER['PHP_SELF']);
} }
private function researchComplete() { private function researchComplete() {