fixes #15
This commit is contained in:
+9
-4
@@ -1,4 +1,9 @@
|
||||
<?php
|
||||
|
||||
use Battles\DressedItems;
|
||||
use Battles\Template;
|
||||
use Battles\User;
|
||||
|
||||
if (isset($_POST['end'])) {
|
||||
header("Location: main.php");
|
||||
exit;
|
||||
@@ -15,7 +20,7 @@ if (isset($user['id'])) {
|
||||
include('./classes/battle_new.class.php');
|
||||
|
||||
$fbattle = new fbattle($user['battle']);
|
||||
\Battles\Template::header('fbattle');
|
||||
Template::header('fbattle');
|
||||
?>
|
||||
<script type="text/javascript" src="js/sl2.js"></script>
|
||||
<script type="text/javascript" src="js/ch.js"></script>
|
||||
@@ -133,7 +138,7 @@ $fbattle = new fbattle($user['battle']);
|
||||
<tr>
|
||||
<td valign=top width=250 nowrap>
|
||||
<?php
|
||||
$myinfo = new \Battles\User($_SESSION['uid']);
|
||||
$myinfo = new User($_SESSION['uid']);
|
||||
$myinfo->showUserDoll(1);
|
||||
?>
|
||||
</td>
|
||||
@@ -290,7 +295,7 @@ $fbattle = new fbattle($user['battle']);
|
||||
if (($user['hp'] > 0) && $fbattle->battle) {
|
||||
echo '<center><FONT COLOR=red><b>Ожидаем хода противника...</b></FONT><BR><INPUT TYPE=submit value="Обновить" name=' . (($user['battle'] > 0) ? "battle" : "end") . '><BR></CENTER>';
|
||||
} elseif ($user['hp'] <= 0 && $fbattle->battle) {
|
||||
ref_drop();
|
||||
(new DressedItems(User::getInstance()->getId()))->checkRequirements();
|
||||
echo '<center><FONT COLOR=red><b>Ожидаем, пока бой закончат другие игроки...</b></FONT><BR><INPUT TYPE=submit value="Обновить" name=' . (($user['battle'] > 0) ? "battle" : "end") . '><BR></CENTER>';
|
||||
}
|
||||
break;
|
||||
@@ -468,7 +473,7 @@ $fbattle = new fbattle($user['battle']);
|
||||
<?php
|
||||
|
||||
if ($fbattle->return == 1) {
|
||||
$enemyInfo = new \Battles\User($fbattle->enemy);
|
||||
$enemyInfo = new User($fbattle->enemy);
|
||||
$enemyInfo->showUserDoll(1);
|
||||
} else {
|
||||
if ($fbattle->battle_data['type'] == 4 || $fbattle->battle_data['type'] == 5) {
|
||||
|
||||
Reference in New Issue
Block a user