Merge branch '0.9' into develop

This commit is contained in:
slawkens 2023-08-05 20:52:26 +02:00
commit c802d427eb
3 changed files with 27 additions and 4 deletions

View File

@ -9,7 +9,30 @@
*/
defined('MYAAC') or die('Direct access not allowed!');
class Player extends OTS_Player {}
class Guild extends OTS_Guild {}
class Account extends OTS_Account {
public function loadById($id) {
$this->load($id);
}
public function loadByName($name) {
$this->find($name);
}
}
class Player extends OTS_Player {
public function loadById($id) {
$this->load($id);
}
public function loadByName($name) {
$this->find($name);
}
}
class Guild extends OTS_Guild {
public function loadById($id) {
$this->load($id);
}
public function loadByName($name) {
$this->find($name);
}
}
class GuildRank extends OTS_GuildRank {}
class House extends OTS_House {}

View File

@ -123,7 +123,7 @@ class OTS_ServerInfo
{
// loads respond XML
$info = new OTS_InfoRespond();
if(!$info->loadXML( utf8_encode($status->getBuffer())))
if(!$info->loadXML( $status->getBuffer()))
return false;
return $info;

View File

@ -14,7 +14,7 @@ imagecolortransparent($image, imagecolorallocate($image, 0, 0, 0));
// set text
$font = getenv('GDFONTPATH') . DIRECTORY_SEPARATOR . 'martel.ttf';
imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, utf8_decode($text));
imagettftext($image, 18, 0, 4, 20, imagecolorallocate($image, 240, 209, 164), $font, $text);
// header mime type
header('Content-type: image/gif');