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

Comparing deliantra/server/server/swamp.C (file contents):
Revision 1.6 by pippijn, Sat Jan 6 14:42:31 2007 UTC vs.
Revision 1.14 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2005 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2005,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 the Free Software Foundation; either version 2 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 (at your option) any later version. 11 * 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
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 Affero GNU General Public License
19 along with this program; if not, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 21 *
22 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23*/ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#ifndef __CEXTRACT__ 26#ifndef __CEXTRACT__
27# include <sproto.h> 27# include <sproto.h>
28#endif 28#endif
73 case 2: 73 case 2:
74 if (rndm (0, 2) == 0) 74 if (rndm (0, 2) == 0)
75 { 75 {
76 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, above, "You are down to your NECK in the dangerous %s.", &op->name); 76 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, above, "You are down to your NECK in the dangerous %s.", &op->name);
77 op->stats.food = 3; 77 op->stats.food = 3;
78 sprintf (above->contr->killer, "drowning in a %s", &op->name); 78 above->contr->killer = op;
79 above->stats.hp--; 79 above->stats.hp--;
80 above->speed_left -= op->move_slow_penalty; 80 above->speed_left -= op->move_slow_penalty;
81 } 81 }
82 break; 82 break;
83 83
89 /* player is ready to drown - only woodsman skill can save him */ 89 /* player is ready to drown - only woodsman skill can save him */
90 if (!woodsman) 90 if (!woodsman)
91 { 91 {
92 op->stats.food = 0; 92 op->stats.food = 0;
93 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 1, NULL, "%s disappeared into a %s.", &above->name, &op->name); 93 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 1, NULL, "%s disappeared into a %s.", &above->name, &op->name);
94 sprintf (above->contr->killer, "drowning in a %s", &op->name); 94 above->contr->killer = op;
95 95
96 above->stats.hp = -1; 96 above->stats.hp = -1;
97 kill_player (above); /* player dies in the swamp */ 97 kill_player (above); /* player dies in the swamp */
98 } 98 }
99 else 99 else
108 } 108 }
109 else if (!QUERY_FLAG (above, FLAG_ALIVE) && !(above->move_type & MOVE_FLYING) && 109 else if (!QUERY_FLAG (above, FLAG_ALIVE) && !(above->move_type & MOVE_FLYING) &&
110 !(QUERY_FLAG (above, FLAG_IS_FLOOR)) && !(QUERY_FLAG (above, FLAG_OVERLAY_FLOOR)) && !(QUERY_FLAG (above, FLAG_NO_PICK))) 110 !(QUERY_FLAG (above, FLAG_IS_FLOOR)) && !(QUERY_FLAG (above, FLAG_OVERLAY_FLOOR)) && !(QUERY_FLAG (above, FLAG_NO_PICK)))
111 { 111 {
112 if (rndm (0, 2) == 0) 112 if (rndm (0, 2) == 0)
113 decrease_ob (above); 113 above->decrease ();
114 } 114 }
115
115 above = nabove; 116 above = nabove;
116 } 117 }
117} 118}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines