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.72 by root, Mon Jan 1 21:19:52 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 (map && map != newmap)
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 (map != newmap && contr)
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])
… …
247 243
248 /* since the players map is already loaded, we don't need to worry 244 /* since the players map is already loaded, we don't need to worry
249 * about pending objects. 245 * about pending objects.
250 */ 246 */
251 remove_all_pets (newmap); 247 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} 248}
291 249
292/* process_players1 and process_players2 do all the player related stuff. 250/* 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 251 * 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 252 * extent for debugging as well as to get a better idea of the time used
… …
307 flag = 0; 265 flag = 0;
308 for_all_players (pl) 266 for_all_players (pl)
309 { 267 {
310 pl->refcnt_chk (); 268 pl->refcnt_chk ();
311 269
312 if (!pl->ob || !pl->ns) 270 if (!pl->ob || !pl->ns || !pl->ob->active ())
313 continue; 271 continue;
314 272
315 if (pl->ob->speed_left > 0) 273 if (pl->ob->speed_left > 0)
316 if (handle_newcs_player (pl->ob)) 274 if (handle_newcs_player (pl->ob))
317 flag = 1; 275 flag = 1;
… …
338 } /* end of for loop for all the players */ 296 } /* end of for loop for all the players */
339 } /* for flag */ 297 } /* for flag */
340 298
341 for_all_players (pl) 299 for_all_players (pl)
342 { 300 {
343 if (!pl->ob || !pl->ns) 301 if (!pl->ob || !pl->ns || !pl->ob->active ())
344 continue; 302 continue;
345 303
346 if (settings.casting_time) 304 if (settings.casting_time)
347 { 305 {
348 if (pl->ob->casting_time > 0) 306 if (pl->ob->casting_time > 0)
… …
455 free (dump); 413 free (dump);
456 op->destroy (); 414 op->destroy ();
457 continue; 415 continue;
458 } 416 }
459 417
460 if (!op->speed) 418 if (!op->has_active_speed ())
461 { 419 {
462 LOG (llevError, "BUG: process_events(): Object %s has no speed, " 420 LOG (llevError, "BUG: process_events(): Object %s has no speed (%f), "
463 "but is on active list\n", &op->arch->name); 421 "but is on active list\n", op->debug_desc (), op->speed);
464 op->set_speed (0); 422 op->set_speed (0);
465 continue; 423 continue;
466 } 424 }
467 425
468 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP) 426 if (op->map == NULL && op->env == NULL && op->name && op->type != MAP)
… …
554void 512void
555cleanup (bool make_core) 513cleanup (bool make_core)
556{ 514{
557 LOG (llevDebug, "cleanup begin.\n"); 515 LOG (llevDebug, "cleanup begin.\n");
558 516
517 if (init_done && !in_cleanup)
518 {
559 in_cleanup = true; 519 in_cleanup = true;
560
561 if (init_done)
562 emergency_save (); 520 emergency_save ();
521 }
522 else
523 in_cleanup = true;
563 524
564 LOG (llevDebug, "running cleanup handlers.\n"); 525 LOG (llevDebug, "running cleanup handlers.\n");
565 INVOKE_GLOBAL (CLEANUP); 526 INVOKE_GLOBAL (CLEANUP);
566 527
567 LOG (llevDebug, "cleanup done.\n"); 528 LOG (llevDebug, "cleanup done.\n");
… …
729 initPlugins (); 690 initPlugins ();
730 691
731 for (;;) 692 for (;;)
732 cfperl_main (); 693 cfperl_main ();
733 694
734 // unreached
735 cleanup (); 695 cleanup (true);
736
737 return 0;
738} 696}
697

Diff Legend

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