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.10 by root, Thu Nov 8 19:43:29 2007 UTC vs.
Revision 1.14 by root, Mon Oct 12 14:00:59 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2005,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
72 case 2: 73 case 2:
73 if (rndm (0, 2) == 0) 74 if (rndm (0, 2) == 0)
74 { 75 {
75 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);
76 op->stats.food = 3; 77 op->stats.food = 3;
77 sprintf (above->contr->killer, "drowning in a %s", &op->name); 78 above->contr->killer = op;
78 above->stats.hp--; 79 above->stats.hp--;
79 above->speed_left -= op->move_slow_penalty; 80 above->speed_left -= op->move_slow_penalty;
80 } 81 }
81 break; 82 break;
82 83
88 /* player is ready to drown - only woodsman skill can save him */ 89 /* player is ready to drown - only woodsman skill can save him */
89 if (!woodsman) 90 if (!woodsman)
90 { 91 {
91 op->stats.food = 0; 92 op->stats.food = 0;
92 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);
93 sprintf (above->contr->killer, "drowning in a %s", &op->name); 94 above->contr->killer = op;
94 95
95 above->stats.hp = -1; 96 above->stats.hp = -1;
96 kill_player (above); /* player dies in the swamp */ 97 kill_player (above); /* player dies in the swamp */
97 } 98 }
98 else 99 else
107 } 108 }
108 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) &&
109 !(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)))
110 { 111 {
111 if (rndm (0, 2) == 0) 112 if (rndm (0, 2) == 0)
112 decrease_ob (above); 113 above->decrease ();
113 } 114 }
115
114 above = nabove; 116 above = nabove;
115 } 117 }
116} 118}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines