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.85 by root, Mon Jan 15 02:39:41 2007 UTC vs.
Revision 1.155 by root, Wed Apr 21 06:45:57 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#ifdef HAVE_DES_H
30# include <des.h>
31#else
32# ifdef HAVE_CRYPT_H
33# include <crypt.h>
34# endif
35#endif
36
37#include <sproto.h> 29#include <sproto.h>
38#include <time.h> 30#include <time.h>
31
32#include <glib.h>
39 33
40#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
41#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
42#include "path.h" 36#include "path.h"
43 37
44static char days[7][4] = {
45 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
46};
47
48void 38void
49version (object *op) 39version (object *op)
50{ 40{
51 if (op)
52 clear_win_info (op);
53
54 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);
55
56 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
57 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
59 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
60 new_draw_info (NDI_UNIQUE, 0, op, "");
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
62 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
68 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
88 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
90 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
91 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
92 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
93 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
94 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
95 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
96 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
97 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
99 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
100 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
101 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
102 new_draw_info (NDI_UNIQUE, 0, op, "");
103 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
104 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
105 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
106 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
107 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
108 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
109 new_draw_info (NDI_UNIQUE, 0, op, "");
110 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
111} 42}
112 43
113/* 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
114 * savebed. We do some error checking - its possible that the 45 * savebed. We do some error checking - its possible that the
115 * 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
116 * goes someplace. 47 * goes someplace.
117 */ 48 */
118void 49void
119enter_player_savebed (object *op) 50enter_player_savebed (object *op)
120{ 51{
121 object *tmp = object::create (); 52 op->player_goto (op->contr->savebed_map, op->contr->bed_x, op->contr->bed_y);
122 EXIT_PATH (tmp) = op->contr->savebed_map;
123 EXIT_X (tmp) = op->contr->bed_x;
124 EXIT_Y (tmp) = op->contr->bed_y;
125 op->enter_exit (tmp);
126 tmp->destroy ();
127} 53}
128 54
129/* 55/*
130 * 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
131 * 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
… …
134 * the function that calls this should figure them out. 60 * the function that calls this should figure them out.
135 */ 61 */
136void 62void
137object::enter_map (maptile *newmap, int x, int y) 63object::enter_map (maptile *newmap, int x, int y)
138{ 64{
139 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 65 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
140 return; 66 return;
141 67
142 if (out_of_map (newmap, x, y)) 68 if (out_of_map (newmap, x, y))
143 { 69 {
144 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);
… …
155 81
156 if (contr && map != newmap && map) 82 if (contr && map != newmap && map)
157 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 83 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
158 return; 84 return;
159 85
160 // remove, so stupid ob_locked does not trigger a failure 86 // remove, so stupid blocked does not trigger a failure
161 remove (); 87 remove ();
162 88
163 /* try to find a spot for the player */ 89 /* try to find a spot for the player */
164 if (ob_blocked (this, newmap, x, y)) 90 if (blocked (newmap, x, y))
165 { /* First choice blocked */ 91 { /* First choice blocked */
166 /* 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.
167 * 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,
168 * 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
169 * if other spaces around are available. 95 * if other spaces around are available.
170 * Note that for the second and third calls, we could start at a position other 96 * Note that for the second and third calls, we could start at a position other
171 * than one, but then we could end up on the other side of walls and so forth. 97 * than one, but then we could end up on the other side of walls and so forth.
172 */ 98 */
173 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 99 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
174 100
175 if (i == -1) 101 if (i < 0)
176 { 102 {
177 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
178 if (i == -1) 104 if (i < 0)
179 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 105 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
180 } 106 }
181 107
182 if (i != -1) 108 if (i >= 0)
183 { 109 {
184 x += freearr_x[i]; 110 x += freearr_x[i];
185 y += freearr_y[i]; 111 y += freearr_y[i];
186 } 112 }
187 else 113 else
… …
196 122
197 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)))
198 return; 124 return;
199 } 125 }
200 126
201 this->x = x; 127 newmap->insert (this, x, y, 0, INS_NO_WALK_ON);
202 this->y = y;
203 map = newmap;
204
205 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
206 128
207 enemy = 0; 129 enemy = 0;
208 130
209 if (contr) 131 if (contr)
210 { 132 {
211 contr->maplevel = newmap->path; 133 contr->maplevel = newmap->path;
212 contr->count = 0; 134 contr->count = 0;
213 } 135 }
214 136
215 /* Update any golems */ 137 /* Update any golems */
216 if (type == PLAYER && contr->ranges[range_golem]) 138 if (type == PLAYER)
217 { 139 if (object *golem = contr->golem)
218 int i = find_free_spot (contr->ranges[range_golem], newmap,
219 x, y, 1, SIZEOFFREE);
220
221 if (i == -1)
222 { 140 {
223 contr->ranges[range_golem]->destroy (); 141 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
224 contr->ranges[range_golem] = 0; 142
225 } 143 if (i < 0)
144 golem->drop_and_destroy ();
226 else 145 else
227 {
228 for (object *tmp = contr->ranges[range_golem]; tmp; tmp = tmp->more)
229 { 146 {
230 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x); 147 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
231 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y); 148 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
232 tmp->map = newmap;
233 } 149 }
234
235 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
236 contr->ranges[range_golem]->direction =
237 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
238 } 150 }
239 }
240 151
241 /* 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
242 * about pending objects. 153 * about pending objects.
243 */ 154 */
244 remove_all_pets (newmap); 155 remove_all_pets (newmap);
… …
252 * is needed after the players have been updated. 163 * is needed after the players have been updated.
253 */ 164 */
254static void 165static void
255process_players1 () 166process_players1 ()
256{ 167{
257 int flag;
258
259 /* Basically, we keep looping until all the players have done their actions. */ 168 /* Basically, we keep looping until all the players have done their actions. */
260 for (flag = 1; flag != 0;) 169 for (int flag = 1; flag != 0;)
261 { 170 {
262 flag = 0; 171 flag = 0;
263 for_all_players (pl) 172 for_all_players (pl)
264 { 173 {
265 pl->refcnt_chk (); 174 pl->refcnt_chk ();
266 175
267 if (!pl->ob || !pl->ns || !pl->ob->active) 176 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
268 continue; 177 continue;
269 178
270 if (pl->ob->speed_left > 0)
271 if (handle_newcs_player (pl->ob)) 179 if (handle_newcs_player (pl->ob))
272 flag = 1; 180 flag = 1;
273 181 }
274 /* If the player is not actively playing, don't make a 182 }
275 * backup save - nothing to save anyway. Plus, the
276 * map may not longer be valid. This can happen when the
277 * player quits - they exist for purposes of tracking on the map,
278 * but don't actually reside on any actual map.
279 */
280 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
281 continue;
282 } /* end of for loop for all the players */
283 } /* for flag */
284 183
285 for_all_players (pl) 184 for_all_players (pl)
286 { 185 {
186 object *ob = pl->ob;
187
188 // process_objects destroys the speed_left value
189 pl->speed_left_save = ob->speed_left;
190
287 if (!pl->ob || !pl->ns || !pl->ob->active) 191 if (expect_false (!ob || !pl->ns || !ob->active))
288 continue; 192 continue;
289 193
290 if (settings.casting_time)
291 {
292 if (pl->ob->casting_time > 0)
293 {
294 pl->ob->casting_time--;
295 pl->ob->start_holding = 1;
296 }
297
298 /* set spell_state so we can update the range in stats field */
299 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
300 pl->ob->start_holding = 0;
301 }
302
303 do_some_living (pl->ob); 194 do_some_living (ob);
304 } 195 }
305} 196}
306 197
307static void 198static void
308process_players2 () 199process_players2 ()
309{ 200{
310 /* 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 */
311 for_all_players (pl) 202 for_all_players (pl)
312 { 203 {
313 /* The code that did weapon_sp handling here was out of place - 204 // restore speed_left value saved by process_players1
314 * this isn't called until after the player has finished there
315 * actions, and is thus out of place. All we do here is bounds
316 * checking.
317 */
318 if (pl->has_hit)
319 {
320 if (pl->ob->speed_left > pl->weapon_sp)
321 pl->ob->speed_left = pl->weapon_sp;
322
323 /* This needs to be here - if the player is running, we need to
324 * clear this each tick, but new commands are not being received
325 * so execute_newserver_command() is never called
326 */
327 pl->has_hit = 0;
328 }
329 else if (pl->ob->speed_left > pl->ob->speed)
330 pl->ob->speed_left = pl->ob->speed; 205 pl->ob->speed_left = pl->speed_left_save;
331 }
332}
333 206
334void 207 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
208 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
209 }
210}
211
212static void
335process_events () 213process_events ()
336{ 214{
337 process_players1 (); 215 process_players1 ();
338 216
339 for_all_actives (op) 217 for_all_actives (op)
340 { 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
341 /* Now process op */ 233 /* Now process op */
342 if (QUERY_FLAG (op, FLAG_FREED)) 234 if (expect_false (op->flag [FLAG_FREED]))
343 { 235 {
344 LOG (llevError, "BUG: process_events(): Free object on list\n"); 236 LOG (llevError, "BUG: process_events(): Free object on list\n");
345 op->set_speed (0); 237 op->set_speed (0);
346 continue; 238 continue;
347 } 239 }
348 240
349 /* I've seen occasional crashes due to this - the object is removed,
350 * and thus the map it points to (last map it was on) may be bogus
351 * The real bug is to try to find out the cause of this - someone
352 * is probably calling remove_ob without either an insert_ob or
353 * free_object afterwards, leaving an object dangling. But I'd
354 * rather log this and continue on instead of crashing.
355 * Don't remove players - when a player quits, the object is in
356 * sort of a limbo, of removed, but something we want to keep
357 * around.
358 */
359 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
360 {
361 LOG (llevError, "BUG: process_events(): Removed object on list\n");
362 char *dump = dump_object (op);
363 LOG (llevError, dump);
364 free (dump);
365 op->destroy ();
366 continue;
367 }
368
369 if (!op->has_active_speed ()) 241 if (expect_false (!op->has_active_speed ()))
370 { 242 {
371 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 243 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
372 "but is on active list\n", op->debug_desc (), op->speed); 244 "but is on active list\n", op->debug_desc (), op->speed);
373 op->set_speed (0); 245 op->set_speed (0);
374 continue; 246 continue;
375 } 247 }
376 248
377 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 249 if (expect_false (op->flag [FLAG_REMOVED]))
378 { 250 {
379 LOG (llevError, "BUG: process_events(): Object without map or " 251 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
380 "inventory is on active list: %s (%d)\n", &op->name, op->count); 252 op->debug_desc ());
381 op->set_speed (0); 253 op->set_speed (0);
382 continue; 254 continue;
383 } 255 }
384 256
385 /* Animate the object. Bug or feature that anim_speed 257 /* Animate the object. Bug or feature that anim_speed
386 * is based on ticks, and not the creatures speed? 258 * is based on ticks, and not the creatures speed?
387 */ 259 */
388 if (op->anim_speed && op->last_anim >= op->anim_speed) 260 if (op->anim_speed && op->last_anim >= op->anim_speed)
389 { 261 {
390 if ((op->type == PLAYER))
391 animate_object (op, op->facing);
392 else
393 animate_object (op, op->direction); 262 animate_object (op, op->contr ? op->facing : op->direction);
394
395 op->last_anim = 1; 263 op->last_anim = 1;
396 } 264 }
397 else 265 else
398 op->last_anim++; 266 ++op->last_anim;
399 267
400 if (op->speed_left > 0) 268 if (expect_false (op->speed_left > 0.f))
401 {
402#if 0
403 /* I've seen occasional crashes in move_symptom() with it
404 * crashing because op is removed - add some debugging to
405 * track if it is removed at this point.
406 * This unfortunately is a bit too verbose it seems - not sure
407 * why - I think what happens is a map is freed or something and
408 * some objects get 'lost' - removed never to be reclaimed.
409 * removed objects generally shouldn't exist.
410 */
411 if (QUERY_FLAG (op, FLAG_REMOVED))
412 { 269 {
413 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
414 }
415#endif
416 --op->speed_left; 270 --op->speed_left;
417 process_object (op); 271 process_object (op);
418
419 if (op->destroyed ())
420 continue;
421 } 272 }
422 273
423 if (settings.casting_time == TRUE && op->casting_time > 0) 274 // this will destroy the speed_left value for players, but
424 op->casting_time--; 275 // process_players1 and ..2 save/restore the real value,
425 276 // so we can avoid a costly test here.
426 if (op->speed_left <= 0) 277 op->speed_left = min (op->speed, op->speed_left + op->speed);
427 op->speed_left += FABS (op->speed);
428 } 278 }
429 279
430 process_players2 (); 280 process_players2 ();
431} 281}
432 282
… …
446 296
447// send all clients some informational text 297// send all clients some informational text
448static void 298static void
449cleanup_inform (const char *cause, bool make_core) 299cleanup_inform (const char *cause, bool make_core)
450{ 300{
451 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);
452 302
453 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.");
454 new_draw_info_format (flags, 0, 0, "Cause for this shtudown: %s\n", cause); 304 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
455 305
456 if (make_core) 306 if (make_core)
457 new_draw_info_format (flags, 0, 0, "This is considered a crash.\n"); 307 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
458 else 308 else
459 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown.\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.");
460 310
461 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 311 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
462 312
463 flush_sockets (); 313 client::flush_sockets ();
464} 314}
465 315
466/* clean up everything before exiting */ 316/* clean up everything before exiting */
467void 317void
468cleanup (const char *cause, bool make_core) 318cleanup (const char *cause, bool make_core)
… …
488 LOG (llevDebug, "running cleanup handlers.\n"); 338 LOG (llevDebug, "running cleanup handlers.\n");
489 INVOKE_GLOBAL (CLEANUP); 339 INVOKE_GLOBAL (CLEANUP);
490 340
491 LOG (llevDebug, "cleanup done.\n"); 341 LOG (llevDebug, "cleanup done.\n");
492 342
343 log_cleanup ();
344
493 if (make_core) 345 if (make_core)
494 {
495 cleanup_inform (cause, make_core); 346 cleanup_inform (cause, make_core);
496 _exit (1);
497 }
498 else 347 else
499 _exit (0);
500}
501
502int
503forbid_play (void)
504{
505#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
506 char buf[MAX_BUF], day[MAX_BUF];
507 FILE *fp;
508 time_t clock;
509 struct tm *tm;
510 int i, start, stop, forbit = 0, comp;
511
512 clock = time (NULL);
513 tm = (struct tm *) localtime (&clock);
514
515 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
516 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
517 return 0;
518
519 while (fgets (buf, MAX_BUF, fp))
520 {
521 if (buf[0] == '#')
522 continue;
523
524 if (!strncmp (buf, "msg", 3))
525 {
526 if (forbit)
527 while (fgets (buf, MAX_BUF, fp)) /* print message */
528 fputs (buf, logfile);
529 break;
530 }
531 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
532 {
533 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
534 continue;
535 }
536
537 for (i = 0; i < 7; i++)
538 {
539 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
540 forbit = 1;
541 }
542 } 348 {
349 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
350 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
351 client::flush_sockets ();
352 }
543 353
544 close_and_delete (fp, comp); 354 cfperl_cleanup (make_core);
545 355 _exit (make_core);
546 return forbit;
547#else
548 return 0;
549#endif
550} 356}
551 357
552/* 358/*
553 * 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.
554 * 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
… …
560 * done on the same tick, but that will happen very infrequently 366 * done on the same tick, but that will happen very infrequently
561 * 367 *
562 * 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
563 * doing the various things. 369 * doing the various things.
564 */ 370 */
565 371static void
566extern unsigned long todtick;
567
568void
569do_specials (void) 372do_specials ()
570{ 373{
571 if (!(pticks % PTICKS_PER_CLOCK))
572 tick_the_clock ();
573
574 if (!(pticks % 7))
575 shstr::gc (); 374 shstr::gc ();
375 archetype::gc ();
576 376
377 if (expect_false (!(pticks % TICKS_PER_HOUR)))
378 maptile::adjust_daylight ();
379
577 if (!(pticks % 2503)) 380 if (expect_false (!(pticks % 2503)))
578 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 381 fix_weight (); /* Hack to fix weightproblems caused by bugs */
579 382
580 if (!(pticks % 5003)) 383 if (expect_false (!(pticks % 5003)))
581 write_book_archive (); 384 write_book_archive ();
582 385
583 if (!(pticks % 5009)) 386 if (expect_false (!(pticks % 5009)))
584 clean_friendly_list (); 387 clean_friendly_list ();
585 388
586 if (!(pticks % 5011)) 389 if (expect_false (!(pticks % 5011)))
587 obsolete_parties (); 390 obsolete_parties ();
588 391
589 if (!(pticks % 12503)) 392 if (expect_false (!(pticks % 12503)))
590 fix_luck (); 393 fix_luck ();
591} 394}
592 395
593void 396void
594server_tick () 397server_tick ()
595{ 398{
596 // first do the user visible stuff 399 // first do the user visible stuff
597 doeric_server ();
598 INVOKE_GLOBAL (CLOCK); 400 INVOKE_GLOBAL (CLOCK);
599 process_events (); /* "do" something with objects with speed */ 401 process_events (); // "do" something with objects with speed
600 flush_sockets (); 402 client::clock (); // draw client maps etc.
601 403
602 // then do some bookkeeping, should not really be here 404 // then do some bookkeeping, should not really be here
603 do_specials (); /* Routines called from time to time. */ 405 do_specials (); /* Routines called from time to time. */
604 attachable::check_mortals (); 406 attachable::check_mortals ();
605 407
606 ++pticks; 408 ++pticks;
607}
608 409
410 if (object::object_count >= RESTART_COUNT)
411 cleanup ("running out of protocol ID values - need full restart");
412}
413
414// normal main
609int 415int
610main (int argc, char **argv) 416main (int argc, char **argv)
611{ 417{
612 settings.argc = argc; 418 settings.argc = argc;
613 settings.argv = argv; 419 settings.argv = argv;
420
421 rndm.seed (time (0));
422 g_thread_init (0); // for the slice allocator only
614 423
615 init (argc, argv); 424 init (argc, argv);
616
617 initPlugins ();
618 425
619 for (;;) 426 for (;;)
620 cfperl_main (); 427 cfperl_main ();
621} 428}
622 429

Diff Legend

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