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

psu_proto: Move send_0201 to psu_proto.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-02 17:43:25 +02:00
parent 63b3b0a7b9
commit dbdc02bcd0
2 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/psu/psu_game.erl
View File

@ -390,7 +390,7 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
send_1309(); send_1309();
true -> ignore true -> ignore
end, end,
send_0201(User#egs_user_model{lid=0}), psu_proto:send_0201(User, User#egs_user_model{lid=0}),
if ZoneChange =:= true -> if ZoneChange =:= true ->
send_0a06(); send_0a06();
true -> ignore true -> ignore
@ -419,7 +419,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList]) ->
%~ OldNPCUser#egs_user_model{lid=PartyPos, instancepid=undefined, areatype=AreaType, area={psu_area, 0, 0, 0}, entryid=0, pos={pos, 0.0, 0.0, 0.0, 0}} %~ OldNPCUser#egs_user_model{lid=PartyPos, instancepid=undefined, areatype=AreaType, area={psu_area, 0, 0, 0}, entryid=0, pos={pos, 0.0, 0.0, 0.0, 0}}
egs_user_model:write(NPCUser), egs_user_model:write(NPCUser),
send_010d(NPCUser), send_010d(NPCUser),
send_0201(NPCUser), psu_proto:send_0201(Leader, NPCUser),
psu_proto:send_0215(Leader, 0), psu_proto:send_0215(Leader, 0),
send_0a04(NPCUser#egs_user_model.id), send_0a04(NPCUser#egs_user_model.id),
send_1004(npc_mission, NPCUser, PartyPos), send_1004(npc_mission, NPCUser, PartyPos),
@ -605,7 +605,7 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}) ->
send_1206(), send_1206(),
send_1207(), send_1207(),
send_1212(), send_1212(),
send_0201(User#egs_user_model{lid=0}), psu_proto:send_0201(User, User#egs_user_model{lid=0}),
send_0a06(), send_0a06(),
case User#egs_user_model.partypid of case User#egs_user_model.partypid of
undefined -> ignore; undefined -> ignore;
@ -1154,25 +1154,6 @@ send_0200(ZoneType) ->
end, end,
send(<< (header(16#0200))/binary, 0:32, 16#01000000:32, 16#ffffffff:32, Var/binary, 16#ffffffff:32, 16#ffffffff:32 >>). send(<< (header(16#0200))/binary, 0:32, 16#01000000:32, 16#ffffffff:32, Var/binary, 16#ffffffff:32, 16#ffffffff:32 >>).
%% @todo Figure out what the other things are.
%% @todo Handle LID correctly (should be ffffffff for self? yet LID should be 16 bits).
send_0201(User) ->
GID = get(gid),
CharTypeID = case (User#egs_user_model.character)#characters.type of
npc -> 16#00001d00;
_ -> 16#00001200
end,
CharGID = User#egs_user_model.id,
CharBin = psu_characters:character_user_to_binary(User),
IsGM = 0,
OnlineStatus = 0,
GameVersion = case (User#egs_user_model.character)#characters.type of
npc -> 255;
_ -> 0
end,
send(<< 16#02010300:32, 0:32, CharTypeID:32, CharGID:32/little-unsigned-integer, 0:64, 16#00011300:32,
GID:32/little-unsigned-integer, 0:64, CharBin/binary, IsGM:8, 0:8, OnlineStatus:8, GameVersion:8, 0:608 >>).
%% @doc Hello packet, always sent on client connection. %% @doc Hello packet, always sent on client connection.
send_0202() -> send_0202() ->
send(<< 16#02020300:32, 0:352 >>). send(<< 16#02020300:32, 0:352 >>).

14
src/psu/psu_proto.erl
View File

@ -935,6 +935,20 @@ parse_hits(Hits, Acc) ->
%~ << D1:32, D2:32, D3:32, D4:32, D5:32 >> = D, %~ << D1:32, D2:32, D3:32, D4:32, D5:32 >> = D,
parse_hits(Rest, [{hit, FromTargetID, ToTargetID, A, B}|Acc]). parse_hits(Rest, [{hit, FromTargetID, ToTargetID, A, B}|Acc]).
%% @doc Send character location, appearance and other information.
send_0201(DestUser, CharUser) ->
DestGID = DestUser#egs_user_model.id,
[CharTypeID, GameVersion] = case (CharUser#egs_user_model.character)#characters.type of
npc -> [16#00001d00, 255];
_ -> [16#00001200, 0]
end,
CharGID = CharUser#egs_user_model.id,
CharBin = psu_characters:character_user_to_binary(CharUser),
IsGM = 0,
OnlineStatus = 0,
packet_send(DestUser#egs_user_model.socket, << 16#02010300:32, 0:32, CharTypeID:32, CharGID:32/little-unsigned-integer,
0:64, 16#00011300:32, DestGID:32/little-unsigned-integer, 0:64, CharBin/binary, IsGM:8, 0:8, OnlineStatus:8, GameVersion:8, 0:608 >>).
%% @doc Make the client load a new map. %% @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. %% @todo We set a value of 1 and not 0 after EntryID because this value is never found to be 0.
send_0205(DestUser, IsSeasonal) -> send_0205(DestUser, IsSeasonal) ->