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.68 by root, Sun Dec 31 10:28:36 2006 UTC vs.
Revision 1.133 by root, Mon Sep 29 10:31:32 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 to <support@deliantra.net>
21 The authors can be reached via e-mail at <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>
30
31#include <glib.h>
38 32
39#include <../random_maps/random_map.h> 33#include <../random_maps/random_map.h>
40#include <../random_maps/rproto.h> 34#include <../random_maps/rproto.h>
41#include "path.h" 35#include "path.h"
42 36
… …
45}; 39};
46 40
47void 41void
48version (object *op) 42version (object *op)
49{ 43{
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); 44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
54 45
55/* If in a socket, don't print out the list of authors. It confuses the 46#if 0
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 47 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>"); 48 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>"); 49 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>"); 50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
51 new_draw_info (NDI_UNIQUE, 0, op, "");
52 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>"); 53 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>"); 54 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>"); 55 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>"); 56 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>"); 57 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>"); 58 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>"); 59 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>"); 60 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>"); 61 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>"); 62 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>"); 63 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>"); 64 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>"); 65 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>"); 66 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>"); 88 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>"); 89 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>"); 90 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>"); 91 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"); 92 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105 93 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 94 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 96 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>"); 97 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>"); 98 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>"); 99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
113} 103}
114 104
115/* This is a basic little function to put the player back to his 105/* This is a basic little function to put the player back to his
116 * savebed. We do some error checking - its possible that the 106 * savebed. We do some error checking - its possible that the
117 * savebed map may no longer exist, so we make sure the player 107 * savebed map may no longer exist, so we make sure the player
118 * goes someplace. 108 * goes someplace.
119 */ 109 */
120void 110void
121enter_player_savebed (object *op) 111enter_player_savebed (object *op)
122{ 112{
123 object *tmp = object::create (); 113 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
124 EXIT_PATH (tmp) = op->contr->savebed_map;
125 EXIT_X (tmp) = op->contr->bed_x;
126 EXIT_Y (tmp) = op->contr->bed_y;
127 op->enter_exit (tmp);
128 tmp->destroy ();
129} 114}
130 115
131/* 116/*
132 * enter_map(): Moves the player and pets from current map (if any) to 117 * enter_map(): Moves the player and pets from current map (if any) to
133 * new map. map, x, y must be set. map is the map we are moving the 118 * new map. map, x, y must be set. map is the map we are moving the
… …
136 * the function that calls this should figure them out. 121 * the function that calls this should figure them out.
137 */ 122 */
138void 123void
139object::enter_map (maptile *newmap, int x, int y) 124object::enter_map (maptile *newmap, int x, int y)
140{ 125{
126 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
127 return;
128
141 if (out_of_map (newmap, x, y)) 129 if (out_of_map (newmap, x, y))
142 { 130 {
143 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 131 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
144 x = newmap->enter_x; 132 x = newmap->enter_x;
145 y = newmap->enter_y; 133 y = newmap->enter_y;
… …
150 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 138 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
151 return; 139 return;
152 } 140 }
153 } 141 }
154 142
155 if (map) 143 if (contr && map != newmap && map)
156 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 144 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
157 return; 145 return;
158 146
159 /* If it is a player login, he has yet to be inserted anyplace. 147 // remove, so stupid ob_locked does not trigger a failure
160 * otherwise, we need to deal with removing the player here.
161 */
162 remove (); 148 remove ();
163 149
164 /* try to find a spot for the player */ 150 /* try to find a spot for the player */
165 if (ob_blocked (this, newmap, x, y)) 151 if (blocked (newmap, x, y))
166 { /* First choice blocked */ 152 { /* First choice blocked */
167 /* We try to find a spot for the player, starting closest in. 153 /* We try to find a spot for the player, starting closest in.
168 * We could use find_first_free_spot, but that doesn't randomize it at all, 154 * We could use find_first_free_spot, but that doesn't randomize it at all,
169 * So for example, if the north space is free, you would always end up there even 155 * So for example, if the north space is free, you would always end up there even
170 * if other spaces around are available. 156 * if other spaces around are available.
… …
188 else 174 else
189 /* not much we can do in this case. */ 175 /* not much we can do in this case. */
190 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); 176 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);
191 } 177 }
192 178
179 if (contr && map != newmap)
180 {
193 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 181 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
194 return; 182 return;
195 183
196 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 184 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
197 return; 185 return;
186 }
198 187
199 this->x = x; 188 this->x = x;
200 this->y = y; 189 this->y = y;
201 map = newmap; 190 map = newmap;
202 191
203 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 192 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
204 193
205 newmap->timeout = 0;
206 enemy = NULL; 194 enemy = 0;
207 195
208 if (contr) 196 if (contr)
209 { 197 {
210 strcpy (contr->maplevel, newmap->path); 198 contr->maplevel = newmap->path;
211 contr->count = 0; 199 contr->count = 0;
212 } 200 }
213 201
214 /* Update any golems */ 202 /* Update any golems */
215 if (type == PLAYER && contr->ranges[range_golem]) 203 if (type == PLAYER)
216 { 204 if (object *golem = contr->golem)
217 int i = find_free_spot (contr->ranges[range_golem], newmap,
218 x, y, 1, SIZEOFFREE);
219
220 contr->ranges[range_golem]->remove ();
221
222 if (i == -1)
223 { 205 {
224 remove_friendly_object (contr->ranges[range_golem]); 206 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
225 contr->ranges[range_golem]->destroy (); 207
226 contr->ranges[range_golem] = 0; 208 if (i < 0)
227 } 209 golem->drop_and_destroy ();
228 else 210 else
229 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
231 { 211 {
232 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
233 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 213 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
234 tmp->map = newmap;
235 } 214 }
236
237 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
238 contr->ranges[range_golem]->direction =
239 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
240 } 215 }
241 }
242
243 direction = 0;
244 216
245 /* since the players map is already loaded, we don't need to worry 217 /* since the players map is already loaded, we don't need to worry
246 * about pending objects. 218 * about pending objects.
247 */ 219 */
248 remove_all_pets (newmap); 220 remove_all_pets (newmap);
… …
256 * is needed after the players have been updated. 228 * is needed after the players have been updated.
257 */ 229 */
258static void 230static void
259process_players1 () 231process_players1 ()
260{ 232{
261 int flag;
262
263 /* Basically, we keep looping until all the players have done their actions. */ 233 /* Basically, we keep looping until all the players have done their actions. */
264 for (flag = 1; flag != 0;) 234 for (int flag = 1; flag != 0;)
265 { 235 {
266 flag = 0; 236 flag = 0;
267 for_all_players (pl) 237 for_all_players (pl)
268 { 238 {
269 pl->refcnt_chk (); 239 pl->refcnt_chk ();
270 240
271 if (!pl->ob || !pl->ns) 241 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
272 continue; 242 continue;
273 243
274 if (pl->ob->speed_left > 0)
275 if (handle_newcs_player (pl->ob)) 244 if (handle_newcs_player (pl->ob))
276 flag = 1; 245 flag = 1;
277
278 /* If the player is not actively playing, don't make a
279 * backup save - nothing to save anyway. Plus, the
280 * map may not longer be valid. This can happen when the
281 * player quits - they exist for purposes of tracking on the map,
282 * but don't actually reside on any actual map.
283 */
284 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
285 continue;
286
287#ifdef AUTOSAVE
288 /* check for ST_PLAYING state so that we don't try to save off when
289 * the player is logging in.
290 */
291 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
292 {
293 pl->ob->contr->save ();
294 pl->last_save_tick = pticks;
295 } 246 }
296#endif 247 }
297 } /* end of for loop for all the players */
298 } /* for flag */
299 248
300 for_all_players (pl) 249 for_all_players (pl)
301 { 250 {
302 if (!pl->ob || !pl->ns) 251 object *ob = pl->ob;
252
253 if (expect_false (!ob || !pl->ns || !ob->active))
303 continue; 254 continue;
304 255
305 if (settings.casting_time)
306 {
307 if (pl->ob->casting_time > 0)
308 {
309 pl->ob->casting_time--;
310 pl->ob->start_holding = 1;
311 }
312
313 /* set spell_state so we can update the range in stats field */
314 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
315 pl->ob->start_holding = 0;
316 }
317
318 do_some_living (pl->ob); 256 do_some_living (ob);
319 } 257 }
320} 258}
321 259
322static void 260static void
323process_players2 () 261process_players2 ()
324{ 262{
325 /* Then check if any players should use weapon-speed instead of speed */ 263 /* Then check if any players should use weapon-speed instead of speed */
326 for_all_players (pl) 264 for_all_players (pl)
327 { 265 {
328 /* The code that did weapon_sp handling here was out of place - 266 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
329 * this isn't called until after the player has finished there 267 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
330 * actions, and is thus out of place. All we do here is bounds
331 * checking.
332 */
333 if (pl->has_hit)
334 {
335 if (pl->ob->speed_left > pl->weapon_sp)
336 pl->ob->speed_left = pl->weapon_sp;
337
338 /* This needs to be here - if the player is running, we need to
339 * clear this each tick, but new commands are not being received
340 * so execute_newserver_command() is never called
341 */
342 pl->has_hit = 0;
343 }
344 else if (pl->ob->speed_left > pl->ob->speed)
345 pl->ob->speed_left = pl->ob->speed;
346 } 268 }
347} 269}
348 270
349void 271void
350process_events () 272process_events ()
351{ 273{
352 object *op;
353
354 static object_ptr marker_;
355
356 if (!marker_)
357 marker_ = object::create ();
358
359 object *marker = marker_;
360
361 process_players1 (); 274 process_players1 ();
362 275
363 marker->active_next = active_objects; 276 for_all_actives (op)
364
365 if (marker->active_next)
366 marker->active_next->active_prev = marker;
367
368 marker->active_prev = 0;
369 active_objects = marker;
370
371 while (marker->active_next)
372 { 277 {
373 op = marker->active_next;
374
375 /* Move marker forward - swap op and marker */
376 op->active_prev = marker->active_prev;
377
378 if (op->active_prev)
379 op->active_prev->active_next = op;
380 else
381 active_objects = op;
382
383 marker->active_next = op->active_next;
384
385 if (marker->active_next)
386 marker->active_next->active_prev = marker;
387
388 marker->active_prev = op;
389 op->active_next = marker;
390
391 /* Now process op */ 278 /* Now process op */
392 if (QUERY_FLAG (op, FLAG_FREED)) 279 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
393 { 280 {
394 LOG (llevError, "BUG: process_events(): Free object on list\n"); 281 LOG (llevError, "BUG: process_events(): Free object on list\n");
395 op->set_speed (0); 282 op->set_speed (0);
396 continue; 283 continue;
397 } 284 }
398 285
399 /* I've seen occasional crashes due to this - the object is removed,
400 * and thus the map it points to (last map it was on) may be bogus
401 * The real bug is to try to find out the cause of this - someone
402 * is probably calling remove_ob without either an insert_ob or
403 * free_object afterwards, leaving an object dangling. But I'd
404 * rather log this and continue on instead of crashing.
405 * Don't remove players - when a player quits, the object is in
406 * sort of a limbo, of removed, but something we want to keep
407 * around.
408 */
409 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
410 {
411 LOG (llevError, "BUG: process_events(): Removed object on list\n");
412 char *dump = dump_object (op);
413 LOG (llevError, dump);
414 free (dump);
415 op->destroy ();
416 continue;
417 }
418
419 if (!op->has_active_speed ()) 286 if (expect_false (!op->has_active_speed ()))
420 { 287 {
421 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 288 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
422 "but is on active list\n", op->debug_desc (), op->speed); 289 "but is on active list\n", op->debug_desc (), op->speed);
423 op->set_speed (0); 290 op->set_speed (0);
424 continue; 291 continue;
425 } 292 }
426 293
427 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 294 if (expect_false (op->flag [FLAG_REMOVED]))
428 { 295 {
429 LOG (llevError, "BUG: process_events(): Object without map or " 296 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
430 "inventory is on active list: %s (%d)\n", &op->name, op->count); 297 op->debug_desc ());
431 op->set_speed (0); 298 op->set_speed (0);
432 continue; 299 continue;
433 } 300 }
434 301
435 /* Animate the object. Bug or feature that anim_speed 302 /* Animate the object. Bug or feature that anim_speed
436 * is based on ticks, and not the creatures speed? 303 * is based on ticks, and not the creatures speed?
437 */ 304 */
438 if (op->anim_speed && op->last_anim >= op->anim_speed) 305 if (op->anim_speed && op->last_anim >= op->anim_speed)
439 { 306 {
440 if ((op->type == PLAYER))
441 animate_object (op, op->facing);
442 else
443 animate_object (op, op->direction); 307 animate_object (op, op->contr ? op->facing : op->direction);
444
445 op->last_anim = 1; 308 op->last_anim = 1;
446 } 309 }
447 else 310 else
448 op->last_anim++; 311 ++op->last_anim;
449 312
450 if (op->speed_left > 0) 313 if (expect_false (op->speed_left > 0.f))
451 {
452#if 0
453 /* I've seen occasional crashes in move_symptom() with it
454 * crashing because op is removed - add some debugging to
455 * track if it is removed at this point.
456 * This unfortunately is a bit too verbose it seems - not sure
457 * why - I think what happens is a map is freed or something and
458 * some objects get 'lost' - removed never to be reclaimed.
459 * removed objects generally shouldn't exist.
460 */
461 if (QUERY_FLAG (op, FLAG_REMOVED))
462 { 314 {
463 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
464 }
465#endif
466 --op->speed_left; 315 --op->speed_left;
467 process_object (op); 316 process_object (op);
468
469 if (op->destroyed ())
470 continue;
471 } 317 }
472 318
473 if (settings.casting_time == TRUE && op->casting_time > 0) 319 if (expect_true (!op->contr))
474 op->casting_time--; 320 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
475
476 if (op->speed_left <= 0)
477 op->speed_left += FABS (op->speed);
478 } 321 }
479
480 /* Remove marker object from active list */
481 if (marker->active_prev != NULL)
482 marker->active_prev->active_next = NULL;
483 else
484 active_objects = NULL;
485 322
486 process_players2 (); 323 process_players2 ();
487} 324}
488 325
489/* clean up everything before exiting */ 326/* clean up everything before exiting */
490void 327void
491emergency_save () 328emergency_save ()
492{ 329{
493 LOG (llevDebug, "emergency save begin.\n"); 330 LOG (llevDebug, "emergency save begin.\n");
494 331
495 LOG (llevDebug, "saving players.\n");
496 for_all_players (pl)
497 pl->save (1);
498
499// for_all_players (pl)
500// if (pl->ob)
501// pl->ob->remove ();
502
503 LOG (llevDebug, "saving maps.\n");
504 maptile::emergency_save (); 332 cfperl_emergency_save ();
505 333
506 LOG (llevDebug, "saving book archive.\n"); 334 LOG (llevDebug, "saving book archive.\n");
507 write_book_archive (); 335 write_book_archive ();
508 336
509 LOG (llevDebug, "emergency save done.\n"); 337 LOG (llevDebug, "emergency save done.\n");
510} 338}
511 339
340// send all clients some informational text
341static void
342cleanup_inform (const char *cause, bool make_core)
343{
344 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
345
346 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
347 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
348
349 if (make_core)
350 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
351 else
352 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
353
354 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
355
356 client::flush_sockets ();
357}
358
512/* clean up everything before exiting */ 359/* clean up everything before exiting */
513void 360void
514cleanup (bool make_core) 361cleanup (const char *cause, bool make_core)
515{ 362{
363 if (make_core)
364 fork_abort (cause);
365
366 LOG (llevError, "cleanup cause: %s\n", cause);
367
368 if (!make_core)
369 cleanup_inform (cause, make_core);
370
516 LOG (llevDebug, "cleanup begin.\n"); 371 LOG (llevDebug, "cleanup begin.\n");
517 372
518 if (init_done && !in_cleanup) 373 if (init_done && !in_cleanup)
519 { 374 {
520 in_cleanup = true; 375 in_cleanup = true;
… …
526 LOG (llevDebug, "running cleanup handlers.\n"); 381 LOG (llevDebug, "running cleanup handlers.\n");
527 INVOKE_GLOBAL (CLEANUP); 382 INVOKE_GLOBAL (CLEANUP);
528 383
529 LOG (llevDebug, "cleanup done.\n"); 384 LOG (llevDebug, "cleanup done.\n");
530 385
386 log_cleanup ();
387
531 if (make_core) 388 if (make_core)
532 abort (); 389 cleanup_inform (cause, make_core);
533 else 390 else
534 _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 } 391 {
574} 392 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
575 393 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
576int 394 client::flush_sockets ();
577forbid_play (void)
578{
579#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
580 char buf[MAX_BUF], day[MAX_BUF];
581 FILE *fp;
582 time_t clock;
583 struct tm *tm;
584 int i, start, stop, forbit = 0, comp;
585
586 clock = time (NULL);
587 tm = (struct tm *) localtime (&clock);
588
589 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
590 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
591 return 0;
592
593 while (fgets (buf, MAX_BUF, fp))
594 { 395 }
595 if (buf[0] == '#')
596 continue;
597 if (!strncmp (buf, "msg", 3))
598 {
599 if (forbit)
600 while (fgets (buf, MAX_BUF, fp)) /* print message */
601 fputs (buf, logfile);
602 break;
603 396
604 } 397 cfperl_cleanup (make_core);
605 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 398 _exit (make_core);
606 {
607 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
608 continue;
609 }
610
611 for (i = 0; i < 7; i++)
612 {
613 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
614 forbit = 1;
615 }
616 }
617
618 close_and_delete (fp, comp);
619
620 return forbit;
621#else
622 return 0;
623#endif
624} 399}
625 400
626/* 401/*
627 * do_specials() is a collection of functions to call from time to time. 402 * 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 403 * 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. 404 * 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 405 * 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 406 * 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 407 * 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 409 * done on the same tick, but that will happen very infrequently
635 * 410 *
636 * I also think this code makes it easier to see how often we really are 411 * I also think this code makes it easier to see how often we really are
637 * doing the various things. 412 * doing the various things.
638 */ 413 */
639
640extern unsigned long todtick;
641
642void 414void
643do_specials (void) 415do_specials (void)
644{ 416{
645 if (!(pticks % PTICKS_PER_CLOCK))
646 tick_the_clock ();
647
648 if (!(pticks % 7))
649 shstr::gc (); 417 shstr::gc ();
418 archetype::gc ();
650 419
420 if (expect_false (!(pticks % TICKS_PER_HOUR)))
421 adjust_daylight ();
422
651 if (!(pticks % 2503)) 423 if (expect_false (!(pticks % 2503)))
652 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 424 fix_weight (); /* Hack to fix weightproblems caused by bugs */
653 425
654 if (!(pticks % 5003)) 426 if (expect_false (!(pticks % 5003)))
655 write_book_archive (); 427 write_book_archive ();
656 428
657 if (!(pticks % 5009)) 429 if (expect_false (!(pticks % 5009)))
658 clean_friendly_list (); 430 clean_friendly_list ();
659 431
660 if (!(pticks % 5011)) 432 if (expect_false (!(pticks % 5011)))
661 obsolete_parties (); 433 obsolete_parties ();
662 434
663 if (!(pticks % 12503)) 435 if (expect_false (!(pticks % 12503)))
664 fix_luck (); 436 fix_luck ();
665} 437}
666 438
667void 439void
668server_tick () 440server_tick ()
669{ 441{
670 // first do the user visible stuff 442 // first do the user visible stuff
671 doeric_server ();
672 INVOKE_GLOBAL (CLOCK); 443 INVOKE_GLOBAL (CLOCK);
673 process_events (); /* "do" something with objects with speed */ 444 process_events (); // "do" something with objects with speed
674 flush_sockets (); 445 client::clock (); // draw client maps etc.
675 446
676 // then do some bookkeeping, should not really be here 447 // then do some bookkeeping, should not really be here
677 do_specials (); /* Routines called from time to time. */ 448 do_specials (); /* Routines called from time to time. */
678 attachable::check_mortals (); 449 attachable::check_mortals ();
679 450
680 ++pticks; 451 ++pticks;
681} 452}
682 453
454#if 0
455// used fro benchmarking (x86/amd64-specific)
456typedef unsigned long tval;
457typedef unsigned long long stamp64;
458
459extern inline tval
460stamp (void)
461{
462 tval tsc;
463 asm volatile ("rdtsc":"=a" (tsc)::"edx");
464
465 return tsc;
466}
467
468extern inline tval
469measure (tval t)
470{
471 tval tsc;
472 asm volatile ("rdtsc":"=a" (tsc)::"edx");
473
474 if (tsc > t)
475 return tsc - t;
476 else
477 return t - tsc;
478}
479
683int 480int
684main (int argc, char **argv) 481main (int argc, char **argv)
685{ 482{
483 rand_gen rg(0);
484 tval fastest = 0x7fffffff;
485 for (int loop = 10000; loop--; )
486 {
487 tval s = stamp ();
488 volatile int i = rg.get_int(25);
489 fastest = min (fastest, measure (s));
490 }
491
492 //printf ("fastest %d\n", fastest);
493 for (int i = 0; i < 1024*1024*3; ++i)
494 {
495 char c = rg.get_int (256);
496 write (2, &c, 1);
497 }
498}
499
500#else
501
502#if 0 // just goofing around, look elsewhere
503
504#include <malloc.h>
505#include <execinfo.h>
506
507static void tr_on ();
508static void tr_off ();
509
510static SMUTEX(tr_mutex);
511
512#define ltr_off() SMUTEX_LOCK (tr_mutex); tr_off ()
513#define ltr_on() tr_on (); SMUTEX_UNLOCK (tr_mutex);
514
515static void *
516tr_malloc (size_t size, const void *caller)
517{
518 ltr_off ();
519
520 void *bt [8];
521 backtrace (bt, 8);
522
523 void *ptr = malloc (size);
524
525 ltr_on ();
526 return (char *)ptr;
527}
528
529static void
530tr_free (void *ptr, const void *caller)
531{
532 ltr_off ();
533
534 free (ptr);
535
536 ltr_on ();
537}
538
539void static *
540tr_realloc (void *ptr, size_t size, const void *caller)
541{
542 ltr_off ();
543
544 void *nptr = realloc (ptr, size);
545
546 ltr_on ();
547 return nptr;
548}
549
550static void *
551tr_memalign (size_t size, size_t alignment, const void *caller)
552{
553 ltr_off ();
554
555 void *ptr = memalign (size, alignment < 16 ? 16 : alignment);
556
557 ltr_on ();
558 return ptr;
559}
560
561static void
562tr_on ()
563{
564 __malloc_hook = tr_malloc;
565 __realloc_hook = tr_realloc;
566 __free_hook = tr_free;
567 __memalign_hook = tr_memalign;
568}
569
570static void
571tr_off ()
572{
573 __malloc_hook = 0;
574 __realloc_hook = 0;
575 __free_hook = 0;
576 __memalign_hook = 0;
577}
578
579void (*__malloc_initialize_hook)(void) = tr_on;
580
581#endif
582
583// normal main
584int
585main (int argc, char **argv)
586{
686 settings.argc = argc; 587 settings.argc = argc;
687 settings.argv = argv; 588 settings.argv = argv;
688 589
590 g_thread_init (0); // for the slice allocator only
591
689 init (argc, argv); 592 init (argc, argv);
690
691 initPlugins ();
692 593
693 for (;;) 594 for (;;)
694 cfperl_main (); 595 cfperl_main ();
695
696 cleanup (true);
697} 596}
597#endif
698 598
599#if 0
600int xyzzy ()
601{
602 return rndm(8);
603}
604
605void xyzzy (object_ptr &a, object_ptr &o)
606{
607 asm volatile ("int3");
608 a = o;
609 asm volatile ("int3");
610}
611#endif
612

Diff Legend

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