ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/player.C
(Generate patch)

Comparing deliantra/server/server/player.C (file contents):
Revision 1.45 by root, Sat Dec 16 17:16:52 2006 UTC vs.
Revision 1.46 by root, Mon Dec 18 04:07:31 2006 UTC

299set_first_map (object *op) 299set_first_map (object *op)
300{ 300{
301 strcpy (op->contr->maplevel, first_map_path); 301 strcpy (op->contr->maplevel, first_map_path);
302 op->x = -1; 302 op->x = -1;
303 op->y = -1; 303 op->y = -1;
304 enter_exit (op, NULL); 304 enter_exit (op, 0);
305} 305}
306 306
307/* Tries to add player on the connection passwd in ns. 307/* Tries to add player on the connection passwd in ns.
308 * All we can really get in this is some settings like host and display 308 * All we can really get in this is some settings like host and display
309 * mode. 309 * mode.
348 { 348 {
349 if (at == NULL || at->next == NULL) 349 if (at == NULL || at->next == NULL)
350 at = first_archetype; 350 at = first_archetype;
351 else 351 else
352 at = at->next; 352 at = at->next;
353
353 if (at->clone.type == PLAYER) 354 if (at->clone.type == PLAYER)
354 return at; 355 return at;
356
355 if (at == start) 357 if (at == start)
356 { 358 {
357 LOG (llevError, "No Player archetypes\n"); 359 LOG (llevError, "No Player archetypes\n");
358 exit (-1); 360 exit (-1);
359 } 361 }
360 } 362 }
361} 363}
362
363 364
364object * 365object *
365get_nearest_player (object *mon) 366get_nearest_player (object *mon)
366{ 367{
367 object *op = NULL; 368 object *op = NULL;
1091 * if the map isn't there, then stay on the 1092 * if the map isn't there, then stay on the
1092 * default initial map */ 1093 * default initial map */
1093 tmp->destroy (); 1094 tmp->destroy ();
1094 } 1095 }
1095 else 1096 else
1096 {
1097 LOG (llevDebug, "first_map_ext_path not set\n"); 1097 LOG (llevDebug, "first_map_ext_path not set\n");
1098 } 1098
1099 return 0; 1099 return 0;
1100 } 1100 }
1101 1101
1102 /* Following actually changes the race - this is the default command 1102 /* Following actually changes the race - this is the default command
1103 * if we don't match with one of the options above. 1103 * if we don't match with one of the options above.

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines