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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.24 by root, Fri Jan 19 21:49:58 2007 UTC vs.
Revision 1.25 by root, Mon Jan 29 17:57:22 2007 UTC

806 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more."); 806 new_draw_info (NDI_UNIQUE, 0, pl, "...and learn nothing more.");
807 } 807 }
808 return success; 808 return success;
809} 809}
810 810
811
812/* players using this skill can 'charm' a monster -- 811/* players using this skill can 'charm' a monster --
813 * into working for them. It can only be used on 812 * into working for them. It can only be used on
814 * non-special (see below) 'neutral' creatures. 813 * non-special (see below) 'neutral' creatures.
815 * -b.t. (thomas@astro.psu.edu) 814 * -b.t. (thomas@astro.psu.edu)
816 */ 815 */
817
818int 816int
819use_oratory (object *pl, int dir, object *skill) 817use_oratory (object *pl, int dir, object *skill)
820{ 818{
821 sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir]; 819 sint16 x = pl->x + freearr_x[dir], y = pl->y + freearr_y[dir];
822 int mflags, chance; 820 int mflags, chance;
924 remove_friendly_object (tmp); 922 remove_friendly_object (tmp);
925 tmp->attack_movement = 0; /* needed? */ 923 tmp->attack_movement = 0; /* needed? */
926 } 924 }
927 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE); 925 CLEAR_FLAG (tmp, FLAG_UNAGGRESSIVE);
928 } 926 }
927
929 return 0; /* Fall through - if we get here, we didn't charm anything */ 928 return 0; /* Fall through - if we get here, we didn't charm anything */
930} 929}
931 930
932/* Singing() -this skill allows the player to pacify nearby creatures. 931/* Singing() -this skill allows the player to pacify nearby creatures.
933 * There are few limitations on who/what kind of 932 * There are few limitations on who/what kind of

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines