| … | |
… | |
| 298 | /* not much we can do in this case. */ |
298 | /* not much we can do in this case. */ |
| 299 | LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", newmap->path, x, y); |
299 | LOG (llevInfo, "enter_map: Could not find free spot for player - will dump on top of object (%s: %d, %d)\n", newmap->path, x, y); |
| 300 | } |
300 | } |
| 301 | } /* end if looking for free spot */ |
301 | } /* end if looking for free spot */ |
| 302 | |
302 | |
| 303 | if (op->map != NULL) |
303 | if (op->map) |
| 304 | if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) |
304 | if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) |
| 305 | return; |
305 | return; |
| 306 | |
306 | |
| 307 | if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
307 | if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) |
| 308 | return; |
308 | return; |
| … | |
… | |
| 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 | { |
| … | |
… | |
| 777 | #define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */ |
776 | #define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */ |
| 778 | object *tmp; |
777 | object *tmp; |
| 779 | |
778 | |
| 780 | /* It may be nice to support other creatures moving across |
779 | /* It may be nice to support other creatures moving across |
| 781 | * exits, but right now a lot of the code looks at op->contr, |
780 | * exits, but right now a lot of the code looks at op->contr, |
| 782 | * so thta is an RFE. |
781 | * so that is an RFE. |
| 783 | */ |
782 | */ |
| 784 | if (op->type != PLAYER) |
783 | if (op->type != PLAYER) |
| 785 | return; |
784 | return; |
| 786 | |
785 | |
| 787 | /* First, lets figure out what map the player is going to go to */ |
786 | /* First, lets figure out what map the player is going to go to */ |
| … | |
… | |
| 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 (); |
