Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 68461 Details for
Bug 83217
dungeon-crawl-4.0.0_beta26.ebuild (New Package)
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
morgue-orig.patch
morgue-orig.patch (text/plain), 3.19 KB, created by
Sophie Hamilton
on 2005-09-14 09:49:36 UTC
(
hide
)
Description:
morgue-orig.patch
Filename:
MIME Type:
Creator:
Sophie Hamilton
Created:
2005-09-14 09:49:36 UTC
Size:
3.19 KB
patch
obsolete
>diff -ur dc400b26-src/init.txt dc400b26-src.new/init.txt >--- dc400b26-src/init.txt 2003-03-20 06:13:46.000000000 +0000 >+++ dc400b26-src.new/init.txt 2005-04-25 18:18:57.800954880 +0100 >@@ -24,10 +24,15 @@ > # name=kernel > > >-# Directory for reading macro.txt and init.txt, and dumping characters. >+# Directory for reading macro.txt and init.txt. > # It should end with the path delimiter. > # crawl_dir=/home/bwross/crawl/ > >+# Directory for dumping character files (morgue.txt) >+# Setting this different from crawl_dir allows configuration >+# to be in a separate directory. >+# It should end with the path delimiter. >+morgue_dir=/var/games/crawl/ > > # Here's a list of autopickup types: > # >diff -ur dc400b26-src/source/chardump.cc dc400b26-src.new/source/chardump.cc >--- dc400b26-src/source/chardump.cc 2003-03-08 04:56:38.000000000 +0000 >+++ dc400b26-src.new/source/chardump.cc 2005-04-25 18:22:49.875674160 +0100 >@@ -847,7 +847,9 @@ > > char file_name[kPathLen] = "\0"; > >- if (SysEnv.crawl_dir) >+ if (SysEnv.morgue_dir) >+ strncpy(file_name, SysEnv.morgue_dir, kPathLen); >+ else if (SysEnv.crawl_dir) > strncpy(file_name, SysEnv.crawl_dir, kPathLen); > > strncat(file_name, fname, kPathLen); >diff -ur dc400b26-src/source/initfile.cc dc400b26-src.new/source/initfile.cc >--- dc400b26-src/source/initfile.cc 2003-03-20 05:09:26.000000000 +0000 >+++ dc400b26-src.new/source/initfile.cc 2005-04-25 18:16:34.133795608 +0100 >@@ -422,6 +422,7 @@ > // some fields want capitals... none care about external spaces > trim_string( field ); > if (key != "name" && key != "crawl_dir" >+ && key != "morgue_dir" > && key != "race" && key != "class") > { > tolower_string( field ); >@@ -684,6 +685,19 @@ > SysEnv.crawl_dir[ kNameLen - 1 ] = '\0'; > } > } >+ else if (key == "morgue_dir") >+ { >+ // We shouldn't bother to allocate this a second time >+ // if the user puts two morgue_dir lines in the init file. >+ if (!SysEnv.morgue_dir) >+ SysEnv.morgue_dir = (char *) calloc(kPathLen, sizeof(char)); >+ >+ if (SysEnv.morgue_dir) >+ { >+ strncpy(SysEnv.morgue_dir, field.c_str(), kNameLen - 1); >+ SysEnv.morgue_dir[ kNameLen - 1 ] = '\0'; >+ } >+ } > else if (key == "race") > { > Options.race = str_to_race( field ); >diff -ur dc400b26-src/source/externs.h dc400b26-src.new/source/externs.h >--- dc400b26-src/source/externs.h 2005-04-25 22:09:56.547105224 +0100 >+++ dc400b26-src.new/source/externs.h 2005-04-25 22:09:45.761744848 +0100 >@@ -445,6 +445,7 @@ > char *crawl_pizza; > char *crawl_rc; > char *crawl_dir; >+ char *morgue_dir; > char *home; // only used by MULTIUSER systems > bool board_with_nail; // Easter Egg silliness > }; >--- dc400b26-src/source/macro.cc.bak 2005-07-25 14:57:05.100216392 +0100 >+++ dc400b26-src/source/macro.cc 2005-07-25 14:58:16.077426216 +0100 >@@ -62,8 +62,8 @@ > { > std::string s; > >- if (SysEnv.crawl_dir) >- s = SysEnv.crawl_dir; >+ if (SysEnv.morgue_dir) >+ s = SysEnv.morgue_dir; > > return (s + "macro.txt"); > }
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 83217
:
52059
|
52060
|
52061
|
52062
|
52302
|
52303
|
58900
|
58901
|
58902
|
58903
|
58905
|
58906
|
68460
| 68461 |
68462
|
68463
|
68464
|
68465
|
105979
|
106632
|
106766
|
116369
|
182639
|
192290
|
192331
|
194950
|
195397
|
204397
|
212651
|
269113