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

psu_proto: Clothes shop use the same field as Quantity for the color choice.

Browse Source
This commit is contained in:
Loïc Hoguin 2010-09-29 17:46:56 +02:00
parent de646c2df8
commit 988dfd326f
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/egs_game.erl
View File

@ -526,8 +526,8 @@ event({npc_invite, NPCid}, #state{gid=GID}) ->
%% @todo Should be 0115(money) 010a03(confirm sale).
%% @todo We probably need to save the ShopID somewhere since it isn't given back here.
event({npc_shop_buy, ShopItemIndex, Quantity}, _State) ->
log("npc shop buy itemindex ~p quantity ~p", [ShopItemIndex, Quantity]);
event({npc_shop_buy, ShopItemIndex, QuantityOrColor}, _State) ->
log("npc shop buy itemindex ~p quantity/color+1 ~p", [ShopItemIndex, QuantityOrColor]);
%% @todo Currently send the normal items shop for all shops, differentiate.
event({npc_shop_enter, ShopID}, #state{gid=GID}) ->

12
src/psu/psu_proto.erl
View File

@ -105,7 +105,7 @@ parse(Size, 16#0105, Channel, Data) ->
parse(Size, 16#010a, Channel, Data) ->
<< HeaderLID:16/little, VarA:16/little, VarB:32/little, VarC:32/little, VarD:32/little, VarE:32/little, VarF:32/little, VarG:32/little, VarH:32/little, VarI:32/little,
_GID:32/little, BodyLID:32/little, EventID:16/little, Quantity:8, VarK:8, Param:16/bits, VarL:16 >> = Data,
_GID:32/little, BodyLID:32/little, EventID:16/little, QuantityOrColor:8, VarK:8, Param:16/bits, VarL:16 >> = Data,
?ASSERT_EQ(Size, 60),
?ASSERT_EQ(Channel, 2),
?ASSERT_EQ(VarA, 0),
@ -121,24 +121,24 @@ parse(Size, 16#010a, Channel, Data) ->
case EventID of
1 ->
<< ShopID:16/little >> = Param,
?ASSERT_EQ(Quantity, 0),
?ASSERT_EQ(QuantityOrColor, 0),
?ASSERT_EQ(VarK, 0),
?ASSERT_EQ(VarL, 0),
{npc_shop_enter, ShopID};
2 ->
<< ShopItemIndex:16/little >> = Param,
?ASSERT_EQ(Quantity, VarK),
?ASSERT_EQ(QuantityOrColor, VarK),
?ASSERT_EQ(VarL, 0),
{npc_shop_buy, ShopItemIndex, Quantity};
{npc_shop_buy, ShopItemIndex, QuantityOrColor};
3 ->
<< InventoryItemIndex:8, _Unknown:8 >> = Param,
?ASSERT_EQ(VarK, 0),
?ASSERT_EQ(VarL, 0),
{npc_shop_sell, InventoryItemIndex, Quantity};
{npc_shop_sell, InventoryItemIndex, QuantityOrColor};
4 -> ignore; %% @todo npc_shop_gift_wrap
5 ->
<< ShopID:16/little >> = Param,
?ASSERT_EQ(Quantity, 0),
?ASSERT_EQ(QuantityOrColor, 0),
?ASSERT_EQ(VarK, 0),
?ASSERT_EQ(VarL, 0),
{npc_shop_leave, ShopID};