diff --git a/hwe/b_currentCity.php b/hwe/b_currentCity.php index ac580bd2..66318672 100644 --- a/hwe/b_currentCity.php +++ b/hwe/b_currentCity.php @@ -289,7 +289,7 @@ for($j=0; $j < $gencount; $j++) { if($ourGeneral && !$isNPC){ $turnText = []; $generalObj = new General($general, null, null, null, false); - $turnBrief = getGeneralTurnBrief($genralObj, $generalTurnList[$generalObj->getID()]); + $turnBrief = getGeneralTurnBrief($generalObj, $generalTurnList[$generalObj->getID()]); foreach($turnBrief as $turnRawIdx=>$turn){ $turnIdx = $turnRawIdx+1; $turnText[] = "{$turnIdx} : $turn"; diff --git a/hwe/sammo/General.php b/hwe/sammo/General.php index e24fedf0..abe5a994 100644 --- a/hwe/sammo/General.php +++ b/hwe/sammo/General.php @@ -174,7 +174,7 @@ class General implements iAction{ return getNationStaticInfo($this->raw['nation']); } - function getLogger():ActionLogger{ + function getLogger():?ActionLogger{ return $this->logger; }