ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/init.C
(Generate patch)

Comparing deliantra/server/common/init.C (file contents):
Revision 1.45 by root, Tue May 6 17:05:17 2008 UTC vs.
Revision 1.46 by root, Tue Sep 23 04:29:11 2008 UTC

139 * overwrite these if specified. 139 * overwrite these if specified.
140 */ 140 */
141void 141void
142init_environ (void) 142init_environ (void)
143{ 143{
144 char *cp; 144 const char *cp;
145 145
146 cp = getenv ("DELIANTRA_LIBDIR"); 146 if (cp = getenv ("DELIANTRA_CONFDIR" )) settings.datadir = cp;
147 if (cp) 147 if (cp = getenv ("DELIANTRA_LIBDIR" )) settings.datadir = cp;
148 settings.datadir = cp; 148 if (cp = getenv ("DELIANTRA_LOCALDIR" )) settings.localdir = cp;
149 if (cp = getenv ("DELIANTRA_PLAYERDIR" )) settings.playerdir = cp;
150 if (cp = getenv ("DELIANTRA_MAPDIR" )) settings.mapdir = cp;
151 if (cp = getenv ("DELIANTRA_ARCHETYPES" )) settings.archetypes = cp;
152 if (cp = getenv ("DELIANTRA_TREASURES" )) settings.treasures = cp;
153 if (cp = getenv ("DELIANTRA_UNIQUEDIR" )) settings.uniquedir = cp;
154 if (cp = getenv ("DELIANTRA_TEMPLATEDIR")) settings.templatedir = cp;
155 if (cp = getenv ("DELIANTRA_TMPDIR" )) settings.tmpdir = cp;
149 156
150 cp = getenv ("DELIANTRA_LOCALDIR"); 157 if (cp = getenv ("DELIANTRA_LOGFILE" )) settings.logfilename = cp;
151 if (cp)
152 settings.localdir = cp;
153
154 cp = getenv ("DELIANTRA_PLAYERDIR");
155 if (cp)
156 settings.playerdir = cp;
157
158 cp = getenv ("DELIANTRA_MAPDIR");
159 if (cp)
160 settings.mapdir = cp;
161
162 cp = getenv ("DELIANTRA_ARCHETYPES");
163 if (cp)
164 settings.archetypes = cp;
165
166 cp = getenv ("DELIANTRA_TREASURES");
167 if (cp)
168 settings.treasures = cp;
169
170 cp = getenv ("DELIANTRA_UNIQUEDIR");
171 if (cp)
172 settings.uniquedir = cp;
173
174 cp = getenv ("DELIANTRA_TEMPLATEDIR");
175 if (cp)
176 settings.templatedir = cp;
177
178 cp = getenv ("DELIANTRA_TMPDIR");
179 if (cp)
180 settings.tmpdir = cp;
181} 158}
182 159
183/* 160/*
184 * Initialises all global variables. 161 * Initialises all global variables.
185 * Might use environment-variables as default for some of them. 162 * Might use environment-variables as default for some of them.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines