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.48 by root, Mon Dec 18 03:49:39 2006 UTC

… …
31# ifdef HAVE_CRYPT_H 31# ifdef HAVE_CRYPT_H
32# include <crypt.h> 32# include <crypt.h>
33# endif 33# endif
34#endif 34#endif
35 35
36#ifndef __CEXTRACT__
37# include <sproto.h> 36#include <sproto.h>
38#endif
39
40#ifdef HAVE_TIME_H
41# include <time.h> 37#include <time.h>
42#endif
43 38
44#include <../random_maps/random_map.h> 39#include <../random_maps/random_map.h>
45#include <../random_maps/rproto.h> 40#include <../random_maps/rproto.h>
46#include "path.h" 41#include "path.h"
47 42
… …
158 * simple case at top - no encryption - makes it easier to read. 153 * simple case at top - no encryption - makes it easier to read.
159 */ 154 */
160char * 155char *
161crypt_string (char *str, char *salt) 156crypt_string (char *str, char *salt)
162{ 157{
163#if defined(WIN32) || (defined(__FreeBSD__) && !defined(HAVE_LIBDES)) 158#if (defined(__FreeBSD__) && !defined(HAVE_LIBDES))
164 return (str); 159 return (str);
165#else 160#else
166 static char *c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./"; 161 static char *c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789./";
167 char s[2]; 162 char s[2];
168 163
… …
194enter_player_savebed (object *op) 189enter_player_savebed (object *op)
195{ 190{
196 maptile *oldmap = op->map; 191 maptile *oldmap = op->map;
197 object *tmp; 192 object *tmp;
198 193
199 tmp = get_object (); 194 tmp = object::create ();
200 195
201 EXIT_PATH (tmp) = op->contr->savebed_map; 196 EXIT_PATH (tmp) = op->contr->savebed_map;
202 EXIT_X (tmp) = op->contr->bed_x; 197 EXIT_X (tmp) = op->contr->bed_x;
203 EXIT_Y (tmp) = op->contr->bed_y; 198 EXIT_Y (tmp) = op->contr->bed_y;
204 enter_exit (op, tmp); 199 enter_exit (op, tmp);
… …
217 EXIT_PATH (tmp) = op->contr->savebed_map; 212 EXIT_PATH (tmp) = op->contr->savebed_map;
218 EXIT_X (tmp) = op->contr->bed_x; 213 EXIT_X (tmp) = op->contr->bed_x;
219 EXIT_Y (tmp) = op->contr->bed_y; 214 EXIT_Y (tmp) = op->contr->bed_y;
220 enter_exit (op, tmp); 215 enter_exit (op, tmp);
221 } 216 }
222 free_object (tmp); 217
218 tmp->destroy ();
223} 219}
224 220
225/* All this really is is a glorified remove_object that also updates 221/* All this really is is a glorified remove_object that also updates
226 * the counts on the map if needed. 222 * the counts on the map if needed.
227 */ 223 */
228void 224void
229leave_map (object *op) 225leave_map (object *op)
230{ 226{
231 maptile *oldmap = op->map; 227 maptile *oldmap = op->map;
232 228
233 remove_ob (op); 229 op->remove ();
234 230
235 if (oldmap) 231 if (oldmap)
236 { 232 {
237 if (!op->contr->hidden) 233 if (!op->contr->hidden)
238 oldmap->players--; 234 oldmap->players--;
… …
298 /* not much we can do in this case. */ 294 /* 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); 295 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 } 296 }
301 } /* end if looking for free spot */ 297 } /* end if looking for free spot */
302 298
303 if (op->map != NULL) 299 if (op->map)
304 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr))) 300 if (INVOKE_MAP (LEAVE, op->map, ARG_PLAYER (op->contr)))
305 return; 301 return;
306 302
307 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 303 if (INVOKE_PLAYER (MAP_CHANGE, op->contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
308 return; 304 return;
… …
311 return; 307 return;
312 308
313 /* If it is a player login, he has yet to be inserted anyplace. 309 /* If it is a player login, he has yet to be inserted anyplace.
314 * otherwise, we need to deal with removing the player here. 310 * otherwise, we need to deal with removing the player here.
315 */ 311 */
316 remove_ob (op); 312 op->remove ();
317 313
318 /* remove_ob clears these so they must be reset after the remove_ob call */ 314 /* remove_ob clears these so they must be reset after the remove_ob call */
319 op->x = x; 315 op->x = x;
320 op->y = y; 316 op->y = y;
321 op->map = newmap; 317 op->map = newmap;
… …
338 if (op->type == PLAYER && op->contr->ranges[range_golem] != NULL) 334 if (op->type == PLAYER && op->contr->ranges[range_golem] != NULL)
339 { 335 {
340 int i = find_free_spot (op->contr->ranges[range_golem], newmap, 336 int i = find_free_spot (op->contr->ranges[range_golem], newmap,
341 x, y, 1, SIZEOFFREE); 337 x, y, 1, SIZEOFFREE);
342 338
343 remove_ob (op->contr->ranges[range_golem]); 339 op->contr->ranges[range_golem]->remove ();
344 340
345 if (i == -1) 341 if (i == -1)
346 { 342 {
347 remove_friendly_object (op->contr->ranges[range_golem]); 343 remove_friendly_object (op->contr->ranges[range_golem]);
348 free_object (op->contr->ranges[range_golem]); 344 op->contr->ranges[range_golem]->destroy ();
349 op->contr->ranges[range_golem] = NULL; 345 op->contr->ranges[range_golem] = 0;
350 op->contr->golem_count = 0;
351 } 346 }
352 else 347 else
353 { 348 {
354 for (object *tmp = op->contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 349 for (object *tmp = op->contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
355 { 350 {
… …
472 rp.origin_y = exit_ob->y; 467 rp.origin_y = exit_ob->y;
473 strcpy (rp.origin_map, pl->map->path); 468 strcpy (rp.origin_map, pl->map->path);
474 469
475 /* If we have a final_map, use it as a base name to give some clue 470 /* If we have a final_map, use it as a base name to give some clue
476 * as where the player is. Otherwise, use the origin map. 471 * as where the player is. Otherwise, use the origin map.
477 * Take the last component (after the last slash) to give
478 * shorter names without bogus slashes.
479 */ 472 */
480 if (rp.final_map[0]) 473 sprintf (newmap_name, "/random%s+%04d",
481 { 474 *rp.final_map ? rp.final_map : rp.origin_map,
482 cp = strrchr (rp.final_map, '/'); 475 reference_number++);
483 if (!cp)
484 cp = rp.final_map;
485 }
486 else
487 {
488 char buf[HUGE_BUF];
489
490 cp = strrchr (rp.origin_map, '/');
491 if (!cp)
492 cp = rp.origin_map;
493 /* Need to strip of any trailing digits, if it has them */
494 strcpy (buf, cp);
495 while (isdigit (buf[strlen (buf) - 1]))
496 buf[strlen (buf) - 1] = 0;
497 cp = buf;
498 }
499
500 sprintf (newmap_name, "/random/%s%04d", cp + 1, reference_number++);
501 476
502 /* now to generate the actual map. */ 477 /* now to generate the actual map. */
503 new_map = generate_random_map (newmap_name, &rp); 478 new_map = generate_random_map (newmap_name, &rp);
504 479
505 /* Update the exit_ob so it now points directly at the newly created 480 /* Update the exit_ob so it now points directly at the newly created
… …
777#define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */ 752#define PORTAL_DESTINATION_NAME "Town portal destination" /* this one should really be in a header file */
778 object *tmp; 753 object *tmp;
779 754
780 /* It may be nice to support other creatures moving across 755 /* It may be nice to support other creatures moving across
781 * exits, but right now a lot of the code looks at op->contr, 756 * exits, but right now a lot of the code looks at op->contr,
782 * so thta is an RFE. 757 * so that is an RFE.
783 */ 758 */
784 if (op->type != PLAYER) 759 if (op->type != PLAYER)
785 return; 760 return;
786 761
787 /* First, lets figure out what map the player is going to go to */ 762 /* First, lets figure out what map the player is going to go to */
… …
893 if (tmp->type == FORCE && tmp->slaying && !strcmp (tmp->slaying, PORTAL_DESTINATION_NAME)) 868 if (tmp->type == FORCE && tmp->slaying && !strcmp (tmp->slaying, PORTAL_DESTINATION_NAME))
894 break; 869 break;
895 } 870 }
896 if (tmp) 871 if (tmp)
897 { 872 {
898 remove_ob (tmp); 873 tmp->remove ();
899 free_object (tmp); 874 tmp->destroy ();
900 } 875 }
901 876
902 strcpy (op->contr->savebed_map, path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob))); 877 strcpy (op->contr->savebed_map, path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob)));
903 op->contr->bed_x = EXIT_X (exit_ob), op->contr->bed_y = EXIT_Y (exit_ob); 878 op->contr->bed_x = EXIT_X (exit_ob), op->contr->bed_y = EXIT_Y (exit_ob);
904 save_player (op, 1); 879 save_player (op, 1);
… …
950 925
951 enter_map (op, newmap, op->x, op->y); 926 enter_map (op, newmap, op->x, op->y);
952 } 927 }
953} 928}
954 929
955/*
956 * process_active_maps(): Works like process_events(), but it only
957 * processes maps which a player is on.
958 *
959 */
960
961#if 0 // dead code, schmorp
962void
963process_active_maps ()
964{
965 for (maptile *map = first_map; map != NULL; map = map->next)
966 if (map->in_memory == MAP_IN_MEMORY)
967 if (players_on_map (map, TRUE))
968 process_events (map);
969}
970#endif
971
972/* process_players1 and process_players2 do all the player related stuff. 930/* process_players1 and process_players2 do all the player related stuff.
973 * I moved it out of process events and process_map. This was to some 931 * I moved it out of process events and process_map. This was to some
974 * extent for debugging as well as to get a better idea of the time used 932 * extent for debugging as well as to get a better idea of the time used
975 * by the various functions. process_players1() does the processing before 933 * by the various functions. process_players1() does the processing before
976 * objects have been updated, process_players2() does the processing that 934 * objects have been updated, process_players2() does the processing that
977 * is needed after the players have been updated. 935 * is needed after the players have been updated.
978 */ 936 */
979 937static void
980void
981process_players1 (maptile *map) 938process_players1 ()
982{ 939{
983 int flag; 940 int flag;
984 player *pl, *plnext;
985
986 /* Basically, we keep looping until all the players have done their actions. */ 941 /* Basically, we keep looping until all the players have done their actions. */
987 for (flag = 1; flag != 0;) 942 for (flag = 1; flag != 0;)
988 { 943 {
989 flag = 0; 944 flag = 0;
990 for (pl = first_player; pl != NULL; pl = plnext) 945 for (player *plnext, *pl = first_player; pl; pl = plnext)
991 { 946 {
992 plnext = pl->next; /* In case a player exits the game in handle_player() */ 947 plnext = pl->next; /* In case a player exits the game in handle_player() */
993 948
994 if (pl->ob == NULL) 949 if (!pl->ob)
995 continue;
996
997 if (map != NULL && pl->ob->map != map)
998 continue; 950 continue;
999 951
1000 if (pl->ob->speed_left > 0) 952 if (pl->ob->speed_left > 0)
1001 { 953 {
1002 if (handle_newcs_player (pl->ob)) 954 if (handle_newcs_player (pl->ob))
… …
1016 /* check for ST_PLAYING state so that we don't try to save off when 968 /* check for ST_PLAYING state so that we don't try to save off when
1017 * the player is logging in. 969 * the player is logging in.
1018 */ 970 */
1019 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->state == ST_PLAYING) 971 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->state == ST_PLAYING)
1020 { 972 {
1021 /* Don't save the player on unholy ground. Instead, increase the
1022 * tick time so it will be about 10 seconds before we try and save
1023 * again.
1024 */
1025// if (get_map_flags(pl->ob->map, NULL, pl->ob->x, pl->ob->y, NULL, NULL) & P_NO_CLERIC) {
1026// pl->last_save_tick += 100;
1027// } else {
1028 save_player (pl->ob, 1); 973 save_player (pl->ob, 1);
1029 pl->last_save_tick = pticks; 974 pl->last_save_tick = pticks;
1030// }
1031 } 975 }
1032#endif 976#endif
1033 } /* end of for loop for all the players */ 977 } /* end of for loop for all the players */
1034 } /* for flag */ 978 } /* for flag */
979
1035 for (pl = first_player; pl != NULL; pl = pl->next) 980 for (player *pl = first_player; pl; pl = pl->next)
1036 { 981 {
1037 if (map != NULL && (pl->ob == NULL || pl->ob->map != map))
1038 continue;
1039 if (settings.casting_time == TRUE) 982 if (settings.casting_time)
1040 { 983 {
1041 if (pl->ob->casting_time > 0) 984 if (pl->ob->casting_time > 0)
1042 { 985 {
1043 pl->ob->casting_time--; 986 pl->ob->casting_time--;
1044 pl->ob->start_holding = 1; 987 pl->ob->start_holding = 1;
1045 } 988 }
989
1046 /* set spell_state so we can update the range in stats field */ 990 /* set spell_state so we can update the range in stats field */
1047 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1)) 991 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
1048 {
1049 pl->ob->start_holding = 0; 992 pl->ob->start_holding = 0;
1050 } 993 }
1051 } 994
1052 do_some_living (pl->ob); 995 do_some_living (pl->ob);
1053 /* draw(pl->ob); *//* updated in socket code */
1054 } 996 }
1055} 997}
1056 998
1057void 999static void
1058process_players2 (maptile *map) 1000process_players2 ()
1059{ 1001{
1060 player *pl;
1061
1062 /* Then check if any players should use weapon-speed instead of speed */ 1002 /* Then check if any players should use weapon-speed instead of speed */
1063 for (pl = first_player; pl != NULL; pl = pl->next) 1003 for (player *pl = first_player; pl; pl = pl->next)
1064 { 1004 {
1065 if (map != NULL)
1066 {
1067 if (pl->ob == NULL || QUERY_FLAG (pl->ob, FLAG_REMOVED))
1068 continue;
1069 else if (pl->loading != NULL) /* Player is blocked */
1070 pl->ob->speed_left -= pl->ob->speed;
1071 if (pl->ob->map != map)
1072 continue;
1073 }
1074
1075 /* The code that did weapon_sp handling here was out of place - 1005 /* The code that did weapon_sp handling here was out of place -
1076 * this isn't called until after the player has finished there 1006 * this isn't called until after the player has finished there
1077 * actions, and is thus out of place. All we do here is bounds 1007 * actions, and is thus out of place. All we do here is bounds
1078 * checking. 1008 * checking.
1079 */ 1009 */
… …
1085 /* This needs to be here - if the player is running, we need to 1015 /* This needs to be here - if the player is running, we need to
1086 * clear this each tick, but new commands are not being received 1016 * clear this each tick, but new commands are not being received
1087 * so execute_newserver_command() is never called 1017 * so execute_newserver_command() is never called
1088 */ 1018 */
1089 pl->has_hit = 0; 1019 pl->has_hit = 0;
1090
1091 } 1020 }
1092 else if (pl->ob->speed_left > pl->ob->speed) 1021 else if (pl->ob->speed_left > pl->ob->speed)
1093 pl->ob->speed_left = pl->ob->speed; 1022 pl->ob->speed_left = pl->ob->speed;
1094 } 1023 }
1095} 1024}
1096 1025
1097void 1026void
1098process_events (maptile *map) 1027process_events ()
1099{ 1028{
1100 object *op; 1029 object *op;
1101 1030
1102 static object *marker; 1031 static object *marker;
1032
1103 if (!marker) 1033 if (!marker)
1104 marker = get_object (); 1034 marker = object::create ();
1105 1035
1106 process_players1 (map); 1036 process_players1 ();
1107 1037
1108 marker->active_next = active_objects; 1038 marker->active_next = active_objects;
1109 1039
1110 if (marker->active_next) 1040 if (marker->active_next)
1111 marker->active_next->active_prev = marker; 1041 marker->active_next->active_prev = marker;
… …
1153 * around. 1083 * around.
1154 */ 1084 */
1155 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY) 1085 if (QUERY_FLAG (op, FLAG_REMOVED) && op->type != PLAYER && op->map && op->map->in_memory != MAP_IN_MEMORY)
1156 { 1086 {
1157 LOG (llevError, "BUG: process_events(): Removed object on list\n"); 1087 LOG (llevError, "BUG: process_events(): Removed object on list\n");
1158 dump_object (op); 1088 char *dump = dump_object (op);
1159 LOG (llevError, errmsg); 1089 LOG (llevError, dump);
1160 free_object (op); 1090 free (dump);
1091 op->destroy ();
1161 continue; 1092 continue;
1162 } 1093 }
1163 1094
1164 if (!op->speed) 1095 if (!op->speed)
1165 { 1096 {
1166 LOG (llevError, "BUG: process_events(): Object %s has no speed, " "but is on active list\n", &op->arch->name); 1097 LOG (llevError, "BUG: process_events(): Object %s has no speed, "
1098 "but is on active list\n", &op->arch->name);
1167 update_ob_speed (op); 1099 update_ob_speed (op);
1168 continue; 1100 continue;
1169 } 1101 }
1170 1102
1171 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP && map == NULL) 1103 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
1172 { 1104 {
1173 LOG (llevError, "BUG: process_events(): Object without map or " "inventory is on active list: %s (%d)\n", &op->name, op->count); 1105 LOG (llevError, "BUG: process_events(): Object without map or "
1106 "inventory is on active list: %s (%d)\n", &op->name, op->count);
1174 op->speed = 0; 1107 op->speed = 0;
1175 update_ob_speed (op); 1108 update_ob_speed (op);
1176 continue; 1109 continue;
1177 } 1110 }
1178 1111
1179 if (map != NULL && op->map != map)
1180 continue;
1181
1182 /* Animate the object. Bug of feature that andim_speed 1112 /* Animate the object. Bug or feature that anim_speed
1183 * is based on ticks, and not the creatures speed? 1113 * is based on ticks, and not the creatures speed?
1184 */ 1114 */
1185 if (op->anim_speed && op->last_anim >= op->anim_speed) 1115 if (op->anim_speed && op->last_anim >= op->anim_speed)
1186 { 1116 {
1187 if ((op->type == PLAYER) || (op->type == MONSTER)) 1117 if ((op->type == PLAYER) || (op->type == MONSTER))
… …
1228 if (marker->active_prev != NULL) 1158 if (marker->active_prev != NULL)
1229 marker->active_prev->active_next = NULL; 1159 marker->active_prev->active_next = NULL;
1230 else 1160 else
1231 active_objects = NULL; 1161 active_objects = NULL;
1232 1162
1233 process_players2 (map); 1163 process_players2 ();
1234} 1164}
1235 1165
1236void 1166void
1237clean_tmp_files (void) 1167clean_tmp_files (void)
1238{ 1168{
… …
1242 1172
1243 /* We save the maps - it may not be intuitive why, but if there are unique 1173 /* We save the maps - it may not be intuitive why, but if there are unique
1244 * items, we need to save the map so they get saved off. Perhaps we should 1174 * items, we need to save the map so they get saved off. Perhaps we should
1245 * just make a special function that only saves the unique items. 1175 * just make a special function that only saves the unique items.
1246 */ 1176 */
1247 for (m = first_map; m != NULL; m = next) 1177 for (m = first_map; m; m = next)
1248 { 1178 {
1249 next = m->next; 1179 next = m->next;
1180
1250 if (m->in_memory == MAP_IN_MEMORY) 1181 if (m->in_memory == MAP_IN_MEMORY)
1251 { 1182 {
1252 /* If we want to reuse the temp maps, swap it out (note that will also 1183 /* If we want to reuse the temp maps, swap it out (note that will also
1253 * update the log file. Otherwise, save the map (mostly for unique item 1184 * update the log file.
1254 * stuff). Note that the clean_tmp_map is called after the end of
1255 * the for loop but is in the #else bracket. IF we are recycling the maps,
1256 * we certainly don't want the temp maps removed.
1257 */ 1185 */
1258 1186
1259 /* XXX The above comment is dead wrong */
1260 if (settings.recycle_tmp_maps == TRUE)
1261 swap_map (m); 1187 swap_map (m);
1262 else
1263 {
1264 new_save_map (m, 0); /* note we save here into a overlay map */
1265 clean_tmp_map (m);
1266 } 1188 }
1267 }
1268 } 1189 }
1190
1269 write_todclock (); /* lets just write the clock here */ 1191 write_todclock (); /* lets just write the clock here */
1270} 1192}
1271 1193
1272/* clean up everything before exiting */ 1194/* clean up everything before exiting */
1273void 1195void
… …
1299 * cleanup. We also leave that loop to actually handle the freeing 1221 * cleanup. We also leave that loop to actually handle the freeing
1300 * of the data. 1222 * of the data.
1301 */ 1223 */
1302 if (pl->ob->type != DEAD_OBJECT) 1224 if (pl->ob->type != DEAD_OBJECT)
1303 { 1225 {
1304 pl->socket.status = Ns_Dead; 1226 pl->socket->status = Ns_Dead;
1305 1227
1306 /* If a hidden dm dropped connection do not create 1228 /* If a hidden dm dropped connection do not create
1307 * inconsistencies by showing that they have left the game 1229 * inconsistencies by showing that they have left the game
1308 */ 1230 */
1309 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden) 1231 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1310 && draw_exit && (pl->state != ST_GET_NAME && pl->state != ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD)) 1232 && draw_exit && (pl->state != ST_GET_NAME && pl->state != ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD))
1311 { 1233 {
1312 if (pl->ob->map) 1234 if (pl->ob->map)
1313 { 1235 {
1314 INVOKE_PLAYER (LOGOUT, pl); 1236 INVOKE_PLAYER (LOGOUT, pl);
1315 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->socket.host); 1237 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->socket->host);
1316 } 1238 }
1317 1239
1318 char buf[MAX_BUF]; 1240 char buf[MAX_BUF];
1319 1241
1320 sprintf (buf, "%s left the game.", &pl->ob->name); 1242 sprintf (buf, "%s left the game.", &pl->ob->name);
… …
1396extern unsigned long todtick; 1318extern unsigned long todtick;
1397 1319
1398void 1320void
1399do_specials (void) 1321do_specials (void)
1400{ 1322{
1401
1402#ifdef WATCHDOG
1403 if (!(pticks % 503))
1404 watchdog ();
1405#endif
1406
1407 if (!(pticks % PTICKS_PER_CLOCK)) 1323 if (!(pticks % PTICKS_PER_CLOCK))
1408 tick_the_clock (); 1324 tick_the_clock ();
1409 1325
1410 if (!(pticks % 7)) 1326 if (!(pticks % 7))
1411 shstr::gc (); 1327 shstr::gc ();
… …
1414 flush_old_maps (); /* Clears the tmp-files of maps which have reset */ 1330 flush_old_maps (); /* Clears the tmp-files of maps which have reset */
1415 1331
1416 if (!(pticks % 2503)) 1332 if (!(pticks % 2503))
1417 fix_weight (); /* Hack to fix weightproblems caused by bugs */ 1333 fix_weight (); /* Hack to fix weightproblems caused by bugs */
1418 1334
1419 if (!(pticks % 2521))
1420 metaserver_update (); /* 2500 ticks is about 5 minutes */
1421
1422 if (!(pticks % 5003)) 1335 if (!(pticks % 5003))
1423 write_book_archive (); 1336 write_book_archive ();
1424 1337
1425 if (!(pticks % 5009)) 1338 if (!(pticks % 5009))
1426 clean_friendly_list (); 1339 clean_friendly_list ();
… …
1435void 1348void
1436server_tick () 1349server_tick ()
1437{ 1350{
1438 nroferrors = 0; 1351 nroferrors = 0;
1439 1352
1353 // first do the user visible stuff
1440 doeric_server (); 1354 doeric_server ();
1441 INVOKE_GLOBAL (CLOCK); 1355 INVOKE_GLOBAL (CLOCK);
1442 process_events (NULL); /* "do" something with objects with speed */ 1356 process_events (); /* "do" something with objects with speed */
1443 flush_sockets (); 1357 flush_sockets ();
1358
1359 // then do some bookkeeping, should not really be here
1444 check_active_maps (); /* Removes unused maps after a certain timeout */ 1360 check_active_maps (); /* Removes unused maps after a certain timeout */
1445 do_specials (); /* Routines called from time to time. */ 1361 do_specials (); /* Routines called from time to time. */
1446 object::free_mortals (); 1362 object::free_mortals ();
1447 1363
1448 ++pticks; 1364 ++pticks;

Diff Legend

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