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

psu_proto: Review and move send_0233 to psu_proto.

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

4
src/egs_game.erl
View File

@ -41,10 +41,10 @@ info({egs, notice, Type, 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{gid=GID}) ->
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_game:send_0233(SpawnList);
psu_proto:send_0233(SpawnList, State);
%% @doc Inform the client that a player has unspawn.
info({egs, player_unspawn, Player}, State) ->

29
src/psu/psu_game.erl
View File

@ -164,7 +164,7 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
psu_proto:send_0a06(User, State2);
true -> ignore
end,
send_0233(SpawnList),
psu_proto:send_0233(SpawnList, State),
case User#egs_user_model.partypid of
undefined -> ignore;
_ -> send_022c(0, 16#12)
@ -246,33 +246,6 @@ send_0113() ->
send_022c(A, B) ->
send(<< (header(16#022c))/binary, A:16/little-unsigned-integer, B:16/little-unsigned-integer >>).
%% @todo Figure out what the other things are.
send_0233(Users) ->
NbUsers = length(Users),
case NbUsers of
0 ->
ignore;
_ ->
GID = get(gid),
Header = << 16#02330300:32, 0:32, 16#00001200:32, GID:32/little-unsigned-integer, 0:64, 16#00011300:32,
GID:32/little-unsigned-integer, 0:64, NbUsers:32/little-unsigned-integer >>,
Contents = build_0233_contents(Users),
send(<< Header/binary, Contents/binary >>)
end.
%% @todo God this function is ugly. Use tail recursion!
build_0233_contents([]) ->
<< >>;
build_0233_contents(Users) ->
[User|Rest] = Users,
LID = 16#010000 + User#egs_user_model.lid, %% @todo The LID must be 16 bits and 0233 seems to (almost always) require that 01 right there...
CharBin = psu_characters:character_user_to_binary(User#egs_user_model{lid=LID}),
IsGM = 0,
GameVersion = 0,
Chunk = << CharBin/binary, IsGM:8, 0:8, GameVersion:8, 0:8 >>,
Next = build_0233_contents(Rest),
<< Chunk/binary, Next/binary >>.
%% @todo Force send a new player location. Used for warps.
%% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit
send_0503(#pos{x=PrevX, y=PrevY, z=PrevZ, dir=_}) ->

13
src/psu/psu_proto.erl
View File

@ -1397,6 +1397,19 @@ send_0231(URL, #state{socket=Socket, gid=DestGID, lid=DestLID}) ->
packet_send(Socket, << 16#02310300:32, DestLID:16/little, 0:16, 16#00000f00:32, DestGID:32/little, 0:64,
16#00000f00:32, DestGID:32/little, 0:64, Length:32/little, URLBin/binary, 0:Padding >>).
%% @todo Handle the LID properly.
send_0233(Users, #state{socket=Socket, gid=DestGID}) ->
NbUsers = length(Users),
Bin = build_0233_users(Users, []),
packet_send(Socket, << 16#02330300:32, 0:32, 16#00001200:32, DestGID:32/little, 0:64,
16#00011300:32, DestGID:32/little, 0:64, NbUsers:32/little, Bin/binary, 0:608 >>).
build_0233_users([], Acc) ->
iolist_to_binary(lists:reverse(Acc));
build_0233_users([User|Tail], Acc) ->
Bin = psu_characters:character_user_to_binary(User),
build_0233_users(Tail, [<< Bin/binary, 0:32 >>|Acc]).
%% @doc Start the zone handling: load the zone file and the objects sent separately.
%% @todo Handle the LID properly.
send_0236(#state{socket=Socket, gid=DestGID}) ->