… | |
… | |
55 | /* If in a socket, don't print out the list of authors. It confuses the |
55 | /* If in a socket, don't print out the list of authors. It confuses the |
56 | * crossclient program. |
56 | * crossclient program. |
57 | */ |
57 | */ |
58 | if (op == NULL) |
58 | if (op == NULL) |
59 | return; |
59 | return; |
|
|
60 | |
60 | new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); |
61 | new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); |
|
|
62 | new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); |
|
|
63 | new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); |
|
|
64 | new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); |
61 | new_draw_info (NDI_UNIQUE, 0, op, "mwedel@sonic.net (Mark Wedel)"); |
65 | new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>"); |
62 | new_draw_info (NDI_UNIQUE, 0, op, "frankj@ifi.uio.no (Frank Tore Johansen)"); |
66 | new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>"); |
63 | new_draw_info (NDI_UNIQUE, 0, op, "kjetilho@ifi.uio.no (Kjetil Torgrim Homme)"); |
67 | new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>"); |
64 | new_draw_info (NDI_UNIQUE, 0, op, "tvangod@ecst.csuchico.edu (Tyler Van Gorder)"); |
68 | new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>"); |
65 | new_draw_info (NDI_UNIQUE, 0, op, "elmroth@cd.chalmers.se (Tony Elmroth)"); |
69 | new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>"); |
66 | new_draw_info (NDI_UNIQUE, 0, op, "dougal.scott@fcit.monasu.edu.au (Dougal Scott)"); |
70 | new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>"); |
67 | new_draw_info (NDI_UNIQUE, 0, op, "wchuang@athena.mit.edu (William)"); |
71 | new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>"); |
68 | new_draw_info (NDI_UNIQUE, 0, op, "ftww@cs.su.oz.au (Geoff Bailey)"); |
72 | new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>"); |
69 | new_draw_info (NDI_UNIQUE, 0, op, "jorgens@flipper.pvv.unit.no (Kjetil Wiekhorst Jxrgensen)"); |
73 | new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jxrgensen <jorgens@flipper.pvv.unit.no>"); |
70 | new_draw_info (NDI_UNIQUE, 0, op, "c.blackwood@rdt.monash.edu.au (Cameron Blackwood)"); |
74 | new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>"); |
71 | new_draw_info (NDI_UNIQUE, 0, op, "jtraub+@cmu.edu (Joseph L. Traub)"); |
75 | new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>"); |
72 | new_draw_info (NDI_UNIQUE, 0, op, "rgg@aaii.oz.au (Rupert G. Goldie)"); |
76 | new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>"); |
73 | new_draw_info (NDI_UNIQUE, 0, op, "eanders+@cmu.edu (Eric A. Anderson)"); |
77 | new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>"); |
74 | new_draw_info (NDI_UNIQUE, 0, op, "eneq@Prag.DoCS.UU.SE (Rickard Eneqvist)"); |
78 | new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>"); |
75 | new_draw_info (NDI_UNIQUE, 0, op, "Jarkko.Sonninen@lut.fi (Jarkko Sonninen)"); |
79 | new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>"); |
76 | new_draw_info (NDI_UNIQUE, 0, op, "kholland@sunlab.cit.cornell.du (Karl Holland)"); |
80 | new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>"); |
77 | new_draw_info (NDI_UNIQUE, 0, op, "vick@bern.docs.uu.se (Mikael Lundgren)"); |
81 | new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>"); |
78 | new_draw_info (NDI_UNIQUE, 0, op, "mol@meryl.csd.uu.se (Mikael Olsson)"); |
82 | new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>"); |
79 | new_draw_info (NDI_UNIQUE, 0, op, "Tero.Haatanen@lut.fi (Tero Haatanen)"); |
83 | new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>"); |
80 | new_draw_info (NDI_UNIQUE, 0, op, "ylitalo@student.docs.uu.se (Lasse Ylitalo)"); |
84 | new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>"); |
81 | new_draw_info (NDI_UNIQUE, 0, op, "anipa@guru.magic.fi (Niilo Neuvo)"); |
85 | new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>"); |
82 | new_draw_info (NDI_UNIQUE, 0, op, "mta@modeemi.cs.tut.fi (Markku J{rvinen)"); |
86 | new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>"); |
83 | new_draw_info (NDI_UNIQUE, 0, op, "meunier@inf.enst.fr (Sylvain Meunier)"); |
87 | new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>"); |
84 | new_draw_info (NDI_UNIQUE, 0, op, "jfosback@darmok.uoregon.edu (Jason Fosback)"); |
88 | new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>"); |
85 | new_draw_info (NDI_UNIQUE, 0, op, "cedman@capitalist.princeton.edu (Carl Edman)"); |
89 | new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>"); |
86 | new_draw_info (NDI_UNIQUE, 0, op, "henrich@crh.cl.msu.edu (Charles Henrich)"); |
90 | new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>"); |
87 | new_draw_info (NDI_UNIQUE, 0, op, "schmid@fb3-s7.math.tu-berlin.de (Gregor Schmid)"); |
91 | new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>"); |
88 | new_draw_info (NDI_UNIQUE, 0, op, "quinet@montefiore.ulg.ac.be (Raphael Quinet)"); |
92 | new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>"); |
89 | new_draw_info (NDI_UNIQUE, 0, op, "jam@modeemi.cs.tut.fi (Jari Vanhala)"); |
93 | new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>"); |
90 | new_draw_info (NDI_UNIQUE, 0, op, "kivinen@joker.cs.hut.fi (Tero Kivinen)"); |
94 | new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>"); |
91 | new_draw_info (NDI_UNIQUE, 0, op, "peterm@soda.berkeley.edu (Peter Mardahl)"); |
95 | new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>"); |
92 | new_draw_info (NDI_UNIQUE, 0, op, "matt@cs.odu.edu (Matthew Zeher)"); |
96 | new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>"); |
93 | new_draw_info (NDI_UNIQUE, 0, op, "srt@sun-dimas.aero.org (Scott R. Turner)"); |
97 | new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>"); |
94 | new_draw_info (NDI_UNIQUE, 0, op, "huma@netcom.com (Ben Fennema)"); |
98 | new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>"); |
95 | new_draw_info (NDI_UNIQUE, 0, op, "njw@cs.city.ac.uk (Nick Williams)"); |
99 | new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>"); |
96 | new_draw_info (NDI_UNIQUE, 0, op, "Wacren@Gin.ObsPM.Fr (Laurent Wacrenier)"); |
100 | new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>"); |
97 | new_draw_info (NDI_UNIQUE, 0, op, "thomas@astro.psu.edu (Brian Thomas)"); |
101 | new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>"); |
98 | new_draw_info (NDI_UNIQUE, 0, op, "jsm@axon.ksc.nasa.gov (John Steven Moerk)"); |
102 | new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>"); |
99 | new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David [david.delbecq@mailandnews.com]"); |
103 | new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>"); |
100 | new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann [yann.chachkoff@mailandnews.com]\n"); |
104 | new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n"); |
|
|
105 | |
101 | new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); |
106 | new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); |
102 | new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); |
107 | new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); |
103 | new_draw_info (NDI_UNIQUE, 0, op, "David Gervais [david_eg@mail.com]"); |
108 | new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); |
104 | new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura [ita@gold.koma.jaeri.go.jp]"); |
109 | new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); |
105 | new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner [hansjoerg.malthaner@danet.de]"); |
110 | new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); |
106 | new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg [maxmc@telia.com]"); |
111 | new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); |
107 | new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); |
112 | new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); |
108 | } |
|
|
109 | |
|
|
110 | void |
|
|
111 | info_keys (object *op) |
|
|
112 | { |
|
|
113 | clear_win_info (op); |
|
|
114 | new_draw_info (NDI_UNIQUE, 0, op, "Push `hjklynub' to walk in a direction."); |
|
|
115 | new_draw_info (NDI_UNIQUE, 0, op, "Shift + dir = fire, Ctrl + dir = run"); |
|
|
116 | new_draw_info (NDI_UNIQUE, 0, op, "(To fire at yourself, hit `.'"); |
|
|
117 | new_draw_info (NDI_UNIQUE, 0, op, "To attack, walk into the monsters."); |
|
|
118 | new_draw_info (NDI_UNIQUE, 0, op, "\" = speak ' = extended command"); |
|
|
119 | new_draw_info (NDI_UNIQUE, 0, op, "i = inventory , = get : = look"); |
|
|
120 | new_draw_info (NDI_UNIQUE, 0, op, "<> = rotate d = drop ? = help"); |
|
|
121 | new_draw_info (NDI_UNIQUE, 0, op, "a = apply A = apply below t = throw"); |
|
|
122 | new_draw_info (NDI_UNIQUE, 0, op, "e = examine E = exa below @ = autopick"); |
|
|
123 | new_draw_info (NDI_UNIQUE, 0, op, "C = configure s = brace v = version"); |
|
|
124 | new_draw_info (NDI_UNIQUE, 0, op, "+- = change range <tab> = browse spells"); |
|
|
125 | new_draw_info (NDI_UNIQUE, 0, op, "x = change inventory type"); |
|
|
126 | new_draw_info (NDI_UNIQUE, 0, op, "Mouse: L = examine, M = apply, R = drop/get"); |
|
|
127 | new_draw_info (NDI_UNIQUE, 0, op, "'help = info about extended commands."); |
|
|
128 | new_draw_info (NDI_UNIQUE, 0, op, "Ctrl-R = refresh Ctrl-C = clear"); |
|
|
129 | new_draw_info (NDI_UNIQUE, 0, op, "You can type a number before most commands."); |
|
|
130 | new_draw_info (NDI_UNIQUE, 0, op, "(For instance 3d drops 3 items.)"); |
|
|
131 | } |
113 | } |
132 | |
114 | |
133 | /* This is a basic little function to put the player back to his |
115 | /* This is a basic little function to put the player back to his |
134 | * savebed. We do some error checking - its possible that the |
116 | * savebed. We do some error checking - its possible that the |
135 | * savebed map may no longer exist, so we make sure the player |
117 | * savebed map may no longer exist, so we make sure the player |
136 | * goes someplace. |
118 | * goes someplace. |
137 | */ |
119 | */ |
138 | void |
120 | void |
139 | enter_player_savebed (object *op) |
121 | enter_player_savebed (object *op) |
140 | { |
122 | { |
141 | maptile *oldmap = op->map; |
|
|
142 | object *tmp; |
|
|
143 | |
|
|
144 | tmp = object::create (); |
123 | object *tmp = object::create (); |
145 | |
|
|
146 | EXIT_PATH (tmp) = op->contr->savebed_map; |
124 | EXIT_PATH (tmp) = op->contr->savebed_map; |
147 | EXIT_X (tmp) = op->contr->bed_x; |
125 | EXIT_X (tmp) = op->contr->bed_x; |
148 | EXIT_Y (tmp) = op->contr->bed_y; |
126 | EXIT_Y (tmp) = op->contr->bed_y; |
149 | op->enter_exit (tmp); |
127 | op->enter_exit (tmp); |
150 | |
|
|
151 | /* If the player has not changed maps and the name does not match |
|
|
152 | * that of the savebed, his savebed map is gone. Lets go back |
|
|
153 | * to the emergency path. Update what the players savebed is |
|
|
154 | * while we're at it. |
|
|
155 | */ |
|
|
156 | //TODO: must go - move to interim map |
|
|
157 | if (oldmap == op->map && strcmp (op->contr->savebed_map, oldmap->path)) |
|
|
158 | { |
|
|
159 | LOG (llevDebug, "Player %s savebed location %s is invalid - going to emergency location\n", |
|
|
160 | &op->name, op->contr->savebed_map); |
|
|
161 | strcpy (op->contr->savebed_map, "/world/world_105_115"); |
|
|
162 | op->contr->bed_x = 5; |
|
|
163 | op->contr->bed_y = 37; |
|
|
164 | EXIT_PATH (tmp) = op->contr->savebed_map; |
|
|
165 | EXIT_X (tmp) = op->contr->bed_x; |
|
|
166 | EXIT_Y (tmp) = op->contr->bed_y; |
|
|
167 | op->enter_exit (tmp); |
|
|
168 | } |
|
|
169 | |
|
|
170 | tmp->destroy (); |
128 | tmp->destroy (); |
171 | } |
129 | } |
172 | |
130 | |
173 | /* |
131 | /* |
174 | * enter_map(): Moves the player and pets from current map (if any) to |
132 | * enter_map(): Moves the player and pets from current map (if any) to |
… | |
… | |
194 | &newmap->path, x, y, newmap->width, newmap->height); |
152 | &newmap->path, x, y, newmap->width, newmap->height); |
195 | new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); |
153 | new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); |
196 | return; |
154 | return; |
197 | } |
155 | } |
198 | } |
156 | } |
|
|
157 | |
|
|
158 | if (map) |
|
|
159 | if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) |
|
|
160 | return; |
|
|
161 | |
|
|
162 | /* If it is a player login, he has yet to be inserted anyplace. |
|
|
163 | * otherwise, we need to deal with removing the player here. |
|
|
164 | */ |
|
|
165 | remove (); |
199 | |
166 | |
200 | /* try to find a spot for the player */ |
167 | /* try to find a spot for the player */ |
201 | if (ob_blocked (this, newmap, x, y)) |
168 | if (ob_blocked (this, newmap, x, y)) |
202 | { /* First choice blocked */ |
169 | { /* First choice blocked */ |
203 | /* We try to find a spot for the player, starting closest in. |
170 | /* We try to find a spot for the player, starting closest in. |
… | |
… | |
224 | else |
191 | else |
225 | /* not much we can do in this case. */ |
192 | /* not much we can do in this case. */ |
226 | LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); |
193 | LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", &newmap->path, x, y); |
227 | } |
194 | } |
228 | |
195 | |
229 | if (map) |
|
|
230 | if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) |
|
|
231 | return; |
|
|
232 | |
|
|
233 | if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
196 | if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
234 | return; |
197 | return; |
235 | |
198 | |
236 | if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) |
199 | if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) |
237 | return; |
200 | return; |
238 | |
|
|
239 | /* If it is a player login, he has yet to be inserted anyplace. |
|
|
240 | * otherwise, we need to deal with removing the player here. |
|
|
241 | */ |
|
|
242 | remove (); |
|
|
243 | |
201 | |
244 | this->x = x; |
202 | this->x = x; |
245 | this->y = y; |
203 | this->y = y; |
246 | map = newmap; |
204 | map = newmap; |
247 | |
205 | |
… | |
… | |
289 | |
247 | |
290 | /* since the players map is already loaded, we don't need to worry |
248 | /* since the players map is already loaded, we don't need to worry |
291 | * about pending objects. |
249 | * about pending objects. |
292 | */ |
250 | */ |
293 | remove_all_pets (newmap); |
251 | remove_all_pets (newmap); |
294 | } |
|
|
295 | |
|
|
296 | /* clean_path takes a path and replaces all / with _ |
|
|
297 | * We do a strcpy so that we do not change the original string. |
|
|
298 | */ |
|
|
299 | char * |
|
|
300 | clean_path (const char *file) |
|
|
301 | { |
|
|
302 | static char newpath[MAX_BUF], *cp; |
|
|
303 | assign (newpath, file); |
|
|
304 | |
|
|
305 | for (cp = newpath; *cp != '\0'; cp++) |
|
|
306 | if (*cp == '/') |
|
|
307 | *cp = '_'; |
|
|
308 | |
|
|
309 | return newpath; |
|
|
310 | } |
|
|
311 | |
|
|
312 | /* unclean_path takes a path and replaces all _ with / |
|
|
313 | * This basically undoes clean path. |
|
|
314 | * We do a strcpy so that we do not change the original string. |
|
|
315 | * We are smart enough to start after the last / in case we |
|
|
316 | * are getting passed a string that points to a unique map |
|
|
317 | * path. |
|
|
318 | */ |
|
|
319 | char * |
|
|
320 | unclean_path (const char *src) |
|
|
321 | { |
|
|
322 | static char newpath[MAX_BUF], *cp; |
|
|
323 | |
|
|
324 | cp = strrchr (src, '/'); |
|
|
325 | assign (newpath, cp ? cp + 1 : src); |
|
|
326 | |
|
|
327 | for (cp = newpath; *cp != '\0'; cp++) |
|
|
328 | if (*cp == '_') |
|
|
329 | *cp = '/'; |
|
|
330 | |
|
|
331 | return newpath; |
|
|
332 | } |
252 | } |
333 | |
253 | |
334 | /* process_players1 and process_players2 do all the player related stuff. |
254 | /* process_players1 and process_players2 do all the player related stuff. |
335 | * I moved it out of process events and process_map. This was to some |
255 | * I moved it out of process events and process_map. This was to some |
336 | * extent for debugging as well as to get a better idea of the time used |
256 | * extent for debugging as well as to get a better idea of the time used |
… | |
… | |
497 | free (dump); |
417 | free (dump); |
498 | op->destroy (); |
418 | op->destroy (); |
499 | continue; |
419 | continue; |
500 | } |
420 | } |
501 | |
421 | |
502 | if (!op->speed) |
422 | if (!op->has_active_speed ()) |
503 | { |
423 | { |
504 | LOG (llevError, "BUG: process_events(): Object %s has no speed, " |
424 | LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " |
505 | "but is on active list\n", &op->arch->name); |
425 | "but is on active list\n", op->debug_desc (), op->speed); |
506 | op->set_speed (0); |
426 | op->set_speed (0); |
507 | continue; |
427 | continue; |
508 | } |
428 | } |
509 | |
429 | |
510 | if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) |
430 | if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) |
… | |
… | |
596 | void |
516 | void |
597 | cleanup (bool make_core) |
517 | cleanup (bool make_core) |
598 | { |
518 | { |
599 | LOG (llevDebug, "cleanup begin.\n"); |
519 | LOG (llevDebug, "cleanup begin.\n"); |
600 | |
520 | |
|
|
521 | if (init_done && !in_cleanup) |
|
|
522 | { |
601 | in_cleanup = true; |
523 | in_cleanup = true; |
602 | |
|
|
603 | if (init_done) |
|
|
604 | emergency_save (); |
524 | emergency_save (); |
|
|
525 | } |
|
|
526 | else |
|
|
527 | in_cleanup = true; |
605 | |
528 | |
606 | LOG (llevDebug, "running cleanup handlers.\n"); |
529 | LOG (llevDebug, "running cleanup handlers.\n"); |
607 | INVOKE_GLOBAL (CLEANUP); |
530 | INVOKE_GLOBAL (CLEANUP); |
608 | |
531 | |
609 | LOG (llevDebug, "cleanup done.\n"); |
532 | LOG (llevDebug, "cleanup done.\n"); |
… | |
… | |
771 | initPlugins (); |
694 | initPlugins (); |
772 | |
695 | |
773 | for (;;) |
696 | for (;;) |
774 | cfperl_main (); |
697 | cfperl_main (); |
775 | |
698 | |
776 | // unreached |
|
|
777 | cleanup (); |
699 | cleanup (true); |
778 | |
|
|
779 | return 0; |
|
|
780 | } |
700 | } |
|
|
701 | |