diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-18 16:01:26 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-04-18 16:01:26 +0000 |
| commit | 2449d2a6e7ddd1648d2e1fe446c97fe94378af28 (patch) | |
| tree | ce6f82d036029d2954764b2fc7119f538e0347fa /src/map/atcommand.c | |
| parent | bb0bd9d290f6dd1f3a455da7d4cd4ae58e8e49a2 (diff) | |
| download | hercules-2449d2a6e7ddd1648d2e1fe446c97fe94378af28.tar.gz hercules-2449d2a6e7ddd1648d2e1fe446c97fe94378af28.tar.bz2 hercules-2449d2a6e7ddd1648d2e1fe446c97fe94378af28.tar.xz hercules-2449d2a6e7ddd1648d2e1fe446c97fe94378af28.zip | |
- Removed message 592 from trade.c
- Removed mapflag nopvp
- Added support for disabling mapflags on a mapflag line:
comodo.gat mapflag nomemo <- turns on nomemo mapflag
comodo.gat mapflag nomemo off <- turns off nomemo mapflag
- Cleaned up and optimized the restricted/zones mapflag. Restricted cards will just not work in disallowed maps rather than blocking the compounded equipement from being used.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@6159 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/atcommand.c')
| -rw-r--r-- | src/map/atcommand.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index d6a7e12ef..d6389639f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -2971,7 +2971,7 @@ int atcommand_pvpon( return -1;
}
- if (!map[sd->bl.m].flag.pvp && !map[sd->bl.m].flag.nopvp) {
+ if (!map[sd->bl.m].flag.pvp) {
map[sd->bl.m].flag.pvp = 1;
clif_send0199(sd->bl.m, 1);
pl_allsd = map_getallusers(&users);
@@ -5626,8 +5626,6 @@ int atcommand_mapinfo( strcpy(atcmd_output,"PvP Flags: ");
if (map[m_id].flag.pvp)
strcat(atcmd_output, "Pvp ON | ");
- if (map[m_id].flag.nopvp)
- strcat(atcmd_output, "NoPvp | ");
if (map[m_id].flag.pvp_noguild)
strcat(atcmd_output, "NoGuild | ");
if (map[m_id].flag.pvp_noparty)
|