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

egs_game_server: Make sure the egs_users:read can't fail in on_exit.

Browse Source
This commit is contained in:
Loïc Hoguin 2011-02-21 00:58:14 +01:00
parent 344c534812
commit 953da28a3e
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/egs_char_select.erl
View File

@ -79,6 +79,7 @@ event({char_select_enter, Slot, _BackToPreviousField}, State=#state{gid=GID}) ->
egs_universes:enter(UniID), egs_universes:enter(UniID),
User = #users{gid=GID, pid=self(), uni=UniID, character=Character, area={1100000, 0, 4}, entryid=0}, User = #users{gid=GID, pid=self(), uni=UniID, character=Character, area={1100000, 0, 4}, entryid=0},
egs_users:write(User), egs_users:write(User),
egs_game_server:link_exit(),
egs_users:item_add(GID, 16#11010000, #psu_special_item_variables{}), egs_users:item_add(GID, 16#11010000, #psu_special_item_variables{}),
egs_users:item_add(GID, 16#11020000, #psu_special_item_variables{}), egs_users:item_add(GID, 16#11020000, #psu_special_item_variables{}),
egs_users:item_add(GID, 16#11020100, #psu_special_item_variables{}), egs_users:item_add(GID, 16#11020100, #psu_special_item_variables{}),

37
src/egs_game_server.erl
View File

@ -18,7 +18,7 @@
%% along with EGS. If not, see <http://www.gnu.org/licenses/>. %% along with EGS. If not, see <http://www.gnu.org/licenses/>.
-module(egs_game_server). -module(egs_game_server).
-export([start_link/1, on_exit/1, init/1]). -export([start_link/1, link_exit/0, on_exit/1, init/1]).
-include("include/records.hrl"). -include("include/records.hrl").
@ -30,33 +30,32 @@ start_link(Port) ->
LPid = spawn(egs_network, listen, [Port, ?MODULE]), LPid = spawn(egs_network, listen, [Port, ?MODULE]),
{ok, LPid}. {ok, LPid}.
%% @doc Link the on_exit handler to the current process.
link_exit() ->
egs_game_server_exit_mon ! {link, self()}.
%% @spec on_exit(Pid) -> ok %% @spec on_exit(Pid) -> ok
%% @doc Cleanup the data associated with the failing process. %% @doc Cleanup the data associated with the failing process.
%% @todo Cleanup the instance process if there's nobody in it anymore. %% @todo Cleanup the instance process if there's nobody in it anymore.
%% @todo Leave party instead of stopping it. %% @todo Leave party instead of stopping it.
on_exit(Pid) -> on_exit(Pid) ->
case egs_users:read({pid, Pid}) of {ok, User} = egs_users:read({pid, Pid}),
{ok, User} -> case User#users.partypid of
case User#users.partypid of undefined ->
undefined -> ignore;
ignore; PartyPid ->
PartyPid -> {ok, NPCList} = psu_party:get_npc(PartyPid),
{ok, NPCList} = psu_party:get_npc(PartyPid), [egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList],
[egs_users:delete(NPCGID) || {_Spot, NPCGID} <- NPCList], psu_party:stop(PartyPid)
psu_party:stop(PartyPid) end,
end, egs_zones:leave(User#users.zonepid, User#users.gid),
egs_zones:leave(User#users.zonepid, User#users.gid), egs_universes:leave(User#users.uni),
egs_universes:leave(User#users.uni), egs_users:delete(User#users.gid),
egs_users:delete(User#users.gid), io:format("game (~p): quit~n", [User#users.gid]).
io:format("game (~p): quit~n", [User#users.gid]);
{error, _Reason} ->
ignore
end.
%% @doc Initialize the game state and start receiving messages. %% @doc Initialize the game state and start receiving messages.
%% @todo Handle keepalive messages globally? %% @todo Handle keepalive messages globally?
init(Socket) -> init(Socket) ->
egs_game_server_exit_mon ! {link, self()},
timer:send_interval(5000, {egs, keepalive}), timer:send_interval(5000, {egs, keepalive}),
State = #state{socket=Socket, gid=egs_accounts:tmp_gid()}, State = #state{socket=Socket, gid=egs_accounts:tmp_gid()},
psu_proto:send_0202(State), psu_proto:send_0202(State),