Merge trunk (1403-1409] back to 0.2:

- Level-design howto.
- Horn of Geryon now jelly-safe.
- Mac users can double-click to run Crawl.
- Prices of rings of slaying calculated correctly.
- Fixed travel cache losing stair distances.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup-0.2@1410 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 7 insertions, 5 deletions

diff --git a/crawl-ref/source/externs.h b/crawl-ref/source/externs.h
index 6bdf8f1562..004cc278c4 100644
--- a/crawl-ref/source/externs.h
+++ b/crawl-ref/source/externs.h
@@ -1132,11 +1132,13 @@ extern std::vector<ghost_demon> ghosts;
 
 struct system_environment
 {
-    char *crawl_name;
-    char *crawl_pizza;
-    char *crawl_rc;
-    char *crawl_dir;
-    char *home;                    // only used by MULTIUSER systems
+    std::string crawl_name;
+    std::string crawl_pizza;
+    std::string crawl_rc;
+    std::string crawl_dir;
+    std::string crawl_base;        // Directory from argv[0], may be used to
+                                   // locate datafiles.
+    std::string home;              // only used by MULTIUSER systems
     bool  board_with_nail;         // Easter Egg silliness
 
 #ifdef DGL_SIMPLE_MESSAGING