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.94 by root, Wed Mar 14 04:12:29 2007 UTC vs.
Revision 1.161 by root, Thu Apr 29 08:26:38 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.
107 * savebed map may no longer exist, so we make sure the player
108 * goes someplace.
109 */ 46 */
110void 47void
111enter_player_savebed (object *op) 48enter_player_savebed (object *op)
112{ 49{
113 object *tmp = object::create (); 50 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} 51}
120 52
121/* 53/*
122 * enter_map(): Moves the player and pets from current map (if any) to 54 * 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 55 * new map. map, x, y must be set. map is the map we are moving the
124 * player to - it could be the map he just came from if the load failed for 56 * player to - it could be the map he just came from if the load failed for
125 * whatever reason. If default map coordinates are to be used, then 57 * whatever reason. If default map coordinates are to be used, then
126 * the function that calls this should figure them out. 58 * the function that calls this should figure them out.
127 */ 59 */
128void 60bool
129object::enter_map (maptile *newmap, int x, int y) 61object::enter_map (maptile *newmap, int x, int y)
130{ 62{
131 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY) 63 if (destroyed () || !newmap || newmap->in_memory != MAP_ACTIVE)
132 return; 64 return false;
133 65
134 if (out_of_map (newmap, x, y)) 66 if (out_of_map (newmap, x, y))
135 { 67 {
136 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 68 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
137 x = newmap->enter_x; 69 x = newmap->enter_x;
… …
139 if (out_of_map (newmap, x, y)) 71 if (out_of_map (newmap, x, y))
140 { 72 {
141 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n", 73 LOG (llevError, "enter_map: map %s provides invalid default enter location (%d, %d) > (%d, %d)\n",
142 &newmap->path, x, y, newmap->width, newmap->height); 74 &newmap->path, x, y, newmap->width, newmap->height);
143 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 75 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
144 return; 76 return false;
145 } 77 }
146 } 78 }
147 79
148 if (contr && map != newmap && map) 80 if (contr && map != newmap && map)
149 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 81 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
150 return; 82 return false;
151 83
152 // remove, so stupid ob_locked does not trigger a failure 84 // remove, so stupid blocked does not trigger a failure
153 remove (); 85 remove ();
154 86
155 /* try to find a spot for the player */ 87 /* try to find a spot for the player */
156 if (ob_blocked (this, newmap, x, y)) 88 if (blocked (newmap, x, y))
157 { /* First choice blocked */ 89 { /* First choice blocked */
158 /* We try to find a spot for the player, starting closest in. 90 /* 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, 91 * 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 92 * So for example, if the north space is free, you would always end up there even
161 * if other spaces around are available. 93 * if other spaces around are available.
162 * Note that for the second and third calls, we could start at a position other 94 * Note that for the second and third calls, we could start at a position other
163 * than one, but then we could end up on the other side of walls and so forth. 95 * than one, but then we could end up on the other side of walls and so forth.
164 */ 96 */
165 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1); 97 int i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE1 + 1);
166 98
167 if (i == -1) 99 if (i < 0)
168 { 100 {
169 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1); 101 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE2 + 1);
170 if (i == -1) 102 if (i < 0)
171 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE); 103 i = find_free_spot (this, newmap, x, y, 1, SIZEOFFREE);
172 } 104 }
173 105
174 if (i != -1) 106 if (i >= 0)
175 { 107 {
176 x += freearr_x[i]; 108 x += freearr_x[i];
177 y += freearr_y[i]; 109 y += freearr_y[i];
178 } 110 }
179 else 111 else
… …
182 } 114 }
183 115
184 if (contr && map != newmap) 116 if (contr && map != newmap)
185 { 117 {
186 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 118 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
187 return; 119 return false;
188 120
189 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 121 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
190 return; 122 return false;
191 } 123 }
192
193 this->x = x;
194 this->y = y;
195 map = newmap;
196
197 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
198 124
199 enemy = 0; 125 enemy = 0;
200 126
127 //newmap->insert (this, x, y);
128 newmap->insert (this, x, y, 0, INS_NO_AUTO_EXIT);
129
130 if (map == newmap) // see if we actually arrived there - insert might trigger a teleport
131 {
201 if (contr) 132 if (contr)
202 { 133 {
203 contr->maplevel = newmap->path; 134 contr->maplevel = newmap->path;
204 contr->count = 0; 135 contr->count = 0;
205 }
206 136
207 /* Update any golems */ 137 /* Update any golems */
208 if (type == PLAYER && contr->ranges[range_golem]) 138 if (object *golem = contr->golem)
209 { 139 {
210 int i = find_free_spot (contr->ranges[range_golem], newmap, x, y, 1, SIZEOFFREE); 140 int i = find_free_spot (golem, newmap, x, y, 1, SIZEOFFREE);
211 141
212 if (i < 0) 142 if (i < 0)
143 golem->drop_and_destroy ();
144 else
145 {
146 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
147 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
148 }
149 }
213 { 150 }
214 contr->ranges[range_golem]->destroy ();
215 contr->ranges[range_golem] = 0;
216 }
217 else
218 {
219 newmap->insert (contr->ranges[range_golem], x + freearr_x[i], y + freearr_y[i]);
220 151
221 contr->ranges[range_golem]->direction =
222 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
223 }
224 }
225
226 /* 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
227 * about pending objects. 153 * about pending objects.
228 */ 154 */
229 remove_all_pets (newmap); 155 move_all_pets ();
156
157 return true;
158 }
159
160 return false;
230} 161}
231 162
232/* process_players1 and process_players2 do all the player related stuff. 163/* process_players1 and process_players2 do all the player related stuff.
233 * I moved it out of process events and process_map. This was to some 164 * I moved it out of process events and process_map. This was to some
234 * extent for debugging as well as to get a better idea of the time used 165 * extent for debugging as well as to get a better idea of the time used
… …
245 flag = 0; 176 flag = 0;
246 for_all_players (pl) 177 for_all_players (pl)
247 { 178 {
248 pl->refcnt_chk (); 179 pl->refcnt_chk ();
249 180
250 if (!pl->ob || !pl->ns || !pl->ob->active) 181 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
251 continue; 182 continue;
252 183
253 if (pl->ob->speed_left > 0 && pl->ns)
254 if (handle_newcs_player (pl->ob)) 184 if (handle_newcs_player (pl->ob))
255 flag = 1; 185 flag = 1;
256 186 }
257 /* If the player is not actively playing, don't make a 187 }
258 * backup save - nothing to save anyway. Plus, the
259 * map may not longer be valid. This can happen when the
260 * player quits - they exist for purposes of tracking on the map,
261 * but don't actually reside on any actual map.
262 */
263 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
264 continue;
265 } /* end of for loop for all the players */
266 } /* for flag */
267 188
268 for_all_players (pl) 189 for_all_players (pl)
269 { 190 {
191 object *ob = pl->ob;
192
193 // process_objects destroys the speed_left value
194 pl->speed_left_save = ob->speed_left;
195
270 if (!pl->ob || !pl->ns || !pl->ob->active) 196 if (expect_false (!ob || !pl->ns || !ob->active))
271 continue; 197 continue;
272 198
273 if (settings.casting_time)
274 {
275 if (pl->ob->casting_time > 0)
276 {
277 pl->ob->casting_time--;
278 pl->ob->start_holding = 1;
279 }
280
281 /* set spell_state so we can update the range in stats field */
282 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
283 pl->ob->start_holding = 0;
284 }
285
286 do_some_living (pl->ob); 199 do_some_living (ob);
287 } 200 }
288} 201}
289 202
290static void 203static void
291process_players2 () 204process_players2 ()
292{ 205{
293 /* Then check if any players should use weapon-speed instead of speed */ 206 /* Then check if any players should use weapon-speed instead of speed */
294 for_all_players (pl) 207 for_all_players (pl)
295 { 208 {
296 /* The code that did weapon_sp handling here was out of place - 209 // restore speed_left value saved by process_players1
297 * this isn't called until after the player has finished there
298 * actions, and is thus out of place. All we do here is bounds
299 * checking.
300 */
301 if (pl->has_hit)
302 {
303 if (pl->ob->speed_left > pl->weapon_sp)
304 pl->ob->speed_left = pl->weapon_sp;
305
306 /* This needs to be here - if the player is running, we need to
307 * clear this each tick, but new commands are not being received
308 * so execute_newserver_command() is never called
309 */
310 pl->has_hit = 0;
311 }
312 else if (pl->ob->speed_left > pl->ob->speed)
313 pl->ob->speed_left = pl->ob->speed; 210 pl->ob->speed_left = pl->speed_left_save;
314 }
315}
316 211
317void 212 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
213 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
214 }
215}
216
217static void
318process_events () 218process_events ()
319{ 219{
320 process_players1 (); 220 process_players1 ();
321 221
322 for_all_actives (op) 222 for_all_actives (op)
323 { 223 {
224 // try to prefetch some stuff we expect to need
225 // obviously, it should be grouped into the same cacheline.
226 // preliminary results indicate that this gives halves the speed
227 // used for the inner loop
228 if (_i < actives.size ()) // HACK, rely on _i :/
229 {
230 object *next = actives [_i + 1];
231
232 prefetch (&next->flag , 0, 1);
233 prefetch (&next->speed , 0, 1);
234 prefetch (&next->anim_speed, 0, 1);
235 prefetch (&next->contr , 0, 1);
236 }
237
324 /* Now process op */ 238 /* Now process op */
325 if (QUERY_FLAG (op, FLAG_FREED)) 239 if (expect_false (op->flag [FLAG_FREED]))
326 { 240 {
327 LOG (llevError, "BUG: process_events(): Free object on list\n"); 241 LOG (llevError, "BUG: process_events(): Free object on list\n");
328 op->set_speed (0); 242 op->set_speed (0);
329 continue; 243 continue;
330 } 244 }
331 245
332 /* I've seen occasional crashes due to this - the object is removed,
333 * and thus the map it points to (last map it was on) may be bogus
334 * The real bug is to try to find out the cause of this - someone
335 * is probably calling remove_ob without either an insert_ob or
336 * free_object afterwards, leaving an object dangling. But I'd
337 * rather log this and continue on instead of crashing.
338 * Don't remove players - when a player quits, the object is in
339 * sort of a limbo, of removed, but something we want to keep
340 * around.
341 */
342 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
343 {
344 LOG (llevError, "BUG: process_events(): Removed object on list\n");
345 char *dump = dump_object (op);
346 LOG (llevError, dump);
347 free (dump);
348 op->destroy ();
349 continue;
350 }
351
352 if (!op->has_active_speed ()) 246 if (expect_false (!op->has_active_speed ()))
353 { 247 {
354 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 248 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
355 "but is on active list\n", op->debug_desc (), op->speed); 249 "but is on active list\n", op->debug_desc (), op->speed);
356 op->set_speed (0); 250 op->set_speed (0);
357 continue; 251 continue;
358 } 252 }
359 253
360 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 254 if (expect_false (op->flag [FLAG_REMOVED]))
361 { 255 {
362 LOG (llevError, "BUG: process_events(): Object without map or " 256 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
363 "inventory is on active list: %s (%d)\n", &op->name, op->count); 257 op->debug_desc ());
364 op->set_speed (0); 258 op->set_speed (0);
365 continue; 259 continue;
366 } 260 }
367 261
368 /* Animate the object. Bug or feature that anim_speed 262 /* Animate the object. Bug or feature that anim_speed
369 * is based on ticks, and not the creatures speed? 263 * is based on ticks, and not the creatures speed?
370 */ 264 */
371 if (op->anim_speed && op->last_anim >= op->anim_speed) 265 if (op->anim_speed && op->last_anim >= op->anim_speed)
372 { 266 {
373 animate_object (op, op->type == PLAYER ? op->facing : op->direction); 267 animate_object (op, op->contr ? op->facing : op->direction);
374
375 op->last_anim = 1; 268 op->last_anim = 1;
376 } 269 }
377 else 270 else
378 op->last_anim++; 271 ++op->last_anim;
379 272
380 if (op->speed_left > 0) 273 if (expect_false (op->speed_left > 0.f))
381 {
382#if 0
383 /* I've seen occasional crashes in move_symptom() with it
384 * crashing because op is removed - add some debugging to
385 * track if it is removed at this point.
386 * This unfortunately is a bit too verbose it seems - not sure
387 * why - I think what happens is a map is freed or something and
388 * some objects get 'lost' - removed never to be reclaimed.
389 * removed objects generally shouldn't exist.
390 */
391 if (QUERY_FLAG (op, FLAG_REMOVED))
392 { 274 {
393 LOG (llevDebug, "process_events: calling process_object with removed object %s\n", op->name ? op->name : "null");
394 }
395#endif
396 --op->speed_left; 275 --op->speed_left;
397 process_object (op); 276 process_object (op);
398
399 if (op->destroyed ())
400 continue;
401 } 277 }
402 278
403 if (settings.casting_time == TRUE && op->casting_time > 0) 279 // this will destroy the speed_left value for players, but
404 op->casting_time--; 280 // process_players1 and ..2 save/restore the real value,
405 281 // so we can avoid a costly test here.
406 if (op->speed_left <= 0) 282 op->speed_left = min (op->speed, op->speed_left + op->speed);
407 op->speed_left += FABS (op->speed);
408 } 283 }
409 284
410 process_players2 (); 285 process_players2 ();
411} 286}
412 287
413/* clean up everything before exiting */ 288/* clean up everything before exiting */
414void 289void
415emergency_save () 290emergency_save ()
416{ 291{
417 LOG (llevDebug, "emergency save begin.\n"); 292 LOG (llevInfo, "emergency_save: enter\n");
293
294 LOG (llevInfo, "emergency_save: saving book archive\n");
295 write_book_archive ();
418 296
419 cfperl_emergency_save (); 297 cfperl_emergency_save ();
420 298
421 LOG (llevDebug, "saving book archive.\n");
422 write_book_archive ();
423
424 LOG (llevDebug, "emergency save done.\n"); 299 LOG (llevInfo, "emergency_save: leave\n");
425} 300}
426 301
427// send all clients some informational text 302// send all clients some informational text
428static void 303static void
429cleanup_inform (const char *cause, bool make_core) 304cleanup_inform (const char *cause, bool make_core)
430{ 305{
431 int flags = NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN); 306 int flags = NDI_REPLY | NDI_UNIQUE | NDI_ALL | (make_core ? NDI_RED : NDI_GREEN);
432 307
433 new_draw_info_format (flags, 0, 0, "The server will now shutdown.\n"); 308 new_draw_info_format (flags, 0, 0, "The server will now shutdown.");
434 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s\n", cause); 309 new_draw_info_format (flags, 0, 0, "Cause for this shutdown: %s", cause);
435 310
436 if (make_core) 311 if (make_core)
437 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.\n"); 312 new_draw_info_format (flags, 0, 0, "This is considered a crash, but all maps and players have been saved.");
438 else 313 else
439 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"); 314 new_draw_info_format (flags, 0, 0, "This is considered to be a clean shutdown, and all maps and players will be saved now.");
440 315
441 new_draw_info_format (flags, 0, 0, "%s\n", CLEANUP_MESSAGE); 316 new_draw_info_format (flags, 0, 0, "%s", CLEANUP_MESSAGE);
442 317
443 flush_sockets (); 318 client::flush_sockets ();
444} 319}
445 320
446/* clean up everything before exiting */ 321/* clean up everything before exiting */
447void 322void
448cleanup (const char *cause, bool make_core) 323cleanup (const char *cause, bool make_core)
449{ 324{
450 if (make_core) 325 if (make_core)
451 fork_abort (cause); 326 fork_abort (cause);
452 327
453 LOG (llevError, "cleanup cause: %s\n", cause); 328 LOG (make_core ? llevError : llevInfo, "cleanup cause: %s\n", cause);
454 329
455 if (!make_core) 330 if (!make_core)
456 cleanup_inform (cause, make_core); 331 cleanup_inform (cause, make_core);
457 332
458 LOG (llevDebug, "cleanup begin.\n"); 333 LOG (llevDebug, "cleanup begin.\n");
… …
468 LOG (llevDebug, "running cleanup handlers.\n"); 343 LOG (llevDebug, "running cleanup handlers.\n");
469 INVOKE_GLOBAL (CLEANUP); 344 INVOKE_GLOBAL (CLEANUP);
470 345
471 LOG (llevDebug, "cleanup done.\n"); 346 LOG (llevDebug, "cleanup done.\n");
472 347
348 log_cleanup ();
349
473 if (make_core) 350 if (make_core)
474 {
475 cleanup_inform (cause, make_core); 351 cleanup_inform (cause, make_core);
476 cfperl_cleanup (make_core);
477 _exit (1);
478 }
479 else 352 else
480 { 353 {
481 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.\n"); 354 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "Maps and players successfully saved, exiting.");
482 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE "\n"); 355 new_draw_info_format (NDI_REPLY | NDI_UNIQUE | NDI_ALL | NDI_GREEN, 0, 0, "And again: " CLEANUP_MESSAGE);
483 flush_sockets (); 356 client::flush_sockets ();
357 }
358
484 cfperl_cleanup (make_core); 359 cfperl_cleanup (make_core);
485 _exit (0); 360 _exit (make_core);
486 }
487}
488
489int
490forbid_play (void)
491{
492#if !defined(_IBMR2) && !defined(___IBMR2) && defined(PERM_FILE)
493 char buf[MAX_BUF], day[MAX_BUF];
494 FILE *fp;
495 time_t clock;
496 struct tm *tm;
497 int i, start, stop, forbit = 0, comp;
498
499 clock = time (NULL);
500 tm = (struct tm *) localtime (&clock);
501
502 sprintf (buf, "%s/%s", settings.confdir, PERM_FILE);
503 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
504 return 0;
505
506 while (fgets (buf, MAX_BUF, fp))
507 {
508 if (buf[0] == '#')
509 continue;
510
511 if (!strncmp (buf, "msg", 3))
512 {
513 if (forbit)
514 while (fgets (buf, MAX_BUF, fp)) /* print message */
515 fputs (buf, logfile);
516 break;
517 }
518 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
519 {
520 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
521 continue;
522 }
523
524 for (i = 0; i < 7; i++)
525 {
526 if (!strncmp (buf, days[i], 3) && (tm->tm_wday == i) && (tm->tm_hour >= start) && (tm->tm_hour < stop))
527 forbit = 1;
528 }
529 }
530
531 close_and_delete (fp, comp);
532
533 return forbit;
534#else
535 return 0;
536#endif
537} 361}
538 362
539/* 363/*
540 * do_specials() is a collection of functions to call from time to time. 364 * do_specials() is a collection of functions to call from time to time.
541 * Modified 2000-1-14 MSW to use the global pticks count to determine how 365 * Modified 2000-1-14 MSW to use the global pticks count to determine how
… …
547 * done on the same tick, but that will happen very infrequently 371 * done on the same tick, but that will happen very infrequently
548 * 372 *
549 * I also think this code makes it easier to see how often we really are 373 * I also think this code makes it easier to see how often we really are
550 * doing the various things. 374 * doing the various things.
551 */ 375 */
552 376static void
553extern unsigned long todtick;
554
555void
556do_specials (void) 377do_specials ()
557{ 378{
558 if (!(pticks % PTICKS_PER_CLOCK))
559 tick_the_clock ();
560
561 if (!(pticks % 7))
562 shstr::gc (); 379 shstr::gc ();
380 archetype::gc ();
563 381
382 if (expect_false (!(pticks % TICKS_PER_HOUR)))
383 maptile::adjust_daylight ();
384
564 if (!(pticks % 2503)) 385 if (expect_false (!(pticks % 2503)))
565 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 386 fix_weight (); /* Hack to fix weightproblems caused by bugs */
566 387
567 if (!(pticks % 5003)) 388 if (expect_false (!(pticks % 5003)))
568 write_book_archive (); 389 write_book_archive ();
569 390
570 if (!(pticks % 5009)) 391 if (expect_false (!(pticks % 5009)))
571 clean_friendly_list (); 392 clean_friendly_list ();
572 393
573 if (!(pticks % 5011)) 394 if (expect_false (!(pticks % 5011)))
574 obsolete_parties (); 395 obsolete_parties ();
575 396
576 if (!(pticks % 12503)) 397 if (expect_false (!(pticks % 12503)))
577 fix_luck (); 398 fix_luck ();
578} 399}
579 400
580void 401void
581server_tick () 402server_tick ()
582{ 403{
583 // first do the user visible stuff 404 // first do the user visible stuff
584 doeric_server ();
585 INVOKE_GLOBAL (CLOCK); 405 INVOKE_GLOBAL (CLOCK);
586 process_events (); /* "do" something with objects with speed */ 406 process_events (); // "do" something with objects with speed
587 flush_sockets (); 407 client::clock (); // draw client maps etc.
588 408
589 // then do some bookkeeping, should not really be here 409 // then do some bookkeeping, should not really be here
590 do_specials (); /* Routines called from time to time. */ 410 do_specials (); /* Routines called from time to time. */
591 attachable::check_mortals (); 411 attachable::check_mortals ();
592 412
593 ++pticks; 413 ++pticks;
594}
595 414
596#if 0 415 if (object::object_count >= RESTART_COUNT)
597// used fro benchmarking (x86/amd64-specific) 416 cleanup ("running out of protocol ID values - need full restart");
598typedef unsigned long tval;
599typedef unsigned long long stamp64;
600
601extern inline tval
602stamp (void)
603{
604 tval tsc;
605 asm volatile ("rdtsc":"=a" (tsc)::"edx");
606
607 return tsc;
608} 417}
609
610extern inline tval
611measure (tval t)
612{
613 tval tsc;
614 asm volatile ("rdtsc":"=a" (tsc)::"edx");
615
616 if (tsc > t)
617 return tsc - t;
618 else
619 return t - tsc;
620}
621
622int
623main (int argc, char **argv)
624{
625 rand_gen rg(0);
626 tval fastest = 0x7fffffff;
627 for (int loop = 10000; loop--; )
628 {
629 tval s = stamp ();
630 volatile int i = rg.get_int(25);
631 fastest = min (fastest, measure (s));
632 }
633
634 //printf ("fastest %d\n", fastest);
635 for (int i = 0; i < 1024*1024*3; ++i)
636 {
637 char c = rg.get_int (256);
638 write (2, &c, 1);
639 }
640}
641
642#else
643 418
644// normal main 419// normal main
645int 420int
646main (int argc, char **argv) 421main (int argc, char **argv)
647{ 422{
648 settings.argc = argc; 423 settings.argc = argc;
649 settings.argv = argv; 424 settings.argv = argv;
425
426 rndm.seed (time (0));
427 g_thread_init (0); // for the slice allocator only
650 428
651 init (argc, argv); 429 init (argc, argv);
652
653 initPlugins ();
654 430
655 for (;;) 431 for (;;)
656 cfperl_main (); 432 cfperl_main ();
657} 433}
658#endif
659 434

Diff Legend

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