xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-11 23:26:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/evader1337/TravianZ into evader1337-master

Browse Source 
# Conflicts:
#	GameEngine/Database/db_MYSQL.php
#	Templates/Build/avaliable.tpl
#	Templates/Message/inbox.tpl
This commit is contained in:
Martin Ambrus
2017-08-28 14:18:24 +02:00
parent 1a4005cd67 cdfee7780b
commit 9261a4a4b2
93 changed files with 5041 additions and 9207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.php
+3 -3
View File
@@ -237,16 +237,16 @@ $now=time();
if(($now-$oldmovement[0]['starttime'])<90 && $oldmovement[0]['from'] == $village->wid){
$qc="SELECT * FROM " . TB_PREFIX . "movement where proc = 0 and moveid = ".$_GET['moveid'];
$resultc=$database->query($qc) or die(mysql_error());
$resultc=$database->query($qc) or die(mysqli_error());
if (mysql_num_rows($resultc)==1){
if (mysqli_num_rows($resultc)==1){
$q = "UPDATE " . TB_PREFIX . "movement set proc = 1 where proc = 0 and moveid = ".$_GET['moveid'];
$database->query($q);
$end=$now+($now-$oldmovement[0]['starttime']);
//echo "6,".$oldmovement[0]['to'].",".$oldmovement[0]['from'].",0,".$now.",".$end;
$q2 = "SELECT id FROM " . TB_PREFIX . "send ORDER BY id DESC";
$lastid=mysql_fetch_array(mysql_query($q2));
$lastid=mysqli_fetch_array(mysqli_query($GLOBALS['link'],$q2));
$newid=$lastid['id']+1;
$q2 = "INSERT INTO " . TB_PREFIX . "send values ($newid,0,0,0,0,0)";
$database->query($q2);