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.63 by root, Sat Dec 30 16:56:16 2006 UTC vs.
Revision 1.78 by root, Thu Jan 4 16:19:32 2007 UTC

… …
45}; 45};
46 46
47void 47void
48version (object *op) 48version (object *op)
49{ 49{
50 if (op != NULL) 50 if (op)
51 clear_win_info (op); 51 clear_win_info (op);
52 52
53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire v%s", VERSION); 53 new_draw_info_format (NDI_UNIQUE, 0, op, "This is Crossfire+ v%s", VERSION);
54
55/* If in a socket, don't print out the list of authors. It confuses the
56 * crossclient program.
57 */
58 if (op == NULL)
59 return;
60 54
61 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:"); 55 new_draw_info (NDI_UNIQUE, 0, op, "Authors and contributors to this program:");
62 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>"); 56 new_draw_info (NDI_UNIQUE, 0, op, "Marc A. Lehmann <pcg@goof.com>");
63 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>"); 57 new_draw_info (NDI_UNIQUE, 0, op, "Robin Redeker <elmex@x-paste.de>");
64 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>"); 58 new_draw_info (NDI_UNIQUE, 0, op, "Pippijn van Steenhoven <pip88nl@gmail.com>");
… …
68 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>"); 62 new_draw_info (NDI_UNIQUE, 0, op, "Tyler Van Gorder <tvangod@ecst.csuchico.edu>");
69 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>"); 63 new_draw_info (NDI_UNIQUE, 0, op, "Tony Elmroth <elmroth@cd.chalmers.se>");
70 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>"); 64 new_draw_info (NDI_UNIQUE, 0, op, "Dougal Scott <dougal.scott@fcit.monasu.edu.au>");
71 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>"); 65 new_draw_info (NDI_UNIQUE, 0, op, "William <wchuang@athena.mit.edu>");
72 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>"); 66 new_draw_info (NDI_UNIQUE, 0, op, "Geoff Bailey <ftww@cs.su.oz.au>");
73 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst Jxrgensen <jorgens@flipper.pvv.unit.no>"); 67 new_draw_info (NDI_UNIQUE, 0, op, "Kjetil Wiekhorst JΓΈrgensen <jorgens@flipper.pvv.unit.no>");
74 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>"); 68 new_draw_info (NDI_UNIQUE, 0, op, "Cameron Blackwood <c.blackwood@rdt.monash.edu.au>");
75 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>"); 69 new_draw_info (NDI_UNIQUE, 0, op, "Joseph L. Traub <jtraub+@cmu.edu>");
76 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>"); 70 new_draw_info (NDI_UNIQUE, 0, op, "Rupert G. Goldie <rgg@aaii.oz.au>");
77 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>"); 71 new_draw_info (NDI_UNIQUE, 0, op, "Eric A. Anderson <eanders+@cmu.edu>");
78 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>"); 72 new_draw_info (NDI_UNIQUE, 0, op, "Rickard Eneqvist <eneq@Prag.DoCS.UU.SE>");
… …
136 * the function that calls this should figure them out. 130 * the function that calls this should figure them out.
137 */ 131 */
138void 132void
139object::enter_map (maptile *newmap, int x, int y) 133object::enter_map (maptile *newmap, int x, int y)
140{ 134{
141 if (!newmap->load ()) 135 if (destroyed () || !newmap || newmap->in_memory != MAP_IN_MEMORY)
142 return; 136 return;
143 137
144 if (out_of_map (newmap, x, y)) 138 if (out_of_map (newmap, x, y))
145 { 139 {
146 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y); 140 LOG (llevError, "enter_map: supplied coordinates are not within the map! (%s: %d, %d)\n", &newmap->path, x, y);
… …
152 &newmap->path, x, y, newmap->width, newmap->height); 146 &newmap->path, x, y, newmap->width, newmap->height);
153 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed"); 147 new_draw_info (NDI_UNIQUE, 0, this, "The exit is closed");
154 return; 148 return;
155 } 149 }
156 } 150 }
151
152 if (contr && map != newmap && map)
153 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr)))
154 return;
155
156 /* If it is a player login, he has yet to be inserted anyplace.
157 * otherwise, we need to deal with removing the player here.
158 */
159 remove ();
157 160
158 /* try to find a spot for the player */ 161 /* try to find a spot for the player */
159 if (ob_blocked (this, newmap, x, y)) 162 if (ob_blocked (this, newmap, x, y))
160 { /* First choice blocked */ 163 { /* First choice blocked */
161 /* We try to find a spot for the player, starting closest in. 164 /* We try to find a spot for the player, starting closest in.
… …
182 else 185 else
183 /* not much we can do in this case. */ 186 /* not much we can do in this case. */
184 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); 187 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);
185 } 188 }
186 189
187 if (map) 190 if (contr && map != newmap)
188 if (INVOKE_MAP (LEAVE, map, ARG_PLAYER (contr))) 191 {
189 return;
190
191 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y))) 192 if (INVOKE_PLAYER (MAP_CHANGE, contr, ARG_MAP (newmap), ARG_INT (x), ARG_INT (y)))
192 return; 193 return;
193 194
194 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y))) 195 if (INVOKE_MAP (ENTER, newmap, ARG_PLAYER (contr), ARG_INT (x), ARG_INT (y)))
195 return; 196 return;
196 197 }
197 /* If it is a player login, he has yet to be inserted anyplace.
198 * otherwise, we need to deal with removing the player here.
199 */
200 remove ();
201 198
202 this->x = x; 199 this->x = x;
203 this->y = y; 200 this->y = y;
204 map = newmap; 201 map = newmap;
205 202
206 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON); 203 insert_ob_in_map (this, map, 0, INS_NO_WALK_ON);
207 204
208 newmap->timeout = 0;
209 enemy = NULL; 205 enemy = NULL;
210 206
211 if (contr) 207 if (contr)
212 { 208 {
213 strcpy (contr->maplevel, newmap->path); 209 contr->maplevel = newmap->path;
214 contr->count = 0; 210 contr->count = 0;
215 } 211 }
216 212
217 /* Update any golems */ 213 /* Update any golems */
218 if (type == PLAYER && contr->ranges[range_golem]) 214 if (type == PLAYER && contr->ranges[range_golem])
… …
230 } 226 }
231 else 227 else
232 { 228 {
233 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more) 229 for (object *tmp = contr->ranges[range_golem]; tmp != NULL; tmp = tmp->more)
234 { 230 {
235 tmp->x = x + freearr_x[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.x); 231 tmp->x = x + freearr_x[i] + (tmp->arch ? 0 : tmp->arch->clone.x);
236 tmp->y = y + freearr_y[i] + (tmp->arch == NULL ? 0 : tmp->arch->clone.y); 232 tmp->y = y + freearr_y[i] + (tmp->arch ? 0 : tmp->arch->clone.y);
237 tmp->map = newmap; 233 tmp->map = newmap;
238 } 234 }
239 235
240 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0); 236 insert_ob_in_map (contr->ranges[range_golem], newmap, NULL, 0);
241 contr->ranges[range_golem]->direction = 237 contr->ranges[range_golem]->direction =
242 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y); 238 find_dir_2 (x - contr->ranges[range_golem]->x, y - contr->ranges[range_golem]->y);
243 } 239 }
244 } 240 }
245
246 direction = 0;
247 241
248 /* since the players map is already loaded, we don't need to worry 242 /* since the players map is already loaded, we don't need to worry
249 * about pending objects. 243 * about pending objects.
250 */ 244 */
251 remove_all_pets (newmap); 245 remove_all_pets (newmap);
252}
253
254/* clean_path takes a path and replaces all / with _
255 * We do a strcpy so that we do not change the original string.
256 */
257char *
258clean_path (const char *file)
259{
260 static char newpath[MAX_BUF], *cp;
261 assign (newpath, file);
262
263 for (cp = newpath; *cp != '\0'; cp++)
264 if (*cp == '/')
265 *cp = '_';
266
267 return newpath;
268}
269
270/* unclean_path takes a path and replaces all _ with /
271 * This basically undoes clean path.
272 * We do a strcpy so that we do not change the original string.
273 * We are smart enough to start after the last / in case we
274 * are getting passed a string that points to a unique map
275 * path.
276 */
277char *
278unclean_path (const char *src)
279{
280 static char newpath[MAX_BUF], *cp;
281
282 cp = strrchr (src, '/');
283 assign (newpath, cp ? cp + 1 : src);
284
285 for (cp = newpath; *cp != '\0'; cp++)
286 if (*cp == '_')
287 *cp = '/';
288
289 return newpath;
290} 246}
291 247
292/* process_players1 and process_players2 do all the player related stuff. 248/* process_players1 and process_players2 do all the player related stuff.
293 * I moved it out of process events and process_map. This was to some 249 * I moved it out of process events and process_map. This was to some
294 * extent for debugging as well as to get a better idea of the time used 250 * extent for debugging as well as to get a better idea of the time used
… …
307 flag = 0; 263 flag = 0;
308 for_all_players (pl) 264 for_all_players (pl)
309 { 265 {
310 pl->refcnt_chk (); 266 pl->refcnt_chk ();
311 267
312 if (!pl->ob || !pl->ns) 268 if (!pl->ob || !pl->ns || !pl->ob->active ())
313 continue; 269 continue;
314 270
315 if (pl->ob->speed_left > 0) 271 if (pl->ob->speed_left > 0)
316 if (handle_newcs_player (pl->ob)) 272 if (handle_newcs_player (pl->ob))
317 flag = 1; 273 flag = 1;
… …
338 } /* end of for loop for all the players */ 294 } /* end of for loop for all the players */
339 } /* for flag */ 295 } /* for flag */
340 296
341 for_all_players (pl) 297 for_all_players (pl)
342 { 298 {
343 if (!pl->ob || !pl->ns) 299 if (!pl->ob || !pl->ns || !pl->ob->active ())
344 continue; 300 continue;
345 301
346 if (settings.casting_time) 302 if (settings.casting_time)
347 { 303 {
348 if (pl->ob->casting_time > 0) 304 if (pl->ob->casting_time > 0)
… …
455 free (dump); 411 free (dump);
456 op->destroy (); 412 op->destroy ();
457 continue; 413 continue;
458 } 414 }
459 415
460 if (!op->speed) 416 if (!op->has_active_speed ())
461 { 417 {
462 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 418 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
463 "but is on active list\n", &op->arch->name); 419 "but is on active list\n", op->debug_desc (), op->speed);
464 op->set_speed (0); 420 op->set_speed (0);
465 continue; 421 continue;
466 } 422 }
467 423
468 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 424 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
… …
533{ 489{
534 LOG (llevDebug, "emergency save begin.\n"); 490 LOG (llevDebug, "emergency save begin.\n");
535 491
536 LOG (llevDebug, "saving players.\n"); 492 LOG (llevDebug, "saving players.\n");
537 for_all_players (pl) 493 for_all_players (pl)
494 if (pl->enable_save && pl->ob && pl->ns)
495 {
538 pl->save (1); 496 pl->save (true);
497 pl->enable_save = true;
498 }
539 499
540// for_all_players (pl) 500// for_all_players (pl)
541// if (pl->ob) 501// if (pl->ob)
542// pl->ob->remove (); 502// pl->ob->remove ();
543 503
… …
554void 514void
555cleanup (bool make_core) 515cleanup (bool make_core)
556{ 516{
557 LOG (llevDebug, "cleanup begin.\n"); 517 LOG (llevDebug, "cleanup begin.\n");
558 518
519 if (init_done && !in_cleanup)
520 {
559 in_cleanup = true; 521 in_cleanup = true;
560
561 if (init_done)
562 emergency_save (); 522 emergency_save ();
523 }
524 else
525 in_cleanup = true;
563 526
564 LOG (llevDebug, "running cleanup handlers.\n"); 527 LOG (llevDebug, "running cleanup handlers.\n");
565 INVOKE_GLOBAL (CLEANUP); 528 INVOKE_GLOBAL (CLEANUP);
566 529
567 LOG (llevDebug, "cleanup done.\n"); 530 LOG (llevDebug, "cleanup done.\n");
568 531
569 if (make_core) 532 if (make_core)
570 abort (); 533 abort ();
571 else 534 else
572 _exit (0); 535 _exit (0);
573}
574
575void
576leave (player *pl, int draw_exit)
577{
578 if (pl)
579 {
580 if (pl->ob->type != DEAD_OBJECT)
581 {
582 /* If a hidden dm dropped connection do not create
583 * inconsistencies by showing that they have left the game
584 */
585 if (!(QUERY_FLAG (pl->ob, FLAG_WIZ) && pl->ob->contr->hidden)
586 && draw_exit)
587 {
588 if (pl->ob->map)
589 {
590 INVOKE_PLAYER (LOGOUT, pl);
591 LOG (llevInfo, "LOGOUT: Player named %s from ip %s\n", &pl->ob->name, pl->ns->host);
592 }
593
594 char buf[MAX_BUF];
595
596 sprintf (buf, "%s left the game.", &pl->ob->name);
597 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, 0, buf);
598 }
599
600 pl->ob->remove ();
601 pl->ob->type = DEAD_OBJECT; /* To avoid problems with inventory window */
602 }
603
604 /* We do this so that the socket handling routine can do the final
605 * cleanup. We also leave that loop to actually handle the freeing
606 * of the data.
607 */
608 if (pl->ns)
609 pl->ns->destroy ();
610
611 }
612} 536}
613 537
614int 538int
615forbid_play (void) 539forbid_play (void)
616{ 540{
… …
630 554
631 while (fgets (buf, MAX_BUF, fp)) 555 while (fgets (buf, MAX_BUF, fp))
632 { 556 {
633 if (buf[0] == '#') 557 if (buf[0] == '#')
634 continue; 558 continue;
559
635 if (!strncmp (buf, "msg", 3)) 560 if (!strncmp (buf, "msg", 3))
636 { 561 {
637 if (forbit) 562 if (forbit)
638 while (fgets (buf, MAX_BUF, fp)) /* print message */ 563 while (fgets (buf, MAX_BUF, fp)) /* print message */
639 fputs (buf, logfile); 564 fputs (buf, logfile);
640 break; 565 break;
641
642 } 566 }
643 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3) 567 else if (sscanf (buf, "%s %d%*c%d\n", day, &start, &stop) != 3)
644 { 568 {
645 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n"); 569 LOG (llevDebug, "Warning: Incomplete line in permission file ignored.\n");
646 continue; 570 continue;
… …
660 return 0; 584 return 0;
661#endif 585#endif
662} 586}
663 587
664/* 588/*
665 * do_specials() is a collection of functions to call from time to time. 589 * do_specials() is a collection of functions to call from time to time.
666 * Modified 2000-1-14 MSW to use the global pticks count to determine how 590 * Modified 2000-1-14 MSW to use the global pticks count to determine how
667 * often to do things. This will allow us to spred them out more often. 591 * often to do things. This will allow us to spred them out more often.
668 * I use prime numbers for the factor count - in that way, it is less likely 592 * I use prime numbers for the factor count - in that way, it is less likely
669 * these actions will fall on the same tick (compared to say using 500/2500/15000 593 * these actions will fall on the same tick (compared to say using 500/2500/15000
670 * which would mean on that 15,000 tick count a whole bunch of stuff gets 594 * which would mean on that 15,000 tick count a whole bunch of stuff gets
… …
729 initPlugins (); 653 initPlugins ();
730 654
731 for (;;) 655 for (;;)
732 cfperl_main (); 656 cfperl_main ();
733 657
734 // unreached
735 cleanup (); 658 cleanup (true);
736
737 return 0;
738} 659}
660

Diff Legend

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