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.139 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.144 by root, Thu Nov 19 04:30:46 2009 UTC

… …
33 33
34#include <../random_maps/random_map.h> 34#include <../random_maps/random_map.h>
35#include <../random_maps/rproto.h> 35#include <../random_maps/rproto.h>
36#include "path.h" 36#include "path.h"
37 37
38static char days[7][4] = {
39 "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"
40};
41
42void 38void
43version (object *op) 39version (object *op)
44{ 40{
45 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);
46
47#if 0
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#endif
104} 42}
105 43
106/* 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
107 * savebed. We do some error checking - its possible that the 45 * savebed. We do some error checking - its possible that the
108 * 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
… …
249 187
250 for_all_players (pl) 188 for_all_players (pl)
251 { 189 {
252 object *ob = pl->ob; 190 object *ob = pl->ob;
253 191
192 // process_objects destroys the speed_left value
193 pl->speed_left_save = ob->speed_left;
194
254 if (expect_false (!ob || !pl->ns || !ob->active)) 195 if (expect_false (!ob || !pl->ns || !ob->active))
255 continue; 196 continue;
256 197
257 do_some_living (ob); 198 do_some_living (ob);
258 } 199 }
… …
262process_players2 () 203process_players2 ()
263{ 204{
264 /* 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 */
265 for_all_players (pl) 206 for_all_players (pl)
266 { 207 {
208 // restore speed_left value saved by process_players1
209 pl->ob->speed_left = pl->speed_left_save;
210
267 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);
268 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);
269 } 213 }
270} 214}
271 215
272void 216static void
273process_events () 217process_events ()
274{ 218{
275 process_players1 (); 219 process_players1 ();
276 220
277 for_all_actives (op) 221 for_all_actives (op)
278 { 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
279 /* Now process op */ 237 /* Now process op */
280 if (expect_false (QUERY_FLAG (op, FLAG_FREED))) 238 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
281 { 239 {
282 LOG (llevError, "BUG: process_events(): Free object on list\n"); 240 LOG (llevError, "BUG: process_events(): Free object on list\n");
283 op->set_speed (0); 241 op->set_speed (0);
… …
315 { 273 {
316 --op->speed_left; 274 --op->speed_left;
317 process_object (op); 275 process_object (op);
318 } 276 }
319 277
320 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.
321 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed)); 281 op->speed_left = min (abs (op->speed), op->speed_left + abs (op->speed));
322 } 282 }
323 283
324 process_players2 (); 284 process_players2 ();
325} 285}
326 286
… …
410 * done on the same tick, but that will happen very infrequently 370 * done on the same tick, but that will happen very infrequently
411 * 371 *
412 * 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
413 * doing the various things. 373 * doing the various things.
414 */ 374 */
415void 375static void
416do_specials (void) 376do_specials (void)
417{ 377{
418 shstr::gc (); 378 shstr::gc ();
419 archetype::gc (); 379 archetype::gc ();
420 380

Diff Legend

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