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.144 by root, Thu Nov 19 04:30:46 2009 UTC vs.
Revision 1.148 by root, Fri Mar 26 00:59:22 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 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
276 } 276 }
277 277
278 // this will destroy the speed_left value for players, but 278 // this will destroy the speed_left value for players, but
279 // process_players1 and ..2 save/restore the real value, 279 // process_players1 and ..2 save/restore the real value,
280 // so we can avoid a costly test here. 280 // so we can avoid a costly test here.
281 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);
282 } 282 }
283 283
284 process_players2 (); 284 process_players2 ();
285} 285}
286 286
371 * 371 *
372 * 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
373 * doing the various things. 373 * doing the various things.
374 */ 374 */
375static void 375static void
376do_specials (void) 376do_specials ()
377{ 377{
378 shstr::gc (); 378 shstr::gc ();
379 archetype::gc (); 379 archetype::gc ();
380 380
381 if (expect_false (!(pticks % TICKS_PER_HOUR))) 381 if (expect_false (!(pticks % TICKS_PER_HOUR)))

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines