diff --git a/onyx2/include/Class/planete.php b/onyx2/include/Class/planete.php index 23263a4..af8dc25 100644 --- a/onyx2/include/Class/planete.php +++ b/onyx2/include/Class/planete.php @@ -743,7 +743,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; @@ -769,6 +773,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; } @@ -795,7 +804,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})) { @@ -818,7 +831,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; + } } } }