Sancaros/egs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

egs_game: Properly handle the spawning of individual players instead of sending everything each time.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-10-22 04:04:21 +02:00
parent d6b4b24388
commit a0d6e67e0e
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/egs_game.erl
View File

@ -40,11 +40,13 @@ info({egs, notice, Type, Message}, State) ->
psu_proto:send_0228(Type, 2, Message, State);
%% @doc Inform the client that a player has spawn.
%% @todo Should be something along the lines of 010d 0205 203 201.
info({egs, player_spawn, _Player}, State=#state{gid=GID}) ->
{ok, User} = egs_user_model:read(GID),
{ok, SpawnList} = egs_user_model:select({neighbors, User}),
psu_proto:send_0233(SpawnList, State);
%% @todo Not sure what IsSeasonal or the AreaNb in 0205 should be for other spawns.
info({egs, player_spawn, Player}, State) ->
psu_proto:send_0111(Player, 6, State),
psu_proto:send_010d(Player, State),
psu_proto:send_0205(Player, 0, State),
psu_proto:send_0203(Player, State),
psu_proto:send_0201(Player, State);
%% @doc Inform the client that a player has unspawn.
info({egs, player_unspawn, Player}, State) ->
@ -273,7 +275,7 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}, State=#sta
psu_proto:send_0200(0, mission, State),
psu_proto:send_020f(ZoneFile, 0, 255, State),
State2 = State#state{areanb=State#state.areanb + 1},
psu_proto:send_0205(User, 0, State2),
psu_proto:send_0205(User#egs_user_model{lid=0}, 0, State2),
psu_proto:send_100e(CounterID, "Counter", State2),
psu_proto:send_0215(0, State2),
psu_proto:send_0215(0, State2),

7
src/psu/psu_game.erl
View File

@ -123,7 +123,7 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
true -> ignore
end,
State2 = State#state{areanb=State#state.areanb + 1},
psu_proto:send_0205(User, IsSeasonal, State2),
psu_proto:send_0205(User#egs_user_model{lid=0}, IsSeasonal, State2),
psu_proto:send_100e(User#egs_user_model.area, User#egs_user_model.entryid, AreaName, State2),
if AreaType =:= mission ->
psu_proto:send_0215(0, State2),
@ -164,7 +164,10 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
psu_proto:send_0a06(User, State2);
true -> ignore
end,
psu_proto:send_0233(SpawnList, State),
if length(SpawnList) =/= 0 ->
psu_proto:send_0233(SpawnList, State);
true -> ignore
end,
case User#egs_user_model.partypid of
undefined -> ignore;
_ -> send_022c(0, 16#12)

10
src/psu/psu_proto.erl
View File

@ -1271,6 +1271,12 @@ send_0201(CharUser, #state{socket=Socket, gid=DestGID}) ->
send_0202(#state{socket=Socket, gid=DestGID, lid=DestLID}) ->
packet_send(Socket, << 16#020203bf:32, DestLID:16/little, 0:272, DestGID:32/little, 0:1024 >>).
%% @doc Spawn a player with the given GID and LID.
%% @todo Handle the LID properly.
send_0203(#egs_user_model{id=CharGID, lid=CharLID}, #state{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#02030300:32, 0:160, 16#00011300:32,
DestGID:32/little, 0:64, CharGID:32/little, CharLID:32/little >>).
%% @doc Unspawn the given character.
%% @todo LID.
%% @todo The last 4 bytes are probably the number of players remaining in the zone.
@ -1286,9 +1292,9 @@ send_0204(User, #state{socket=Socket, gid=DestGID}) ->
%% @doc Make the client load a new map.
%% @todo We set a value of 1 and not 0 after EntryID because this value is never found to be 0.
send_0205(CharUser, IsSeasonal, #state{socket=Socket, gid=DestGID, lid=DestLID, areanb=AreaNb}) ->
#egs_user_model{area=#psu_area{zoneid=ZoneID, mapid=MapID}, entryid=EntryID} = CharUser,
#egs_user_model{lid=CharLID, area=#psu_area{zoneid=ZoneID, mapid=MapID}, entryid=EntryID} = CharUser,
packet_send(Socket, << 16#02050300:32, DestLID:16/little, 0:144, 16#00011300:32, DestGID:32/little, 0:64,
16#ffffffff:32, ZoneID:32/little, MapID:32/little, EntryID:32/little, AreaNb:32/little, 0:24, IsSeasonal:8 >>).
16#ffffffff:32, ZoneID:32/little, MapID:32/little, EntryID:32/little, AreaNb:32/little, CharLID:16/little, 0:8, IsSeasonal:8 >>).
%% @doc Indicate to the client that loading should finish.
%% @todo Handle the DestLID properly.