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.38 by root, Thu Aug 23 16:46:28 2007 UTC vs.
Revision 1.44 by root, Mon Sep 29 10:31:32 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation, either version 3 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
… …
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <sproto.h> 25#include <sproto.h>
26#include <spells.h> 26#include <spells.h>
… …
386 /* If we don't have an enemy, do special movement or the like */ 386 /* If we don't have an enemy, do special movement or the like */
387 if (!enemy) 387 if (!enemy)
388 { 388 {
389 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 389 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
390 { 390 {
391 op->destroy (); 391 op->drop_and_destroy ();
392 return 1; 392 return 1;
393 } 393 }
394 394
395 /* Probably really a bug for a creature to have both 395 /* Probably really a bug for a creature to have both
396 * stand still and a movement type set. 396 * stand still and a movement type set.
… …
650 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */ 650 if (QUERY_FLAG (part, FLAG_FREED)) /* Might be freed by ghost-attack or hit-back */
651 return 1; 651 return 1;
652 652
653 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK)) 653 if (QUERY_FLAG (op, FLAG_ONLY_ATTACK))
654 { 654 {
655 op->remove ();
656 op->destroy (); 655 op->drop_and_destroy ();
657 return 1; 656 return 1;
658 } 657 }
658
659 return 0; 659 return 0;
660} 660}
661 661
662int 662int
663can_hit (object *ob1, object *ob2, rv_vector * rv) 663can_hit (object *ob1, object *ob2, rv_vector * rv)
… …
1880 if (enemy->hide) 1880 if (enemy->hide)
1881 { 1881 {
1882 make_visible (enemy); 1882 make_visible (enemy);
1883 new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!"); 1883 new_draw_info (NDI_UNIQUE, 0, enemy, "Your light reveals your hiding spot!");
1884 } 1884 }
1885
1885 return 1; 1886 return 1;
1886 } 1887 }
1887 else if (enemy->hide) 1888 else if (enemy->hide)
1888 return 0; 1889 return 0;
1889 1890
1890 /* Invisible enemy. Break apart the check for invis undead/invis looker 1891 /* Invisible enemy. Break apart the check for invis undead/invis looker
1891 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values, 1892 * into more simple checks - the QUERY_FLAG doesn't return 1/0 values,
1892 * and making it a conditional makes the code pretty ugly. 1893 * and making it a conditional makes the code pretty ugly.
1893 */ 1894 */
1894 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE)) 1895 if (!QUERY_FLAG (looker, FLAG_SEE_INVISIBLE))
1895 {
1896 if (makes_invisible_to (enemy, looker)) 1896 if (makes_invisible_to (enemy, looker))
1897 return 0; 1897 return 0;
1898 }
1899 } 1898 }
1900 else if (looker->type == PLAYER) /* for players, a (possible) shortcut */ 1899 else if (looker->type == PLAYER) /* for players, a (possible) shortcut */
1901 if (player_can_view (looker, enemy)) 1900 if (player_can_view (looker, enemy))
1902 return 1; 1901 return 1;
1903 1902
… …
1914 && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS))) 1913 && (!QUERY_FLAG (looker, FLAG_SEE_IN_DARK) || !is_true_undead (looker) || !QUERY_FLAG (looker, FLAG_XRAYS)))
1915 return 0; 1914 return 0;
1916 1915
1917 return 1; 1916 return 1;
1918} 1917}
1918

Diff Legend

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