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.104 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.154 by root, Wed Apr 21 05:48:35 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <object.h> 26#include <object.h>
27#include <tod.h> 27#include <tod.h>
28 28
29#include <sproto.h> 29#include <sproto.h>
30#include <time.h> 30#include <time.h>
31 31
32#include <glib.h>
33
32#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
33#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
34#include "path.h" 36#include "path.h"
35 37
36static char days[7][4] = {
37 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
38};
39
40void 38void
41version (object *op) 39version (object *op)
42{ 40{
43 if (op)
44 clear_win_info (op);
45
46 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION); 41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
47
48 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
49 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
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:");
54 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
55 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
56 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
59 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
60 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
88 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
90 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
91 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
92 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
93 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
94 new_draw_info (NDI_UNIQUE, 0, op, "");
95 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
96 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
97 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
100 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, "");
102 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
103} 42}
104 43
105/* This is a basic little function to put the player back to his 44/* This is a basic little function to put the player back to his
106 * savebed. We do some error checking - its possible that the 45 * savebed. We do some error checking - its possible that the
107 * savebed map may no longer exist, so we make sure the player 46 * savebed map may no longer exist, so we make sure the player
108 * goes someplace. 47 * goes someplace.
109 */ 48 */
110void 49void
111enter_player_savebed (object *op) 50enter_player_savebed (object *op)
112{ 51{
113 object *tmp = object::create (); 52 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
114 EXIT_PATH (tmp) = op->contr->savebed_map;
115 EXIT_X (tmp) = op->contr->bed_x;
116 EXIT_Y (tmp) = op->contr->bed_y;
117 op->enter_exit (tmp);
118 tmp->destroy ();
119} 53}
120 54
121/* 55/*
122 * enter_map(): Moves the player and pets from current map (if any) to 56 * enter_map(): Moves the player and pets from current map (if any) to
123 * new map. map, x, y must be set. map is the map we are moving the 57 * new map. map, x, y must be set. map is the map we are moving the
… …
126 * the function that calls this should figure them out. 60 * the function that calls this should figure them out.
127 */ 61 */
128void 62void
129object::enter_map (maptile *newmap, int x, int y) 63object::enter_map (maptile *newmap, int x, int y)
130{ 64{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 65 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
132 return; 66 return;
133 67
134 if (out_of_map (newmap, x, y)) 68 if (out_of_map (newmap, x, y))
135 { 69 {
136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 70 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
151 85
152 // remove, so stupid ob_locked does not trigger a failure 86 // remove, so stupid ob_locked does not trigger a failure
153 remove (); 87 remove ();
154 88
155 /* try to find a spot for the player */ 89 /* try to find a spot for the player */
156 if (ob_blocked (this, newmap, x, y)) 90 if (blocked (newmap, x, y))
157 { /* First choice blocked */ 91 { /* First choice blocked */
158 /* We try to find a spot for the player, starting closest in. 92 /* We try to find a spot for the player, starting closest in.
159 * We could use find_first_free_spot, but that doesn't randomize it at all, 93 * We could use find_first_free_spot, but that doesn't randomize it at all,
160 * So for example, if the north space is free, you would always end up there even 94 * So for example, if the north space is free, you would always end up there even
161 * if other spaces around are available. 95 * if other spaces around are available.
… …
188 122
189 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 123 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
190 return; 124 return;
191 } 125 }
192 126
193 this->x = x; 127 newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
194 this->y = y;
195 map = newmap;
196
197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
198 128
199 enemy = 0; 129 enemy = 0;
200 130
201 if (contr) 131 if (contr)
202 { 132 {
… …
209 if (object *golem = contr->golem) 139 if (object *golem = contr->golem)
210 { 140 {
211 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE); 141 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
212 142
213 if (i < 0) 143 if (i < 0)
214 golem->destroy (); 144 golem->drop_and_destroy ();
215 else 145 else
216 { 146 {
217 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 147 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
218 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 148 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
219 } 149 }
220 } 150 }
221 151
222 /* since the players map is already loaded, we don't need to worry 152 /* since the players map is already loaded, we don't need to worry
223 * about pending objects. 153 * about pending objects.
… …
241 flag = 0; 171 flag = 0;
242 for_all_players (pl) 172 for_all_players (pl)
243 { 173 {
244 pl->refcnt_chk (); 174 pl->refcnt_chk ();
245 175
246 if (!pl->ob || !pl->ns || !pl->ob->active) 176 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
247 continue; 177 continue;
248 178
249 if (pl->ob->speed_left > 0.f && pl->ns)
250 if (handle_newcs_player (pl->ob)) 179 if (handle_newcs_player (pl->ob))
251 flag = 1; 180 flag = 1;
252 181 }
253 /* If the player is not actively playing, don't make a 182 }
254 * backup save - nothing to save anyway. Plus, the
255 * map may not longer be valid. This can happen when the
256 * player quits - they exist for purposes of tracking on the map,
257 * but don't actually reside on any actual map.
258 */
259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
260 continue;
261 } /* end of for loop for all the players */
262 } /* for flag */
263 183
264 for_all_players (pl) 184 for_all_players (pl)
265 { 185 {
266 object *ob = pl->ob; 186 object *ob = pl->ob;
267 187
188 // process_objects destroys the speed_left value
189 pl->speed_left_save = ob->speed_left;
190
268 if (!ob || !pl->ns || !ob->active) 191 if (expect_false (!ob || !pl->ns || !ob->active))
269 continue; 192 continue;
270
271 // process_events might steal us one speed slot, so adjust accordingly
272 if (ob->speed_left > 0.f)
273 ++ob->speed_left;
274 193
275 do_some_living (ob); 194 do_some_living (ob);
276 } 195 }
277} 196}
278 197
… …
280process_players2 () 199process_players2 ()
281{ 200{
282 /* Then check if any players should use weapon-speed instead of speed */ 201 /* Then check if any players should use weapon-speed instead of speed */
283 for_all_players (pl) 202 for_all_players (pl)
284 { 203 {
285 if (pl->has_hit) 204 // restore speed_left value saved by process_players1
286 { 205 pl->ob->speed_left = pl->speed_left_save;
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288 206
289 if (pl->ob->speed_left > 0.f) 207 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
290 pl->has_hit = 0;
291 }
292 else
293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 208 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
294 } 209 }
295} 210}
296 211
297void 212static void
298process_events () 213process_events ()
299{ 214{
300 process_players1 (); 215 process_players1 ();
301 216
302 for_all_actives (op) 217 for_all_actives (op)
303 { 218 {
219 // try to prefetch some stuff we expect to need
220 // obviously, it should be grouped into the same cacheline.
221 // preliminary results indicate that this gives halves the speed
222 // used for the inner loop
223 if (_i < actives.size ()) // HACK, rely on _i :/
224 {
225 object *next = actives [_i + 1];
226
227 prefetch (&next->flag , 0, 1);
228 prefetch (&next->speed , 0, 1);
229 prefetch (&next->anim_speed, 0, 1);
230 prefetch (&next->contr , 0, 1);
231 }
232
304 /* Now process op */ 233 /* Now process op */
305 if (QUERY_FLAG (op, FLAG_FREED)) 234 if (expect_false (op->flag [FLAG_FREED]))
306 { 235 {
307 LOG (llevError, "BUG: process_events(): Free object on list\n"); 236 LOG (llevError, "BUG: process_events(): Free object on list\n");
308 op->set_speed (0); 237 op->set_speed (0);
309 continue; 238 continue;
310 } 239 }
311 240
312 if (!op->has_active_speed ()) 241 if (expect_false (!op->has_active_speed ()))
313 { 242 {
314 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 243 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
315 "but is on active list\n", op->debug_desc (), op->speed); 244 "but is on active list\n", op->debug_desc (), op->speed);
316 op->set_speed (0); 245 op->set_speed (0);
317 continue; 246 continue;
318 } 247 }
319 248
320 if (op->flag [FLAG_REMOVED]) 249 if (expect_false (op->flag [FLAG_REMOVED]))
321 { 250 {
322 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n", 251 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
323 op->debug_desc ()); 252 op->debug_desc ());
324 op->set_speed (0); 253 op->set_speed (0);
325 continue; 254 continue;
… …
334 op->last_anim = 1; 263 op->last_anim = 1;
335 } 264 }
336 else 265 else
337 ++op->last_anim; 266 ++op->last_anim;
338 267
339 if (op->speed_left > 0.f) 268 if (expect_false (op->speed_left > 0.f))
340 { 269 {
341 --op->speed_left; 270 --op->speed_left;
342 process_object (op); 271 process_object (op);
343
344 if (op->destroyed ())
345 continue;
346 } 272 }
347 273
348 if (!op->contr) 274 // this will destroy the speed_left value for players, but
275 // process_players1 and ..2 save/restore the real value,
276 // so we can avoid a costly test here.
349 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 277 op->speed_left = min (op->speed, op->speed_left + op->speed);
350 } 278 }
351 279
352 process_players2 (); 280 process_players2 ();
353} 281}
354 282
… …
368 296
369// send all clients some informational text 297// send all clients some informational text
370static void 298static void
371cleanup_inform (const char *cause, bool make_core) 299cleanup_inform (const char *cause, bool make_core)
372{ 300{
373 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 301 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
374 302
375 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 303 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
376 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 304 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
377 305
378 if (make_core) 306 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"); 307 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
380 else 308 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"); 309 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
382 310
383 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 311 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
384 312
385 flush_sockets (); 313 client::flush_sockets ();
386} 314}
387 315
388/* clean up everything before exiting */ 316/* clean up everything before exiting */
389void 317void
390cleanup (const char *cause, bool make_core) 318cleanup (const char *cause, bool make_core)
… …
410 LOG (llevDebug, "running cleanup handlers.\n"); 338 LOG (llevDebug, "running cleanup handlers.\n");
411 INVOKE_GLOBAL (CLEANUP); 339 INVOKE_GLOBAL (CLEANUP);
412 340
413 LOG (llevDebug, "cleanup done.\n"); 341 LOG (llevDebug, "cleanup done.\n");
414 342
343 log_cleanup ();
344
415 if (make_core) 345 if (make_core)
416 {
417 cleanup_inform (cause, make_core); 346 cleanup_inform (cause, make_core);
418 cfperl_cleanup (make_core);
419 _exit (1);
420 }
421 else 347 else
422 { 348 {
423 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n"); 349 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
424 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n"); 350 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
425 flush_sockets (); 351 client::flush_sockets ();
352 }
353
426 cfperl_cleanup (make_core); 354 cfperl_cleanup (make_core);
427 _exit (0); 355 _exit (make_core);
428 }
429}
430
431int
432forbid_play (void)
433{
434#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
435 char buf[MAX_BUF], day[MAX_BUF];
436 FILE *fp;
437 time_t clock;
438 struct tm *tm;
439 int i, start, stop, forbit = 0, comp;
440
441 clock = time (NULL);
442 tm = (struct tm *) localtime (&clock);
443
444 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
445 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
446 return 0;
447
448 while (fgets (buf, MAX_BUF, fp))
449 {
450 if (buf[0] == '#')
451 continue;
452
453 if (!strncmp (buf, "msg", 3))
454 {
455 if (forbit)
456 while (fgets (buf, MAX_BUF, fp)) /* print message */
457 fputs (buf, logfile);
458 break;
459 }
460 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
461 {
462 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
463 continue;
464 }
465
466 for (i = 0; i < 7; i++)
467 {
468 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
469 forbit = 1;
470 }
471 }
472
473 close_and_delete (fp, comp);
474
475 return forbit;
476#else
477 return 0;
478#endif
479} 356}
480 357
481/* 358/*
482 * do_specials() is a collection of functions to call from time to time. 359 * do_specials() is a collection of functions to call from time to time.
483 * Modified 2000-1-14 MSW to use the global pticks count to determine how 360 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
489 * done on the same tick, but that will happen very infrequently 366 * done on the same tick, but that will happen very infrequently
490 * 367 *
491 * I also think this code makes it easier to see how often we really are 368 * I also think this code makes it easier to see how often we really are
492 * doing the various things. 369 * doing the various things.
493 */ 370 */
494void 371static void
495do_specials (void) 372do_specials ()
496{ 373{
497 if (!(pticks % TICKS_PER_HOUR))
498 adjust_daylight ();
499
500 if (!(pticks % 7))
501 shstr::gc (); 374 shstr::gc ();
375 archetype::gc ();
502 376
377 if (expect_false (!(pticks % TICKS_PER_HOUR)))
378 maptile::adjust_daylight ();
379
503 if (!(pticks % 2503)) 380 if (expect_false (!(pticks % 2503)))
504 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 381 fix_weight (); /* Hack to fix weightproblems caused by bugs */
505 382
506 if (!(pticks % 5003)) 383 if (expect_false (!(pticks % 5003)))
507 write_book_archive (); 384 write_book_archive ();
508 385
509 if (!(pticks % 5009)) 386 if (expect_false (!(pticks % 5009)))
510 clean_friendly_list (); 387 clean_friendly_list ();
511 388
512 if (!(pticks % 5011)) 389 if (expect_false (!(pticks % 5011)))
513 obsolete_parties (); 390 obsolete_parties ();
514 391
515 if (!(pticks % 12503)) 392 if (expect_false (!(pticks % 12503)))
516 fix_luck (); 393 fix_luck ();
517} 394}
518 395
519void 396void
520server_tick () 397server_tick ()
521{ 398{
522 // first do the user visible stuff 399 // first do the user visible stuff
523 doeric_server ();
524 INVOKE_GLOBAL (CLOCK); 400 INVOKE_GLOBAL (CLOCK);
525 process_events (); /* "do" something with objects with speed */ 401 process_events (); // "do" something with objects with speed
526 flush_sockets (); 402 client::clock (); // draw client maps etc.
527 403
528 // then do some bookkeeping, should not really be here 404 // then do some bookkeeping, should not really be here
529 do_specials (); /* Routines called from time to time. */ 405 do_specials (); /* Routines called from time to time. */
530 attachable::check_mortals (); 406 attachable::check_mortals ();
531 407
532 ++pticks; 408 ++pticks;
533}
534 409
535#if 0 410 if (object::object_count >= RESTART_COUNT)
536// used fro benchmarking (x86/amd64-specific) 411 cleanup ("running out of protocol ID values - need full restart");
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} 412}
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
561int
562main (int argc, char **argv)
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 413
583// normal main 414// normal main
584int 415int
585main (int argc, char **argv) 416main (int argc, char **argv)
586{ 417{
587 settings.argc = argc; 418 settings.argc = argc;
588 settings.argv = argv; 419 settings.argv = argv;
420
421 rndm.seed (time (0));
422 g_thread_init (0); // for the slice allocator only
589 423
590 init (argc, argv); 424 init (argc, argv);
591
592 initPlugins ();
593 425
594 for (;;) 426 for (;;)
595 cfperl_main (); 427 cfperl_main ();
596} 428}
597#endif
598 429

Diff Legend

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