Merge pull request #124 from hikawiier/waaagh

fix

gamedata/cache/style_20190718.css

@@ -407,6 +407,7 @@ span[tooltip] {
 }
 span[tooltip]:hover:before {
     content: attr(tooltip);
+	display: inline-block;
 	font: 8pt "微软雅黑" serif; color: rgba(225, 124, 226, 1);
 	padding: 7px; text-align: left; white-space:pre-line;
 	text-shadow:1px 1px 1px rgb(106, 0, 108); text-fill-color: rgb(245, 174, 246); -webkit-text-fill-color: rgb(245, 174, 246);
@@ -418,6 +419,7 @@ span[tooltip]:hover:before {
 }
 span[tooltip2]:hover:before {
     content: attr(tooltip2);
+	display: inline-block;
 	font: 8pt "微软雅黑" serif; color: rgba(225, 124, 226, 1);
 	padding: 7px; text-align: left; white-space:pre-line;
 	text-shadow:1px 1px 1px rgb(106, 0, 108); text-fill-color: rgb(245, 174, 246); -webkit-text-fill-color: rgb(245, 174, 246);

include/game/battle.func.php

@@ -177,7 +177,7 @@ function findcorpse(&$w_pdata){
 
 function senditem(){
 	//global $db,$tablepre,$log,$mode,$main,$command,$cmd,$battle_title,$pls,$plsinfo,$message,$now,$name,$w_log,$teamID,$gamestate,$action;
-	global $db,$tablepre,$log,$mode,$main,$command,$cmd,$battle_title,$plsinfo,$hplsinfo,$now,$gamestate;
+	global $db,$tablepre,$log,$mode,$main,$command,$cmd,$battle_title,$message,$plsinfo,$hplsinfo,$now,$gamestate;
 	if(!isset($data))
 	{
 		global $pdata;

include/global.func.php

@@ -258,8 +258,16 @@ function save_gameinfo()
 	global $now,$db,$gtablepre,$tablepre;
 	global $groomid,$gamenum,$gamestate,$lastupdate,$starttime,$winmode,$winner,$arealist,$areanum,$areatime,$areawarn,$validnum,$alivenum,$deathnum,$afktime,$optime,$weather,$hack,$combonum,$gamevars;
 	if(!isset($gamenum)||!isset($gamestate)){return;}
-	if($alivenum < 0){$alivenum = 0;}
-	if($deathnum < 0){$deathnum = 0;}
+	
+	$result = $db->query("SELECT pid FROM {$tablepre}players WHERE type=0");
+	$validnum = $db->num_rows($result);
+	
+	$result = $db->query("SELECT pid FROM {$tablepre}players WHERE hp>0 AND type=0");
+	$alivenum = $db->num_rows($result);
+	
+	$result = $db->query("SELECT pid FROM {$tablepre}players WHERE hp<=0 OR state>=10");
+	$deathnum = $db->num_rows($result);
+	
 	if(empty($afktime)){$afktime = $now;}
 	if(empty($optime)){$optime = $now;}
 	$gameinfo = Array();