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

egs_game: Fix the newly introduced bug when using uni cube.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-18 23:30:31 +02:00
parent 989f152478
commit a498359165
3 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/egs_game.erl
View File

@ -690,23 +690,25 @@ event(ppcube_request, _State) ->
event(unicube_request, _State) -> event(unicube_request, _State) ->
psu_game:send_021e(); psu_game:send_021e();
%% @doc Uni selection handler. %% @doc Uni selection handler. Selecting anything reloads the character which will then be sent to its associated area.
%% @todo When selecting 'Your room', load a default room. %% @todo When selecting 'Your room', load a default room.
%% @todo When selecting 'Reload', reload the character in the current lobby. %% @todo When selecting 'Reload', reload the character in the current lobby.
%% @todo Delete NPC characters and stop the party on entering myroom too. %% @todo Delete NPC characters and stop the party on entering myroom too.
event({unicube_select, Selection, EntryID}, State=#state{gid=GID}) -> event({unicube_select, Selection, EntryID}, #state{gid=GID}) ->
case Selection of case Selection of
cancel -> ignore; cancel -> ignore;
16#ffffffff -> 16#ffffffff ->
log("uni selection (my room)"), log("uni selection (my room)"),
psu_game:send_0230(), psu_game:send_0230(),
% 0220 % 0220
event({area_change, 1120000, 0, 100, 0}, State); {ok, User} = egs_user_model:read(GID),
User2 = User#egs_user_model{area=#psu_area{questid=1120000, zoneid=0, mapid=100}, entryid=0},
egs_user_model:write(User2),
psu_game:char_load(User2);
_UniID -> _UniID ->
log("uni selection (reload)"), log("uni selection (reload)"),
psu_game:send_0230(), psu_game:send_0230(),
% 0220 % 0220
%% force reloading the character and data files (@todo hack, uses myroom questid to do it)
{ok, User} = egs_user_model:read(GID), {ok, User} = egs_user_model:read(GID),
case User#egs_user_model.partypid of case User#egs_user_model.partypid of
undefined -> undefined ->
@ -718,10 +720,9 @@ event({unicube_select, Selection, EntryID}, State=#state{gid=GID}) ->
[egs_user_model:delete(NPCGID) || {_Spot, NPCGID} <- NPCList], [egs_user_model:delete(NPCGID) || {_Spot, NPCGID} <- NPCList],
psu_party:stop(PartyPid) psu_party:stop(PartyPid)
end, end,
Area = User#egs_user_model.area, User2 = User#egs_user_model{entryid=EntryID},
NewRow = User#egs_user_model{partypid=undefined, area=Area#psu_area{questid=1120000, zoneid=undefined}, entryid=EntryID}, egs_user_model:write(User2),
egs_user_model:write(NewRow), psu_game:char_load(User2)
event({area_change, Area#psu_area.questid, Area#psu_area.zoneid, Area#psu_area.mapid, EntryID}, State)
end. end.
%% Internal. %% Internal.

5
src/psu/psu_game.erl
View File

@ -142,11 +142,6 @@ area_load(AreaType, IsStart, SetID, OldUser, User, QuestFile, ZoneFile, AreaName
end, end,
% load area % load area
if QuestChange =:= true -> if QuestChange =:= true ->
% reload the character if entering or leaving the room quest
if OldQuestID =:= 1120000; QuestID =:= 1120000 ->
char_load(User);
true -> ignore
end,
% load new quest % load new quest
psu_proto:send_0c00(User), psu_proto:send_0c00(User),
psu_proto:send_020e(User, QuestFile); psu_proto:send_020e(User, QuestFile);

1
src/psu/psu_instance.erl
View File

@ -94,7 +94,6 @@ object_init([{floor_button, TrigEventID}|Tail], ZoneID, BlockID, ObjectID, Targe
object_init(Tail, ZoneID, BlockID, ObjectID + 1, TargetID + 1, ListIndex, ObjectIndex + 1); object_init(Tail, ZoneID, BlockID, ObjectID + 1, TargetID + 1, ListIndex, ObjectIndex + 1);
object_init([{goggle_target, TrigEventID}|Tail], ZoneID, BlockID, ObjectID, TargetID, ListIndex, ObjectIndex) -> object_init([{goggle_target, TrigEventID}|Tail], ZoneID, BlockID, ObjectID, TargetID, ListIndex, ObjectIndex) ->
io:format("~p~n", [ObjectID]),
object_insert(#psu_object{id={self(), ZoneID, ObjectID}, instancepid=self(), type=goggle_target, args={BlockID, TrigEventID}}), object_insert(#psu_object{id={self(), ZoneID, ObjectID}, instancepid=self(), type=goggle_target, args={BlockID, TrigEventID}}),
object_init(Tail, ZoneID, BlockID, ObjectID + 1, TargetID + 1, ListIndex, ObjectIndex + 1); object_init(Tail, ZoneID, BlockID, ObjectID + 1, TargetID + 1, ListIndex, ObjectIndex + 1);