- Some cleanup of clif_parseloadendack, fixed guild-member list being sent on all map-changes.

- Removed the hardcoded removal of characters who spawn in a castle. All castle maps got the flag nosave now.


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5909 54d463be-8e91-2dee-dedb-b68131a5f0ec

Changelog-Trunk.txt

@@ -4,6 +4,10 @@ AS OF SVN REV. 5091, WE ARE NOW USING TRUNK.  ALL UNTESTED BUGFIXES/FEATURES GO
 IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
 
 2006/04/05
+	* Some cleanup of clif_parseloadendack, fixed guild-member list being sent
+	  on all map-changes. [Skotlex]
+	* Removed the hardcoded removal of characters who spawn in a castle. All
+	  castle maps got the flag nosave now. [Skotlex]
 	* Added support for the 2006/04/04a Sakexe packet version. [Zephiris]
 
 2006/04/04

conf-tmpl/mapflag/nosave.txt

@@ -2,7 +2,7 @@
 //= Map flags that disable auto saving
 //===== By: ==================================================
 //= eAthena Dev Team
-//= 1.3 [Lupus]
+//= 1.4 [Lupus]
 //===== Current Version: =====================================
 
 // Job Quests ====================
@@ -127,4 +127,30 @@ pvp_n_8-4.gat	mapflag	nosave	SavePoint
 pvp_n_8-5.gat	mapflag	nosave	SavePoint
 pvp_2vs2.gat	mapflag	nosave	SavePoint
 
-//gon_test.gat	mapflag	nosave	prontera.gat,150,180
+//gon_test.gat	mapflag	nosave	prontera.gat,150,180
+
+//WoE Castles =================================
+aldeg_cas01.gat	mapflag	nosave	SavePoint
+aldeg_cas02.gat	mapflag	nosave	SavePoint
+aldeg_cas03.gat	mapflag	nosave	SavePoint
+aldeg_cas04.gat	mapflag	nosave	SavePoint
+aldeg_cas05.gat	mapflag	nosave	SavePoint
+gefg_cas01.gat	mapflag	nosave	SavePoint
+gefg_cas02.gat	mapflag	nosave	SavePoint
+gefg_cas03.gat	mapflag	nosave	SavePoint
+gefg_cas04.gat	mapflag	nosave	SavePoint
+gefg_cas05.gat	mapflag	nosave	SavePoint
+payg_cas01.gat	mapflag	nosave	SavePoint
+payg_cas02.gat	mapflag	nosave	SavePoint
+payg_cas03.gat	mapflag	nosave	SavePoint
+payg_cas04.gat	mapflag	nosave	SavePoint
+payg_cas05.gat	mapflag	nosave	SavePoint
+prtg_cas01.gat	mapflag	nosave	SavePoint
+prtg_cas02.gat	mapflag	nosave	SavePoint
+prtg_cas03.gat	mapflag	nosave	SavePoint
+prtg_cas04.gat	mapflag	nosave	SavePoint
+prtg_cas05.gat	mapflag	nosave	SavePoint
+nguild_alde.gat	mapflag	nosave	SavePoint
+nguild_gef.gat	mapflag	nosave	SavePoint
+nguild_pay.gat	mapflag	nosave	SavePoint
+nguild_prt.gat	mapflag	nosave	SavePoint

src/map/clif.c

@@ -7928,9 +7928,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 	if(sd->status.party_id)
 	    clif_party_hp(sd);
 
-	//[LuzZza]
-	clif_guild_send_onlineinfo(sd);
-
 	// pvp
 	//if(sd->pvp_timer!=-1 && !battle_config.pk_mode) /PVP Client crash fix* Removed timer deletion
 	//	delete_timer(sd->pvp_timer,pc_calc_pvprank_timer);
@@ -7966,8 +7963,14 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 	if(sd->state.connect_new) {
 		sd->state.connect_new = 0;
 		//Delayed night effect on log-on fix for the glow-issue. Thanks to Larry.
-		if (night_flag && map[sd->bl.m].flag.nightenabled)
-			add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0);
+		if (night_flag) {
+			char tmpstr[1024];
+			strcpy(tmpstr, msg_txt(500)); // Actually, it's the night...
+			clif_wis_message(sd->fd, wisp_server_name, tmpstr, strlen(tmpstr)+1);
+			
+			if (map[sd->bl.m].flag.nightenabled)
+				add_timer(gettick()+1000,clif_nighttimer,sd->bl.id,0);
+		}
 
 //		if(sd->status.class_ != sd->vd.class_)
 //			clif_refreshlook(&sd->bl,sd->bl.id,LOOK_BASE,sd->vd.class_,SELF);
@@ -7979,13 +7982,17 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
 
 		if(sd->status.pet_id > 0 && sd->pd && sd->pet.intimate > 900)
 			clif_pet_emotion(sd->pd,(sd->pd->class_ - 100)*100 + 50 + pet_hungry_val(sd));
+		//[LuzZza]
+		clif_guild_send_onlineinfo(sd);
 
-/*						Stop players from spawning inside castles [Valaris]					*/
+/* Unneccesary due to mapflag "nosave" [Skotlex]
+//		Stop players from spawning inside castles [Valaris]
 		{
 			struct guild_castle *gc=guild_mapname2gc(map[sd->bl.m].name);
 			if (gc)
 				pc_setpos(sd,sd->status.save_point.map,sd->status.save_point.x,sd->status.save_point.y,2);
 			}
+*/
 	} else
 	//New 'night' effect by dynamix [Skotlex]
 	if (night_flag && map[sd->bl.m].flag.nightenabled)

src/map/pc.c

@@ -761,13 +761,6 @@ int pc_authok(struct map_session_data *sd, int login_id2, time_t connect_until_t
 	sd->state.event_disconnect = 1;
 	sd->state.event_kill_mob = 1;
 
-	if (night_flag) {
-		char tmpstr[1024];
-		strcpy(tmpstr, msg_txt(500)); // Actually, it's the night...
-		clif_wis_message(sd->fd, wisp_server_name, tmpstr, strlen(tmpstr)+1);
-		//Night packet is sent when it finishes loading the map. [Skotlex]
-	}
-
 	// ƒXƒe?ƒ^ƒX�‰ŠúŒvŽZ‚È‚Ç
 	status_calc_pc(sd,1);