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

Comparing deliantra/server/server/attack.C (file contents):
Revision 1.80 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.81 by root, Tue Apr 22 02:46:18 2008 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 (©) 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 * Deliantra 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
198 { 198 {
199 if (op->decrease (rndm (0, op->nrof - 1))) 199 if (op->decrease (rndm (0, op->nrof - 1)))
200 fix_stopped_item (op, m, originator); 200 fix_stopped_item (op, m, originator);
201 } 201 }
202 else 202 else
203 {
204 if (op->env)
205 {
206 object *tmp = op->in_player ();
207
208 if (tmp)
209 esrv_del_item (tmp->contr, op->count);
210 }
211
212 op->destroy (); 203 op->destroy ();
213 }
214 204
215 if (type & (AT_FIRE | AT_ELECTRICITY)) 205 if (type & (AT_FIRE | AT_ELECTRICITY))
216 if (env) 206 if (env)
217 { 207 {
218 op = get_archetype ("burnout"); 208 op = get_archetype ("burnout");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines