| summaryrefslogtreecommitdiff |
diff options
Diffstat (limited to 'src')
20 files changed, 27 insertions, 27 deletions
diff --git a/src/battle/src/Struct/Model.elm b/src/battle/src/Struct/Model.elm index 2924ed3..f12918e 100644 --- a/src/battle/src/Struct/Model.elm +++ b/src/battle/src/Struct/Model.elm @@ -66,7 +66,7 @@ new flags = battle = (Struct.Battle.new) } in - case (Struct.Flags.maybe_get_param "id" flags) of + case (Struct.Flags.maybe_get_parameter "id" flags) of Nothing -> (invalidate (Struct.Error.new diff --git a/src/battle/src/Update/HandleServerReply.elm b/src/battle/src/Update/HandleServerReply.elm index 31b3318..a7fcb71 100644 --- a/src/battle/src/Update/HandleServerReply.elm +++ b/src/battle/src/Update/HandleServerReply.elm @@ -67,7 +67,7 @@ disconnected current_state = (Url.percentEncode ( "/battle/?" - ++ (Struct.Flags.get_params_as_url model.flags) + ++ (Struct.Flags.get_parameters_as_url model.flags) ) ) ) diff --git a/src/login/src/Comm/SendRecovery.elm b/src/login/src/Comm/SendRecovery.elm index 31b89f3..18a64f4 100644 --- a/src/login/src/Comm/SendRecovery.elm +++ b/src/login/src/Comm/SendRecovery.elm @@ -36,5 +36,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.login_recovery_handler - maybe_encod + maybe_encode ) diff --git a/src/login/src/Comm/SendSignIn.elm b/src/login/src/Comm/SendSignIn.elm index 4923751..0eb9c46 100644 --- a/src/login/src/Comm/SendSignIn.elm +++ b/src/login/src/Comm/SendSignIn.elm @@ -37,5 +37,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.login_sign_in_handler - maybe_encod + maybe_encode ) diff --git a/src/login/src/Comm/SendSignUp.elm b/src/login/src/Comm/SendSignUp.elm index cefa0fe..6fc4ba4 100644 --- a/src/login/src/Comm/SendSignUp.elm +++ b/src/login/src/Comm/SendSignUp.elm @@ -38,5 +38,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.login_sign_up_handler - maybe_encod + maybe_encode ) diff --git a/src/login/src/ElmModule/Init.elm b/src/login/src/ElmModule/Init.elm index e3ca64d..9574712 100644 --- a/src/login/src/ElmModule/Init.elm +++ b/src/login/src/ElmModule/Init.elm @@ -22,7 +22,7 @@ init flags = let new_model = (Struct.Model.new flags) in - case (Struct.Flags.maybe_get_param "action" flags) of + case (Struct.Flags.maybe_get_parameter "action" flags) of (Just "disconnect") -> (Update.Disconnect.apply_to new_model) _ -> if (flags.user_id == "") diff --git a/src/login/src/Struct/Model.elm b/src/login/src/Struct/Model.elm index 7d14239..3a721c1 100644 --- a/src/login/src/Struct/Model.elm +++ b/src/login/src/Struct/Model.elm @@ -45,7 +45,7 @@ type alias Type = new : Struct.Flags.Type -> Type new flags = let - maybe_mode = (Struct.Flags.maybe_get_param "mode" flags) + maybe_mode = (Struct.Flags.maybe_get_parameter "mode" flags) model = { help_request = Struct.HelpRequest.None, diff --git a/src/login/src/Update/HandleConnected.elm b/src/login/src/Update/HandleConnected.elm index 00843c7..15e3371 100644 --- a/src/login/src/Update/HandleConnected.elm +++ b/src/login/src/Update/HandleConnected.elm @@ -26,7 +26,7 @@ apply_to model = (Action.Ports.go_to (Constants.IO.base_url ++ ( - case (Struct.Flags.maybe_get_param "goto" model.flags) of + case (Struct.Flags.maybe_get_parameter "goto" model.flags) of Nothing -> "/main-menu/" (Just string) -> case (Url.percentDecode string) of diff --git a/src/main-menu/src/Comm/LoadPlayer.elm b/src/main-menu/src/Comm/LoadPlayer.elm index ce17b8c..49bc562 100644 --- a/src/main-menu/src/Comm/LoadPlayer.elm +++ b/src/main-menu/src/Comm/LoadPlayer.elm @@ -41,5 +41,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.player_loading_handler - maybe_encod + maybe_encode ) diff --git a/src/main-menu/src/Struct/BattleRequest.elm b/src/main-menu/src/Struct/BattleRequest.elm index b6864e1..c4f7aaa 100644 --- a/src/main-menu/src/Struct/BattleRequest.elm +++ b/src/main-menu/src/Struct/BattleRequest.elm @@ -12,7 +12,7 @@ module Struct.BattleRequest exposing set_category, set_size, set_map_id, - get_url_params + get_url_parameters ) -- Elm ------------------------------------------------------------------------- @@ -81,8 +81,8 @@ get_map_id ir = ir.map_id set_map_id : String -> Type -> Type set_map_id id ir = {ir | map_id = id} -get_url_params : Type -> String -get_url_params ir = +get_url_parameters : Type -> String +get_url_parameters ir = ( "?six=" ++ (String.fromInt ir.ix) diff --git a/src/main-menu/src/Update/HandleServerReply.elm b/src/main-menu/src/Update/HandleServerReply.elm index d633bf3..62f8005 100644 --- a/src/main-menu/src/Update/HandleServerReply.elm +++ b/src/main-menu/src/Update/HandleServerReply.elm @@ -44,7 +44,7 @@ disconnected current_state = (Url.percentEncode ( "/main-menu/?" - ++ (Struct.Flags.get_params_as_url model.flags) + ++ (Struct.Flags.get_parameters_as_url model.flags) ) ) ) diff --git a/src/main-menu/src/View/Tab/NewBattle.elm b/src/main-menu/src/View/Tab/NewBattle.elm index c5d22fa..f74e7fb 100644 --- a/src/main-menu/src/View/Tab/NewBattle.elm +++ b/src/main-menu/src/View/Tab/NewBattle.elm @@ -135,7 +135,7 @@ select_characters_html battle_req = ( "/roster-editor/" ++ - (Struct.BattleRequest.get_url_params battle_req) + (Struct.BattleRequest.get_url_parameters battle_req) ) ) ] diff --git a/src/map-editor/src/Comm/LoadMap.elm b/src/map-editor/src/Comm/LoadMap.elm index 7eb92c8..e44612b 100644 --- a/src/map-editor/src/Comm/LoadMap.elm +++ b/src/map-editor/src/Comm/LoadMap.elm @@ -49,5 +49,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.map_loading_handler - maybe_encod + maybe_encode ) diff --git a/src/map-editor/src/Struct/Model.elm b/src/map-editor/src/Struct/Model.elm index 141a9c2..f0a8708 100644 --- a/src/map-editor/src/Struct/Model.elm +++ b/src/map-editor/src/Struct/Model.elm @@ -62,7 +62,7 @@ type alias Type = new : Struct.Flags.Type -> Type new flags = let - maybe_map_id = (Struct.Flags.maybe_get_param "id" flags) + maybe_map_id = (Struct.Flags.maybe_get_parameter "id" flags) model = { flags = flags, diff --git a/src/map-editor/src/Update/HandleServerReply.elm b/src/map-editor/src/Update/HandleServerReply.elm index 3caf506..433d1a9 100644 --- a/src/map-editor/src/Update/HandleServerReply.elm +++ b/src/map-editor/src/Update/HandleServerReply.elm @@ -49,7 +49,7 @@ disconnected current_state = (Url.percentEncode ( "/map-editor/?" - ++ (Struct.Flags.get_params_as_url model.flags) + ++ (Struct.Flags.get_parameters_as_url model.flags) ) ) ) diff --git a/src/roster-editor/src/Comm/JoinBattle.elm b/src/roster-editor/src/Comm/JoinBattle.elm index 90dc0c4..f605ffc 100644 --- a/src/roster-editor/src/Comm/JoinBattle.elm +++ b/src/roster-editor/src/Comm/JoinBattle.elm @@ -44,7 +44,7 @@ maybe_encode model = ( case (String.toInt - (Struct.Flags.force_get_param "six" model.flags) + (Struct.Flags.force_get_parameter "six" model.flags) ) of (Just ix) -> ix @@ -55,25 +55,25 @@ maybe_encode model = ( "cat", (Json.Encode.string - (Struct.Flags.force_get_param "cat" model.flags) + (Struct.Flags.force_get_parameter "cat" model.flags) ) ), ( "mod", (Json.Encode.string - (Struct.Flags.force_get_param "mod" model.flags) + (Struct.Flags.force_get_parameter "mod" model.flags) ) ), ( "s", (Json.Encode.string - (Struct.Flags.force_get_param "s" model.flags) + (Struct.Flags.force_get_parameter "s" model.flags) ) ), ( "map_id", (Json.Encode.string - (Struct.Flags.force_get_param "map_id" model.flags) + (Struct.Flags.force_get_parameter "map_id" model.flags) ) ), ( @@ -98,5 +98,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.join_battle_handler - maybe_encod + maybe_encode ) diff --git a/src/roster-editor/src/Comm/LoadRoster.elm b/src/roster-editor/src/Comm/LoadRoster.elm index 0327806..5156826 100644 --- a/src/roster-editor/src/Comm/LoadRoster.elm +++ b/src/roster-editor/src/Comm/LoadRoster.elm @@ -49,5 +49,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.roster_loading_handler - maybe_encod + maybe_encode ) diff --git a/src/roster-editor/src/Comm/UpdateRoster.elm b/src/roster-editor/src/Comm/UpdateRoster.elm index 4e3ee54..a6066a9 100644 --- a/src/roster-editor/src/Comm/UpdateRoster.elm +++ b/src/roster-editor/src/Comm/UpdateRoster.elm @@ -66,5 +66,5 @@ try model = (Comm.Send.maybe_send model Constants.IO.roster_update_handler - maybe_encod + maybe_encode ) diff --git a/src/roster-editor/src/Struct/Model.elm b/src/roster-editor/src/Struct/Model.elm index c3903d7..f661edf 100644 --- a/src/roster-editor/src/Struct/Model.elm +++ b/src/roster-editor/src/Struct/Model.elm @@ -98,7 +98,7 @@ new flags = battle_order = (Array.repeat ( - case (Struct.Flags.maybe_get_param "s" flags) of + case (Struct.Flags.maybe_get_parameter "s" flags) of Nothing -> 0 (Just "s") -> 8 (Just "m") -> 16 diff --git a/src/roster-editor/src/Update/HandleServerReply.elm b/src/roster-editor/src/Update/HandleServerReply.elm index 0096753..f456355 100644 --- a/src/roster-editor/src/Update/HandleServerReply.elm +++ b/src/roster-editor/src/Update/HandleServerReply.elm @@ -51,7 +51,7 @@ disconnected current_state = (Url.percentEncode ( "/roster-editor/?" - ++ (Struct.Flags.get_params_as_url model.flags) + ++ (Struct.Flags.get_parameters_as_url model.flags) ) ) ) |