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

psu_proto: Review and move send_0304 to psu_proto.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-10-19 18:12:25 +02:00
parent 8bcf1ba3c8
commit b9f407bb1e
3 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/egs_game.erl
View File

@ -33,8 +33,8 @@ info({egs, cast, Command}, #state{gid=GID}) ->
psu_game:send(<< A/binary, 16#00011300:32, B/binary, 16#00011300:32, GID:32/little-unsigned-integer, C/binary >>);
%% @doc Forward the chat message to the client.
info({egs, chat, ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage}, _State) ->
psu_game:send_0304(ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage);
info({egs, chat, FromGID, ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage}, State) ->
psu_proto:send_0304(FromGID, ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage, State);
info({egs, notice, Type, Message}, State) ->
psu_proto:send_0228(Type, 2, Message, State);
@ -246,7 +246,7 @@ event({chat, _FromTypeID, FromGID, _FromName, Modifiers, ChatMsg}, #state{gid=Us
log("chat from ~s: ~s", [[re:replace(LogName, "\\0", "", [global, {return, binary}])], [re:replace(LogMessage, "\\0", "", [global, {return, binary}])]]),
%% broadcast
{ok, List} = egs_user_model:select(all),
lists:foreach(fun(X) -> X#egs_user_model.pid ! {egs, chat, BcastTypeID, BcastGID, BcastName, Modifiers, ChatMsg} end, List);
lists:foreach(fun(X) -> X#egs_user_model.pid ! {egs, chat, UserGID, BcastTypeID, BcastGID, BcastName, Modifiers, ChatMsg} end, List);
%% @todo There's at least 9 different sets of locations. Handle all of them correctly.
event(counter_background_locations_request, _State) ->

6
src/psu/psu_game.erl
View File

@ -321,12 +321,6 @@ build_0233_contents(Users) ->
Next = build_0233_contents(Rest),
<< Chunk/binary, Next/binary >>.
%% @doc Send a chat command.
send_0304(FromTypeID, FromGID, FromName, Modifiers, Message) ->
{chat_modifiers, ChatType, ChatCutIn, ChatCutInAngle, ChatMsgLength, ChatChannel, ChatCharacterType} = Modifiers,
send(<< 16#03040300:32, 0:288, FromTypeID:32/unsigned-integer, FromGID:32/little-unsigned-integer, 0:64,
ChatType:8, ChatCutIn:8, ChatCutInAngle:8, ChatMsgLength:8, ChatChannel:8, ChatCharacterType:8, 0:16, FromName:512/bits, Message/bits >>).
%% @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=_}) ->

8
src/psu/psu_proto.erl
View File

@ -1341,6 +1341,14 @@ send_0231(URL, #state{socket=Socket, gid=DestGID, lid=DestLID}) ->
send_0236(#state{socket=Socket, gid=DestGID}) ->
packet_send(Socket, << 16#02360300:32, 0:160, 16#00011300:32, DestGID:32/little, 0:64 >>).
%% @doc Chat message.
%% @todo Handle the LID properly.
send_0304(FromGID, ChatTypeID, ChatGID, ChatName, ChatModifiers, ChatMessage, #state{socket=Socket, gid=DestGID}) ->
{chat_modifiers, ChatType, ChatCutIn, ChatCutInAngle, ChatMsgLength, ChatChannel, ChatCharacterType} = ChatModifiers,
packet_send(Socket, << 16#03040300:32, 0:32, 16#00011300:32, FromGID:32/little, 0:64, 16#00011300:32, DestGID:32/little, 0:64,
ChatTypeID:32, ChatGID:32/little, 0:64, ChatType:8, ChatCutIn:8, ChatCutInAngle:8, ChatMsgLength:8,
ChatChannel:8, ChatCharacterType:8, 0:16, ChatName/binary, ChatMessage/binary >>).
%% @todo Inventory related. Doesn't seem to do anything.
%% @todo Handle the LID properly.
send_0a05(#state{socket=Socket, gid=DestGID}) ->