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.138 by root, Sun Jan 4 22:39:59 2009 UTC vs.
Revision 1.152 by root, Sun Apr 18 12:50:07 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
… …
32 33
33#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
34#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
35#include "path.h" 36#include "path.h"
36 37
37static char days[7][4] = {
38 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
39};
40
41void 38void
42version (object *op) 39version (object *op)
43{ 40{
44 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION); 41 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Deliantra v%s", VERSION);
45
46#if 0
47 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
48 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
49 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
50 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
51 new_draw_info (NDI_UNIQUE, 0, op, "");
52 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to the original Crossfire:");
53 new_draw_info (NDI_UNIQUE, 0, op, "Mark Wedel <mwedel@sonic.net>");
54 new_draw_info (NDI_UNIQUE, 0, op, "Frank Tore Johansen <frankj@ifi.uio.no>");
55 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Torgrim Homme <kjetilho@ifi.uio.no>");
56 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
57 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
58 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
59 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
60 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
61 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jørgensen <jorgens@flipper.pvv.unit.no>");
62 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
65 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
66 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
67 new_draw_info (NDI_UNIQUE, 0, op, "Jarkko Sonninen <Jarkko.Sonninen@lut.fi>");
68 new_draw_info (NDI_UNIQUE, 0, op, "Karl Holland <kholland@sunlab.cit.cornell.du>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Lundgren <vick@bern.docs.uu.se>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Mikael Olsson <mol@meryl.csd.uu.se>");
71 new_draw_info (NDI_UNIQUE, 0, op, "Tero Haatanen <Tero.Haatanen@lut.fi>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Lasse Ylitalo <ylitalo@student.docs.uu.se>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Niilo Neuvo <anipa@guru.magic.fi>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Markku J{rvinen <mta@modeemi.cs.tut.fi>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Sylvain Meunier <meunier@inf.enst.fr>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Jason Fosback <jfosback@darmok.uoregon.edu>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Carl Edman <cedman@capitalist.princeton.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Charles Henrich <henrich@crh.cl.msu.edu>");
79 new_draw_info (NDI_UNIQUE, 0, op, "Gregor Schmid <schmid@fb3-s7.math.tu-berlin.de>");
80 new_draw_info (NDI_UNIQUE, 0, op, "Raphael Quinet <quinet@montefiore.ulg.ac.be>");
81 new_draw_info (NDI_UNIQUE, 0, op, "Jari Vanhala <jam@modeemi.cs.tut.fi>");
82 new_draw_info (NDI_UNIQUE, 0, op, "Tero Kivinen <kivinen@joker.cs.hut.fi>");
83 new_draw_info (NDI_UNIQUE, 0, op, "Peter Mardahl <peterm@soda.berkeley.edu>");
84 new_draw_info (NDI_UNIQUE, 0, op, "Matthew Zeher <matt@cs.odu.edu>");
85 new_draw_info (NDI_UNIQUE, 0, op, "Scott R. Turner <srt@sun-dimas.aero.org>");
86 new_draw_info (NDI_UNIQUE, 0, op, "Ben Fennema <huma@netcom.com>");
87 new_draw_info (NDI_UNIQUE, 0, op, "Nick Williams <njw@cs.city.ac.uk>");
88 new_draw_info (NDI_UNIQUE, 0, op, "Laurent Wacrenier <Wacren@Gin.ObsPM.Fr>");
89 new_draw_info (NDI_UNIQUE, 0, op, "Brian Thomas <thomas@astro.psu.edu>");
90 new_draw_info (NDI_UNIQUE, 0, op, "John Steven Moerk <jsm@axon.ksc.nasa.gov>");
91 new_draw_info (NDI_UNIQUE, 0, op, "Delbecq David <david.delbecq@mailandnews.com>");
92 new_draw_info (NDI_UNIQUE, 0, op, "Chachkoff Yann <yann.chachkoff@mailandnews.com>\n");
93 new_draw_info (NDI_UNIQUE, 0, op, "");
94 new_draw_info (NDI_UNIQUE, 0, op, "Images and art:");
95 new_draw_info (NDI_UNIQUE, 0, op, "Peter Gardner");
96 new_draw_info (NDI_UNIQUE, 0, op, "David Gervais <david_eg@mail.com>");
97 new_draw_info (NDI_UNIQUE, 0, op, "Mitsuhiro Itakura <ita@gold.koma.jaeri.go.jp>");
98 new_draw_info (NDI_UNIQUE, 0, op, "Hansjoerg Malthaner <hansjoerg.malthaner@danet.de>");
99 new_draw_info (NDI_UNIQUE, 0, op, "Mårten Woxberg <maxmc@telia.com>");
100 new_draw_info (NDI_UNIQUE, 0, op, "");
101 new_draw_info (NDI_UNIQUE, 0, op, "And many more!");
102#endif
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
… …
208 if (i < 0) 147 if (i < 0)
209 golem->drop_and_destroy (); 148 golem->drop_and_destroy ();
210 else 149 else
211 { 150 {
212 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]); 151 newmap->insert (golem, x + freearr_x[i], y + freearr_y[i]);
213 golem->direction = find_dir_2 (x - golem->x, y - golem->y); 152 golem->direction = find_dir_2 (golem->x - x, golem->y - y);
214 } 153 }
215 } 154 }
216 155
217 /* since the players map is already loaded, we don't need to worry 156 /* since the players map is already loaded, we don't need to worry
218 * about pending objects. 157 * about pending objects.
… …
248 187
249 for_all_players (pl) 188 for_all_players (pl)
250 { 189 {
251 object *ob = pl->ob; 190 object *ob = pl->ob;
252 191
192 // process_objects destroys the speed_left value
193 pl->speed_left_save = ob->speed_left;
194
253 if (expect_false (!ob || !pl->ns || !ob->active)) 195 if (expect_false (!ob || !pl->ns || !ob->active))
254 continue; 196 continue;
255 197
256 do_some_living (ob); 198 do_some_living (ob);
257 } 199 }
… …
261process_players2 () 203process_players2 ()
262{ 204{
263 /* Then check if any players should use weapon-speed instead of speed */ 205 /* Then check if any players should use weapon-speed instead of speed */
264 for_all_players (pl) 206 for_all_players (pl)
265 { 207 {
208 // restore speed_left value saved by process_players1
209 pl->ob->speed_left = pl->speed_left_save;
210
266 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp); 211 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
267 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 212 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
268 } 213 }
269} 214}
270 215
271void 216static void
272process_events () 217process_events ()
273{ 218{
274 process_players1 (); 219 process_players1 ();
275 220
276 for_all_actives (op) 221 for_all_actives (op)
277 { 222 {
223 // try to prefetch some stuff we expect to need
224 // obviously, it should be grouped into the same cacheline.
225 // preliminary results indicate that this gives halves the speed
226 // used for the inner loop
227 if (_i < actives.size ()) // HACK, rely on _i :/
228 {
229 object *next = actives [_i + 1];
230
231 prefetch (&next->flag , 0, 1);
232 prefetch (&next->speed , 0, 1);
233 prefetch (&next->anim_speed, 0, 1);
234 prefetch (&next->contr , 0, 1);
235 }
236
278 /* Now process op */ 237 /* Now process op */
279 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 238 if (expect_false (op->flag [FLAG_FREED]))
280 { 239 {
281 LOG (llevError, "BUG: process_events(): Free object on list\n"); 240 LOG (llevError, "BUG: process_events(): Free object on list\n");
282 op->set_speed (0); 241 op->set_speed (0);
283 continue; 242 continue;
284 } 243 }
… …
314 { 273 {
315 --op->speed_left; 274 --op->speed_left;
316 process_object (op); 275 process_object (op);
317 } 276 }
318 277
319 if (expect_true (!op->contr)) 278 // this will destroy the speed_left value for players, but
279 // process_players1 and ..2 save/restore the real value,
280 // so we can avoid a costly test here.
320 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 281 op->speed_left = min (op->speed, op->speed_left + op->speed);
321 } 282 }
322 283
323 process_players2 (); 284 process_players2 ();
324} 285}
325 286
… …
409 * done on the same tick, but that will happen very infrequently 370 * done on the same tick, but that will happen very infrequently
410 * 371 *
411 * I also think this code makes it easier to see how often we really are 372 * I also think this code makes it easier to see how often we really are
412 * doing the various things. 373 * doing the various things.
413 */ 374 */
414void 375static void
415do_specials (void) 376do_specials ()
416{ 377{
417 shstr::gc (); 378 shstr::gc ();
418 archetype::gc (); 379 archetype::gc ();
419 380
420 if (expect_false (!(pticks % TICKS_PER_HOUR))) 381 if (expect_false (!(pticks % TICKS_PER_HOUR)))
… …
447 // then do some bookkeeping, should not really be here 408 // then do some bookkeeping, should not really be here
448 do_specials (); /* Routines called from time to time. */ 409 do_specials (); /* Routines called from time to time. */
449 attachable::check_mortals (); 410 attachable::check_mortals ();
450 411
451 ++pticks; 412 ++pticks;
413
414 if (object::object_count >= RESTART_COUNT)
415 cleanup ("running out of protocol ID values - need full restart");
452} 416}
453 417
454// normal main 418// normal main
455int 419int
456main (int argc, char **argv) 420main (int argc, char **argv)

Diff Legend

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