diff --git a/GameEngine/Alliance.php b/GameEngine/Alliance.php index 46021a5d..664268e3 100644 --- a/GameEngine/Alliance.php +++ b/GameEngine/Alliance.php @@ -348,6 +348,14 @@ if($aType >= 1 and $aType <= 3) { if(!$database->diplomacyInviteCheck($database->getAllianceID($aName), $session->alliance)) { $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, '' . $database->getAllianceName($session->alliance) . ' '. $notice .' ' . $aName . '.'); $form->addError("name", "Invite sended"); } else { $form->addError("name", "You have already sended them a invite"); diff --git a/GameEngine/Database/db_MYSQL.php b/GameEngine/Database/db_MYSQL.php index d425c2ce..4f7c460f 100644 --- a/GameEngine/Database/db_MYSQL.php +++ b/GameEngine/Database/db_MYSQL.php @@ -1216,7 +1216,7 @@ } 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); }