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.104 by root, Thu May 17 14:14:55 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <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) 43 if (op)
51 clear_win_info (op); 44 clear_win_info (op);
52 45
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 46 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 47
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 48 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>"); 49 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>"); 50 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>"); 51 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
52 new_draw_info (NDI_UNIQUE, 0, op, "");
53 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>"); 54 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>"); 55 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>"); 56 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>"); 57 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>"); 58 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>"); 59 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>"); 60 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>"); 61 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>"); 62 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>"); 63 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>"); 64 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>"); 65 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>"); 66 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>"); 67 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>"); 89 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>"); 90 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>"); 91 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>"); 92 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"); 93 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
105 94 new_draw_info (NDI_UNIQUE, 0, op, "");
106 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:"); 95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
107 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner"); 96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
108 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>"); 97 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>"); 98 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>"); 99 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>"); 100 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, "");
112 new_draw_info (NDI_UNIQUE, 0, op, "And many more!"); 102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
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
… …
136 * the function that calls this should figure them out. 126 * the function that calls this should figure them out.
137 */ 127 */
138void 128void
139object::enter_map (maptile *newmap, int x, int y) 129object::enter_map (maptile *newmap, int x, int y)
140{ 130{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
132 return;
133
141 if (out_of_map (newmap, x, y)) 134 if (out_of_map (newmap, x, y))
142 { 135 {
143 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
144 x = newmap->enter_x; 137 x = newmap->enter_x;
145 y = newmap->enter_y; 138 y = newmap->enter_y;
… …
150 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 143 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
151 return; 144 return;
152 } 145 }
153 } 146 }
154 147
155 if (map) 148 if (contr && map != newmap && map)
156 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
157 return; 150 return;
158 151
159 /* If it is a player login, he has yet to be inserted anyplace. 152 // remove, so stupid ob_locked does not trigger a failure
160 * otherwise, we need to deal with removing the player here.
161 */
162 remove (); 153 remove ();
163 154
164 /* try to find a spot for the player */ 155 /* try to find a spot for the player */
165 if (ob_blocked (this, newmap, x, y)) 156 if (ob_blocked (this, newmap, x, y))
166 { /* First choice blocked */ 157 { /* First choice blocked */
… …
188 else 179 else
189 /* not much we can do in this case. */ 180 /* 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); 181 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 } 182 }
192 183
184 if (contr && map != newmap)
185 {
193 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 186 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
194 return; 187 return;
195 188
196 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 189 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
197 return; 190 return;
191 }
198 192
199 this->x = x; 193 this->x = x;
200 this->y = y; 194 this->y = y;
201 map = newmap; 195 map = newmap;
202 196
203 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
204 198
205 newmap->timeout = 0;
206 enemy = NULL; 199 enemy = 0;
207 200
208 if (contr) 201 if (contr)
209 { 202 {
210 strcpy (contr->maplevel, newmap->path); 203 contr->maplevel = newmap->path;
211 contr->count = 0; 204 contr->count = 0;
212 } 205 }
213 206
214 /* Update any golems */ 207 /* Update any golems */
215 if (type == PLAYER && contr->ranges[range_golem]) 208 if (type == PLAYER)
216 { 209 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 { 210 {
224 remove_friendly_object (contr->ranges[range_golem]); 211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
225 contr->ranges[range_golem]->destroy (); 212
226 contr->ranges[range_golem] = 0; 213 if (i < 0)
227 } 214 golem->destroy ();
228 else 215 else
229 {
230 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
231 { 216 {
232 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 217 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); 218 golem->direction = find_dir_2 (x - golem->x, y - golem->y);
234 tmp->map = newmap;
235 } 219 }
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 } 220 }
241 }
242
243 direction = 0;
244 221
245 /* since the players map is already loaded, we don't need to worry 222 /* since the players map is already loaded, we don't need to worry
246 * about pending objects. 223 * about pending objects.
247 */ 224 */
248 remove_all_pets (newmap); 225 remove_all_pets (newmap);
… …
256 * is needed after the players have been updated. 233 * is needed after the players have been updated.
257 */ 234 */
258static void 235static void
259process_players1 () 236process_players1 ()
260{ 237{
261 int flag;
262
263 /* Basically, we keep looping until all the players have done their actions. */ 238 /* Basically, we keep looping until all the players have done their actions. */
264 for (flag = 1; flag != 0;) 239 for (int flag = 1; flag != 0;)
265 { 240 {
266 flag = 0; 241 flag = 0;
267 for_all_players (pl) 242 for_all_players (pl)
268 { 243 {
269 pl->refcnt_chk (); 244 pl->refcnt_chk ();
270 245
271 if (!pl->ob || !pl->ns) 246 if (!pl->ob || !pl->ns || !pl->ob->active)
272 continue; 247 continue;
273 248
274 if (pl->ob->speed_left > 0) 249 if (pl->ob->speed_left > 0.f && pl->ns)
275 if (handle_newcs_player (pl->ob)) 250 if (handle_newcs_player (pl->ob))
276 flag = 1; 251 flag = 1;
277 252
278 /* If the player is not actively playing, don't make a 253 /* If the player is not actively playing, don't make a
279 * backup save - nothing to save anyway. Plus, the 254 * backup save - nothing to save anyway. Plus, the
… …
281 * player quits - they exist for purposes of tracking on the map, 256 * player quits - they exist for purposes of tracking on the map,
282 * but don't actually reside on any actual map. 257 * but don't actually reside on any actual map.
283 */ 258 */
284 if (QUERY_FLAG (pl->ob, FLAG_REMOVED)) 259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
285 continue; 260 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 }
296#endif
297 } /* end of for loop for all the players */ 261 } /* end of for loop for all the players */
298 } /* for flag */ 262 } /* for flag */
299 263
300 for_all_players (pl) 264 for_all_players (pl)
301 { 265 {
302 if (!pl->ob || !pl->ns) 266 object *ob = pl->ob;
267
268 if (!ob || !pl->ns || !ob->active)
303 continue; 269 continue;
304 270
305 if (settings.casting_time) 271 // process_events might steal us one speed slot, so adjust accordingly
306 { 272 if (ob->speed_left > 0.f)
307 if (pl->ob->casting_time > 0) 273 ++ob->speed_left;
308 {
309 pl->ob->casting_time--;
310 pl->ob->start_holding = 1;
311 }
312 274
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); 275 do_some_living (ob);
319 } 276 }
320} 277}
321 278
322static void 279static void
323process_players2 () 280process_players2 ()
324{ 281{
325 /* Then check if any players should use weapon-speed instead of speed */ 282 /* Then check if any players should use weapon-speed instead of speed */
326 for_all_players (pl) 283 for_all_players (pl)
327 { 284 {
328 /* The code that did weapon_sp handling here was out of place -
329 * this isn't called until after the player has finished there
330 * actions, and is thus out of place. All we do here is bounds
331 * checking.
332 */
333 if (pl->has_hit) 285 if (pl->has_hit)
334 { 286 {
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288
335 if (pl->ob->speed_left > pl->weapon_sp) 289 if (pl->ob->speed_left > 0.f)
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; 290 pl->has_hit = 0;
343 } 291 }
344 else if (pl->ob->speed_left > pl->ob->speed) 292 else
345 pl->ob->speed_left = pl->ob->speed; 293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
346 } 294 }
347} 295}
348 296
349void 297void
350process_events () 298process_events ()
351{ 299{
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 (); 300 process_players1 ();
362 301
363 marker->active_next = active_objects; 302 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 { 303 {
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 */ 304 /* Now process op */
392 if (QUERY_FLAG (op, FLAG_FREED)) 305 if (QUERY_FLAG (op, FLAG_FREED))
393 { 306 {
394 LOG (llevError, "BUG: process_events(): Free object on list\n"); 307 LOG (llevError, "BUG: process_events(): Free object on list\n");
395 op->set_speed (0); 308 op->set_speed (0);
396 continue;
397 }
398
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; 309 continue;
417 } 310 }
418 311
419 if (!op->has_active_speed ()) 312 if (!op->has_active_speed ())
420 { 313 {
… …
422 "but is on active list\n", op->debug_desc (), op->speed); 315 "but is on active list\n", op->debug_desc (), op->speed);
423 op->set_speed (0); 316 op->set_speed (0);
424 continue; 317 continue;
425 } 318 }
426 319
427 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 320 if (op->flag [FLAG_REMOVED])
428 { 321 {
429 LOG (llevError, "BUG: process_events(): Object without map or " 322 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); 323 op->debug_desc ());
431 op->set_speed (0); 324 op->set_speed (0);
432 continue; 325 continue;
433 } 326 }
434 327
435 /* Animate the object. Bug or feature that anim_speed 328 /* Animate the object. Bug or feature that anim_speed
436 * is based on ticks, and not the creatures speed? 329 * is based on ticks, and not the creatures speed?
437 */ 330 */
438 if (op->anim_speed && op->last_anim >= op->anim_speed) 331 if (op->anim_speed && op->last_anim >= op->anim_speed)
439 { 332 {
440 if ((op->type == PLAYER))
441 animate_object (op, op->facing);
442 else
443 animate_object (op, op->direction); 333 animate_object (op, op->contr ? op->facing : op->direction);
444
445 op->last_anim = 1; 334 op->last_anim = 1;
446 } 335 }
447 else 336 else
448 op->last_anim++; 337 ++op->last_anim;
449 338
450 if (op->speed_left > 0) 339 if (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 { 340 {
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; 341 --op->speed_left;
467 process_object (op); 342 process_object (op);
468 343
469 if (op->destroyed ()) 344 if (op->destroyed ())
470 continue; 345 continue;
471 } 346 }
472 347
473 if (settings.casting_time == TRUE && op->casting_time > 0) 348 if (!op->contr)
474 op->casting_time--; 349 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 } 350 }
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 351
486 process_players2 (); 352 process_players2 ();
487} 353}
488 354
489/* clean up everything before exiting */ 355/* clean up everything before exiting */
490void 356void
491emergency_save () 357emergency_save ()
492{ 358{
493 LOG (llevDebug, "emergency save begin.\n"); 359 LOG (llevDebug, "emergency save begin.\n");
494 360
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 (); 361 cfperl_emergency_save ();
505 362
506 LOG (llevDebug, "saving book archive.\n"); 363 LOG (llevDebug, "saving book archive.\n");
507 write_book_archive (); 364 write_book_archive ();
508 365
509 LOG (llevDebug, "emergency save done.\n"); 366 LOG (llevDebug, "emergency save done.\n");
510} 367}
511 368
369// send all clients some informational text
370static void
371cleanup_inform (const char *cause, bool make_core)
372{
373 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
374
375 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n");
376 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause);
377
378 if (make_core)
379 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n");
380 else
381 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.\n");
382
383 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE);
384
385 flush_sockets ();
386}
387
512/* clean up everything before exiting */ 388/* clean up everything before exiting */
513void 389void
514cleanup (bool make_core) 390cleanup (const char *cause, bool make_core)
515{ 391{
392 if (make_core)
393 fork_abort (cause);
394
395 LOG (llevError, "cleanup cause: %s\n", cause);
396
397 if (!make_core)
398 cleanup_inform (cause, make_core);
399
516 LOG (llevDebug, "cleanup begin.\n"); 400 LOG (llevDebug, "cleanup begin.\n");
517 401
518 if (init_done && !in_cleanup) 402 if (init_done && !in_cleanup)
519 { 403 {
520 in_cleanup = true; 404 in_cleanup = true;
… …
527 INVOKE_GLOBAL (CLEANUP); 411 INVOKE_GLOBAL (CLEANUP);
528 412
529 LOG (llevDebug, "cleanup done.\n"); 413 LOG (llevDebug, "cleanup done.\n");
530 414
531 if (make_core) 415 if (make_core)
532 abort (); 416 {
417 cleanup_inform (cause, make_core);
418 cfperl_cleanup (make_core);
419 _exit (1);
420 }
533 else 421 else
422 {
423 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n");
424 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n");
425 flush_sockets ();
426 cfperl_cleanup (make_core);
534 _exit (0); 427 _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 } 428 }
574} 429}
575 430
576int 431int
577forbid_play (void) 432forbid_play (void)
… …
592 447
593 while (fgets (buf, MAX_BUF, fp)) 448 while (fgets (buf, MAX_BUF, fp))
594 { 449 {
595 if (buf[0] == '#') 450 if (buf[0] == '#')
596 continue; 451 continue;
452
597 if (!strncmp (buf, "msg", 3)) 453 if (!strncmp (buf, "msg", 3))
598 { 454 {
599 if (forbit) 455 if (forbit)
600 while (fgets (buf, MAX_BUF, fp)) /* print message */ 456 while (fgets (buf, MAX_BUF, fp)) /* print message */
601 fputs (buf, logfile); 457 fputs (buf, logfile);
602 break; 458 break;
603
604 } 459 }
605 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 460 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
606 { 461 {
607 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 462 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
608 continue; 463 continue;
… …
622 return 0; 477 return 0;
623#endif 478#endif
624} 479}
625 480
626/* 481/*
627 * do_specials() is a collection of functions to call from time to time. 482 * 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 483 * 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. 484 * 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 485 * 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 486 * 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 487 * 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 489 * done on the same tick, but that will happen very infrequently
635 * 490 *
636 * I also think this code makes it easier to see how often we really are 491 * I also think this code makes it easier to see how often we really are
637 * doing the various things. 492 * doing the various things.
638 */ 493 */
639
640extern unsigned long todtick;
641
642void 494void
643do_specials (void) 495do_specials (void)
644{ 496{
645 if (!(pticks % PTICKS_PER_CLOCK)) 497 if (!(pticks % TICKS_PER_HOUR))
646 tick_the_clock (); 498 adjust_daylight ();
647 499
648 if (!(pticks % 7)) 500 if (!(pticks % 7))
649 shstr::gc (); 501 shstr::gc ();
650 502
651 if (!(pticks % 2503)) 503 if (!(pticks % 2503))
… …
678 attachable::check_mortals (); 530 attachable::check_mortals ();
679 531
680 ++pticks; 532 ++pticks;
681} 533}
682 534
535#if 0
536// used fro benchmarking (x86/amd64-specific)
537typedef unsigned long tval;
538typedef unsigned long long stamp64;
539
540extern inline tval
541stamp (void)
542{
543 tval tsc;
544 asm volatile ("rdtsc":"=a" (tsc)::"edx");
545
546 return tsc;
547}
548
549extern inline tval
550measure (tval t)
551{
552 tval tsc;
553 asm volatile ("rdtsc":"=a" (tsc)::"edx");
554
555 if (tsc > t)
556 return tsc - t;
557 else
558 return t - tsc;
559}
560
683int 561int
684main (int argc, char **argv) 562main (int argc, char **argv)
685{ 563{
564 rand_gen rg(0);
565 tval fastest = 0x7fffffff;
566 for (int loop = 10000; loop--; )
567 {
568 tval s = stamp ();
569 volatile int i = rg.get_int(25);
570 fastest = min (fastest, measure (s));
571 }
572
573 //printf ("fastest %d\n", fastest);
574 for (int i = 0; i < 1024*1024*3; ++i)
575 {
576 char c = rg.get_int (256);
577 write (2, &c, 1);
578 }
579}
580
581#else
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
689 init (argc, argv); 590 init (argc, argv);
690 591
691 initPlugins (); 592 initPlugins ();
692 593
693 for (;;) 594 for (;;)
694 cfperl_main (); 595 cfperl_main ();
695
696 cleanup (true);
697} 596}
597#endif
698 598

Diff Legend

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