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.34 by root, Sat Sep 30 23:48:57 2006 UTC vs.
Revision 1.37 by root, Sat Dec 9 16:11:09 2006 UTC

344 344
345 if (i == -1) 345 if (i == -1)
346 { 346 {
347 remove_friendly_object (op->contr->ranges[range_golem]); 347 remove_friendly_object (op->contr->ranges[range_golem]);
348 free_object (op->contr->ranges[range_golem]); 348 free_object (op->contr->ranges[range_golem]);
349 op->contr->ranges[range_golem] = NULL; 349 op->contr->ranges[range_golem] = 0;
350 op->contr->golem_count = 0;
351 } 350 }
352 else 351 else
353 { 352 {
354 for (object *tmp = op->contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 353 for (object *tmp = op->contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
355 { 354 {
1153 * around. 1152 * around.
1154 */ 1153 */
1155 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY) 1154 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
1156 { 1155 {
1157 LOG (llevError, "BUG: process_events(): Removed object on list\n"); 1156 LOG (llevError, "BUG: process_events(): Removed object on list\n");
1158 dump_object (op); 1157 char *dump = dump_object (op);
1159 LOG (llevError, errmsg); 1158 LOG (llevError, dump);
1159 free (dump);
1160 free_object (op); 1160 free_object (op);
1161 continue; 1161 continue;
1162 } 1162 }
1163 1163
1164 if (!op->speed) 1164 if (!op->speed)
1414 flush_old_maps (); /* Clears the tmp-files of maps which have reset */ 1414 flush_old_maps (); /* Clears the tmp-files of maps which have reset */
1415 1415
1416 if (!(pticks % 2503)) 1416 if (!(pticks % 2503))
1417 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 1417 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1418 1418
1419 if (!(pticks % 2521))
1420 metaserver_update (); /* 2500 ticks is about 5 minutes */
1421
1422 if (!(pticks % 5003)) 1419 if (!(pticks % 5003))
1423 write_book_archive (); 1420 write_book_archive ();
1424 1421
1425 if (!(pticks % 5009)) 1422 if (!(pticks % 5009))
1426 clean_friendly_list (); 1423 clean_friendly_list ();

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines