summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBardur Arantsson <bardur@scientician.net>2011-02-20 09:23:42 +0100
committerBardur Arantsson <bardur@scientician.net>2011-02-20 09:23:42 +0100
commit534032607ebc420df5c26d7af9c488ea4a318e81 (patch)
treece5dfdc7390422e7b14fd7a7a417c8d6ef8f6e40
parent7781da3afe1ed2c26324a88ff009a11e6bb52216 (diff)
Use C++ friendly identifiers in quest code.
-rw-r--r--src/q_hobbit.c12
-rw-r--r--src/q_nazgul.c6
-rw-r--r--src/q_one.c8
-rw-r--r--src/q_poison.c6
-rw-r--r--src/q_shroom.c6
5 files changed, 19 insertions, 19 deletions
diff --git a/src/q_hobbit.c b/src/q_hobbit.c
index 0dd4ef58..ae5412e4 100644
--- a/src/q_hobbit.c
+++ b/src/q_hobbit.c
@@ -3,7 +3,7 @@
bool quest_hobbit_town_gen_hook(char *fmt)
{
- int x = 1, y = 1, try = 10000;
+ int x = 1, y = 1, tries = 10000;
s32b small;
small = get_next_arg(fmt);
@@ -11,7 +11,7 @@ bool quest_hobbit_town_gen_hook(char *fmt)
if ((turn < (cquest.data[1] + (DAY * 10L))) || (cquest.status > QUEST_STATUS_COMPLETED) || (small) || (p_ptr->town_num != 1)) return (FALSE);
/* Find a good position */
- while (try)
+ while (tries)
{
/* Get a random spot */
y = randint(20) + (cur_hgt / 2) - 10;
@@ -23,7 +23,7 @@ bool quest_hobbit_town_gen_hook(char *fmt)
cave_plain_floor_bold(y, x)) break;
/* One less try */
- try--;
+ tries--;
}
/* Place Melinda */
@@ -35,12 +35,12 @@ bool quest_hobbit_town_gen_hook(char *fmt)
}
bool quest_hobbit_gen_hook(char *fmt)
{
- int x = 1, y = 1, try = 10000;
+ int x = 1, y = 1, tries = 10000;
if ((cquest.status != QUEST_STATUS_TAKEN) || (dun_level != cquest.data[0]) || (dungeon_type != DUNGEON_MAZE)) return FALSE;
/* Find a good position */
- while (try)
+ while (tries)
{
/* Get a random spot */
y = randint(cur_hgt - 4) + 2;
@@ -50,7 +50,7 @@ bool quest_hobbit_gen_hook(char *fmt)
if (cave_empty_bold(y, x)) break;
/* One less try */
- try--;
+ tries--;
}
/* Place the hobbit */
diff --git a/src/q_nazgul.c b/src/q_nazgul.c
index ef188b16..2f9b4bf8 100644
--- a/src/q_nazgul.c
+++ b/src/q_nazgul.c
@@ -3,7 +3,7 @@
bool quest_nazgul_gen_hook(char *fmt)
{
- int m_idx, x = 1, y = 1, try = 10000;
+ int m_idx, x = 1, y = 1, tries = 10000;
s32b small;
small = get_next_arg(fmt);
@@ -11,7 +11,7 @@ bool quest_nazgul_gen_hook(char *fmt)
if ((cquest.status != QUEST_STATUS_TAKEN) || (small) || (p_ptr->town_num != 1)) return (FALSE);
/* Find a good position */
- while (try)
+ while (tries)
{
/* Get a random spot */
y = randint(cur_hgt - 4) + 2;
@@ -22,7 +22,7 @@ bool quest_nazgul_gen_hook(char *fmt)
if ((!los(p_ptr->py, p_ptr->px, y, x)) && cave_empty_bold(y, x)) break;
/* One less try */
- try--;
+ tries--;
}
/* Place the nazgul */
diff --git a/src/q_one.c b/src/q_one.c
index c11c5233..a52b37b8 100644
--- a/src/q_one.c
+++ b/src/q_one.c
@@ -318,14 +318,14 @@ bool quest_one_dump_hook(char *fmt)
}
bool quest_one_gen_hook(char *fmt)
{
- s32b x, y, try = 10000;
+ s32b x, y, tries = 10000;
/* Paranoia */
if (cquest.status != QUEST_STATUS_TAKEN) return (FALSE);
if ((dungeon_type != DUNGEON_ANGBAND) || (dun_level != 99)) return (FALSE);
/* Find a good position */
- while (try)
+ while (tries)
{
/* Get a random spot */
y = randint(cur_hgt - 4) + 2;
@@ -335,10 +335,10 @@ bool quest_one_gen_hook(char *fmt)
if (cave_empty_bold(y, x)) break;
/* One less try */
- try--;
+ tries--;
}
- if (try)
+ if (tries)
{
int m_idx = place_monster_one(y, x, test_monster_name("Sauron, the Sorcerer"), 0, FALSE, MSTATUS_ENEMY);
if (m_idx) m_list[m_idx].mflag |= MFLAG_QUEST;
diff --git a/src/q_poison.c b/src/q_poison.c
index efc8712c..49d3119c 100644
--- a/src/q_poison.c
+++ b/src/q_poison.c
@@ -23,7 +23,7 @@ static bool create_molds_hook(int r_idx)
bool quest_poison_gen_hook(char *fmt)
{
- int cy = 1, cx = 1, x, y, try = 10000, r_idx;
+ int cy = 1, cx = 1, x, y, tries = 10000, r_idx;
bool (*old_get_mon_num_hook)(int r_idx);
if (cquest.status != QUEST_STATUS_TAKEN) return FALSE;
@@ -32,7 +32,7 @@ bool quest_poison_gen_hook(char *fmt)
if (p_ptr->wild_mode) return FALSE;
/* Find a good position */
- while (try)
+ while (tries)
{
/* Get a random spot */
cy = randint(cur_hgt - 24) + 22;
@@ -42,7 +42,7 @@ bool quest_poison_gen_hook(char *fmt)
if (cave_empty_bold(cy, cx)) break;
/* One less try */
- try--;
+ tries--;
}
/* Place the baddies */
diff --git a/src/q_shroom.c b/src/q_shroom.c
index c8cc3bec..cb3f57d7 100644
--- a/src/q_shroom.c
+++ b/src/q_shroom.c
@@ -5,7 +5,7 @@ bool quest_shroom_speak_hook(char *fmt);
bool quest_shroom_town_gen_hook(char *fmt)
{
- int m_idx, x = 1, y = 1, try = 10000;
+ int m_idx, x = 1, y = 1, tries = 10000;
s32b small;
small = get_next_arg(fmt);
@@ -59,7 +59,7 @@ bool quest_shroom_town_gen_hook(char *fmt)
if ((bst(HOUR, turn) < 6) || (bst(HOUR, turn) >= 18) || (cquest.status > QUEST_STATUS_COMPLETED) || (small) || (p_ptr->town_num != 1)) return (FALSE);
/* Find a good position */
- while (try)
+ while (tries)
{
/* Get a random spot */
y = randint(20) + (cur_hgt / 2) - 10;
@@ -71,7 +71,7 @@ bool quest_shroom_town_gen_hook(char *fmt)
cave_plain_floor_bold(y, x)) break;
/* One less try */
- try--;
+ tries--;
}
/* Place Farmer Maggot */