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.14 by root, Mon Oct 12 14:00:59 2009 UTC vs.
Revision 1.19 by root, Tue Jan 3 11:25:37 2012 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2005,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2005 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
49 object *nabove; 49 object *nabove;
50 50
51 while (above) 51 while (above)
52 { 52 {
53 nabove = above->above; 53 nabove = above->above;
54 if (above->type == PLAYER && !(above->move_type & MOVE_FLYING) && above->stats.hp >= 0 && !QUERY_FLAG (above, FLAG_WIZ)) 54 if (above->type == PLAYER && !(above->move_type & MOVE_FLYING) && above->stats.hp >= 0 && !above->flag [FLAG_WIZ])
55 { 55 {
56 if (op->stats.food < 1) 56 if (op->stats.food < 1)
57 { 57 {
58 LOG (llevDebug, "move_deep_swamp(): player is here, but state is " "%d\n", op->stats.food); 58 LOG (llevDebug, "move_deep_swamp(): player is here, but state is " "%d\n", op->stats.food);
59 op->stats.food = 1; 59 op->stats.food = 1;
104 } 104 }
105 } 105 }
106 break; 106 break;
107 } 107 }
108 } 108 }
109 else if (!QUERY_FLAG (above, FLAG_ALIVE) && !(above->move_type & MOVE_FLYING) && 109 else if (!above->flag [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 !(above->flag [FLAG_IS_FLOOR]) && !(above->flag [FLAG_OVERLAY_FLOOR]) && !(above->flag [FLAG_NO_PICK]))
111 { 111 {
112 if (rndm (0, 2) == 0) 112 if (rndm (0, 2) == 0)
113 above->decrease (); 113 above->decrease ();
114 } 114 }
115 115

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines