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.63 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.114 by root, Wed Sep 5 05:48:36 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
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) 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,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <object.h> 25#include <object.h>
26#include <tod.h> 26#include <tod.h>
27 27
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> 28#include <sproto.h>
37#include <time.h> 29#include <time.h>
38 30
39#include <../random_maps/random_map.h> 31#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 32#include <../random_maps/rproto.h>
… …
45}; 37};
46 38
47void 39void
48version (object *op) 40version (object *op)
49{ 41{
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); 42 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 43
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 44 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>"); 45 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>"); 46 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>"); 47 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
48 new_draw_info (NDI_UNIQUE, 0, op, "");
49 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>"); 50 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>"); 51 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>"); 52 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>"); 53 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>"); 54 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>"); 55 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>"); 56 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>"); 57 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>"); 58 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>"); 59 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>"); 60 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>"); 61 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>"); 62 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>"); 63 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>"); 85 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>"); 86 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>"); 87 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>"); 88 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"); 89 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105 90 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 91 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 93 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>"); 94 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>"); 95 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>"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
97 new_draw_info (NDI_UNIQUE, 0, op, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 98 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
113} 99}
114 100
115/* This is a basic little function to put the player back to his 101/* This is a basic little function to put the player back to his
116 * savebed. We do some error checking - its possible that the 102 * savebed. We do some error checking - its possible that the
… …
136 * the function that calls this should figure them out. 122 * the function that calls this should figure them out.
137 */ 123 */
138void 124void
139object::enter_map (maptile *newmap, int x, int y) 125object::enter_map (maptile *newmap, int x, int y)
140{ 126{
141 if (!newmap->load ()) 127 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
142 return; 128 return;
143 129
144 if (out_of_map (newmap, x, y)) 130 if (out_of_map (newmap, x, y))
145 { 131 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 132 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
152 &newmap->path, x, y, newmap->width, newmap->height); 138 &newmap->path, x, y, newmap->width, newmap->height);
153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 139 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
154 return; 140 return;
155 } 141 }
156 } 142 }
143
144 if (contr && map != newmap && map)
145 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
146 return;
147
148 // remove, so stupid ob_locked does not trigger a failure
149 remove ();
157 150
158 /* try to find a spot for the player */ 151 /* try to find a spot for the player */
159 if (ob_blocked (this, newmap, x, y)) 152 if (ob_blocked (this, newmap, x, y))
160 { /* First choice blocked */ 153 { /* First choice blocked */
161 /* We try to find a spot for the player, starting closest in. 154 /* We try to find a spot for the player, starting closest in.
… …
182 else 175 else
183 /* not much we can do in this case. */ 176 /* not much we can do in this case. */
184 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); 177 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);
185 } 178 }
186 179
187 if (map) 180 if (contr && map != newmap)
188 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 181 {
189 return;
190
191 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 182 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
192 return; 183 return;
193 184
194 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 185 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
195 return; 186 return;
196 187 }
197 /* If it is a player login, he has yet to be inserted anyplace.
198 * otherwise, we need to deal with removing the player here.
199 */
200 remove ();
201 188
202 this->x = x; 189 this->x = x;
203 this->y = y; 190 this->y = y;
204 map = newmap; 191 map = newmap;
205 192
206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 193 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
207 194
208 newmap->timeout = 0;
209 enemy = NULL; 195 enemy = 0;
210 196
211 if (contr) 197 if (contr)
212 { 198 {
213 strcpy (contr->maplevel, newmap->path); 199 contr->maplevel = newmap->path;
214 contr->count = 0; 200 contr->count = 0;
215 } 201 }
216 202
217 /* Update any golems */ 203 /* Update any golems */
218 if (type == PLAYER && contr->ranges[range_golem]) 204 if (type == PLAYER)
219 { 205 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 { 206 {
227 remove_friendly_object (contr->ranges[range_golem]); 207 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
228 contr->ranges[range_golem]->destroy (); 208
229 contr->ranges[range_golem] = 0; 209 if (i < 0)
230 } 210 golem->destroy ();
231 else 211 else
232 {
233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
234 { 212 {
235 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 213 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); 214 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
237 tmp->map = newmap;
238 } 215 }
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 } 216 }
244 }
245
246 direction = 0;
247 217
248 /* since the players map is already loaded, we don't need to worry 218 /* since the players map is already loaded, we don't need to worry
249 * about pending objects. 219 * about pending objects.
250 */ 220 */
251 remove_all_pets (newmap); 221 remove_all_pets (newmap);
252}
253
254/* clean_path takes a path and replaces all / with _
255 * We do a strcpy so that we do not change the original string.
256 */
257char *
258clean_path (const char *file)
259{
260 static char newpath[MAX_BUF], *cp;
261 assign (newpath, file);
262
263 for (cp = newpath; *cp != '\0'; cp++)
264 if (*cp == '/')
265 *cp = '_';
266
267 return newpath;
268}
269
270/* unclean_path takes a path and replaces all _ with /
271 * This basically undoes clean path.
272 * We do a strcpy so that we do not change the original string.
273 * We are smart enough to start after the last / in case we
274 * are getting passed a string that points to a unique map
275 * path.
276 */
277char *
278unclean_path (const char *src)
279{
280 static char newpath[MAX_BUF], *cp;
281
282 cp = strrchr (src, '/');
283 assign (newpath, cp ? cp + 1 : src);
284
285 for (cp = newpath; *cp != '\0'; cp++)
286 if (*cp == '_')
287 *cp = '/';
288
289 return newpath;
290} 222}
291 223
292/* process_players1 and process_players2 do all the player related stuff. 224/* process_players1 and process_players2 do all the player related stuff.
293 * I moved it out of process events and process_map. This was to some 225 * I moved it out of process events and process_map. This was to some
294 * extent for debugging as well as to get a better idea of the time used 226 * extent for debugging as well as to get a better idea of the time used
… …
297 * is needed after the players have been updated. 229 * is needed after the players have been updated.
298 */ 230 */
299static void 231static void
300process_players1 () 232process_players1 ()
301{ 233{
302 int flag;
303
304 /* Basically, we keep looping until all the players have done their actions. */ 234 /* Basically, we keep looping until all the players have done their actions. */
305 for (flag = 1; flag != 0;) 235 for (int flag = 1; flag != 0;)
306 { 236 {
307 flag = 0; 237 flag = 0;
308 for_all_players (pl) 238 for_all_players (pl)
309 { 239 {
310 pl->refcnt_chk (); 240 pl->refcnt_chk ();
311 241
312 if (!pl->ob || !pl->ns) 242 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
313 continue; 243 continue;
314 244
315 if (pl->ob->speed_left > 0)
316 if (handle_newcs_player (pl->ob)) 245 if (handle_newcs_player (pl->ob))
317 flag = 1; 246 flag = 1;
318
319 /* If the player is not actively playing, don't make a
320 * backup save - nothing to save anyway. Plus, the
321 * map may not longer be valid. This can happen when the
322 * player quits - they exist for purposes of tracking on the map,
323 * but don't actually reside on any actual map.
324 */
325 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
326 continue;
327
328#ifdef AUTOSAVE
329 /* check for ST_PLAYING state so that we don't try to save off when
330 * the player is logging in.
331 */
332 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
333 {
334 pl->ob->contr->save ();
335 pl->last_save_tick = pticks;
336 } 247 }
337#endif 248 }
338 } /* end of for loop for all the players */
339 } /* for flag */
340 249
341 for_all_players (pl) 250 for_all_players (pl)
342 { 251 {
343 if (!pl->ob || !pl->ns) 252 object *ob = pl->ob;
253
254 if (expect_false (!ob || !pl->ns || !ob->active))
344 continue; 255 continue;
345 256
346 if (settings.casting_time)
347 {
348 if (pl->ob->casting_time > 0)
349 {
350 pl->ob->casting_time--;
351 pl->ob->start_holding = 1;
352 }
353
354 /* set spell_state so we can update the range in stats field */
355 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
356 pl->ob->start_holding = 0;
357 }
358
359 do_some_living (pl->ob); 257 do_some_living (ob);
360 } 258 }
361} 259}
362 260
363static void 261static void
364process_players2 () 262process_players2 ()
365{ 263{
366 /* Then check if any players should use weapon-speed instead of speed */ 264 /* Then check if any players should use weapon-speed instead of speed */
367 for_all_players (pl) 265 for_all_players (pl)
368 { 266 {
369 /* The code that did weapon_sp handling here was out of place - 267 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
370 * this isn't called until after the player has finished there 268 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
371 * actions, and is thus out of place. All we do here is bounds
372 * checking.
373 */
374 if (pl->has_hit)
375 {
376 if (pl->ob->speed_left > pl->weapon_sp)
377 pl->ob->speed_left = pl->weapon_sp;
378
379 /* This needs to be here - if the player is running, we need to
380 * clear this each tick, but new commands are not being received
381 * so execute_newserver_command() is never called
382 */
383 pl->has_hit = 0;
384 }
385 else if (pl->ob->speed_left > pl->ob->speed)
386 pl->ob->speed_left = pl->ob->speed;
387 } 269 }
388} 270}
389 271
390void 272void
391process_events () 273process_events ()
392{ 274{
393 object *op;
394
395 static object_ptr marker_;
396
397 if (!marker_)
398 marker_ = object::create ();
399
400 object *marker = marker_;
401
402 process_players1 (); 275 process_players1 ();
403 276
404 marker->active_next = active_objects; 277 for_all_actives (op)
405
406 if (marker->active_next)
407 marker->active_next->active_prev = marker;
408
409 marker->active_prev = 0;
410 active_objects = marker;
411
412 while (marker->active_next)
413 { 278 {
414 op = marker->active_next;
415
416 /* Move marker forward - swap op and marker */
417 op->active_prev = marker->active_prev;
418
419 if (op->active_prev)
420 op->active_prev->active_next = op;
421 else
422 active_objects = op;
423
424 marker->active_next = op->active_next;
425
426 if (marker->active_next)
427 marker->active_next->active_prev = marker;
428
429 marker->active_prev = op;
430 op->active_next = marker;
431
432 /* Now process op */ 279 /* Now process op */
433 if (QUERY_FLAG (op, FLAG_FREED)) 280 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
434 { 281 {
435 LOG (llevError, "BUG: process_events(): Free object on list\n"); 282 LOG (llevError, "BUG: process_events(): Free object on list\n");
436 op->set_speed (0); 283 op->set_speed (0);
437 continue; 284 continue;
438 } 285 }
439 286
440 /* I've seen occasional crashes due to this - the object is removed, 287 if (expect_false (!op->has_active_speed ()))
441 * and thus the map it points to (last map it was on) may be bogus
442 * The real bug is to try to find out the cause of this - someone
443 * is probably calling remove_ob without either an insert_ob or
444 * free_object afterwards, leaving an object dangling. But I'd
445 * rather log this and continue on instead of crashing.
446 * Don't remove players - when a player quits, the object is in
447 * sort of a limbo, of removed, but something we want to keep
448 * around.
449 */
450 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
451 {
452 LOG (llevError, "BUG: process_events(): Removed object on list\n");
453 char *dump = dump_object (op);
454 LOG (llevError, dump);
455 free (dump);
456 op->destroy ();
457 continue;
458 } 288 {
459
460 if (!op->speed)
461 {
462 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 289 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
463 "but is on active list\n", &op->arch->name); 290 "but is on active list\n", op->debug_desc (), op->speed);
464 op->set_speed (0); 291 op->set_speed (0);
465 continue; 292 continue;
466 } 293 }
467 294
468 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 295 if (expect_false (op->flag [FLAG_REMOVED]))
469 { 296 {
470 LOG (llevError, "BUG: process_events(): Object without map or " 297 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
471 "inventory is on active list: %s (%d)\n", &op->name, op->count); 298 op->debug_desc ());
472 op->set_speed (0); 299 op->set_speed (0);
473 continue; 300 continue;
474 } 301 }
475 302
476 /* Animate the object. Bug or feature that anim_speed 303 /* Animate the object. Bug or feature that anim_speed
477 * is based on ticks, and not the creatures speed? 304 * is based on ticks, and not the creatures speed?
478 */ 305 */
479 if (op->anim_speed && op->last_anim >= op->anim_speed) 306 if (op->anim_speed && op->last_anim >= op->anim_speed)
480 { 307 {
481 if ((op->type == PLAYER))
482 animate_object (op, op->facing);
483 else
484 animate_object (op, op->direction); 308 animate_object (op, op->contr ? op->facing : op->direction);
485
486 op->last_anim = 1; 309 op->last_anim = 1;
487 } 310 }
488 else 311 else
489 op->last_anim++; 312 ++op->last_anim;
490 313
491 if (op->speed_left > 0) 314 if (op->speed_left > 0.f)
492 {
493#if 0
494 /* I've seen occasional crashes in move_symptom() with it
495 * crashing because op is removed - add some debugging to
496 * track if it is removed at this point.
497 * This unfortunately is a bit too verbose it seems - not sure
498 * why - I think what happens is a map is freed or something and
499 * some objects get 'lost' - removed never to be reclaimed.
500 * removed objects generally shouldn't exist.
501 */
502 if (QUERY_FLAG (op, FLAG_REMOVED))
503 { 315 {
504 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
505 }
506#endif
507 --op->speed_left; 316 --op->speed_left;
508 process_object (op); 317 process_object (op);
509 318
510 if (op->destroyed ()) 319 if (op->destroyed ())
511 continue; 320 continue;
512 } 321 }
513 322
514 if (settings.casting_time == TRUE && op->casting_time > 0) 323 if (!op->contr)
515 op->casting_time--; 324 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
516
517 if (op->speed_left <= 0)
518 op->speed_left += FABS (op->speed);
519 } 325 }
520
521 /* Remove marker object from active list */
522 if (marker->active_prev != NULL)
523 marker->active_prev->active_next = NULL;
524 else
525 active_objects = NULL;
526 326
527 process_players2 (); 327 process_players2 ();
528} 328}
529 329
530/* clean up everything before exiting */ 330/* clean up everything before exiting */
531void 331void
532emergency_save () 332emergency_save ()
533{ 333{
534 LOG (llevDebug, "emergency save begin.\n"); 334 LOG (llevDebug, "emergency save begin.\n");
535 335
536 LOG (llevDebug, "saving players.\n");
537 for_all_players (pl)
538 pl->save (1);
539
540// for_all_players (pl)
541// if (pl->ob)
542// pl->ob->remove ();
543
544 LOG (llevDebug, "saving maps.\n");
545 maptile::emergency_save (); 336 cfperl_emergency_save ();
546 337
547 LOG (llevDebug, "saving book archive.\n"); 338 LOG (llevDebug, "saving book archive.\n");
548 write_book_archive (); 339 write_book_archive ();
549 340
550 LOG (llevDebug, "emergency save done.\n"); 341 LOG (llevDebug, "emergency save done.\n");
551} 342}
552 343
344// send all clients some informational text
345static void
346cleanup_inform (const char *cause, bool make_core)
347{
348 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
349
350 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
351 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
352
353 if (make_core)
354 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
355 else
356 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
357
358 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
359
360 client::flush_sockets ();
361}
362
553/* clean up everything before exiting */ 363/* clean up everything before exiting */
554void 364void
555cleanup (bool make_core) 365cleanup (const char *cause, bool make_core)
556{ 366{
367 if (make_core)
368 fork_abort (cause);
369
370 LOG (llevError, "cleanup cause: %s\n", cause);
371
372 if (!make_core)
373 cleanup_inform (cause, make_core);
374
557 LOG (llevDebug, "cleanup begin.\n"); 375 LOG (llevDebug, "cleanup begin.\n");
558 376
377 if (init_done && !in_cleanup)
378 {
559 in_cleanup = true; 379 in_cleanup = true;
560
561 if (init_done)
562 emergency_save (); 380 emergency_save ();
381 }
382 else
383 in_cleanup = true;
563 384
564 LOG (llevDebug, "running cleanup handlers.\n"); 385 LOG (llevDebug, "running cleanup handlers.\n");
565 INVOKE_GLOBAL (CLEANUP); 386 INVOKE_GLOBAL (CLEANUP);
566 387
567 LOG (llevDebug, "cleanup done.\n"); 388 LOG (llevDebug, "cleanup done.\n");
568 389
569 if (make_core) 390 if (make_core)
570 abort (); 391 {
392 cleanup_inform (cause, make_core);
393 cfperl_cleanup (make_core);
394 _exit (1);
395 }
571 else 396 else
397 {
398 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
399 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
400 client::flush_sockets ();
401 cfperl_cleanup (make_core);
572 _exit (0); 402 _exit (0);
573}
574
575void
576leave (player *pl, int draw_exit)
577{
578 if (pl)
579 {
580 if (pl->ob->type != DEAD_OBJECT)
581 {
582 /* If a hidden dm dropped connection do not create
583 * inconsistencies by showing that they have left the game
584 */
585 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
586 && draw_exit)
587 {
588 if (pl->ob->map)
589 {
590 INVOKE_PLAYER (LOGOUT, pl);
591 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
592 }
593
594 char buf[MAX_BUF];
595
596 sprintf (buf, "%s left the game.", &pl->ob->name);
597 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
598 }
599
600 pl->ob->remove ();
601 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
602 }
603
604 /* We do this so that the socket handling routine can do the final
605 * cleanup. We also leave that loop to actually handle the freeing
606 * of the data.
607 */
608 if (pl->ns)
609 pl->ns->destroy ();
610
611 } 403 }
612} 404}
613 405
614int 406int
615forbid_play (void) 407forbid_play (void)
… …
630 422
631 while (fgets (buf, MAX_BUF, fp)) 423 while (fgets (buf, MAX_BUF, fp))
632 { 424 {
633 if (buf[0] == '#') 425 if (buf[0] == '#')
634 continue; 426 continue;
427
635 if (!strncmp (buf, "msg", 3)) 428 if (!strncmp (buf, "msg", 3))
636 { 429 {
637 if (forbit) 430 if (forbit)
638 while (fgets (buf, MAX_BUF, fp)) /* print message */ 431 while (fgets (buf, MAX_BUF, fp)) /* print message */
639 fputs (buf, logfile); 432 fputs (buf, logfile);
640 break; 433 break;
641
642 } 434 }
643 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 435 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
644 { 436 {
645 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 437 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
646 continue; 438 continue;
… …
660 return 0; 452 return 0;
661#endif 453#endif
662} 454}
663 455
664/* 456/*
665 * do_specials() is a collection of functions to call from time to time. 457 * do_specials() is a collection of functions to call from time to time.
666 * Modified 2000-1-14 MSW to use the global pticks count to determine how 458 * Modified 2000-1-14 MSW to use the global pticks count to determine how
667 * often to do things. This will allow us to spred them out more often. 459 * often to do things. This will allow us to spred them out more often.
668 * I use prime numbers for the factor count - in that way, it is less likely 460 * I use prime numbers for the factor count - in that way, it is less likely
669 * these actions will fall on the same tick (compared to say using 500/2500/15000 461 * these actions will fall on the same tick (compared to say using 500/2500/15000
670 * which would mean on that 15,000 tick count a whole bunch of stuff gets 462 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
672 * done on the same tick, but that will happen very infrequently 464 * done on the same tick, but that will happen very infrequently
673 * 465 *
674 * I also think this code makes it easier to see how often we really are 466 * I also think this code makes it easier to see how often we really are
675 * doing the various things. 467 * doing the various things.
676 */ 468 */
677
678extern unsigned long todtick;
679
680void 469void
681do_specials (void) 470do_specials (void)
682{ 471{
683 if (!(pticks % PTICKS_PER_CLOCK)) 472 if (expect_false (!(pticks % TICKS_PER_HOUR)))
684 tick_the_clock (); 473 adjust_daylight ();
685 474
686 if (!(pticks % 7)) 475 if (expect_false (!(pticks % 7)))
687 shstr::gc (); 476 shstr::gc ();
688 477
689 if (!(pticks % 2503)) 478 if (expect_false (!(pticks % 2503)))
690 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 479 fix_weight (); /* Hack to fix weightproblems caused by bugs */
691 480
692 if (!(pticks % 5003)) 481 if (expect_false (!(pticks % 5003)))
693 write_book_archive (); 482 write_book_archive ();
694 483
695 if (!(pticks % 5009)) 484 if (expect_false (!(pticks % 5009)))
696 clean_friendly_list (); 485 clean_friendly_list ();
697 486
698 if (!(pticks % 5011)) 487 if (expect_false (!(pticks % 5011)))
699 obsolete_parties (); 488 obsolete_parties ();
700 489
701 if (!(pticks % 12503)) 490 if (expect_false (!(pticks % 12503)))
702 fix_luck (); 491 fix_luck ();
703} 492}
704 493
705void 494void
706server_tick () 495server_tick ()
707{ 496{
708 // first do the user visible stuff 497 // first do the user visible stuff
709 doeric_server ();
710 INVOKE_GLOBAL (CLOCK); 498 INVOKE_GLOBAL (CLOCK);
711 process_events (); /* "do" something with objects with speed */ 499 process_events (); // "do" something with objects with speed
712 flush_sockets (); 500 client::clock (); // draw client maps etc.
713 501
714 // then do some bookkeeping, should not really be here 502 // then do some bookkeeping, should not really be here
715 do_specials (); /* Routines called from time to time. */ 503 do_specials (); /* Routines called from time to time. */
716 attachable::check_mortals (); 504 attachable::check_mortals ();
717 505
718 ++pticks; 506 ++pticks;
719} 507}
720 508
509#if 0
510// used fro benchmarking (x86/amd64-specific)
511typedef unsigned long tval;
512typedef unsigned long long stamp64;
513
514extern inline tval
515stamp (void)
516{
517 tval tsc;
518 asm volatile ("rdtsc":"=a" (tsc)::"edx");
519
520 return tsc;
521}
522
523extern inline tval
524measure (tval t)
525{
526 tval tsc;
527 asm volatile ("rdtsc":"=a" (tsc)::"edx");
528
529 if (tsc > t)
530 return tsc - t;
531 else
532 return t - tsc;
533}
534
721int 535int
722main (int argc, char **argv) 536main (int argc, char **argv)
723{ 537{
538 rand_gen rg(0);
539 tval fastest = 0x7fffffff;
540 for (int loop = 10000; loop--; )
541 {
542 tval s = stamp ();
543 volatile int i = rg.get_int(25);
544 fastest = min (fastest, measure (s));
545 }
546
547 //printf ("fastest %d\n", fastest);
548 for (int i = 0; i < 1024*1024*3; ++i)
549 {
550 char c = rg.get_int (256);
551 write (2, &c, 1);
552 }
553}
554
555#else
556
557// normal main
558int
559main (int argc, char **argv)
560{
724 settings.argc = argc; 561 settings.argc = argc;
725 settings.argv = argv; 562 settings.argv = argv;
726 563
727 init (argc, argv); 564 init (argc, argv);
728 565
729 initPlugins (); 566 initPlugins ();
730 567
731 for (;;) 568 for (;;)
732 cfperl_main (); 569 cfperl_main ();
733
734 // unreached
735 cleanup ();
736
737 return 0;
738} 570}
571#endif
572

Diff Legend

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