This commit is contained in:
Shadow
2013-12-02 19:01:40 +02:00
parent 3815cd8c49
commit 709e1fefa5
18 changed files with 722 additions and 493 deletions
+7 -3
View File
@@ -2563,7 +2563,7 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
for($i=1;$i<=10;$i++){
if($battlepart['casualties_attacker'][$i]){
if($from['owner'] == 3){
$database->addNotice($to['owner'],$to['wref'],$targetally,0,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
$database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
break;
}else if($unitsdead_att == $unitssend_att && $defspy){ //fix by ronix
$database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
@@ -2724,8 +2724,12 @@ $wallimg = "<img src=\"".GP_LOCATE."img/g/g3".$targettribe."Icon.gif\" height=\"
$endtime += $AttackArrivalTime;
if($type == 1) {
if($from['owner'] == 3) { //fix natar report by ronix
$database->addNotice($to['owner'],$to['wref'],$targetally,0,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
} else $database->addNotice($from['owner'],$to['wref'],$ownally,21,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
$database->addNotice($to['owner'],$to['wref'],$targetally,20,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
}elseif ($totaldead_att == 0 && $totaltraped_att == 0){
$database->addNotice($from['owner'],$to['wref'],$ownally,18,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
}else{
$database->addNotice($from['owner'],$to['wref'],$ownally,21,''.addslashes($from['name']).' scouts '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
}
}else {
if ($totaldead_att == 0 && $totaltraped_att == 0){
$database->addNotice($from['owner'],$to['wref'],$ownally,1,''.addslashes($from['name']).' attacks '.addslashes($to['name']).'',$data2,$AttackArrivalTime);
+3 -3
View File
@@ -158,7 +158,7 @@ class MYSQL_DB {
$q = "SELECT $field FROM " . TB_PREFIX . "users where username = '$ref'";
}
$result = mysql_query($q, $this->connection) or die(mysql_error());
if(mysql_num_rows($result)) {
if($result) {
$dbarray = mysql_fetch_array($result);
return $dbarray[$field];
}elseif($field=="username"){
@@ -841,10 +841,10 @@ class MYSQL_DB {
function getVillageField($ref, $field) {
$q = "SELECT $field FROM " . TB_PREFIX . "vdata where wref = $ref";
$result = mysql_query($q, $this->connection);
if(mysql_num_rows($result)) {
if($result){
$dbarray = mysql_fetch_array($result);
return $dbarray[$field];
}elseif($field=="name"){
}elseif($field=="name"){
return "??";
}else return 0;
}