Merge remote-tracking branch 'origin/dev' into dev-lopar

# Conflicts:
#	online.php
This commit is contained in:
2023-01-28 04:41:36 +02:00
31 changed files with 1228 additions and 335 deletions
+3 -4
View File
@@ -1,13 +1,12 @@
<?
if(!defined('GAME'))
{
die();
}
require_once('/home/newcom1/public_html/_incl_data/__config.php');
require_once('/home/newcom1/public_html/_incl_data/class/__db_connect.php');
if($u->room['file']=='cp1')
{
if($u->room['file']=='cp1') {
if(date("H")>=8 && date("H")<=23) {
$now = 'day';
$tattack = '<a style="color:#D8D8D8" style="cursor:pointer" onclick="top.useMagic(\'Нападение на персонажа\',\'night_atack\',\'pal_button8.gif\',1,\'main.php?nightatack=1\');">Напасть на игрока</a> &nbsp; ';