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.104 by root, Thu May 17 14:14:55 2007 UTC vs.
Revision 1.109 by root, Sun Jun 3 11:22:06 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2001-2003 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2001-2003,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
9 * it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
10 * the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
11 * (at your option) any later version. 11 * 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, but
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
16 * GNU General Public License for more details. 16 * 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 GNU General Public License along
19 * along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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>
… …
241 flag = 0; 241 flag = 0;
242 for_all_players (pl) 242 for_all_players (pl)
243 { 243 {
244 pl->refcnt_chk (); 244 pl->refcnt_chk ();
245 245
246 if (!pl->ob || !pl->ns || !pl->ob->active) 246 if (expect_false (!pl->ob || !pl->ns || !pl->ob->active))
247 continue; 247 continue;
248 248
249 if (pl->ob->speed_left > 0.f && pl->ns)
250 if (handle_newcs_player (pl->ob)) 249 if (handle_newcs_player (pl->ob))
251 flag = 1; 250 flag = 1;
252 251 }
253 /* If the player is not actively playing, don't make a 252 }
254 * backup save - nothing to save anyway. Plus, the
255 * map may not longer be valid. This can happen when the
256 * player quits - they exist for purposes of tracking on the map,
257 * but don't actually reside on any actual map.
258 */
259 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
260 continue;
261 } /* end of for loop for all the players */
262 } /* for flag */
263 253
264 for_all_players (pl) 254 for_all_players (pl)
265 { 255 {
266 object *ob = pl->ob; 256 object *ob = pl->ob;
267 257
268 if (!ob || !pl->ns || !ob->active) 258 if (expect_false (!ob || !pl->ns || !ob->active))
269 continue; 259 continue;
270
271 // process_events might steal us one speed slot, so adjust accordingly
272 if (ob->speed_left > 0.f)
273 ++ob->speed_left;
274 260
275 do_some_living (ob); 261 do_some_living (ob);
276 } 262 }
277} 263}
278 264
… …
280process_players2 () 266process_players2 ()
281{ 267{
282 /* Then check if any players should use weapon-speed instead of speed */ 268 /* Then check if any players should use weapon-speed instead of speed */
283 for_all_players (pl) 269 for_all_players (pl)
284 { 270 {
285 if (pl->has_hit) 271 pl->weapon_sp_left = min (pl->weapon_sp, pl->weapon_sp_left + pl->weapon_sp);
286 {
287 pl->ob->speed_left = min (pl->weapon_speed (), pl->ob->speed_left + pl->weapon_speed ());
288
289 if (pl->ob->speed_left > 0.f)
290 pl->has_hit = 0;
291 }
292 else
293 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed); 272 pl->ob->speed_left = min (pl->ob->speed, pl->ob->speed_left + pl->ob->speed);
294 } 273 }
295} 274}
296 275
297void 276void
298process_events () 277process_events ()
… …
300 process_players1 (); 279 process_players1 ();
301 280
302 for_all_actives (op) 281 for_all_actives (op)
303 { 282 {
304 /* Now process op */ 283 /* Now process op */
305 if (QUERY_FLAG (op, FLAG_FREED)) 284 if (expect_false (QUERY_FLAG (op, FLAG_FREED)))
306 { 285 {
307 LOG (llevError, "BUG: process_events(): Free object on list\n"); 286 LOG (llevError, "BUG: process_events(): Free object on list\n");
308 op->set_speed (0); 287 op->set_speed (0);
309 continue; 288 continue;
310 } 289 }
311 290
312 if (!op->has_active_speed ()) 291 if (expect_false (!op->has_active_speed ()))
313 { 292 {
314 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), " 293 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
315 "but is on active list\n", op->debug_desc (), op->speed); 294 "but is on active list\n", op->debug_desc (), op->speed);
316 op->set_speed (0); 295 op->set_speed (0);
317 continue; 296 continue;
318 } 297 }
319 298
320 if (op->flag [FLAG_REMOVED]) 299 if (expect_false (op->flag [FLAG_REMOVED]))
321 { 300 {
322 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n", 301 LOG (llevError, "BUG: process_events(): removed object is on active list: %s\n",
323 op->debug_desc ()); 302 op->debug_desc ());
324 op->set_speed (0); 303 op->set_speed (0);
325 continue; 304 continue;
… …
492 * doing the various things. 471 * doing the various things.
493 */ 472 */
494void 473void
495do_specials (void) 474do_specials (void)
496{ 475{
497 if (!(pticks % TICKS_PER_HOUR)) 476 if (expect_false (!(pticks % TICKS_PER_HOUR)))
498 adjust_daylight (); 477 adjust_daylight ();
499 478
500 if (!(pticks % 7)) 479 if (expect_false (!(pticks % 7)))
501 shstr::gc (); 480 shstr::gc ();
502 481
503 if (!(pticks % 2503)) 482 if (expect_false (!(pticks % 2503)))
504 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 483 fix_weight (); /* Hack to fix weightproblems caused by bugs */
505 484
506 if (!(pticks % 5003)) 485 if (expect_false (!(pticks % 5003)))
507 write_book_archive (); 486 write_book_archive ();
508 487
509 if (!(pticks % 5009)) 488 if (expect_false (!(pticks % 5009)))
510 clean_friendly_list (); 489 clean_friendly_list ();
511 490
512 if (!(pticks % 5011)) 491 if (expect_false (!(pticks % 5011)))
513 obsolete_parties (); 492 obsolete_parties ();
514 493
515 if (!(pticks % 12503)) 494 if (expect_false (!(pticks % 12503)))
516 fix_luck (); 495 fix_luck ();
517} 496}
518 497
519void 498void
520server_tick () 499server_tick ()

Diff Legend

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