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.83 by root, Wed Apr 30 06:40:28 2008 UTC vs.
Revision 1.84 by root, Sun May 4 18:24:11 2008 UTC

166 const char *arch = op->other_arch->archname; 166 const char *arch = op->other_arch->archname;
167 167
168 if (op->decrease ()) 168 if (op->decrease ())
169 fix_stopped_item (op, m, originator); 169 fix_stopped_item (op, m, originator);
170 170
171 if ((op = get_archetype (arch))) 171 if ((op = archetype::get (arch)))
172 { 172 {
173 if (env) 173 if (env)
174 { 174 {
175 op->x = env->x, op->y = env->y; //???? wtf 175 op->x = env->x, op->y = env->y; //???? wtf
176 env->insert (op); 176 env->insert (op);
201 op->destroy (); 201 op->destroy ();
202 202
203 if (type & (AT_FIRE | AT_ELECTRICITY)) 203 if (type & (AT_FIRE | AT_ELECTRICITY))
204 if (env) 204 if (env)
205 { 205 {
206 op = get_archetype ("burnout"); 206 op = archetype::get (shstr_burnout);
207 op->x = env->x, op->y = env->y; 207 op->x = env->x, op->y = env->y;
208 insert_ob_in_ob (op, env); 208 env->insert (op);
209 } 209 }
210 else 210 else
211 replace_insert_ob_in_map ("burnout", originator); 211 replace_insert_ob_in_map (shstr_burnout, originator);
212 212
213 return; 213 return;
214 } 214 }
215 215
216 /* The value of 50 is arbitrary. */ 216 /* The value of 50 is arbitrary. */
217 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2)) 217 if (type & AT_COLD && (op->resist[ATNR_COLD] < 50) && !QUERY_FLAG (op, FLAG_NO_PICK) && (RANDOM () & 2))
218 { 218 {
219 object *tmp; 219 object *tmp;
220 archetype *at = archetype::find ("icecube"); 220 archetype *at = archetype::find (shstr_icecube);
221 221
222 if (at == NULL) 222 if (at == NULL)
223 return; 223 return;
224 224
225 op = stop_item (op); 225 op = stop_item (op);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines