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.42 by root, Wed Dec 13 00:42:04 2006 UTC vs.
Revision 1.53 by root, Fri Dec 22 16:34:00 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
… …
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
… …
633 608
634 /* If we are coming from another template map, use reletive paths unless 609 /* If we are coming from another template map, use reletive paths unless
635 * indicated otherwise. 610 * indicated otherwise.
636 */ 611 */
637 if (exit_ob->map->templatemap && (resultname[0] != '/')) 612 if (exit_ob->map->templatemap && (resultname[0] != '/'))
638 {
639 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname); 613 new_map_name = path_combine_and_normalize (exit_ob->map->path, resultname);
640 }
641 else 614 else
642 {
643 new_map_name = create_template_pathname (resultname); 615 new_map_name = create_template_pathname (resultname);
644 }
645 616
646 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE); 617 new_map = ready_map_name (new_map_name, MAP_PLAYER_UNIQUE);
647 if (!new_map) 618 if (!new_map)
648 { 619 {
649 memset (&rp, 0, sizeof (RMParms)); 620 memset (&rp, 0, sizeof (RMParms));
… …
899 tmp->destroy (); 870 tmp->destroy ();
900 } 871 }
901 872
902 strcpy (op->contr->savebed_map, path_combine_and_normalize (exit_ob->map->path, EXIT_PATH (exit_ob))); 873 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); 874 op->contr->bed_x = EXIT_X (exit_ob), op->contr->bed_y = EXIT_Y (exit_ob);
904 save_player (op, 1); 875 op->contr->save ();
905 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n", 876 /* LOG(llevDebug,"enter_exit: Taking damned exit %s to (%d,%d) on map %s\n",
906 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y, 877 * exit_ob->name?exit_ob->name:"(none)", exit_ob->x, exit_ob->y,
907 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */ 878 * path_combine_and_normalize(exit_ob->map->path, EXIT_PATH(exit_ob))); */
908 } 879 }
909 880
… …
950 921
951 enter_map (op, newmap, op->x, op->y); 922 enter_map (op, newmap, op->x, op->y);
952 } 923 }
953} 924}
954 925
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. 926/* 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 927 * 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 928 * 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 929 * by the various functions. process_players1() does the processing before
976 * objects have been updated, process_players2() does the processing that 930 * objects have been updated, process_players2() does the processing that
977 * is needed after the players have been updated. 931 * is needed after the players have been updated.
978 */ 932 */
979 933static void
980void
981process_players1 (maptile *map) 934process_players1 ()
982{ 935{
983 int flag; 936 int flag;
984 player *pl, *plnext;
985
986 /* Basically, we keep looping until all the players have done their actions. */ 937 /* Basically, we keep looping until all the players have done their actions. */
987 for (flag = 1; flag != 0;) 938 for (flag = 1; flag != 0;)
988 { 939 {
989 flag = 0; 940 flag = 0;
990 for (pl = first_player; pl != NULL; pl = plnext) 941 for (player *plnext, *pl = first_player; pl; pl = plnext)
991 { 942 {
992 plnext = pl->next; /* In case a player exits the game in handle_player() */ 943 plnext = pl->next; /* In case a player exits the game in handle_player() */
993 944
994 if (pl->ob == NULL) 945 if (!pl->ob)
995 continue;
996
997 if (map != NULL && pl->ob->map != map)
998 continue; 946 continue;
999 947
1000 if (pl->ob->speed_left > 0) 948 if (pl->ob->speed_left > 0)
1001 { 949 {
1002 if (handle_newcs_player (pl->ob)) 950 if (handle_newcs_player (pl->ob))
… …
1014 962
1015#ifdef AUTOSAVE 963#ifdef AUTOSAVE
1016 /* check for ST_PLAYING state so that we don't try to save off when 964 /* check for ST_PLAYING state so that we don't try to save off when
1017 * the player is logging in. 965 * the player is logging in.
1018 */ 966 */
1019 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->state == ST_PLAYING) 967 if ((pl->last_save_tick + AUTOSAVE) < (uint32) pticks && pl->ns->state == ST_PLAYING)
1020 {
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 */ 968 {
1025// if (get_map_flags(pl->ob->map, NULL, pl->ob->x, pl->ob->y, NULL, NULL) & P_NO_CLERIC) { 969 pl->ob->contr->save ();
1026// pl->last_save_tick += 100;
1027// } else {
1028 save_player (pl->ob, 1);
1029 pl->last_save_tick = pticks; 970 pl->last_save_tick = pticks;
1030// }
1031 } 971 }
1032#endif 972#endif
1033 } /* end of for loop for all the players */ 973 } /* end of for loop for all the players */
1034 } /* for flag */ 974 } /* for flag */
975
1035 for (pl = first_player; pl != NULL; pl = pl->next) 976 for (player *pl = first_player; pl; pl = pl->next)
1036 { 977 {
1037 if (map != NULL && (pl->ob == NULL || pl->ob->map != map))
1038 continue;
1039 if (settings.casting_time == TRUE) 978 if (settings.casting_time)
1040 { 979 {
1041 if (pl->ob->casting_time > 0) 980 if (pl->ob->casting_time > 0)
1042 { 981 {
1043 pl->ob->casting_time--; 982 pl->ob->casting_time--;
1044 pl->ob->start_holding = 1; 983 pl->ob->start_holding = 1;
1045 } 984 }
985
1046 /* set spell_state so we can update the range in stats field */ 986 /* set spell_state so we can update the range in stats field */
1047 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1)) 987 if ((pl->ob->casting_time == 0) && (pl->ob->start_holding == 1))
1048 {
1049 pl->ob->start_holding = 0; 988 pl->ob->start_holding = 0;
1050 } 989 }
1051 } 990
1052 do_some_living (pl->ob); 991 do_some_living (pl->ob);
1053 /* draw(pl->ob); *//* updated in socket code */
1054 } 992 }
1055} 993}
1056 994
1057void 995static void
1058process_players2 (maptile *map) 996process_players2 ()
1059{ 997{
1060 player *pl;
1061
1062 /* Then check if any players should use weapon-speed instead of speed */ 998 /* Then check if any players should use weapon-speed instead of speed */
1063 for (pl = first_player; pl != NULL; pl = pl->next) 999 for (player *pl = first_player; pl; pl = pl->next)
1064 { 1000 {
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 - 1001 /* The code that did weapon_sp handling here was out of place -
1076 * this isn't called until after the player has finished there 1002 * 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 1003 * actions, and is thus out of place. All we do here is bounds
1078 * checking. 1004 * checking.
1079 */ 1005 */
… …
1085 /* This needs to be here - if the player is running, we need to 1011 /* 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 1012 * clear this each tick, but new commands are not being received
1087 * so execute_newserver_command() is never called 1013 * so execute_newserver_command() is never called
1088 */ 1014 */
1089 pl->has_hit = 0; 1015 pl->has_hit = 0;
1090
1091 } 1016 }
1092 else if (pl->ob->speed_left > pl->ob->speed) 1017 else if (pl->ob->speed_left > pl->ob->speed)
1093 pl->ob->speed_left = pl->ob->speed; 1018 pl->ob->speed_left = pl->ob->speed;
1094 } 1019 }
1095} 1020}
1096 1021
1097void 1022void
1098process_events (maptile *map) 1023process_events ()
1099{ 1024{
1100 object *op; 1025 object *op;
1101 1026
1102 static object *marker; 1027 static object *marker;
1103 1028
1104 if (!marker) 1029 if (!marker)
1105 marker = object::create (); 1030 marker = object::create ();
1106 1031
1107 process_players1 (map); 1032 process_players1 ();
1108 1033
1109 marker->active_next = active_objects; 1034 marker->active_next = active_objects;
1110 1035
1111 if (marker->active_next) 1036 if (marker->active_next)
1112 marker->active_next->active_prev = marker; 1037 marker->active_next->active_prev = marker;
… …
1163 continue; 1088 continue;
1164 } 1089 }
1165 1090
1166 if (!op->speed) 1091 if (!op->speed)
1167 { 1092 {
1168 LOG (llevError, "BUG: process_events(): Object %s has no speed, " "but is on active list\n", &op->arch->name); 1093 LOG (llevError, "BUG: process_events(): Object %s has no speed, "
1094 "but is on active list\n", &op->arch->name);
1169 update_ob_speed (op); 1095 update_ob_speed (op);
1170 continue; 1096 continue;
1171 } 1097 }
1172 1098
1173 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP && map == NULL) 1099 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
1174 { 1100 {
1175 LOG (llevError, "BUG: process_events(): Object without map or " "inventory is on active list: %s (%d)\n", &op->name, op->count); 1101 LOG (llevError, "BUG: process_events(): Object without map or "
1102 "inventory is on active list: %s (%d)\n", &op->name, op->count);
1176 op->speed = 0; 1103 op->speed = 0;
1177 update_ob_speed (op); 1104 update_ob_speed (op);
1178 continue; 1105 continue;
1179 } 1106 }
1180 1107
1181 if (map != NULL && op->map != map)
1182 continue;
1183
1184 /* Animate the object. Bug of feature that andim_speed 1108 /* Animate the object. Bug or feature that anim_speed
1185 * is based on ticks, and not the creatures speed? 1109 * is based on ticks, and not the creatures speed?
1186 */ 1110 */
1187 if (op->anim_speed && op->last_anim >= op->anim_speed) 1111 if (op->anim_speed && op->last_anim >= op->anim_speed)
1188 { 1112 {
1189 if ((op->type == PLAYER) || (op->type == MONSTER)) 1113 if ((op->type == PLAYER))
1190 animate_object (op, op->facing); 1114 animate_object (op, op->facing);
1191 else 1115 else
1192 animate_object (op, op->direction); 1116 animate_object (op, op->direction);
1193 1117
1194 op->last_anim = 1; 1118 op->last_anim = 1;
… …
1230 if (marker->active_prev != NULL) 1154 if (marker->active_prev != NULL)
1231 marker->active_prev->active_next = NULL; 1155 marker->active_prev->active_next = NULL;
1232 else 1156 else
1233 active_objects = NULL; 1157 active_objects = NULL;
1234 1158
1235 process_players2 (map); 1159 process_players2 ();
1236} 1160}
1237 1161
1238void 1162void
1239clean_tmp_files (void) 1163clean_tmp_files (void)
1240{ 1164{
… …
1244 1168
1245 /* We save the maps - it may not be intuitive why, but if there are unique 1169 /* We save the maps - it may not be intuitive why, but if there are unique
1246 * items, we need to save the map so they get saved off. Perhaps we should 1170 * items, we need to save the map so they get saved off. Perhaps we should
1247 * just make a special function that only saves the unique items. 1171 * just make a special function that only saves the unique items.
1248 */ 1172 */
1249 for (m = first_map; m != NULL; m = next) 1173 for (m = first_map; m; m = next)
1250 { 1174 {
1251 next = m->next; 1175 next = m->next;
1176
1252 if (m->in_memory == MAP_IN_MEMORY) 1177 if (m->in_memory == MAP_IN_MEMORY)
1253 { 1178 {
1254 /* If we want to reuse the temp maps, swap it out (note that will also 1179 /* If we want to reuse the temp maps, swap it out (note that will also
1255 * update the log file. Otherwise, save the map (mostly for unique item 1180 * update the log file.
1256 * stuff). Note that the clean_tmp_map is called after the end of
1257 * the for loop but is in the #else bracket. IF we are recycling the maps,
1258 * we certainly don't want the temp maps removed.
1259 */ 1181 */
1260 1182
1261 /* XXX The above comment is dead wrong */
1262 if (settings.recycle_tmp_maps == TRUE)
1263 swap_map (m); 1183 swap_map (m);
1264 else
1265 {
1266 new_save_map (m, 0); /* note we save here into a overlay map */
1267 clean_tmp_map (m);
1268 } 1184 }
1269 }
1270 } 1185 }
1186
1271 write_todclock (); /* lets just write the clock here */ 1187 write_todclock (); /* lets just write the clock here */
1272} 1188}
1273 1189
1274/* clean up everything before exiting */ 1190/* clean up everything before exiting */
1275void 1191void
1276cleanup (void) 1192cleanup (bool make_core)
1277{ 1193{
1278 LOG (llevDebug, "Cleanup called.\n"); 1194 LOG (llevDebug, "Cleanup called.\n");
1279 1195
1196 if (init_done)
1197 {
1280 for (player *pl = first_player; pl != NULL; pl = pl->next) 1198 for (player *pl = first_player; pl; pl = pl->next)
1281 save_player (pl->ob, 0); 1199 pl->save (1);
1282 1200
1283 for (player *pl = first_player; pl != NULL; pl = pl->next) 1201 for (player *pl = first_player; pl; pl = pl->next)
1284 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) 1202 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1285 leave_map (pl->ob); 1203 leave_map (pl->ob);
1286 1204
1287 clean_tmp_files (); 1205 clean_tmp_files ();
1288 write_book_archive (); 1206 write_book_archive ();
1289 1207
1290 INVOKE_GLOBAL (CLEANUP); 1208 INVOKE_GLOBAL (CLEANUP);
1209 }
1291 1210
1211 if (make_core)
1212 abort ();
1213 else
1292 _exit (0); 1214 _exit (0);
1293} 1215}
1294 1216
1295void 1217void
1296leave (player *pl, int draw_exit) 1218leave (player *pl, int draw_exit)
1297{ 1219{
1298 if (pl != NULL) 1220 if (pl)
1299 { 1221 {
1222 if (pl->ob->type != DEAD_OBJECT)
1223 {
1224 /* If a hidden dm dropped connection do not create
1225 * inconsistencies by showing that they have left the game
1226 */
1227 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1228 && draw_exit)
1229 {
1230 if (pl->ob->map)
1231 {
1232 INVOKE_PLAYER (LOGOUT, pl);
1233 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
1234 }
1235
1236 char buf[MAX_BUF];
1237
1238 sprintf (buf, "%s left the game.", &pl->ob->name);
1239 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
1240 }
1241
1242 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1243 leave_map (pl->ob);
1244
1245 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1246 }
1247
1300 /* We do this so that the socket handling routine can do the final 1248 /* We do this so that the socket handling routine can do the final
1301 * cleanup. We also leave that loop to actually handle the freeing 1249 * cleanup. We also leave that loop to actually handle the freeing
1302 * of the data. 1250 * of the data.
1303 */ 1251 */
1304 if (pl->ob->type != DEAD_OBJECT) 1252 if (pl->ns)
1305 { 1253 pl->ns->destroy ();
1306 pl->socket.status = Ns_Dead;
1307 1254
1308 /* If a hidden dm dropped connection do not create
1309 * inconsistencies by showing that they have left the game
1310 */
1311 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
1312 && draw_exit && (pl->state != ST_GET_NAME && pl->state != ST_GET_PASSWORD && pl->state != ST_CONFIRM_PASSWORD))
1313 {
1314 if (pl->ob->map)
1315 {
1316 INVOKE_PLAYER (LOGOUT, pl);
1317 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->socket.host);
1318 }
1319
1320 char buf[MAX_BUF];
1321
1322 sprintf (buf, "%s left the game.", &pl->ob->name);
1323 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, buf);
1324 }
1325
1326 if (!QUERY_FLAG (pl->ob, FLAG_REMOVED))
1327 leave_map (pl->ob);
1328
1329 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
1330 }
1331 } 1255 }
1332} 1256}
1333 1257
1334int 1258int
1335forbid_play (void) 1259forbid_play (void)
… …
1398extern unsigned long todtick; 1322extern unsigned long todtick;
1399 1323
1400void 1324void
1401do_specials (void) 1325do_specials (void)
1402{ 1326{
1403
1404#ifdef WATCHDOG
1405 if (!(pticks % 503))
1406 watchdog ();
1407#endif
1408
1409 if (!(pticks % PTICKS_PER_CLOCK)) 1327 if (!(pticks % PTICKS_PER_CLOCK))
1410 tick_the_clock (); 1328 tick_the_clock ();
1411 1329
1412 if (!(pticks % 7)) 1330 if (!(pticks % 7))
1413 shstr::gc (); 1331 shstr::gc ();
… …
1434void 1352void
1435server_tick () 1353server_tick ()
1436{ 1354{
1437 nroferrors = 0; 1355 nroferrors = 0;
1438 1356
1357 // first do the user visible stuff
1439 doeric_server (); 1358 doeric_server ();
1440 INVOKE_GLOBAL (CLOCK); 1359 INVOKE_GLOBAL (CLOCK);
1441 process_events (NULL); /* "do" something with objects with speed */ 1360 process_events (); /* "do" something with objects with speed */
1442 flush_sockets (); 1361 flush_sockets ();
1362
1363 // then do some bookkeeping, should not really be here
1443 check_active_maps (); /* Removes unused maps after a certain timeout */ 1364 check_active_maps (); /* Removes unused maps after a certain timeout */
1444 do_specials (); /* Routines called from time to time. */ 1365 do_specials (); /* Routines called from time to time. */
1445 object::free_mortals (); 1366 object::free_mortals ();
1446 1367
1447 ++pticks; 1368 ++pticks;

Diff Legend

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