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

Use a normal tuple instead of a record for the pos values.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-12 20:12:48 +01:00
parent 4dcaa79371
commit 05149483c8
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/records.hrl
View File

@ -21,6 +21,10 @@
-opaque sslsocket() :: any().
%% EGS types.
-type position() :: {X :: float(), Y :: float(), Z :: float(), Dir :: float()}.
%% Records.
%% @doc Per-process state used by the various EGS modules.
@ -42,10 +46,6 @@
auth_state :: undefined | {wait_for_authentication, binary(), any()}
}).
%% @doc Character position data structure.
%% @todo Review.
-record(pos, {x, y, z, dir}).
%% @doc Character area location data structure.
%% @todo Review.
-record(psu_area, {questid, zoneid, mapid}).
@ -66,7 +66,7 @@
areatype :: counter | mission | lobby | myroom | spaceport,
area :: {psu_area, 0..16#ffffffff, 0..16#ffff, 0..9999},
entryid :: 0..16#ffff,
pos = #pos{x=0.0, y=0.0, z=0.0, dir=0.0} :: {pos, float(), float(), float(), float()},
pos = {0.0, 0.0, 0.0, 0.0} :: position(),
shopid :: integer(),
prev_area = #psu_area{questid=0, zoneid=0, mapid=0} :: {psu_area, 0..16#ffffffff, 0..16#ffff, 0..9999},
prev_entryid = 0 :: 0..16#ffff,

4
src/egs_game.erl
View File

@ -64,7 +64,7 @@ cast(16#0503, Data, State=#state{gid=GID}) ->
QuestID:32/little-unsigned-integer, ZoneID:32/little-unsigned-integer, MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, _:32 >> = Data,
FloatDir = Dir / 46603.375,
{ok, User} = egs_users:read(GID),
NewUser = User#users{pos=#pos{x=X, y=Y, z=Z, dir=FloatDir}, area=#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, entryid=EntryID},
NewUser = User#users{pos={X, Y, Z, FloatDir}, area=#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, entryid=EntryID},
egs_users:write(NewUser),
cast(valid, Data, State);
@ -75,7 +75,7 @@ cast(16#0514, Data, State=#state{gid=GID}) ->
MapID:32/little-unsigned-integer, EntryID:32/little-unsigned-integer, _/bits >> = Data,
FloatDir = Dir / 46603.375,
{ok, User} = egs_users:read(GID),
NewUser = User#users{pos=#pos{x=X, y=Y, z=Z, dir=FloatDir}, area=#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, entryid=EntryID},
NewUser = User#users{pos={X, Y, Z, FloatDir}, area=#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, entryid=EntryID},
egs_users:write(NewUser),
cast(valid, Data, State);

2
src/psu/psu_characters.erl
View File

@ -45,7 +45,7 @@ character_tuple_to_binary(Tuple) ->
%% @todo The value before IntDir seems to be the player's current animation. 01 stand up, 08 ?, 17 normal sit
character_user_to_binary(User) ->
#users{id=CharGID, lid=CharLID, character=Character, pos=#pos{x=X, y=Y, z=Z, dir=Dir}, area={psu_area, QuestID, ZoneID, MapID}, entryid=EntryID,
#users{id=CharGID, lid=CharLID, character=Character, pos={X, Y, Z, Dir}, area={psu_area, QuestID, ZoneID, MapID}, entryid=EntryID,
prev_area={psu_area, PrevQuestID, PrevZoneID, PrevMapID}, prev_entryid=PrevEntryID} = User,
#characters{npcid=NPCid, type=Type, mainlevel=Level, stats=Stats, se=SE, currenthp=CurrentHP, maxhp=MaxHP} = Character,
#level{number=LV} = Level,

6
src/psu/psu_game.erl
View File

@ -200,7 +200,7 @@ npc_load(Leader, [{PartyPos, NPCGID}|NPCList], State) ->
#users{instancepid=InstancePid, area=Area, entryid=EntryID, pos=Pos} = Leader,
NPCUser = OldNPCUser#users{lid=PartyPos, instancepid=InstancePid, areatype=mission, area=Area, entryid=EntryID, pos=Pos},
%% @todo This one on mission end/abort?
%~ OldNPCUser#users{lid=PartyPos, instancepid=undefined, areatype=AreaType, area={psu_area, 0, 0, 0}, entryid=0, pos={pos, 0.0, 0.0, 0.0, 0}}
%~ OldNPCUser#users{lid=PartyPos, instancepid=undefined, areatype=AreaType, area={psu_area, 0, 0, 0}, entryid=0, pos={0.0, 0.0, 0.0, 0}}
egs_users:write(NPCUser),
psu_proto:send_010d(NPCUser, State),
psu_proto:send_0201(NPCUser, State),
@ -261,9 +261,9 @@ send_022c(A, B) ->
%% @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=_}) ->
send_0503({PrevX, PrevY, PrevZ, _AnyDir}) ->
{ok, User} = egs_users:read(get(gid)),
#users{id=GID, pos=#pos{x=X, y=Y, z=Z, dir=Dir}, area=#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, entryid=EntryID} = User,
#users{id=GID, pos={X, Y, Z, Dir}, area=#psu_area{questid=QuestID, zoneid=ZoneID, mapid=MapID}, entryid=EntryID} = User,
IntDir = trunc(Dir * 182.0416),
send(<< 16#05030300:32, 0:64, GID:32/little-unsigned-integer, 0:64, 16#00011300:32, GID:32/little-unsigned-integer, 0:64, GID:32/little-unsigned-integer, 0:32,
16#1000:16, IntDir:16/little-unsigned-integer, PrevX:32/little-float, PrevY:32/little-float, PrevZ:32/little-float, X:32/little-float, Y:32/little-float, Z:32/little-float,

2
src/psu/psu_instance.erl
View File

@ -121,7 +121,7 @@ object_init([{'spawn', NbTargets, TrigEventID, _ReqEventID}|Tail], ZoneID, Block
%% @doc warp: {InstancePid, ZoneID, warp, BlockID, ListIndex, ObjectIndex}
object_init([{warp, DestX, DestY, DestZ, DestDir}|Tail], ZoneID, BlockID, ObjectID, TargetID, ListIndex, ObjectIndex) ->
object_insert(#psu_object{id={self(), ZoneID, warp, BlockID, ListIndex, ObjectIndex}, instancepid=self(), type=warp, args=#pos{x=DestX, y=DestY, z=DestZ, dir=DestDir}}),
object_insert(#psu_object{id={self(), ZoneID, warp, BlockID, ListIndex, ObjectIndex}, instancepid=self(), type=warp, args={DestX, DestY, DestZ, DestDir}}),
object_init(Tail, ZoneID, BlockID, ObjectID, TargetID, ListIndex, ObjectIndex + 1);
%% @doc Ignore for now: boss_gate, shoot_button, goggle_target, trap (all kinds), sensor