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.66 by elmex, Sat Dec 30 21:07:46 2006 UTC vs.
Revision 1.111 by root, Sun Jun 24 04:09:29 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <object.h> 26#include <object.h>
26#include <tod.h> 27#include <tod.h>
27 28
28#ifdef HAVE_DES_H
29# include <des.h>
30#else
31# ifdef HAVE_CRYPT_H
32# include <crypt.h>
33# endif
34#endif
35
36#include <sproto.h> 29#include <sproto.h>
37#include <time.h> 30#include <time.h>
38 31
39#include <../random_maps/random_map.h> 32#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 33#include <../random_maps/rproto.h>
… …
45}; 38};
46 39
47void 40void
48version (object *op) 41version (object *op)
49{ 42{
50 if (op != NULL)
51 clear_win_info (op);
52
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 43 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
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 44
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 45 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>"); 46 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>"); 47 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>"); 48 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "");
50 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
65 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>"); 51 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>"); 52 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>"); 53 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>"); 54 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>"); 56 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
71 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>"); 57 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>"); 58 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jxrgensen <jorgens@flipper.pvv.unit.no>"); 59 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>"); 60 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>"); 61 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>"); 62 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>"); 63 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>"); 64 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
… …
100 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>"); 86 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
101 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>"); 87 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
102 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>"); 88 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
103 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
104 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n"); 90 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105 91 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 94 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
109 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
110 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
111 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>"); 97 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 99 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
113} 100}
114 101
115/* This is a basic little function to put the player back to his 102/* This is a basic little function to put the player back to his
116 * savebed. We do some error checking - its possible that the 103 * savebed. We do some error checking - its possible that the
… …
136 * the function that calls this should figure them out. 123 * the function that calls this should figure them out.
137 */ 124 */
138void 125void
139object::enter_map (maptile *newmap, int x, int y) 126object::enter_map (maptile *newmap, int x, int y)
140{ 127{
141 if (!newmap->load ()) 128 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
142 return; 129 return;
143 130
144 if (out_of_map (newmap, x, y)) 131 if (out_of_map (newmap, x, y))
145 { 132 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 133 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 140 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
154 return; 141 return;
155 } 142 }
156 } 143 }
157 144
158 if (map) 145 if (contr && map != newmap && map)
159 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 146 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
160 return; 147 return;
161 148
162 /* If it is a player login, he has yet to be inserted anyplace. 149 // remove, so stupid ob_locked does not trigger a failure
163 * otherwise, we need to deal with removing the player here.
164 */
165 remove (); 150 remove ();
166 151
167 /* try to find a spot for the player */ 152 /* try to find a spot for the player */
168 if (ob_blocked (this, newmap, x, y)) 153 if (ob_blocked (this, newmap, x, y))
169 { /* First choice blocked */ 154 { /* First choice blocked */
… …
191 else 176 else
192 /* not much we can do in this case. */ 177 /* not much we can do in this case. */
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); 178 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);
194 } 179 }
195 180
181 if (contr && map != newmap)
182 {
196 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 183 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
197 return; 184 return;
198 185
199 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 186 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
200 return; 187 return;
188 }
201 189
202 this->x = x; 190 this->x = x;
203 this->y = y; 191 this->y = y;
204 map = newmap; 192 map = newmap;
205 193
206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 194 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
207 195
208 newmap->timeout = 0;
209 enemy = NULL; 196 enemy = 0;
210 197
211 if (contr) 198 if (contr)
212 { 199 {
213 strcpy (contr->maplevel, newmap->path); 200 contr->maplevel = newmap->path;
214 contr->count = 0; 201 contr->count = 0;
215 } 202 }
216 203
217 /* Update any golems */ 204 /* Update any golems */
218 if (type == PLAYER && contr->ranges[range_golem]) 205 if (type == PLAYER)
219 { 206 if (object *golem = contr->golem)
220 int i = find_free_spot (contr->ranges[range_golem], newmap,
221 x, y, 1, SIZEOFFREE);
222
223 contr->ranges[range_golem]->remove ();
224
225 if (i == -1)
226 { 207 {
227 remove_friendly_object (contr->ranges[range_golem]); 208 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
228 contr->ranges[range_golem]->destroy (); 209
229 contr->ranges[range_golem] = 0; 210 if (i < 0)
230 } 211 golem->destroy ();
231 else 212 else
232 {
233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
234 { 213 {
235 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 214 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
236 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 215 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
237 tmp->map = newmap;
238 } 216 }
239
240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
241 contr->ranges[range_golem]->direction =
242 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
243 } 217 }
244 }
245
246 direction = 0;
247 218
248 /* since the players map is already loaded, we don't need to worry 219 /* since the players map is already loaded, we don't need to worry
249 * about pending objects. 220 * about pending objects.
250 */ 221 */
251 remove_all_pets (newmap); 222 remove_all_pets (newmap);
… …
259 * is needed after the players have been updated. 230 * is needed after the players have been updated.
260 */ 231 */
261static void 232static void
262process_players1 () 233process_players1 ()
263{ 234{
264 int flag;
265
266 /* Basically, we keep looping until all the players have done their actions. */ 235 /* Basically, we keep looping until all the players have done their actions. */
267 for (flag = 1; flag != 0;) 236 for (int flag = 1; flag != 0;)
268 { 237 {
269 flag = 0; 238 flag = 0;
270 for_all_players (pl) 239 for_all_players (pl)
271 { 240 {
272 pl->refcnt_chk (); 241 pl->refcnt_chk ();
273 242
274 if (!pl->ob || !pl->ns) 243 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
275 continue; 244 continue;
276 245
277 if (pl->ob->speed_left > 0)
278 if (handle_newcs_player (pl->ob)) 246 if (handle_newcs_player (pl->ob))
279 flag = 1; 247 flag = 1;
280
281 /* If the player is not actively playing, don't make a
282 * backup save - nothing to save anyway. Plus, the
283 * map may not longer be valid. This can happen when the
284 * player quits - they exist for purposes of tracking on the map,
285 * but don't actually reside on any actual map.
286 */
287 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
288 continue;
289
290#ifdef AUTOSAVE
291 /* check for ST_PLAYING state so that we don't try to save off when
292 * the player is logging in.
293 */
294 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
295 {
296 pl->ob->contr->save ();
297 pl->last_save_tick = pticks;
298 } 248 }
299#endif 249 }
300 } /* end of for loop for all the players */
301 } /* for flag */
302 250
303 for_all_players (pl) 251 for_all_players (pl)
304 { 252 {
305 if (!pl->ob || !pl->ns) 253 object *ob = pl->ob;
254
255 if (expect_false (!ob || !pl->ns || !ob->active))
306 continue; 256 continue;
307 257
308 if (settings.casting_time)
309 {
310 if (pl->ob->casting_time > 0)
311 {
312 pl->ob->casting_time--;
313 pl->ob->start_holding = 1;
314 }
315
316 /* set spell_state so we can update the range in stats field */
317 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
318 pl->ob->start_holding = 0;
319 }
320
321 do_some_living (pl->ob); 258 do_some_living (ob);
322 } 259 }
323} 260}
324 261
325static void 262static void
326process_players2 () 263process_players2 ()
327{ 264{
328 /* Then check if any players should use weapon-speed instead of speed */ 265 /* Then check if any players should use weapon-speed instead of speed */
329 for_all_players (pl) 266 for_all_players (pl)
330 { 267 {
331 /* The code that did weapon_sp handling here was out of place - 268 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
332 * this isn't called until after the player has finished there 269 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
333 * actions, and is thus out of place. All we do here is bounds
334 * checking.
335 */
336 if (pl->has_hit)
337 {
338 if (pl->ob->speed_left > pl->weapon_sp)
339 pl->ob->speed_left = pl->weapon_sp;
340
341 /* This needs to be here - if the player is running, we need to
342 * clear this each tick, but new commands are not being received
343 * so execute_newserver_command() is never called
344 */
345 pl->has_hit = 0;
346 }
347 else if (pl->ob->speed_left > pl->ob->speed)
348 pl->ob->speed_left = pl->ob->speed;
349 } 270 }
350} 271}
351 272
352void 273void
353process_events () 274process_events ()
354{ 275{
355 object *op;
356
357 static object_ptr marker_;
358
359 if (!marker_)
360 marker_ = object::create ();
361
362 object *marker = marker_;
363
364 process_players1 (); 276 process_players1 ();
365 277
366 marker->active_next = active_objects; 278 for_all_actives (op)
367
368 if (marker->active_next)
369 marker->active_next->active_prev = marker;
370
371 marker->active_prev = 0;
372 active_objects = marker;
373
374 while (marker->active_next)
375 { 279 {
376 op = marker->active_next;
377
378 /* Move marker forward - swap op and marker */
379 op->active_prev = marker->active_prev;
380
381 if (op->active_prev)
382 op->active_prev->active_next = op;
383 else
384 active_objects = op;
385
386 marker->active_next = op->active_next;
387
388 if (marker->active_next)
389 marker->active_next->active_prev = marker;
390
391 marker->active_prev = op;
392 op->active_next = marker;
393
394 /* Now process op */ 280 /* Now process op */
395 if (QUERY_FLAG (op, FLAG_FREED)) 281 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
396 { 282 {
397 LOG (llevError, "BUG: process_events(): Free object on list\n"); 283 LOG (llevError, "BUG: process_events(): Free object on list\n");
398 op->set_speed (0); 284 op->set_speed (0);
399 continue; 285 continue;
400 } 286 }
401 287
402 /* I've seen occasional crashes due to this - the object is removed,
403 * and thus the map it points to (last map it was on) may be bogus
404 * The real bug is to try to find out the cause of this - someone
405 * is probably calling remove_ob without either an insert_ob or
406 * free_object afterwards, leaving an object dangling. But I'd
407 * rather log this and continue on instead of crashing.
408 * Don't remove players - when a player quits, the object is in
409 * sort of a limbo, of removed, but something we want to keep
410 * around.
411 */
412 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
413 {
414 LOG (llevError, "BUG: process_events(): Removed object on list\n");
415 char *dump = dump_object (op);
416 LOG (llevError, dump);
417 free (dump);
418 op->destroy ();
419 continue;
420 }
421
422 if (!op->has_active_speed ()) 288 if (expect_false (!op->has_active_speed ()))
423 { 289 {
424 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 290 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
425 "but is on active list\n", op->debug_desc (), op->speed); 291 "but is on active list\n", op->debug_desc (), op->speed);
426 op->set_speed (0); 292 op->set_speed (0);
427 continue; 293 continue;
428 } 294 }
429 295
430 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 296 if (expect_false (op->flag [FLAG_REMOVED]))
431 { 297 {
432 LOG (llevError, "BUG: process_events(): Object without map or " 298 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
433 "inventory is on active list: %s (%d)\n", &op->name, op->count); 299 op->debug_desc ());
434 op->set_speed (0); 300 op->set_speed (0);
435 continue; 301 continue;
436 } 302 }
437 303
438 /* Animate the object. Bug or feature that anim_speed 304 /* Animate the object. Bug or feature that anim_speed
439 * is based on ticks, and not the creatures speed? 305 * is based on ticks, and not the creatures speed?
440 */ 306 */
441 if (op->anim_speed && op->last_anim >= op->anim_speed) 307 if (op->anim_speed && op->last_anim >= op->anim_speed)
442 { 308 {
443 if ((op->type == PLAYER))
444 animate_object (op, op->facing);
445 else
446 animate_object (op, op->direction); 309 animate_object (op, op->contr ? op->facing : op->direction);
447
448 op->last_anim = 1; 310 op->last_anim = 1;
449 } 311 }
450 else 312 else
451 op->last_anim++; 313 ++op->last_anim;
452 314
453 if (op->speed_left > 0) 315 if (op->speed_left > 0.f)
454 {
455#if 0
456 /* I've seen occasional crashes in move_symptom() with it
457 * crashing because op is removed - add some debugging to
458 * track if it is removed at this point.
459 * This unfortunately is a bit too verbose it seems - not sure
460 * why - I think what happens is a map is freed or something and
461 * some objects get 'lost' - removed never to be reclaimed.
462 * removed objects generally shouldn't exist.
463 */
464 if (QUERY_FLAG (op, FLAG_REMOVED))
465 { 316 {
466 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
467 }
468#endif
469 --op->speed_left; 317 --op->speed_left;
470 process_object (op); 318 process_object (op);
471 319
472 if (op->destroyed ()) 320 if (op->destroyed ())
473 continue; 321 continue;
474 } 322 }
475 323
476 if (settings.casting_time == TRUE && op->casting_time > 0) 324 if (!op->contr)
477 op->casting_time--; 325 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
478
479 if (op->speed_left <= 0)
480 op->speed_left += FABS (op->speed);
481 } 326 }
482
483 /* Remove marker object from active list */
484 if (marker->active_prev != NULL)
485 marker->active_prev->active_next = NULL;
486 else
487 active_objects = NULL;
488 327
489 process_players2 (); 328 process_players2 ();
490} 329}
491 330
492/* clean up everything before exiting */ 331/* clean up everything before exiting */
493void 332void
494emergency_save () 333emergency_save ()
495{ 334{
496 LOG (llevDebug, "emergency save begin.\n"); 335 LOG (llevDebug, "emergency save begin.\n");
497 336
498 LOG (llevDebug, "saving players.\n");
499 for_all_players (pl)
500 pl->save (1);
501
502// for_all_players (pl)
503// if (pl->ob)
504// pl->ob->remove ();
505
506 LOG (llevDebug, "saving maps.\n");
507 maptile::emergency_save (); 337 cfperl_emergency_save ();
508 338
509 LOG (llevDebug, "saving book archive.\n"); 339 LOG (llevDebug, "saving book archive.\n");
510 write_book_archive (); 340 write_book_archive ();
511 341
512 LOG (llevDebug, "emergency save done.\n"); 342 LOG (llevDebug, "emergency save done.\n");
513} 343}
514 344
345// send all clients some informational text
346static void
347cleanup_inform (const char *cause, bool make_core)
348{
349 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
350
351 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
352 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
353
354 if (make_core)
355 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
356 else
357 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
358
359 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
360
361 flush_sockets ();
362}
363
515/* clean up everything before exiting */ 364/* clean up everything before exiting */
516void 365void
517cleanup (bool make_core) 366cleanup (const char *cause, bool make_core)
518{ 367{
368 if (make_core)
369 fork_abort (cause);
370
371 LOG (llevError, "cleanup cause: %s\n", cause);
372
373 if (!make_core)
374 cleanup_inform (cause, make_core);
375
519 LOG (llevDebug, "cleanup begin.\n"); 376 LOG (llevDebug, "cleanup begin.\n");
520 377
521 in_cleanup = true;
522
523 if (init_done && !in_cleanup) 378 if (init_done && !in_cleanup)
379 {
380 in_cleanup = true;
524 emergency_save (); 381 emergency_save ();
382 }
383 else
384 in_cleanup = true;
525 385
526 LOG (llevDebug, "running cleanup handlers.\n"); 386 LOG (llevDebug, "running cleanup handlers.\n");
527 INVOKE_GLOBAL (CLEANUP); 387 INVOKE_GLOBAL (CLEANUP);
528 388
529 LOG (llevDebug, "cleanup done.\n"); 389 LOG (llevDebug, "cleanup done.\n");
530 390
531 if (make_core) 391 if (make_core)
532 abort (); 392 {
393 cleanup_inform (cause, make_core);
394 cfperl_cleanup (make_core);
395 _exit (1);
396 }
533 else 397 else
398 {
399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
400 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
401 flush_sockets ();
402 cfperl_cleanup (make_core);
534 _exit (0); 403 _exit (0);
535}
536
537void
538leave (player *pl, int draw_exit)
539{
540 if (pl)
541 {
542 if (pl->ob->type != DEAD_OBJECT)
543 {
544 /* If a hidden dm dropped connection do not create
545 * inconsistencies by showing that they have left the game
546 */
547 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
548 && draw_exit)
549 {
550 if (pl->ob->map)
551 {
552 INVOKE_PLAYER (LOGOUT, pl);
553 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
554 }
555
556 char buf[MAX_BUF];
557
558 sprintf (buf, "%s left the game.", &pl->ob->name);
559 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
560 }
561
562 pl->ob->remove ();
563 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
564 }
565
566 /* We do this so that the socket handling routine can do the final
567 * cleanup. We also leave that loop to actually handle the freeing
568 * of the data.
569 */
570 if (pl->ns)
571 pl->ns->destroy ();
572
573 } 404 }
574} 405}
575 406
576int 407int
577forbid_play (void) 408forbid_play (void)
… …
592 423
593 while (fgets (buf, MAX_BUF, fp)) 424 while (fgets (buf, MAX_BUF, fp))
594 { 425 {
595 if (buf[0] == '#') 426 if (buf[0] == '#')
596 continue; 427 continue;
428
597 if (!strncmp (buf, "msg", 3)) 429 if (!strncmp (buf, "msg", 3))
598 { 430 {
599 if (forbit) 431 if (forbit)
600 while (fgets (buf, MAX_BUF, fp)) /* print message */ 432 while (fgets (buf, MAX_BUF, fp)) /* print message */
601 fputs (buf, logfile); 433 fputs (buf, logfile);
602 break; 434 break;
603
604 } 435 }
605 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 436 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
606 { 437 {
607 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 438 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
608 continue; 439 continue;
… …
622 return 0; 453 return 0;
623#endif 454#endif
624} 455}
625 456
626/* 457/*
627 * do_specials() is a collection of functions to call from time to time. 458 * do_specials() is a collection of functions to call from time to time.
628 * Modified 2000-1-14 MSW to use the global pticks count to determine how 459 * Modified 2000-1-14 MSW to use the global pticks count to determine how
629 * often to do things. This will allow us to spred them out more often. 460 * often to do things. This will allow us to spred them out more often.
630 * I use prime numbers for the factor count - in that way, it is less likely 461 * I use prime numbers for the factor count - in that way, it is less likely
631 * these actions will fall on the same tick (compared to say using 500/2500/15000 462 * these actions will fall on the same tick (compared to say using 500/2500/15000
632 * which would mean on that 15,000 tick count a whole bunch of stuff gets 463 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
634 * done on the same tick, but that will happen very infrequently 465 * done on the same tick, but that will happen very infrequently
635 * 466 *
636 * I also think this code makes it easier to see how often we really are 467 * I also think this code makes it easier to see how often we really are
637 * doing the various things. 468 * doing the various things.
638 */ 469 */
639
640extern unsigned long todtick;
641
642void 470void
643do_specials (void) 471do_specials (void)
644{ 472{
645 if (!(pticks % PTICKS_PER_CLOCK)) 473 if (expect_false (!(pticks % TICKS_PER_HOUR)))
646 tick_the_clock (); 474 adjust_daylight ();
647 475
648 if (!(pticks % 7)) 476 if (expect_false (!(pticks % 7)))
649 shstr::gc (); 477 shstr::gc ();
650 478
651 if (!(pticks % 2503)) 479 if (expect_false (!(pticks % 2503)))
652 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 480 fix_weight (); /* Hack to fix weightproblems caused by bugs */
653 481
654 if (!(pticks % 5003)) 482 if (expect_false (!(pticks % 5003)))
655 write_book_archive (); 483 write_book_archive ();
656 484
657 if (!(pticks % 5009)) 485 if (expect_false (!(pticks % 5009)))
658 clean_friendly_list (); 486 clean_friendly_list ();
659 487
660 if (!(pticks % 5011)) 488 if (expect_false (!(pticks % 5011)))
661 obsolete_parties (); 489 obsolete_parties ();
662 490
663 if (!(pticks % 12503)) 491 if (expect_false (!(pticks % 12503)))
664 fix_luck (); 492 fix_luck ();
665} 493}
666 494
667void 495void
668server_tick () 496server_tick ()
… …
678 attachable::check_mortals (); 506 attachable::check_mortals ();
679 507
680 ++pticks; 508 ++pticks;
681} 509}
682 510
511#if 0
512// used fro benchmarking (x86/amd64-specific)
513typedef unsigned long tval;
514typedef unsigned long long stamp64;
515
516extern inline tval
517stamp (void)
518{
519 tval tsc;
520 asm volatile ("rdtsc":"=a" (tsc)::"edx");
521
522 return tsc;
523}
524
525extern inline tval
526measure (tval t)
527{
528 tval tsc;
529 asm volatile ("rdtsc":"=a" (tsc)::"edx");
530
531 if (tsc > t)
532 return tsc - t;
533 else
534 return t - tsc;
535}
536
683int 537int
684main (int argc, char **argv) 538main (int argc, char **argv)
685{ 539{
540 rand_gen rg(0);
541 tval fastest = 0x7fffffff;
542 for (int loop = 10000; loop--; )
543 {
544 tval s = stamp ();
545 volatile int i = rg.get_int(25);
546 fastest = min (fastest, measure (s));
547 }
548
549 //printf ("fastest %d\n", fastest);
550 for (int i = 0; i < 1024*1024*3; ++i)
551 {
552 char c = rg.get_int (256);
553 write (2, &c, 1);
554 }
555}
556
557#else
558
559// normal main
560int
561main (int argc, char **argv)
562{
686 settings.argc = argc; 563 settings.argc = argc;
687 settings.argv = argv; 564 settings.argv = argv;
688 565
689 init (argc, argv); 566 init (argc, argv);
690 567
691 initPlugins (); 568 initPlugins ();
692 569
693 for (;;) 570 for (;;)
694 cfperl_main (); 571 cfperl_main ();
695
696 cleanup (true);
697} 572}
573#endif
698 574

Diff Legend

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