Browse Source

* Removed unused 'indoors' mapflag (follow-up to r3729).

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@14434 54d463be-8e91-2dee-dedb-b68131a5f0ec
Gepard 14 năm trước cách đây
mục cha
commit
123a803ccb

+ 2 - 0
Changelog-Trunk.txt

@@ -1,5 +1,7 @@
 Date	Added
 
+2010/10/21
+	* Removed unused 'indoors' mapflag. [Gepard]
 2010/10/17
 	* Fixed wrong char info packet size for clients after 2010-07-27. (bugreport:4413) [Gepard]
 2010/10/13

+ 0 - 119
conf/mapflag/indoors.txt

@@ -1,119 +0,0 @@
-//===== eAthena Script =======================================
-//= Map Flags for Indoors Buildings or Dungeons
-//===== By: ==================================================
-//= eAthena Dev Team
-//===== Current Version: =====================================
-//= 1.3a [Lupus]
-//===== Compatible With: =====================================
-//=
-//===== Description: =========================================
-//= 'indoors' turns off all night effects.
-//============================================================
-
-alberta_in	mapflag	indoors
-ama_test	mapflag	indoors
-izlude_in	mapflag	indoors
-gef_tower	mapflag	indoors
-geffen_in	mapflag	indoors
-moc_castle	mapflag	indoors
-morocc_in	mapflag	indoors
-mosk_in	mapflag	indoors
-payon_in01	mapflag	indoors
-payon_in02	mapflag	indoors
-payon_in03	mapflag	indoors
-prt_in	mapflag	indoors
-prt_castle	mapflag	indoors
-prt_church	mapflag	indoors
-in_orcs01	mapflag	indoors
-aldeba_in	mapflag	indoors
-monk_in	mapflag	indoors
-nameless_in	mapflag	indoors
-prt_are_in	mapflag	indoors
-arena_room	mapflag	indoors
-job_sword1	mapflag	indoors
-xmas_in	mapflag	indoors
-cmd_in01	mapflag	indoors
-cmd_in02	mapflag	indoors
-yuno_in01	mapflag	indoors
-yuno_in02	mapflag	indoors
-yuno_in03	mapflag	indoors
-yuno_in04	mapflag	indoors
-yuno_in05	mapflag	indoors
-alde_alche	mapflag	indoors
-sec_in01	mapflag	indoors
-ama_in01	mapflag	indoors
-ama_in02	mapflag	indoors
-gon_in	mapflag	indoors
-um_in	mapflag	indoors
-nif_in	mapflag	indoors
-lou_in01	mapflag	indoors
-lou_in02	mapflag	indoors
-jawaii_in	mapflag	indoors
-que_god01	mapflag	indoors
-que_god02	mapflag	indoors
-ayo_in01	mapflag	indoors
-ayo_in02	mapflag	indoors
-que_sign01	mapflag	indoors
-ein_in01	mapflag	indoors
-airport	mapflag	indoors
-airplane	mapflag	indoors
-airplane_01	mapflag	indoors
-y_airport	mapflag	indoors
-lhz_airport	mapflag	indoors
-lhz_in01	mapflag	indoors
-lhz_in02	mapflag	indoors
-lhz_in03	mapflag	indoors
-lhz_cube	mapflag	indoors
-hu_in01	mapflag	indoors
-auction_01	mapflag	indoors
-auction_02	mapflag	indoors
-ra_in01	mapflag	indoors
-ra_temin	mapflag	indoors
-que_rachel	mapflag	indoors
-yuno_pre	mapflag	indoors
-lhz_que01	mapflag	indoors
-que_job01	mapflag	indoors
-thana_step	mapflag	indoors
-kh_mansion	mapflag	indoors
-kh_rossi	mapflag	indoors
-kh_school	mapflag	indoors
-kh_vila	mapflag	indoors
-que_bingo	mapflag	indoors
-que_ng	mapflag	indoors
-ve_in	mapflag	indoors
-ve_in02	mapflag	indoors
-
-//Episdoe 12 =====================
-nameless_in	mapflag	indoors
-abbey01	mapflag	indoors
-abbey02	mapflag	indoors
-abbey03	mapflag	indoors
-que_san04	mapflag	indoors
-mosk_in	mapflag	indoors
-z_agit	mapflag	indoors
-cave	mapflag	indoors
-que_ba	mapflag	indoors
-que_moc_16	mapflag	indoors
-que_moon	mapflag	indoors
-bat_room	mapflag	indoors
-
-//Sealed Shrine ==================
-1@cata	mapflag	indoors
-2@cata	mapflag	indoors
-
-//Endless Tower ==================
-1@tower	mapflag	indoors
-2@tower	mapflag	indoors
-3@tower	mapflag	indoors
-4@tower	mapflag	indoors
-5@tower	mapflag	indoors
-6@tower	mapflag	indoors
-
-//Episode 13 =====================
-mid_campin	mapflag	indoors
-schg_dun01	mapflag	indoors
-arug_dun01	mapflag	indoors
-man_in01	mapflag	indoors
-spl_in01	mapflag	indoors
-spl_in02	mapflag	indoors
-

+ 0 - 1
db/const.txt

@@ -199,7 +199,6 @@ mf_fog		17
 mf_sakura	18
 mf_leaves	19
 mf_rain		20
-mf_indoors	21
 mf_nogo		22
 mf_clouds	23
 mf_clouds2	24

+ 1 - 1
doc/script_commands.txt

@@ -5674,7 +5674,7 @@ mf_noteleport, mf_nowarp, mf_nogo), storing location when disconnected
 mf_pvp_noguild), WoE behavior (mf_gvg,mf_gvg_noparty), ability to use 
 skills or open up trade deals (mf_notrade, mf_novending, mf_noskill, mf_noicewall),
 current weather effects (mf_snow, mf_fog, mf_sakura, mf_leaves, mf_rain, mf_clouds, 
-mf_fireworks) and whether day/night will be in effect on this map (mf_indoors).
+mf_fireworks) and whether night will be in effect on this map (mf_nightenabled).
 
 ---------------------------------------
 

+ 0 - 1
npc/scripts_mapflags.conf

@@ -3,7 +3,6 @@
 // --------------------------------------------------------------
 npc: conf/mapflag/nopvp.txt
 npc: conf/mapflag/gvg.txt
-npc: conf/mapflag/indoors.txt
 npc: conf/mapflag/jail.txt
 npc: conf/mapflag/nightmare.txt
 npc: conf/mapflag/nobranch.txt

+ 0 - 2
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);

+ 0 - 1
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]

+ 0 - 2
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"))

+ 2 - 5
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;