egs_zones: Broadcast spawn/unspawn directly from enter/leave.

src/egs_users.erl

@@ -18,7 +18,7 @@
 %%	along with EGS.  If not, see <http://www.gnu.org/licenses/>.
 
 -module(egs_users).
--export([read/1, select/1, write/1, delete/1, item_nth/2, item_add/3, item_qty_add/3, shop_enter/2, shop_leave/1, shop_get/1, money_add/2]).
+-export([read/1, select/1, write/1, delete/1, item_nth/2, item_add/3, item_qty_add/3, shop_enter/2, shop_leave/1, shop_get/1, money_add/2, broadcast_spawn/2, broadcast_unspawn/2]).
 
 -define(TABLE, users).
 
@@ -160,3 +160,17 @@ money_add(GID, MoneyDiff) ->
 			mnesia:write(User#users{character=Character2})
 		end
 	end).
+
+broadcast_spawn(GID, PlayersGID) ->
+	{ok, OrigUser} = read(GID),
+	lists:foreach(fun(DestGID) ->
+		{ok, DestUser} = read(DestGID),
+		DestUser#users.pid ! {egs, player_spawn, OrigUser}
+	end, PlayersGID).
+
+broadcast_unspawn(GID, PlayersGID) ->
+	{ok, OrigUser} = read(GID),
+	lists:foreach(fun(DestGID) ->
+		{ok, DestUser} = read(DestGID),
+		DestUser#users.pid ! {egs, player_unspawn, OrigUser}
+	end, PlayersGID).

src/egs_zones.erl

@@ -66,8 +66,9 @@ handle_call(setid, _From, State) ->
 
 handle_call({enter, GID}, _From, State) ->
 	Players = State#state.players,
+	PlayersGID = players_gid(Players),
 	[LID|FreeLIDs] = State#state.freelids,
-	%% @todo Broadcast spawn to other players in the zone.
+	egs_users:broadcast_spawn(GID, PlayersGID),
 	{reply, LID, State#state{players=[{GID, LID}|Players], freelids=FreeLIDs}};
 
 handle_call(stop, _From, State) ->
@@ -79,8 +80,9 @@ handle_call(_Request, _From, State) ->
 handle_cast({leave, GID}, State) ->
 	{_, LID} = lists:keyfind(GID, 1, State#state.players),
 	Players = lists:delete({GID, LID}, State#state.players),
+	PlayersGID = players_gid(Players),
 	FreeLIDs = State#state.freelids,
-	%% @todo Broadcast unspawn to other players in the zone.
+	egs_users:broadcast_unspawn(GID, PlayersGID),
 	{noreply, State#state{players=Players, freelids=[LID|FreeLIDs]}};
 
 handle_cast(_Msg, State) ->
@@ -155,3 +157,11 @@ index_objects([{Key, Object}|Tail], Index, IndexesAcc, Target, TargetsAcc) ->
 		{_, [false]} -> {Target, TargetsAcc}
 	end,
 	index_objects(Tail, Index2, IndexesAcc2, Target2, TargetsAcc2).
+
+%% @doc Return a list of GID from a list of {GID, LID}.
+players_gid(Players) ->
+	players_gid(Players, []).
+players_gid([], Acc) ->
+	Acc;
+players_gid([{GID, _LID}|Tail], Acc) ->
+	players_gid(Tail, [GID|Acc]).

src/psu/psu_game.erl

@@ -53,7 +53,7 @@ area_load(QuestID, ZoneID, MapID, EntryID, State) ->
 	SetID = 0, %% @todo Handle multiple sets properly.
 	{IsSeasonal, SeasonID} = egs_seasons:read(QuestID),
 	User = OldUser#users{areatype=AreaType, area={QuestID, ZoneID, MapID}, entryid=EntryID},
-	%% @todo Handle spawn and unspawn using egs_zone:leave and egs_zone:enter.
+	egs_users:write(User), %% @todo Booh ugly! But temporary.
 	%% Load the quest.
 	User2 = if QuestChange ->
 			psu_proto:send_0c00(User, State),
@@ -67,28 +67,28 @@ area_load(QuestID, ZoneID, MapID, EntryID, State) ->
 			egs_zones:leave(User2#users.zonepid, User2#users.gid),
 			LID = egs_zones:enter(ZonePid, User2#users.gid),
 			psu_proto:send_0a05(State),
-			psu_proto:send_0111(User#users{lid=0}, 6, State),
-			psu_proto:send_010d(User#users{lid=0}, State),
+			psu_proto:send_0111(User2#users{lid=0}, 6, State),
+			psu_proto:send_010d(User2#users{lid=0}, State),
 			psu_proto:send_0200(ZoneID, AreaType, State),
 			psu_proto:send_020f(ZoneData, SetID, SeasonID, State),
-			User2#users{lid=LID, zonepid=ZonePid};
+			User2#users{zonepid=ZonePid};
 		true -> User2
 	end,
 	%% Save the user.
 	egs_users:write(User3),
 	%% Load the player location.
 	State2 = State#state{areanb=State#state.areanb + 1},
-	psu_proto:send_0205(User#users{lid=0}, IsSeasonal, State2),
-	psu_proto:send_100e(User#users.area, User#users.entryid, AreaShortName, State2),
+	psu_proto:send_0205(User3#users{lid=0}, IsSeasonal, State2),
+	psu_proto:send_100e(User3#users.area, User3#users.entryid, AreaShortName, State2),
 	%% Load the zone objects.
 	if ZoneChange ->
 			send_1212(); %% @todo Only sent if there is a set file.
 		true -> ignore
 	end,
 	%% Load the player.
-	psu_proto:send_0201(User#users{lid=0}, State2),
+	psu_proto:send_0201(User3#users{lid=0}, State2),
 	if ZoneChange ->
-			psu_proto:send_0a06(User, State2);
+			psu_proto:send_0a06(User3, State2);
 		true -> ignore
 	end,
 	%% @todo Send the spawn list.