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.250 by root, Sat Dec 12 03:17:21 2009 UTC vs.
Revision 1.252 by root, Wed Mar 24 17:23:43 2010 UTC

110 link_skills (); 110 link_skills ();
111 111
112 assign (title, ob->arch->object::name); 112 assign (title, ob->arch->object::name);
113 113
114 /* if it's a dragon player, set the correct title here */ 114 /* if it's a dragon player, set the correct title here */
115 if (is_dragon_pl (ob)) 115 if (ob->is_dragon ())
116 { 116 {
117 object *tmp, *abil = 0, *skin = 0; 117 object *tmp, *abil = 0, *skin = 0;
118 118
119 for (tmp = ob->inv; tmp; tmp = tmp->below) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
120 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
3045 && tmp->name == shstr_battleground 3045 && tmp->name == shstr_battleground
3046 && EXIT_X (tmp) && EXIT_Y (tmp)) 3046 && EXIT_X (tmp) && EXIT_Y (tmp))
3047 { 3047 {
3048 /* before we assign the exit, check if this is a teambattle */ 3048 /* before we assign the exit, check if this is a teambattle */
3049 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3049 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3050 {
3051 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3050 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3051 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3052 { 3052 {
3053 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3054 {
3055 if (x && y) 3053 if (x && y)
3056 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3054 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3057 3055
3058 return 1; 3056 return 1;
3059 }
3060 } 3057 }
3061 }
3062 3058
3063 if (x && y) 3059 if (x && y)
3064 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3060 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3065 3061
3066 return 1; 3062 return 1;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines