psu_proto: Move player_options_change to events.

src/psu/psu_characters.erl

@@ -20,7 +20,7 @@
 -export([
 	character_tuple_to_binary/1, character_user_to_binary/1, class_atom_to_binary/1, class_binary_to_atom/1,
 	gender_atom_to_binary/1, gender_binary_to_atom/1, options_binary_to_tuple/1, options_tuple_to_binary/1,
-	race_atom_to_binary/1, race_binary_to_atom/1, se_list_to_binary/1, stats_tuple_to_binary/1, validate_name/1, validate_options/1
+	race_atom_to_binary/1, race_binary_to_atom/1, se_list_to_binary/1, stats_tuple_to_binary/1, validate_name/1
 ]).
 
 -include("include/records.hrl").
@@ -199,29 +199,3 @@ stats_tuple_to_binary(Tuple) ->
 validate_name(_Name) ->
 	%~ Something like that probably: << true = X =/= 16#00F7 andalso X =/= 16#03F7 || X:16 <- Name>>.
 	ok.
-
-%% @doc Validate the options data.
-%%      Trigger an exception rather than handling errors.
-
-validate_options(Tuple) ->
-	{options, TextDisplaySpeed, Sound, MusicVolume, SoundEffectVolume, Vibration, RadarMapDisplay,
-		CutInDisplay, MainMenuCursorPosition, Camera3rdY, Camera3rdX, Camera1stY, Camera1stX,
-		Controller, WeaponSwap, LockOn, Brightness, FunctionKeySetting, ButtonDetailDisplay} = Tuple,
-	true = TextDisplaySpeed =< 1,
-	true = Sound =< 1,
-	true = MusicVolume =< 9,
-	true = SoundEffectVolume =< 9,
-	true = Vibration =< 1,
-	true = RadarMapDisplay =< 1,
-	true = CutInDisplay =< 1,
-	true = MainMenuCursorPosition =< 1,
-	true = Camera3rdY =< 1,
-	true = Camera3rdX =< 1,
-	true = Camera1stY =< 1,
-	true = Camera1stX =< 1,
-	true = Controller =< 1,
-	true = WeaponSwap =< 1,
-	true = LockOn =< 1,
-	true = Brightness =< 4,
-	true = FunctionKeySetting =< 1,
-	true = ButtonDetailDisplay =< 2.

src/psu/psu_game.erl

@@ -902,8 +902,9 @@ event({object_warp_take, BlockID, ListNb, ObjectNb}) ->
 	send_0503(User#egs_user_model.pos),
 	send_1211(16#ffffffff, 0, 14, 0);
 
-event(player_type_availability_request) ->
+event({player_options_change, Options}) ->
-	send_1a07();
+	{ok, User} = egs_user_model:read(get(gid)),
+	file:write_file(io_lib:format("save/~s/~b-character.options", [User#egs_user_model.folder, (User#egs_user_model.character)#characters.slot]), Options);
 
 %% @todo If the player has a scape, use it! Otherwise red screen.
 %% @todo Right now we force revive and don't update the player's HP.
@@ -922,6 +923,9 @@ event(player_death_return_to_lobby) ->
 	Area = User#egs_user_model.prev_area,
 	area_load(Area#psu_area.questid, Area#psu_area.zoneid, Area#psu_area.mapid, User#egs_user_model.prev_entryid);
 
+event(player_type_availability_request) ->
+	send_1a07();
+
 event(player_type_capabilities_request) ->
 	send_0113();
 
@@ -1007,16 +1011,6 @@ handle(16#0d04, Data) ->
 	GID = get(gid),
 	send(<< 16#0d040300:32, 0:160, 16#00011300:32, GID:32/little-unsigned-integer, 0:64, Flag/binary, A/binary, 1, B/binary >>);
 
-%% @doc Options changes handler.
-handle(16#0d07, Data) ->
-	log("options changes"),
-	% Translate options into a tuple, validate them and do nothing with it for now
-	Options = psu_characters:options_binary_to_tuple(Data),
-	psu_characters:validate_options(Options),
-	% End of validation
-	{ok, User} = egs_user_model:read(get(gid)),
-	file:write_file(io_lib:format("save/~s/~b-character.options", [User#egs_user_model.folder, (User#egs_user_model.character)#characters.slot]), Data);
-
 %% @doc Initialize a vehicle object.
 %% @todo Find what are the many values, including the odd Whut value (and whether it's used in the reply).
 %% @todo Separate the reply.

src/psu/psu_proto.erl

@@ -520,6 +520,50 @@ parse(Size, 16#0c0f, Channel, Data) ->
 	?ASSERT_EQ(VarI, 0),
 	{counter_quest_options_request, CounterID};
 
+%% @todo Return a tuple rather than a binary!
+parse(Size, 16#0d07, Channel, Data) ->
+	<<	VarA:32/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,
+		TextDisplaySpeed:8, Sound:8, MusicVolume:8, SoundEffectVolume:8, Vibration:8, RadarMapDisplay:8,
+		CutInDisplay:8, MainMenuCursorPosition:8, VarJ:8, Camera3rdY:8, Camera3rdX:8, Camera1stY:8, Camera1stX:8,
+		Controller:8, WeaponSwap:8, LockOn:8, Brightness:8, FunctionKeySetting:8, _VarK:8, ButtonDetailDisplay:8, VarL:32/little >> = Data,
+	?ASSERT_EQ(Size, 68),
+	?ASSERT_EQ(Channel, 2),
+	?ASSERT_EQ(VarA, 0),
+	?ASSERT_EQ(VarB, 0),
+	?ASSERT_EQ(VarC, 0),
+	?ASSERT_EQ(VarD, 0),
+	?ASSERT_EQ(VarE, 0),
+	?ASSERT_EQ(VarF, 0),
+	?ASSERT_EQ(VarG, 0),
+	?ASSERT_EQ(VarH, 0),
+	?ASSERT_EQ(VarI, 0),
+	?ASSERT_EQ(VarJ, 0),
+	?ASSERT_EQ(VarL, 0),
+	%% Make sure the options are valid.
+	true = TextDisplaySpeed =< 1,
+	true = Sound =< 1,
+	true = MusicVolume =< 9,
+	true = SoundEffectVolume =< 9,
+	true = Vibration =< 1,
+	true = RadarMapDisplay =< 1,
+	true = CutInDisplay =< 1,
+	true = MainMenuCursorPosition =< 1,
+	true = Camera3rdY =< 1,
+	true = Camera3rdX =< 1,
+	true = Camera1stY =< 1,
+	true = Camera1stX =< 1,
+	true = Controller =< 1,
+	true = WeaponSwap =< 1,
+	true = LockOn =< 1,
+	true = Brightness =< 4,
+	true = FunctionKeySetting =< 1,
+	true = ButtonDetailDisplay =< 2,
+	%% Options are considered safe past this point.
+	Options = {options, TextDisplaySpeed, Sound, MusicVolume, SoundEffectVolume, Vibration, RadarMapDisplay,
+						CutInDisplay, MainMenuCursorPosition, Camera3rdY, Camera3rdX, Camera1stY, Camera1stX,
+						Controller, WeaponSwap, LockOn, Brightness, FunctionKeySetting, ButtonDetailDisplay},
+	{player_options_change, psu_characters:options_tuple_to_binary(Options)}; %% @todo {player_options_change, Options};
+
 %% @todo Many unknown vars in the command header.
 parse(Size, 16#0e00, Channel, Data) ->
 	<< _UnknownVars:288/bits, NbHits:32/little, _PartyPosOrLID:32/little, _HitCommandNb:32/little, Hits/bits >> = Data,