mirror of
https://github.com/slawkens/myaac.git
synced 2025-04-26 09:19:22 +02:00
* fixes to the latest commit (removed some files)
* otserv 0.6.3: fixed some warning (on the characters page) and fatal mysql error (on the mango signature)
This commit is contained in:
parent
1e3aef211e
commit
67590e13a6
@ -231,7 +231,7 @@ if($player->isLoaded() && !$player->isDeleted())
|
||||
$dead_add_content = '';
|
||||
$deaths = array();
|
||||
if(tableExist('killers')) {
|
||||
$player_deaths = $db->query('SELECT `id`, `date`, `level` FROM `player_deaths` WHERE `player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,10;');
|
||||
$player_deaths = $db->query('SELECT `id`, `date`, `level` FROM `player_deaths` WHERE `player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,10;')->fetchAll();
|
||||
if(count($player_deaths))
|
||||
{
|
||||
$number_of_rows = 0;
|
||||
@ -289,7 +289,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
|
||||
$deaths_db = $db->query('SELECT
|
||||
`player_id`, `time`, `level`, `killed_by`, `is_player`' . $mostdamage . '
|
||||
FROM `player_deaths`
|
||||
WHERE `player_id` = ' . $player->getId() . ' ORDER BY `time` DESC LIMIT 10;');
|
||||
WHERE `player_id` = ' . $player->getId() . ' ORDER BY `time` DESC LIMIT 10;')->fetchAll();
|
||||
|
||||
if(count($deaths_db))
|
||||
{
|
||||
@ -328,7 +328,7 @@ WHERE killers.death_id = '".$death['id']."' ORDER BY killers.final_hit DESC, kil
|
||||
//frags list by Xampy
|
||||
$i = 0;
|
||||
$frags_limit = 10; // frags limit to show? // default: 10
|
||||
$player_frags = $db->query('SELECT `player_deaths`.*, `players`.`name`, `killers`.`unjustified` FROM `player_deaths` LEFT JOIN `killers` ON `killers`.`death_id` = `player_deaths`.`id` LEFT JOIN `player_killers` ON `player_killers`.`kill_id` = `killers`.`id` LEFT JOIN `players` ON `players`.`id` = `player_deaths`.`player_id` WHERE `player_killers`.`player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,'.$frags_limit.';');
|
||||
$player_frags = $db->query('SELECT `player_deaths`.*, `players`.`name`, `killers`.`unjustified` FROM `player_deaths` LEFT JOIN `killers` ON `killers`.`death_id` = `player_deaths`.`id` LEFT JOIN `player_killers` ON `player_killers`.`kill_id` = `killers`.`id` LEFT JOIN `players` ON `players`.`id` = `player_deaths`.`player_id` WHERE `player_killers`.`player_id` = '.$player->getId().' ORDER BY `date` DESC LIMIT 0,'.$frags_limit.';')->fetchAll();
|
||||
if(count($player_frags))
|
||||
{
|
||||
$row_count = 0;
|
||||
|
@ -3,7 +3,7 @@
|
||||
|
||||
body
|
||||
{
|
||||
background: #a7a597 url('images/background.png') no-repeat top left;
|
||||
background: #a7a597 url('images/background.jpg') no-repeat top left;
|
||||
margin: 0px;
|
||||
padding: 0px;
|
||||
font-family: Verdana, Arial, Helvetica, sans-serif;
|
||||
|
@ -10,7 +10,7 @@ $config['boxes'] = "highscores,newcomer,gallery,networks,poll";
|
||||
$config['network_facebook'] = 'tibia'; // leave empty to disable
|
||||
$config['network_twitter'] = 'tibia'; // leave empty to disable
|
||||
|
||||
$config['background_image'] = "background-artwork-860.jpg";
|
||||
$config['background_image'] = "background-artwork.jpg";
|
||||
$config['logo_image'] = "tibia-logo-artwork-top.gif";
|
||||
$config['gallery_image'] = 1;
|
||||
$config['menu_categories'] = array(
|
||||
|
@ -31,7 +31,7 @@
|
||||
$MadGD = new MadGD( SIGNATURES_BACKGROUNDS.$background );
|
||||
$MadGD->testMode = false;
|
||||
|
||||
$MadGD->setDefaultStyle( SIGNATURES_FONTS.'arial.ttf', SIGNATURES_FONTS.'arialbd.ttf', 8 );
|
||||
$MadGD->setDefaultStyle( SIGNATURES_FONTS.'arialbd.ttf', SIGNATURES_FONTS.'arialbd.ttf', 8 );
|
||||
$MadGD->setEquipmentBackground( SIGNATURES_IMAGES.'equipments.png' );
|
||||
|
||||
/** NAME **/
|
||||
@ -67,6 +67,8 @@
|
||||
$town = 'town';
|
||||
if(fieldExist('town_id', 'houses'))
|
||||
$town = 'town_id';
|
||||
else if($db->hasColumn('houses', 'townid'))
|
||||
$town = 'townid';
|
||||
|
||||
$house = $db->query( 'SELECT `houses`.`name`, `houses`.`' . $town . '` as town FROM `houses` WHERE `houses`.`owner` = '.$player->getId().';' )->fetchAll();
|
||||
if ( count( $house ) != 0 )
|
||||
|
Loading…
x
Reference in New Issue
Block a user