summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-01 08:14:47 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-06-01 08:14:47 +0000
commit6b1e40e08d0d42abad80cc8bad1b848091bf0b30 (patch)
tree73066f776fe1da7ffd7d967fed365e342f54c763
parent243405af6a72368e732566b2d9f50b7d5214251c (diff)
downloadhercules-6b1e40e08d0d42abad80cc8bad1b848091bf0b30.tar.gz
hercules-6b1e40e08d0d42abad80cc8bad1b848091bf0b30.tar.bz2
hercules-6b1e40e08d0d42abad80cc8bad1b848091bf0b30.tar.xz
hercules-6b1e40e08d0d42abad80cc8bad1b848091bf0b30.zip
Added Ai4rei's "gm can view all players' equips" feature (topic:186519).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12751 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog-Trunk.txt2
-rw-r--r--conf/Changelog.txt2
-rw-r--r--conf/battle/gm.conf4
-rw-r--r--src/map/battle.c1
-rw-r--r--src/map/battle.h1
-rw-r--r--src/map/clif.c2
6 files changed, 11 insertions, 1 deletions
diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt
index e14c060bf..de7df7801 100644
--- a/Changelog-Trunk.txt
+++ b/Changelog-Trunk.txt
@@ -3,6 +3,8 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
+2008/06/01
+ * Added Ai4rei's "gm can view all players' equips" feature [ultramage]
2008/05/31
* Crashfix to attach/detach timers, thanks to Konard (fixed recent crashes) [Lupus]
2008/05/28
diff --git a/conf/Changelog.txt b/conf/Changelog.txt
index 7f3c4d577..cad9455ef 100644
--- a/conf/Changelog.txt
+++ b/conf/Changelog.txt
@@ -1,5 +1,7 @@
Date Added
+2008/06/01
+ * Added gm_viewequip_min_lv to gm.conf [ultramage]
2008/05/28
* Rev. r12736 Added new maps related to episode 13.1. [L0ne_W0lf]
2008/04/28
diff --git a/conf/battle/gm.conf b/conf/battle/gm.conf
index 040a91ef7..1bfc4a372 100644
--- a/conf/battle/gm.conf
+++ b/conf/battle/gm.conf
@@ -87,6 +87,10 @@ gm_cant_drop_max_lv: 0
// no/0 can be used to disable it.
disp_hpmeter: 0
+// Minimum GM level to view players equip regardless of their setting.
+// (Default: 0 = Disabled).
+gm_viewequip_min_lv: 0
+
// Players Titles (check msg_athena.conf for title strings)
// You may assign different titles for your Players and GMs
title_lvl1: 1
diff --git a/src/map/battle.c b/src/map/battle.c
index cb6d95b2a..c767891a0 100644
--- a/src/map/battle.c
+++ b/src/map/battle.c
@@ -3698,6 +3698,7 @@ static const struct _battle_data {
{ "ksprotection", &battle_config.ksprotection, 5000, 0, INT_MAX, },
{ "auction_feeperhour", &battle_config.auction_feeperhour, 12000, 0, INT_MAX, },
{ "auction_maximumprice", &battle_config.auction_maximumprice, 500000000, 0, MAX_ZENY, },
+ { "gm_viewequip_min_lv", &battle_config.gm_viewequip_min_lv, 0, 0, 99, },
};
diff --git a/src/map/battle.h b/src/map/battle.h
index 4b272c85f..93ead772d 100644
--- a/src/map/battle.h
+++ b/src/map/battle.h
@@ -451,6 +451,7 @@ extern struct Battle_Config
int ksprotection;
int auction_feeperhour;
int auction_maximumprice;
+ int gm_viewequip_min_lv;
} battle_config;
void do_init_battle(void);
diff --git a/src/map/clif.c b/src/map/clif.c
index 5b9b3cfc1..5f807a86f 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -12158,7 +12158,7 @@ void clif_parse_ViewPlayerEquip(int fd, struct map_session_data* sd)
if (!tsd)
return;
- if( tsd->status.show_equip )
+ if( tsd->status.show_equip || (battle_config.gm_viewequip_min_lv && pc_isGM(sd) >= battle_config.gm_viewequip_min_lv) )
clif_viewequip_ack(sd, tsd);
else
clif_viewequip_fail(sd);