| … | |
… | |
| 162 | * function if the object doesnt contain a material that can burn. |
162 | * function if the object doesnt contain a material that can burn. |
| 163 | * So forget lighting magical swords on fire with this!) -b.t. |
163 | * So forget lighting magical swords on fire with this!) -b.t. |
| 164 | */ |
164 | */ |
| 165 | if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE)) |
165 | if (type & (AT_FIRE | AT_ELECTRICITY) && op->other_arch && QUERY_FLAG (op, FLAG_IS_LIGHTABLE)) |
| 166 | { |
166 | { |
| 167 | const char *arch = op->other_arch->name; |
167 | const char *arch = op->other_arch->archname; |
| 168 | |
168 | |
| 169 | op = decrease_ob_nr (op, 1); |
169 | op = decrease_ob_nr (op, 1); |
| 170 | |
170 | |
| 171 | if (op) |
171 | if (op) |
| 172 | fix_stopped_item (op, m, originator); |
172 | fix_stopped_item (op, m, originator); |
| … | |
… | |
| 283 | return 0; |
283 | return 0; |
| 284 | } |
284 | } |
| 285 | |
285 | |
| 286 | if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) |
286 | if (QUERY_FLAG (op, FLAG_REMOVED) || op->env != NULL) |
| 287 | { |
287 | { |
| 288 | LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->name, &op->name); |
288 | LOG (llevError, "BUG: hit_map(): hitter (arch %s, name %s) not on a map\n", &op->arch->archname, &op->name); |
| 289 | return 0; |
289 | return 0; |
| 290 | } |
290 | } |
| 291 | |
291 | |
| 292 | if (!op->map) |
292 | if (!op->map) |
| 293 | { |
293 | { |
| … | |
… | |
| 697 | return 0; |
697 | return 0; |
| 698 | } |
698 | } |
| 699 | if (QUERY_FLAG (*target, FLAG_REMOVED) |
699 | if (QUERY_FLAG (*target, FLAG_REMOVED) |
| 700 | || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) |
700 | || QUERY_FLAG (*hitter, FLAG_REMOVED) || (*hitter)->map == NULL || !on_same_map ((*hitter), (*target))) |
| 701 | { |
701 | { |
| 702 | LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->name, &(*hitter)->name); |
702 | LOG (llevError, "BUG: hitter (arch %s, name %s) with no relation to " "target\n", &(*hitter)->arch->archname, &(*hitter)->name); |
| 703 | return 1; |
703 | return 1; |
| 704 | } |
704 | } |
| 705 | *simple_attack = 0; |
705 | *simple_attack = 0; |
| 706 | return 0; |
706 | return 0; |
| 707 | } |
707 | } |
| … | |
… | |
| 1081 | return dam; |
1081 | return dam; |
| 1082 | |
1082 | |
| 1083 | if (hitter->slaying) |
1083 | if (hitter->slaying) |
| 1084 | { |
1084 | { |
| 1085 | if ((op->race && strstr (hitter->slaying, op->race)) |
1085 | if ((op->race && strstr (hitter->slaying, op->race)) |
| 1086 | || (op->arch && op->arch->name && strstr (op->arch->name, hitter->slaying))) |
1086 | || (op->arch && op->arch->archname && strstr (op->arch->archname, hitter->slaying))) |
| 1087 | { |
1087 | { |
| 1088 | doesnt_slay = 0; |
1088 | doesnt_slay = 0; |
| 1089 | dam *= 3; |
1089 | dam *= 3; |
| 1090 | } |
1090 | } |
| 1091 | } |
1091 | } |
| … | |
… | |
| 2199 | return; |
2199 | return; |
| 2200 | |
2200 | |
| 2201 | def_lev = op->level; |
2201 | def_lev = op->level; |
| 2202 | if (def_lev < 1) |
2202 | if (def_lev < 1) |
| 2203 | { |
2203 | { |
| 2204 | LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->name, &op->name); |
2204 | LOG (llevError, "BUG: arch %s, name %s with level < 1\n", &op->arch->archname, &op->name); |
| 2205 | def_lev = 1; |
2205 | def_lev = 1; |
| 2206 | } |
2206 | } |
| 2207 | |
2207 | |
| 2208 | atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; |
2208 | atk_lev = (hitter->chosen_skill ? hitter->chosen_skill->level : hitter->level) / 2; |
| 2209 | /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", |
2209 | /* LOG(llevDebug,"Deathstrike - attack level %d, defender level %d\n", |
