summaryrefslogtreecommitdiff
path: root/src/dice.cc
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2019-02-15 19:20:25 +0100
committerBardur Arantsson <bardur@scientician.net>2019-02-15 19:20:25 +0100
commit4665f2477ba66f303f764f953accc1c798f85d03 (patch)
tree539b771a769955b04d384980a41583f2102cce0f /src/dice.cc
parentfdba7ea1d04f8aa1df2ab8426b36dd05f26bd516 (diff)
Replace uses of bool_ in dice.*
Diffstat (limited to 'src/dice.cc')
-rw-r--r--src/dice.cc17
1 files changed, 8 insertions, 9 deletions
diff --git a/src/dice.cc b/src/dice.cc
index 45f139b2..3b5b05a9 100644
--- a/src/dice.cc
+++ b/src/dice.cc
@@ -14,47 +14,46 @@ void dice_init(dice_type *dice, long base, long num, long sides)
dice->sides = sides;
}
-bool_ dice_parse(dice_type *dice, const char *s)
+static bool dice_parse(dice_type *dice, const char *s)
{
long base, num, sides;
if (sscanf(s, "%ld+%ldd%ld", &base, &num, &sides) == 3)
{
dice_init(dice, base, num, sides);
- return TRUE;
+ return true;
}
if (sscanf(s, "%ld+d%ld", &base, &sides) == 2)
{
dice_init(dice, base, 1, sides);
- return TRUE;
+ return true;
}
if (sscanf(s, "d%ld", &sides) == 1)
{
dice_init(dice, 0, 1, sides);
- return TRUE;
+ return true;
}
if (sscanf(s, "%ldd%ld", &num, &sides) == 2)
{
dice_init(dice, 0, num, sides);
- return TRUE;
+ return true;
}
if (sscanf(s, "%ld", &base) == 1)
{
dice_init(dice, base, 0, 0);
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
void dice_parse_checked(dice_type *dice, const char *s)
{
- bool_ result = dice_parse(dice, s);
- if (!result)
+ if (!dice_parse(dice, s))
{
abort();
}