summaryrefslogtreecommitdiffstats
path: root/crawl-ref/source/branch.h
diff options
context:
space:
mode:
authorj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-12 09:03:37 +0000
committerj-p-e-g <j-p-e-g@c06c8d41-db1a-0410-9941-cceddc491573>2008-06-12 09:03:37 +0000
commit14f96d4f59e4c91915bb15d2f4ca845e6e2e459e (patch)
tree0d4e442574394649b916aaecef060cda9a6c4282 /crawl-ref/source/branch.h
parent42d4567bed5358f70d8205f17f65c380e6ad65f7 (diff)
downloadcrawl-ref-14f96d4f59e4c91915bb15d2f4ca845e6e2e459e.tar.gz
crawl-ref-14f96d4f59e4c91915bb15d2f4ca845e6e2e459e.zip
Remove unneeded methods (including the old resistance screen), rename
debugging functions, and some other clean-up. git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5757 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source/branch.h')
-rw-r--r--crawl-ref/source/branch.h13
1 files changed, 9 insertions, 4 deletions
diff --git a/crawl-ref/source/branch.h b/crawl-ref/source/branch.h
index 08abfaaa14..94222fc689 100644
--- a/crawl-ref/source/branch.h
+++ b/crawl-ref/source/branch.h
@@ -43,7 +43,7 @@ struct Branch
const char* entry_message;
bool has_shops;
bool has_uniques;
- char floor_colour; // Zot needs special handling
+ char floor_colour; // Zot needs special handling.
char rock_colour;
int (*mons_rarity_function)(int);
int (*mons_level_function)(int);
@@ -51,16 +51,21 @@ struct Branch
trap_type (*rand_trap_function)(int);
int (*num_fogs_function)(int);
void (*rand_fog_function)(int,fog_machine_data&);
- int altar_chance; // in percent
- int travel_shortcut; // which key to press for travel
- bool any_upstair_exits; // any upstair exits the branch (Hell branches)
+ int altar_chance; // in percent
+ int travel_shortcut; // Which key to press for travel.
+ bool any_upstair_exits; // any upstair exits the branch (Hell branches)
bool dangerous_bottom_level; // bottom level is more dangerous than normal
};
extern Branch branches[];
Branch& your_branch();
+
+/* ***********************************************************************
+ * called from: dungeon
+ * *********************************************************************** */
bool at_branch_bottom();
+
branch_type str_to_branch(const std::string &branch,
branch_type err = NUM_BRANCHES);