halo-battle/game
1
0
Fork 1
Code Issues Pull Requests Projects Releases Activity

Corrige le chantier terrestre #20

Merged
nemunaire merged 1 commits from fix/chantier_terrestre into master 2021-02-18 21:53:52 +00:00
Conversation 0 Commits 1 Files Changed 1 +20 -3
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
onyx2/include/Class/planete.php
View File

@ -747,7 +747,11 @@ class Planete extends Surface
global ${$calc.'VAR'};
}
$outNomChamps[] = ${$calc.'VAR'}[$modif[1]];
if ($calc == "terrestre") {
$outNomChamps[] = ${$calc.'VAR'}[$this->race][$modif[1]];
} else {
$outNomChamps[] = ${$calc.'VAR'}[$modif[1]];
}
$outValeurs[] = $this->{$modif[0]}[$modif[1]];
} elseif ($modif == "force") {
continue;
@ -773,6 +777,11 @@ class Planete extends Surface
}
foreach ($this->{$modif} as $j => $value) {
if ($calc == "terrestre") {
$outNomChamps[] = ${$calc.'VAR'}[$this->race][$j];
} else {
$outNomChamps[] = ${$calc.'VAR'}[$j];
}
$outNomChamps[] = ${$calc.'VAR'}[$j];
$outValeurs[] = $value;
}
@ -799,7 +808,11 @@ class Planete extends Surface
trigger_error('Impossible de trouver les données pour '.$modif[0], E_USER_ERROR);
}
$out[] = ${$calc.'VAR'}[$modif[1]]." = ".$this->{$modif[0]}[$modif[1]];
if ($calc == "terrestre") {
$out[] = ${$calc.'VAR'}[$this->race][$modif[1]]." = ".$this->{$modif[0]}[$modif[1]];
} else {
$out[] = ${$calc.'VAR'}[$modif[1]]." = ".$this->{$modif[0]}[$modif[1]];
}
} elseif ($modif == "force") {
$out[] = "timestamp = timestamp";
} elseif (!is_array($this->{$modif}) && !is_object($this->{$modif})) {
@ -822,7 +835,11 @@ class Planete extends Surface
}
foreach ($this->{$modif} as $j => $value) {
$out[] = ${$calc.'VAR'}[$j]." = ".$value;
if ($calc == "terrestre") {
$out[] = ${$calc.'VAR'}[$this->race][$j]." = ".$value;
} else {
$out[] = ${$calc.'VAR'}[$j]." = ".$value;
}
}
}
}