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

Comparing deliantra/server/server/monster.C (file contents):
Revision 1.85 by root, Sun Apr 11 00:34:06 2010 UTC vs.
Revision 1.86 by root, Sun Apr 18 12:50:07 2010 UTC

… …
1051 if (!(dir = path_to_player (part, pl, 0))) 1051 if (!(dir = path_to_player (part, pl, 0)))
1052 return 0; 1052 return 0;
1053 1053
1054 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL) 1054 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1055 { 1055 {
1056 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1056 int dir2 = find_dir_2 (owner->x - head->x, owner->y - head->y);
1057 1057
1058 if (dirdiff (dir, dir2) < 1) 1058 if (dirdiff (dir, dir2) < 1)
1059 return 0; /* Might hit owner with skill -thrown rocks for example ? */ 1059 return 0; /* Might hit owner with skill -thrown rocks for example ? */
1060 } 1060 }
1061 1061
… …
1093 if (!(dir = path_to_player (part, pl, 0))) 1093 if (!(dir = path_to_player (part, pl, 0)))
1094 return 0; 1094 return 0;
1095 1095
1096 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL) 1096 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1097 { 1097 {
1098 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1098 int dir2 = find_dir_2 (owner->x - head->x, owner->y - head->y);
1099 1099
1100 if (dirdiff (dir, dir2) < 2) 1100 if (dirdiff (dir, dir2) < 2)
1101 return 0; /* Might hit owner with spell */ 1101 return 0; /* Might hit owner with spell */
1102 } 1102 }
1103 1103
… …
1165 if (head->flag [FLAG_CONFUSED]) 1165 if (head->flag [FLAG_CONFUSED])
1166 dir = absdir (dir + rndm (3) + rndm (3) - 2); 1166 dir = absdir (dir + rndm (3) + rndm (3) - 2);
1167 1167
1168 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL) 1168 if (head->flag [FLAG_FRIENDLY] && (owner = head->owner) != NULL)
1169 { 1169 {
1170 int dir2 = find_dir_2 (head->x - owner->x, head->y - owner->y); 1170 int dir2 = find_dir_2 (owner->x - head->x, owner->y - head->y);
1171 1171
1172 if (dirdiff (dir, dir2) < 1) 1172 if (dirdiff (dir, dir2) < 1)
1173 return 0; /* Might hit owner with arrow */ 1173 return 0; /* Might hit owner with arrow */
1174 } 1174 }
1175 1175

Diff Legend

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