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

egs_user_model: Remove the unused counterid introduced earlier today.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-08-21 18:42:23 +02:00
parent e4b2ab8a75
commit 46fabad441
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/records.hrl
View File

@ -31,7 +31,7 @@
%% @todo Probably can use a "param" or "extra" field to store the game-specific information (for things that don't need to be queried). %% @todo Probably can use a "param" or "extra" field to store the game-specific information (for things that don't need to be queried).
-record(egs_user_model, { -record(egs_user_model, {
id, pid, socket, state, time, character, instancepid, partypid, areatype, area, entryid, counterid, pos, id, pid, socket, state, time, character, instancepid, partypid, areatype, area, entryid, pos,
%% psu specific fields %% psu specific fields
lid, setid, prev_area, prev_entryid, lid, setid, prev_area, prev_entryid,
%% temporary fields %% temporary fields

4
src/psu/psu_game.erl
View File

@ -299,7 +299,7 @@ area_load(QuestID, ZoneID, MapID, EntryID) ->
{RetPid, RetSetID}; {RetPid, RetSetID};
true -> {OldUser#egs_user_model.instancepid, OldUser#egs_user_model.setid} true -> {OldUser#egs_user_model.instancepid, OldUser#egs_user_model.setid}
end, end,
User = OldUser#egs_user_model{instancepid=InstancePid, areatype=AreaType, area={psu_area, QuestID, RealZoneID, RealMapID}, entryid=RealEntryID, counterid=undefined}, User = OldUser#egs_user_model{instancepid=InstancePid, areatype=AreaType, area={psu_area, QuestID, RealZoneID, RealMapID}, entryid=RealEntryID},
egs_user_model:write(User), egs_user_model:write(User),
RealSetID = if SetID > NbSetsInZone - 1 -> NbSetsInZone - 1; true -> SetID end, RealSetID = if SetID > NbSetsInZone - 1 -> NbSetsInZone - 1; true -> SetID end,
area_load(AreaType, IsStart, RealSetID, OldUser, User, QuestFile, ZoneFile, AreaName). area_load(AreaType, IsStart, RealSetID, OldUser, User, QuestFile, ZoneFile, AreaName).
@ -533,7 +533,7 @@ event({counter_enter, CounterID, FromZoneID, FromMapID, FromEntryID}) ->
{ok, OldUser} = egs_user_model:read(get(gid)), {ok, OldUser} = egs_user_model:read(get(gid)),
OldArea = OldUser#egs_user_model.area, OldArea = OldUser#egs_user_model.area,
FromArea = {psu_area, OldArea#psu_area.questid, FromZoneID, FromMapID}, FromArea = {psu_area, OldArea#psu_area.questid, FromZoneID, FromMapID},
User = OldUser#egs_user_model{areatype=counter, area={psu_area, 16#7fffffff, 0, 0}, entryid=0, counterid=CounterID, prev_area=FromArea, prev_entryid=FromEntryID}, User = OldUser#egs_user_model{areatype=counter, area={psu_area, 16#7fffffff, 0, 0}, entryid=0, prev_area=FromArea, prev_entryid=FromEntryID},
egs_user_model:write(User), egs_user_model:write(User),
AreaName = "Counter", AreaName = "Counter",
QuestFile = "data/lobby/counter.quest.nbl", QuestFile = "data/lobby/counter.quest.nbl",