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

Comparing deliantra/server/server/main.C (file contents):
Revision 1.62 by root, Sat Dec 30 10:16:11 2006 UTC vs.
Revision 1.73 by root, Tue Jan 2 11:08:36 2007 UTC

… …
45}; 45};
46 46
47void 47void
48version (object *op) 48version (object *op)
49{ 49{
50 if (op != NULL) 50 if (op)
51 clear_win_info (op); 51 clear_win_info (op);
52 52
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
54 54
55/* If in a socket, don't print out the list of authors. It confuses the
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
56 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
58 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)"); 59 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)"); 60 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)"); 61 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)"); 62 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)"); 63 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)"); 64 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)"); 65 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)"); 66 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)"); 67 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
70 new_draw_info (NDI_UNIQUE, 0, op, "c.blackwood@rdt.monash.edu.au (Cameron Blackwood)"); 68 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)"); 69 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)"); 70 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)"); 71 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)"); 72 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)"); 73 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)"); 74 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)"); 75 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)"); 76 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)"); 77 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)"); 78 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)"); 79 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)"); 80 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)"); 81 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)"); 82 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)"); 83 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)"); 84 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)"); 85 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)"); 86 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)"); 87 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)"); 88 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)"); 89 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)"); 90 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)"); 91 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)"); 92 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)"); 93 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)"); 94 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)"); 95 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)"); 96 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]"); 97 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"); 98 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
99
101 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 100 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
102 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 101 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
103 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais [david_eg@mail.com]"); 102 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]"); 103 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]"); 104 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]"); 105 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
107 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 106 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
108}
109
110void
111info_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} 107}
132 108
133/* This is a basic little function to put the player back to his 109/* This is a basic little function to put the player back to his
134 * savebed. We do some error checking - its possible that the 110 * savebed. We do some error checking - its possible that the
135 * savebed map may no longer exist, so we make sure the player 111 * savebed map may no longer exist, so we make sure the player
136 * goes someplace. 112 * goes someplace.
137 */ 113 */
138void 114void
139enter_player_savebed (object *op) 115enter_player_savebed (object *op)
140{ 116{
141 maptile *oldmap = op->map;
142 object *tmp;
143
144 tmp = object::create (); 117 object *tmp = object::create ();
145
146 EXIT_PATH (tmp) = op->contr->savebed_map; 118 EXIT_PATH (tmp) = op->contr->savebed_map;
147 EXIT_X (tmp) = op->contr->bed_x; 119 EXIT_X (tmp) = op->contr->bed_x;
148 EXIT_Y (tmp) = op->contr->bed_y; 120 EXIT_Y (tmp) = op->contr->bed_y;
149 op->enter_exit (tmp); 121 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 (); 122 tmp->destroy ();
171} 123}
172 124
173/* 125/*
174 * enter_map(): Moves the player and pets from current map (if any) to 126 * enter_map(): Moves the player and pets from current map (if any) to
… …
178 * the function that calls this should figure them out. 130 * the function that calls this should figure them out.
179 */ 131 */
180void 132void
181object::enter_map (maptile *newmap, int x, int y) 133object::enter_map (maptile *newmap, int x, int y)
182{ 134{
183 if (!newmap->load ()) 135 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
184 return; 136 return;
185 137
186 if (out_of_map (newmap, x, y)) 138 if (out_of_map (newmap, x, y))
187 { 139 {
188 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 140 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
194 &newmap->path, x, y, newmap->width, newmap->height); 146 &newmap->path, x, y, newmap->width, newmap->height);
195 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 147 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
196 return; 148 return;
197 } 149 }
198 } 150 }
151
152 if (map && map != newmap)
153 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
154 return;
155
156 /* If it is a player login, he has yet to be inserted anyplace.
157 * otherwise, we need to deal with removing the player here.
158 */
159 remove ();
199 160
200 /* try to find a spot for the player */ 161 /* try to find a spot for the player */
201 if (ob_blocked (this, newmap, x, y)) 162 if (ob_blocked (this, newmap, x, y))
202 { /* First choice blocked */ 163 { /* First choice blocked */
203 /* We try to find a spot for the player, starting closest in. 164 /* We try to find a spot for the player, starting closest in.
… …
224 else 185 else
225 /* not much we can do in this case. */ 186 /* 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); 187 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 } 188 }
228 189
229 if (map) 190 if (map != newmap && contr)
230 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 191 {
231 return;
232
233 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 192 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
234 return; 193 return;
235 194
236 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 195 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
237 return; 196 return;
238 197 }
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 198
244 this->x = x; 199 this->x = x;
245 this->y = y; 200 this->y = y;
246 map = newmap; 201 map = newmap;
247 202
248 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 203 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
249 204
250 newmap->timeout = 0;
251 enemy = NULL; 205 enemy = NULL;
252 206
253 if (contr) 207 if (contr)
254 { 208 {
255 strcpy (contr->maplevel, newmap->path); 209 contr->maplevel = newmap->path;
256 contr->count = 0; 210 contr->count = 0;
257 } 211 }
258 212
259 /* Update any golems */ 213 /* Update any golems */
260 if (type == PLAYER && contr->ranges[range_golem]) 214 if (type == PLAYER && contr->ranges[range_golem])
… …
289 243
290 /* since the players map is already loaded, we don't need to worry 244 /* since the players map is already loaded, we don't need to worry
291 * about pending objects. 245 * about pending objects.
292 */ 246 */
293 remove_all_pets (newmap); 247 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 */
299char *
300clean_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 */
319char *
320unclean_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} 248}
333 249
334/* process_players1 and process_players2 do all the player related stuff. 250/* 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 251 * 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 252 * extent for debugging as well as to get a better idea of the time used
… …
349 flag = 0; 265 flag = 0;
350 for_all_players (pl) 266 for_all_players (pl)
351 { 267 {
352 pl->refcnt_chk (); 268 pl->refcnt_chk ();
353 269
354 if (!pl->ob || !pl->ns) 270 if (!pl->ob || !pl->ns || !pl->ob->active ())
355 continue; 271 continue;
356 272
357 if (pl->ob->speed_left > 0) 273 if (pl->ob->speed_left > 0)
358 if (handle_newcs_player (pl->ob)) 274 if (handle_newcs_player (pl->ob))
359 flag = 1; 275 flag = 1;
… …
380 } /* end of for loop for all the players */ 296 } /* end of for loop for all the players */
381 } /* for flag */ 297 } /* for flag */
382 298
383 for_all_players (pl) 299 for_all_players (pl)
384 { 300 {
385 if (!pl->ob || !pl->ns) 301 if (!pl->ob || !pl->ns || !pl->ob->active ())
386 continue; 302 continue;
387 303
388 if (settings.casting_time) 304 if (settings.casting_time)
389 { 305 {
390 if (pl->ob->casting_time > 0) 306 if (pl->ob->casting_time > 0)
… …
497 free (dump); 413 free (dump);
498 op->destroy (); 414 op->destroy ();
499 continue; 415 continue;
500 } 416 }
501 417
502 if (!op->speed) 418 if (!op->has_active_speed ())
503 { 419 {
504 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 420 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
505 "but is on active list\n", &op->arch->name); 421 "but is on active list\n", op->debug_desc (), op->speed);
506 op->set_speed (0); 422 op->set_speed (0);
507 continue; 423 continue;
508 } 424 }
509 425
510 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 426 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
… …
596void 512void
597cleanup (bool make_core) 513cleanup (bool make_core)
598{ 514{
599 LOG (llevDebug, "cleanup begin.\n"); 515 LOG (llevDebug, "cleanup begin.\n");
600 516
517 if (init_done && !in_cleanup)
518 {
601 in_cleanup = true; 519 in_cleanup = true;
602
603 if (init_done)
604 emergency_save (); 520 emergency_save ();
521 }
522 else
523 in_cleanup = true;
605 524
606 LOG (llevDebug, "running cleanup handlers.\n"); 525 LOG (llevDebug, "running cleanup handlers.\n");
607 INVOKE_GLOBAL (CLEANUP); 526 INVOKE_GLOBAL (CLEANUP);
608 527
609 LOG (llevDebug, "cleanup done.\n"); 528 LOG (llevDebug, "cleanup done.\n");
610 529
611 if (make_core) 530 if (make_core)
612 abort (); 531 abort ();
613 else 532 else
614 _exit (0); 533 _exit (0);
615}
616
617void
618leave (player *pl, int draw_exit)
619{
620 if (pl)
621 {
622 if (pl->ob->type != DEAD_OBJECT)
623 {
624 /* If a hidden dm dropped connection do not create
625 * inconsistencies by showing that they have left the game
626 */
627 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
628 && draw_exit)
629 {
630 if (pl->ob->map)
631 {
632 INVOKE_PLAYER (LOGOUT, pl);
633 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
634 }
635
636 char buf[MAX_BUF];
637
638 sprintf (buf, "%s left the game.", &pl->ob->name);
639 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
640 }
641
642 pl->ob->remove ();
643 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
644 }
645
646 /* We do this so that the socket handling routine can do the final
647 * cleanup. We also leave that loop to actually handle the freeing
648 * of the data.
649 */
650 if (pl->ns)
651 pl->ns->destroy ();
652
653 }
654} 534}
655 535
656int 536int
657forbid_play (void) 537forbid_play (void)
658{ 538{
… …
672 552
673 while (fgets (buf, MAX_BUF, fp)) 553 while (fgets (buf, MAX_BUF, fp))
674 { 554 {
675 if (buf[0] == '#') 555 if (buf[0] == '#')
676 continue; 556 continue;
557
677 if (!strncmp (buf, "msg", 3)) 558 if (!strncmp (buf, "msg", 3))
678 { 559 {
679 if (forbit) 560 if (forbit)
680 while (fgets (buf, MAX_BUF, fp)) /* print message */ 561 while (fgets (buf, MAX_BUF, fp)) /* print message */
681 fputs (buf, logfile); 562 fputs (buf, logfile);
682 break; 563 break;
683
684 } 564 }
685 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 565 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
686 { 566 {
687 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 567 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
688 continue; 568 continue;
… …
702 return 0; 582 return 0;
703#endif 583#endif
704} 584}
705 585
706/* 586/*
707 * do_specials() is a collection of functions to call from time to time. 587 * do_specials() is a collection of functions to call from time to time.
708 * Modified 2000-1-14 MSW to use the global pticks count to determine how 588 * Modified 2000-1-14 MSW to use the global pticks count to determine how
709 * often to do things. This will allow us to spred them out more often. 589 * often to do things. This will allow us to spred them out more often.
710 * I use prime numbers for the factor count - in that way, it is less likely 590 * I use prime numbers for the factor count - in that way, it is less likely
711 * these actions will fall on the same tick (compared to say using 500/2500/15000 591 * these actions will fall on the same tick (compared to say using 500/2500/15000
712 * which would mean on that 15,000 tick count a whole bunch of stuff gets 592 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
771 initPlugins (); 651 initPlugins ();
772 652
773 for (;;) 653 for (;;)
774 cfperl_main (); 654 cfperl_main ();
775 655
776 // unreached
777 cleanup (); 656 cleanup (true);
778
779 return 0;
780} 657}
658

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines