xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-09-17 23:57:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve diplomacy

Browse Source
This commit is contained in:
unknown
2012-04-16 14:42:20 +03:00
parent 78f22d0c1f
commit e8353d1645
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GameEngine/Alliance.php
+8
View File
@@ -348,6 +348,14 @@
if($aType >= 1 and $aType <= 3) { if($aType >= 1 and $aType <= 3) {
if(!$database->diplomacyInviteCheck($database->getAllianceID($aName), $session->alliance)) { if(!$database->diplomacyInviteCheck($database->getAllianceID($aName), $session->alliance)) {
$database->diplomacyInviteAdd($session->alliance, $database->getAllianceID($aName), $aType); $database->diplomacyInviteAdd($session->alliance, $database->getAllianceID($aName), $aType);
if($aType == 1){
$notice = "offer a confederation to";
}else if($aType == 2){
$notice = "offer non-aggression pact to";
}else if($aType == 3){
$notice = "declare war on";
}
$database->insertAlliNotice($session->alliance, '<a href="allianz.php?aid=' . $session->alliance . '">' . $database->getAllianceName($session->alliance) . '</a> '. $notice .' <a href="allianz.php?aid=' . $database->getAllianceID($aName) . '">' . $aName . '</a>.');
$form->addError("name", "Invite sended"); $form->addError("name", "Invite sended");
} else { } else {
$form->addError("name", "You have already sended them a invite"); $form->addError("name", "You have already sended them a invite");
GameEngine/Database/db_MYSQL.php
+1 -1
View File
@@ -1216,7 +1216,7 @@
} }
function diplomacyCancelExistingRelationship($id, $session_alliance) { function diplomacyCancelExistingRelationship($id, $session_alliance) {
$q = "DELETE FROM " . TB_PREFIX . "diplomacy WHERE id = $id AND alli2 = $session_alliance"; $q = "DELETE FROM " . TB_PREFIX . "diplomacy WHERE id = $id AND alli2 = $session_alliance OR id = $id AND alli1 = $session_alliance";
return mysql_query($q, $this->connection); return mysql_query($q, $this->connection);
} }