summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-27 19:47:26 +0000
committersketchyphoenix <sketchyphoenix@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-08-27 19:47:26 +0000
commitad214f567b533091a9867e4c4f592c17da4b09c8 (patch)
treec48542a9a11694fc58c20952b947e5a368644b2b
parent89f86c8022179b82af00eb8fe0e53c164bc74b3a (diff)
downloadhercules-ad214f567b533091a9867e4c4f592c17da4b09c8.tar.gz
hercules-ad214f567b533091a9867e4c4f592c17da4b09c8.tar.bz2
hercules-ad214f567b533091a9867e4c4f592c17da4b09c8.tar.xz
hercules-ad214f567b533091a9867e4c4f592c17da4b09c8.zip
* pc_isGM() checks in gm_cant_party config checks will now check against being lower or higher than lowest_gm_level config.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13143 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt1
-rw-r--r--src/map/party.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index 997d27f93..99ca3256c 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -5,6 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2008/08/26
* Fixed @agjgmlvl bug preventing its use on other players. (bugreport:2124) [SketchyPhoenix]
+ * pc_isGM() checks in gm_cant_party config checks will now check against being lower or higher than lowest_gm_level config.
2008/08/25
* Fixed homun sp regen bug introduced on r12953 bugreport:2071 [Brain]
* Fixed: several compiler warnings [akrus]
diff --git a/src/map/party.c b/src/map/party.c
index 8053aec76..b56d5e500 100644
--- a/src/map/party.c
+++ b/src/map/party.c
@@ -292,8 +292,8 @@ int party_invite(struct map_session_data *sd,struct map_session_data *tsd)
return 0;
}
- if ( (pc_isGM(sd) && !pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_min_lv)
- || ( !pc_isGM(sd) && pc_isGM(tsd) && !battle_config.gm_can_party && pc_isGM(tsd) < battle_config.gm_cant_party_min_lv) )
+ if ( (pc_isGM(sd) > battle_config.lowest_gm_level && pc_isGM(tsd) < battle_config.lowest_gm_level && !battle_config.gm_can_party && pc_isGM(sd) < battle_config.gm_cant_party_min_lv)
+ || ( pc_isGM(sd) < battle_config.lowest_gm_level && pc_isGM(tsd) > battle_config.lowest_gm_level && !battle_config.gm_can_party && pc_isGM(tsd) < battle_config.gm_cant_party_min_lv) )
{
//GMs can't invite non GMs to the party if not above the invite trust level
//Likewise, as long as gm_can_party is off, players can't invite GMs.