diff options
| author | Gepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-21 00:38:57 +0000 |
|---|---|---|
| committer | Gepard <Gepard@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2010-10-21 00:38:57 +0000 |
| commit | 55b7526fef129aa129b1451fa2f55c76f3de3df6 (patch) | |
| tree | 5570c49a5422e987479560c92ef710eea9cee41b /src/map | |
| parent | 0d0eec49317fff199cfb67b4d4f202d824cf68e6 (diff) | |
| download | hercules-55b7526fef129aa129b1451fa2f55c76f3de3df6.tar.gz hercules-55b7526fef129aa129b1451fa2f55c76f3de3df6.tar.bz2 hercules-55b7526fef129aa129b1451fa2f55c76f3de3df6.tar.xz hercules-55b7526fef129aa129b1451fa2f55c76f3de3df6.zip | |
* Removed unused 'indoors' mapflag (follow-up to r3729).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14434 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/atcommand.c | 2 | ||||
| -rw-r--r-- | src/map/map.h | 1 | ||||
| -rw-r--r-- | src/map/npc.c | 2 | ||||
| -rw-r--r-- | src/map/script.c | 7 |
4 files changed, 2 insertions, 10 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index eccce4eb1..bed466f48 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -4366,8 +4366,6 @@ int atcommand_mapinfo(const int fd, struct map_session_data* sd, const char* com strcat(atcmd_output, "Leaves | "); if (map[m_id].flag.rain) strcat(atcmd_output, "Rain | "); - if (map[m_id].flag.indoors) - strcat(atcmd_output, "Indoors | "); if (map[m_id].flag.nightenabled) strcat(atcmd_output, "Displays Night | "); clif_displaymessage(fd, atcmd_output); diff --git a/src/map/map.h b/src/map/map.h index f5da4a437..199db618d 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -453,7 +453,6 @@ struct map_data { unsigned sakura : 1; // [Valaris] unsigned leaves : 1; // [Valaris] unsigned rain : 1; // [Valaris] - unsigned indoors : 1; // celest unsigned nogo : 1; // [Valaris] unsigned nobaseexp : 1; // [Lorky] added by Lupus unsigned nojobexp : 1; // [Lorky] diff --git a/src/map/npc.c b/src/map/npc.c index 425967da7..8eb1c1ba7 100644 --- a/src/map/npc.c +++ b/src/map/npc.c @@ -2977,8 +2977,6 @@ static const char* npc_parse_mapflag(char* w1, char* w2, char* w3, char* w4, con map[m].flag.leaves=state; else if (!strcmpi(w3,"rain")) map[m].flag.rain=state; - else if (!strcmpi(w3,"indoors")) - map[m].flag.indoors=state; else if (!strcmpi(w3,"nightenabled")) map[m].flag.nightenabled=state; else if (!strcmpi(w3,"nogo")) diff --git a/src/map/script.c b/src/map/script.c index b37c31c1e..ac7ac9163 100644 --- a/src/map/script.c +++ b/src/map/script.c @@ -312,8 +312,8 @@ enum { MF_SAKURA, MF_LEAVES, MF_RAIN, //20 - MF_INDOORS, - MF_NOGO, + // 21 free + MF_NOGO = 22, MF_CLOUDS, MF_CLOUDS2, MF_FIREWORKS, @@ -9161,7 +9161,6 @@ BUILDIN_FUNC(getmapflag) case MF_SAKURA: script_pushint(st,map[m].flag.sakura); break; case MF_LEAVES: script_pushint(st,map[m].flag.leaves); break; case MF_RAIN: script_pushint(st,map[m].flag.rain); break; - case MF_INDOORS: script_pushint(st,map[m].flag.indoors); break; case MF_NIGHTENABLED: script_pushint(st,map[m].flag.nightenabled); break; case MF_NOGO: script_pushint(st,map[m].flag.nogo); break; case MF_NOBASEEXP: script_pushint(st,map[m].flag.nobaseexp); break; @@ -9231,7 +9230,6 @@ BUILDIN_FUNC(setmapflag) case MF_SAKURA: map[m].flag.sakura=1; break; case MF_LEAVES: map[m].flag.leaves=1; break; case MF_RAIN: map[m].flag.rain=1; break; - case MF_INDOORS: map[m].flag.indoors=1; break; case MF_NIGHTENABLED: map[m].flag.nightenabled=1; break; case MF_NOGO: map[m].flag.nogo=1; break; case MF_NOBASEEXP: map[m].flag.nobaseexp=1; break; @@ -9298,7 +9296,6 @@ BUILDIN_FUNC(removemapflag) case MF_SAKURA: map[m].flag.sakura=0; break; case MF_LEAVES: map[m].flag.leaves=0; break; case MF_RAIN: map[m].flag.rain=0; break; - case MF_INDOORS: map[m].flag.indoors=0; break; case MF_NIGHTENABLED: map[m].flag.nightenabled=0; break; case MF_NOGO: map[m].flag.nogo=0; break; case MF_NOBASEEXP: map[m].flag.nobaseexp=0; break; |