aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-29 21:05:42 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2020-05-29 21:05:42 +0200
commitd626afac1c72192403da9b190e14a140b09ecf2e (patch)
treecda516f03e5962e9a896944c0a5867cf87ab0c76
parent0c86b3f337a24e9936bfec0fe5dc127d7f6212d4 (diff)
downloadtacticians-server-skills_and_conditions.zip
tacticians-server-skills_and_conditions.tar.bz2
Ensures things still compile with -Wall -Werror...skills_and_conditions
-rw-r--r--src/balancer/struct/blc_weapon.erl4
-rw-r--r--src/bounty/bnt_join_battle.erl82
2 files changed, 43 insertions, 43 deletions
diff --git a/src/balancer/struct/blc_weapon.erl b/src/balancer/struct/blc_weapon.erl
index 84d0383..23f6790 100644
--- a/src/balancer/struct/blc_weapon.erl
+++ b/src/balancer/struct/blc_weapon.erl
@@ -204,8 +204,8 @@ get_max_attribute_ratio (SpendablePoints, ?WEAPON_ATTRIBUTE_RANGE) ->
),
case (Contrib == 0) of
- true -> 0.0;
- false -> (SpendablePoints / Contrib) * 100.0
+ false -> (SpendablePoints / Contrib) * 100.0;
+ _ -> 0.0
end;
get_max_attribute_ratio (SpendablePoints, Attribute) ->
{AttMin, _AttDef, AttMax, AttCost} = blc_attribute:get_info(Attribute),
diff --git a/src/bounty/bnt_join_battle.erl b/src/bounty/bnt_join_battle.erl
index f1a8c10..dea7965 100644
--- a/src/bounty/bnt_join_battle.erl
+++ b/src/bounty/bnt_join_battle.erl
@@ -310,47 +310,47 @@ generate_pending_battle
S0PendingBattle.
--spec repair_join_battle
- (
- shr_player:id(),
- non_neg_integer(),
- shr_battle_summary:category(),
- list(non_neg_integer()),
- btl_pending_battle:id(),
- btl_pending_battle:type()
- )
- -> {ok, btl_pending_battle:type()}.
-repair_join_battle
-(
- PlayerID,
- PlayerSumIX,
- PlayerSumCategory,
- RosterCharIXs,
- PBattleID,
- PBattle
-) ->
- PlayerUser = ataxia_security:user_from_id(PlayerID),
-
- {S0PBattle, AtaxicUpdate} =
- add_to_pending_battle
- (
- PlayerID,
- PlayerSumIX,
- PlayerSumCategory,
- RosterCharIXs,
- PBattle
- ),
-
- ok =
- ataxia_client:update
- (
- pending_battle_db,
- PlayerUser,
- AtaxicUpdate,
- PBattleID
- ),
-
- {ok, S0PBattle}.
+%%-spec repair_join_battle
+%% (
+%% shr_player:id(),
+%% non_neg_integer(),
+%% shr_battle_summary:category(),
+%% list(non_neg_integer()),
+%% btl_pending_battle:id(),
+%% btl_pending_battle:type()
+%% )
+%% -> {ok, btl_pending_battle:type()}.
+%%repair_join_battle
+%%(
+%% PlayerID,
+%% PlayerSumIX,
+%% PlayerSumCategory,
+%% RosterCharIXs,
+%% PBattleID,
+%% PBattle
+%%) ->
+%% PlayerUser = ataxia_security:user_from_id(PlayerID),
+%%
+%% {S0PBattle, AtaxicUpdate} =
+%% add_to_pending_battle
+%% (
+%% PlayerID,
+%% PlayerSumIX,
+%% PlayerSumCategory,
+%% RosterCharIXs,
+%% PBattle
+%% ),
+%%
+%% ok =
+%% ataxia_client:update
+%% (
+%% pending_battle_db,
+%% PlayerUser,
+%% AtaxicUpdate,
+%% PBattleID
+%% ),
+%%
+%% {ok, S0PBattle}.
-spec repair_create_battle
(