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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.168 by root, Wed Aug 27 03:41:24 2008 UTC vs.
Revision 1.187 by elmex, Tue Jan 13 13:29:57 2009 UTC

… …
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 GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 22 */
23 23
24#include <cmath> 24#include <cmath>
25 25
… …
113 { 113 {
114 if (operate_altar (altar, &money)) 114 if (operate_altar (altar, &money))
115 { 115 {
116 identify (marked); 116 identify (marked);
117 117
118 buf.printf ("You have %s.\n\n", long_desc (marked, pl)); 118 buf.printf ("You have %s.\r", long_desc (marked, pl));
119 if (marked->msg) 119 if (marked->msg)
120 buf << "The item has a story:\n\n" << marked->msg << "\n\n"; 120 buf << "The item has a story:\r" << marked->msg << "\n\n";
121 121
122 return !money; 122 return !money;
123 } 123 }
124 } 124 }
125 125
… …
129 { 129 {
130 if (operate_altar (altar, &money)) 130 if (operate_altar (altar, &money))
131 { 131 {
132 identify (id); 132 identify (id);
133 133
134 buf.printf ("You have %s.\n\n", long_desc (id, pl)); 134 buf.printf ("You have %s.\r", long_desc (id, pl));
135 if (id->msg) 135 if (id->msg)
136 buf << "The item has a story:\n\n" << id->msg << "\n\n"; 136 buf << "The item has a story:\r" << id->msg << "\n\n";
137 137
138 /* If no more money, might as well quit now */ 138 /* If no more money, might as well quit now */
139 if (!money || !check_altar_sacrifice (altar, money)) 139 if (!money || !check_altar_sacrifice (altar, money))
140 break; 140 break;
141 } 141 }
… …
160 * matching item. 160 * matching item.
161 **/ 161 **/
162void 162void
163handle_apply_yield (object *tmp) 163handle_apply_yield (object *tmp)
164{ 164{
165 if (shstr yield = tmp->kv (shstr_on_use_yield)) 165 if (shstr_tmp yield = tmp->kv (shstr_on_use_yield))
166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR); 166 archetype::get (yield)->insert_at (tmp, tmp, INS_BELOW_ORIGINATOR);
167} 167}
168 168
169/** 169/**
170 * Handles applying a potion. 170 * Handles applying a potion.
… …
315 */ 315 */
316 if (tmp->inv) 316 if (tmp->inv)
317 { 317 {
318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) 318 if (QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED))
319 { 319 {
320 object *fball;
321
322 op->failmsg ("Yech! Your lungs are on fire!"); 320 op->failmsg ("Yech! Your lungs are on fire!");
323 321 create_exploding_ball_at (op, op->level);
324 /* Explodes a fireball centered at player */
325 fball = get_archetype (EXPLODING_FIREBALL);
326 fball->dam_modifier = random_roll (1, op->level, op, PREFER_LOW) / 5 + 1;
327 fball->stats.maxhp = random_roll (1, op->level, op, PREFER_LOW) / 10 + 2;
328 fball->x = op->x;
329 fball->y = op->y;
330 insert_ob_in_map (fball, op->map, NULL, 0);
331 } 322 }
332 else 323 else
333 cast_spell (op, tmp, op->facing, tmp->inv, NULL); 324 cast_spell (op, tmp, op->facing, tmp->inv, NULL);
334 325
335 tmp->decrease (); 326 tmp->decrease ();
… …
378 } 369 }
379 370
380 /* Only thing left are the stat potions */ 371 /* Only thing left are the stat potions */
381 if (op->type == PLAYER) 372 if (op->type == PLAYER)
382 { /* only for players */ 373 { /* only for players */
383 if ((QUERY_FLAG (tmp, FLAG_CURSED) || QUERY_FLAG (tmp, FLAG_DAMNED)) && tmp->value != 0) 374 if ((QUERY_FLAG (tmp, FLAG_CURSED)
375 || QUERY_FLAG (tmp, FLAG_DAMNED))
376 && tmp->value != 0)
384 CLEAR_FLAG (tmp, FLAG_APPLIED); 377 CLEAR_FLAG (tmp, FLAG_APPLIED);
385 else 378 else
386 SET_FLAG (tmp, FLAG_APPLIED); 379 SET_FLAG (tmp, FLAG_APPLIED);
387 380
388 if (!change_abil (op, tmp)) 381 if (!change_abil (op, tmp))
… …
406 399
407/** 400/**
408 * This returns the sum of nrof of item (arch name). 401 * This returns the sum of nrof of item (arch name).
409 */ 402 */
410static int 403static int
411check_item (object *op, const char *item) 404check_item (object *op, shstr_cmp item)
412{ 405{
413 int count = 0; 406 int count = 0;
414 407
415 if (!item) 408 if (!item)
416 return 0; 409 return 0;
417 410
418 for (op = op->below; op; op = op->below) 411 for (op = op->below; op; op = op->below)
419 {
420 if (strcmp (op->arch->archname, item) == 0) 412 if (op->arch->archname == item)
421 {
422 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED) 413 if (!QUERY_FLAG (op, FLAG_CURSED) && !QUERY_FLAG (op, FLAG_DAMNED)
423 /* Loophole bug? -FD- */ && !QUERY_FLAG (op, FLAG_UNPAID)) 414 && /* Loophole bug? -FD- */ !QUERY_FLAG (op, FLAG_UNPAID))
424 {
425 if (op->nrof == 0) /* this is necessary for artifact sacrifices --FD-- */
426 count++;
427 else
428 count += op->nrof; 415 count += op->number_of ();
429 }
430 }
431 }
432 416
433 return count; 417 return count;
434} 418}
435 419
436/** 420/**
… …
438 * op is typically the player, which is only 422 * op is typically the player, which is only
439 * really used to determine what space to look at. 423 * really used to determine what space to look at.
440 * Modified to only eat 'nrof' of objects. 424 * Modified to only eat 'nrof' of objects.
441 */ 425 */
442static void 426static void
443eat_item (object *op, const char *item, uint32 nrof) 427eat_item (object *op, shstr_cmp item, uint32 nrof)
444{ 428{
445 object *prev; 429 object *prev;
446 430
447 prev = op; 431 prev = op;
448 op = op->below; 432 op = op->below;
449 433
450 while (op) 434 while (op)
451 { 435 {
452 if (strcmp (op->arch->archname, item) == 0) 436 if (op->arch->archname == item)
453 { 437 {
454 if (op->nrof >= nrof) 438 if (op->nrof >= nrof)
455 { 439 {
456 op->decrease (nrof); 440 op->decrease (nrof);
457 return; 441 return;
… …
995 item->nrof = give; 979 item->nrof = give;
996 980
997 if (nr) 981 if (nr)
998 item->nrof *= nr; 982 item->nrof *= nr;
999 983
1000 if (is_in_shop (converter)) 984 if (converter->flag [FLAG_PRECIOUS])
1001 SET_FLAG (item, FLAG_UNPAID); 985 SET_FLAG (item, FLAG_UNPAID);
986
987 if (is_in_shop (converter))
988 {
989 // converters on shop floors don't work anymore, bug lets check for it
990 // and report in case someone still does it.
991 LOG (llevDebug, "ITEMBUG: broken converter, converters on shop floor don't work: %s\n",
992 converter->debug_desc ());
993 SET_FLAG (item, FLAG_UNPAID);
994 }
1002 else if (price_in < sint64 (item->nrof) * item->value) 995 else if (price_in < sint64 (item->nrof) * item->value)
1003 { 996 {
1004 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n", 997 LOG (llevDebug, "converter output price higher than input: %s at %s (%d, %d) in value %d, out value %d for %s\n",
1005 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name); 998 &converter->name, &converter->map->path, converter->x, converter->y, price_in, item->nrof * item->value, &item->name);
1006 /** 999 /**
… …
1117/* push_button (altar);*/ 1110/* push_button (altar);*/
1118 } 1111 }
1119 else 1112 else
1120 { 1113 {
1121 altar->value = 1; /* works only once */ 1114 altar->value = 1; /* works only once */
1122 push_button (altar); 1115 push_button (altar, originator);
1123 } 1116 }
1124 1117
1125 return !sacrifice; 1118 return !sacrifice;
1126 } 1119 }
1127 else 1120 else
… …
1153 { 1146 {
1154 has_unpaid = true; 1147 has_unpaid = true;
1155 break; 1148 break;
1156 } 1149 }
1157 1150
1158 if (op->type != PLAYER) 1151 if (!op->is_player ())
1159 { 1152 {
1160 /* Remove all the unpaid objects that may be carried here. 1153 /* Remove all the unpaid objects that may be carried here.
1161 * This could be pets or monsters that are somehow in 1154 * This could be pets or monsters that are somehow in
1162 * the shop. 1155 * the shop.
1163 */ 1156 */
… …
1167 1160
1168 if (QUERY_FLAG (tmp, FLAG_UNPAID)) 1161 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1169 { 1162 {
1170 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9); 1163 int i = find_free_spot (tmp, op->map, op->x, op->y, 1, 9);
1171 1164
1165 if (i >= 0)
1172 tmp->remove (); 1166 tmp->move (i);
1173
1174 if (i == -1)
1175 i = 0;
1176
1177 tmp->map = op->map;
1178 tmp->x = op->x + freearr_x[i];
1179 tmp->y = op->y + freearr_y[i];
1180 insert_ob_in_map (tmp, op->map, op, 0);
1181 } 1167 }
1182 } 1168 }
1183 1169
1184 /* Don't teleport things like spell effects */ 1170 /* Don't teleport things like spell effects */
1185 if (QUERY_FLAG (op, FLAG_NO_PICK)) 1171 if (QUERY_FLAG (op, FLAG_NO_PICK))
… …
1196 if (i != -1) 1182 if (i != -1)
1197 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat); 1183 rv = transfer_ob (op, op->x + freearr_x[i], op->y + freearr_y[i], 0, shop_mat);
1198 1184
1199 return 0; 1185 return 0;
1200 } 1186 }
1187
1201 /* Removed code that checked for multipart objects - it appears that 1188 /* Removed code that checked for multipart objects - it appears that
1202 * the teleport function should be able to handle this just fine. 1189 * the teleport function should be able to handle this just fine.
1203 */ 1190 */
1204 rv = teleport (shop_mat, SHOP_MAT, op); 1191 rv = teleport (shop_mat, SHOP_MAT, op);
1205 } 1192 }
… …
1260 * Handles applying a sign. 1247 * Handles applying a sign.
1261 */ 1248 */
1262static void 1249static void
1263apply_sign (object *op, object *sign, int autoapply) 1250apply_sign (object *op, object *sign, int autoapply)
1264{ 1251{
1252 if (!op->is_player())
1253 return;
1254
1265 if (sign->has_dialogue ()) 1255 if (sign->has_dialogue ())
1266 { 1256 {
1267 op->statusmsg (form ("Maybe you should I<talk> to the %s instead?", &sign->name)); 1257 op->statusmsg (format ("Maybe you should I<talk> to the %s instead?", &sign->name));
1268 return; 1258 return;
1269 } 1259 }
1270 1260
1271 if (!sign->msg) 1261 if (!sign->msg)
1272 { 1262 {
1273 op->statusmsg ("Nothing is written on it."); 1263 op->contr->infobox (MSG_CHANNEL ("examine"),
1264 format ("T<%s>\n\n Nothing %sis written on it.",
1265 &sign->name,
1266 sign->name == sign->arch->name ? "" : "else "));
1274 return; 1267 return;
1275 } 1268 }
1276 1269
1277 if (sign->stats.food) 1270 if (sign->stats.food)
1278 { 1271 {
1279 if (sign->last_eat >= sign->stats.food) 1272 if (sign->last_eat >= sign->stats.food)
1280 { 1273 {
1281 if (!sign->move_on) 1274 if (!sign->move_on)
1282 op->statusmsg ("You cannot read it anymore."); 1275 op->failmsg ("You cannot read it anymore.");
1283 1276
1284 return; 1277 return;
1285 } 1278 }
1286 1279
1287 if (!QUERY_FLAG (op, FLAG_WIZPASS)) 1280 if (!QUERY_FLAG (op, FLAG_WIZPASS))
… …
1305 if (sign->sound) 1298 if (sign->sound)
1306 ns->play_sound (sign->sound); 1299 ns->play_sound (sign->sound);
1307 else if (autoapply) 1300 else if (autoapply)
1308 ns->play_sound (sound_find ("msg_voice")); 1301 ns->play_sound (sound_find ("msg_voice"));
1309 1302
1310 if (ns->can_msg)
1311 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n\n\n%s", &sign->name, &sign->msg)); 1303 op->contr->infobox (MSG_CHANNEL ("examine"), format ("T<%s>\n\n%s", &sign->name, &sign->msg));
1312 else
1313 {
1314 readable_message_type *msgType = get_readable_message_type (sign);
1315 const char *somemsg = format ("%u %s", autoapply ? 1 : 0, &sign->msg);
1316 draw_ext_info (NDI_UNIQUE | NDI_NAVY, 0, op, msgType->message_type, msgType->message_subtype, somemsg, &sign->msg);
1317 }
1318 } 1304 }
1319} 1305}
1320 1306
1321static void 1307static void
1322move_apply_hole (object *trap, object *victim) 1308move_apply_hole (object *trap, object *victim)
… …
1430 } 1416 }
1431 goto leave; 1417 goto leave;
1432 1418
1433 case BUTTON: 1419 case BUTTON:
1434 case PEDESTAL: 1420 case PEDESTAL:
1435 update_button (trap); 1421 update_button (trap, originator);
1436 goto leave; 1422 goto leave;
1437 1423
1438 case ALTAR: 1424 case ALTAR:
1439 /* sacrifice victim on trap */ 1425 /* sacrifice victim on trap */
1440 apply_altar (trap, victim, originator); 1426 apply_altar (trap, victim, originator);
… …
1533 if (victim->type == PLAYER && EXIT_PATH (trap)) 1519 if (victim->type == PLAYER && EXIT_PATH (trap))
1534 { 1520 {
1535 /* Basically, don't show exits leading to random maps the 1521 /* Basically, don't show exits leading to random maps the
1536 * players output. 1522 * players output.
1537 */ 1523 */
1538 if (trap->msg && strncmp (EXIT_PATH (trap), "/!", 2)) 1524 if (trap->msg && !EXIT_PATH (trap).starts_with ("/!"))
1539 victim->statusmsg (trap->msg, NDI_NAVY); 1525 victim->statusmsg (trap->msg, NDI_NAVY);
1540 1526
1541 trap->play_sound (trap->sound); 1527 trap->play_sound (trap->sound);
1542 victim->enter_exit (trap); 1528 victim->enter_exit (trap);
1543 } 1529 }
… …
1626 1612
1627 readable_message_type *msgType = get_readable_message_type (tmp); 1613 readable_message_type *msgType = get_readable_message_type (tmp);
1628 1614
1629 if (player *pl = op->contr) 1615 if (player *pl = op->contr)
1630 if (client *ns = pl->ns) 1616 if (client *ns = pl->ns)
1631 if (ns->can_msg)
1632 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n\n\n%s", (char *)long_desc (tmp, op), &tmp->msg)); 1617 pl->infobox (MSG_CHANNEL ("book"), format ("T<%s>\n\n%s", (char *)long_desc (tmp, op), &tmp->msg));
1633 else
1634 draw_ext_info_format (NDI_UNIQUE | NDI_NAVY, 0, op,
1635 msgType->message_type, msgType->message_subtype,
1636 "You open the %s and start reading.\n%s", (char *)"%s\n%s",
1637 long_desc (tmp, op), &tmp->msg);
1638 1618
1639 /* gain xp from reading */ 1619 /* gain xp from reading */
1640 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT)) 1620 if (!QUERY_FLAG (tmp, FLAG_NO_SKILL_IDENT))
1641 { /* only if not read before */ 1621 { /* only if not read before */
1642 int exp_gain = calc_skill_exp (op, tmp, skill_ob); 1622 int exp_gain = calc_skill_exp (op, tmp, skill_ob);
… …
1965 if (op->destroyed () || tmp->destroyed ()) 1945 if (op->destroyed () || tmp->destroyed ())
1966 break; 1946 break;
1967 } 1947 }
1968 1948
1969 if (!tmp->destroyed () && !tmp->inv) 1949 if (!tmp->destroyed () && !tmp->inv)
1970 tmp->decrease (); 1950 tmp->decrease (true);
1971} 1951}
1972 1952
1973/** 1953/**
1974 * op eats food. 1954 * op eats food.
1975 * If player, takes care of messages and dragon special food. 1955 * If player, takes care of messages and dragon special food.
… …
2170 op->statusmsg (buf); 2150 op->statusmsg (buf);
2171 2151
2172 /* now choose a winner if we have any */ 2152 /* now choose a winner if we have any */
2173 i = -1; 2153 i = -1;
2174 if (winners > 0) 2154 if (winners > 0)
2175 i = atnr_winner[RANDOM () % winners]; 2155 i = atnr_winner [rndm (winners)];
2176 2156
2177 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95) 2157 if (i >= 0 && i < NROFATTACKS && skin->resist[i] < 95)
2178 { 2158 {
2179 /* resistance increased! */ 2159 /* resistance increased! */
2180 skin->resist[i]++; 2160 skin->resist[i]++;
… …
2355 2335
2356 return 0; 2336 return 0;
2357} 2337}
2358 2338
2359/** 2339/**
2340 * This function will try to apply a lighter and in case no lighter
2341 * is specified it will try to find a lighter in the players inventory,
2342 * and inform him about this requirement.
2343 *
2344 * who - the player
2345 * op - the item we want to light
2346 * ligher - the lighter or 0 if a lighter has yet to be found
2347 */
2348object *auto_apply_lighter (object *who, object *op, object *lighter)
2349{
2350 if (lighter == 0)
2351 {
2352 for (object *tmp = who->inv; tmp; tmp = tmp->below)
2353 {
2354 if (tmp->type == LIGHTER)
2355 {
2356 lighter = tmp;
2357 break;
2358 }
2359 }
2360
2361 if (!lighter)
2362 {
2363 who->failmsg (format (
2364 "You can't light up the %s with your bare hands! "
2365 "H<You need a lighter in your inventory, for example a flint and steel.>",
2366 &op->name));
2367 return 0;
2368 }
2369 }
2370
2371 // last_eat == 0 means the lighter is not being used up!
2372 if (lighter->last_eat && lighter->stats.food)
2373 {
2374 /* lighter gets used up */
2375 lighter = lighter->split ();
2376 lighter->stats.food--;
2377 who->insert (lighter);
2378 }
2379 else if (lighter->last_eat)
2380 {
2381 /* no charges left in lighter */
2382 who->failmsg (format (
2383 "You attempt to light the %s with a used up %s.",
2384 &op->name, &lighter->name));
2385 return 0;
2386 }
2387
2388 return lighter;
2389}
2390
2391/**
2392 * Designed primarily to light torches/lanterns/etc.
2393 * Also burns up burnable material too. First object in the inventory is
2394 * the selected object to "burn". -b.t.
2395 */
2396void
2397apply_lighter (object *who, object *lighter)
2398{
2399 object *item;
2400 int is_player_env = 0;
2401
2402 item = find_marked_object (who);
2403 if (item)
2404 {
2405 if (!auto_apply_lighter (who, 0, lighter))
2406 return;
2407
2408 /* Perhaps we should split what we are trying to light on fire?
2409 * I can't see many times when you would want to light multiple
2410 * objects at once.
2411 */
2412
2413 save_throw_object (item, AT_FIRE, who);
2414
2415 if (item->destroyed ()
2416 || ((item->type == LAMP || item->type == TORCH)
2417 && item->glow_radius > 0))
2418 who->statusmsg (format (
2419 "You light the %s with the %s.",
2420 &item->name, &lighter->name));
2421 else
2422 who->failmsg (format (
2423 "You attempt to light the %s with the %s and fail.",
2424 &item->name, &lighter->name));
2425 }
2426 else
2427 who->failmsg ("You need to mark a lightable object.");
2428}
2429
2430/**
2431 * This function generates a cursed effect for cursed lamps and torches.
2432 */
2433void player_apply_lamp_cursed_effect (object *who, object *op)
2434{
2435 if (op->level)
2436 {
2437 who->failmsg (format (
2438 "The %s was cursed, it explodes in a big fireball!",
2439 &op->name));
2440 create_exploding_ball_at (who, op->level);
2441 }
2442 else
2443 {
2444 who->failmsg (format (
2445 "The %s was cursed, it crumbles to dust, at least it didn't explode.!",
2446 &op->name));
2447 }
2448
2449 op->destroy ();
2450}
2451
2452/**
2453 * Apply for players and lamps
2454 *
2455 * who - the player
2456 * op - the lamp
2457 */
2458void player_apply_lamp (object *who, object *op)
2459{
2460 bool switch_on = op->glow_radius ? false : true;
2461
2462 if (switch_on)
2463 {
2464 object *lighter = 0;
2465
2466 if (op->flag [FLAG_IS_LIGHTABLE]
2467 && !(lighter = auto_apply_lighter (who, op, 0)))
2468 return;
2469
2470 if (op->stats.food < 1)
2471 {
2472 if (op->type == LAMP)
2473 who->failmsg (format (
2474 "The %s is out of fuel! "
2475 "H<Lamps and similar items need fuel. They cannot be refilled.>",
2476 &op->name));
2477 else
2478 who->failmsg (format (
2479 "The %s is burnt out! "
2480 "H<Torches and similar items burn out and become worthless.>",
2481 &op->name));
2482 return;
2483 }
2484
2485 if (op->flag [FLAG_CURSED])
2486 {
2487 player_apply_lamp_cursed_effect (who, op);
2488 return;
2489 }
2490
2491 if (lighter)
2492 who->statusmsg (format (
2493 "You light up the %s with the %s.", &op->name, &lighter->name));
2494 else
2495 who->statusmsg (format ("You light up the %s.", &op->name));
2496 }
2497 else
2498 {
2499 if (op->flag [FLAG_CURSED])
2500 {
2501 player_apply_lamp_cursed_effect (who, op);
2502 return;
2503 }
2504
2505 if (op->type == TORCH)
2506 {
2507 if (!op->flag [FLAG_IS_LIGHTABLE])
2508 {
2509 who->statusmsg (format (
2510 "You put out the %s. "
2511 "H<The %s can't be used anymore, as it can't be lighted up again.>",
2512 &op->name, &op->name));
2513 }
2514 else
2515 who->statusmsg (format (
2516 "You put out the %s."
2517 "H<Torches wear out if you put them out.>",
2518 &op->name));
2519 }
2520 else
2521 who->statusmsg (format ("You turn off the %s.", &op->name));
2522 }
2523
2524 apply_lamp (op, switch_on);
2525}
2526
2527void get_animation_from_arch (object *op, arch_ptr a)
2528{
2529 op->animation_id = a->animation_id;
2530 op->flag [FLAG_IS_TURNABLE] = a->flag [FLAG_IS_TURNABLE];
2531 op->flag [FLAG_ANIMATE] = a->flag [FLAG_ANIMATE];
2532 op->anim_speed = a->anim_speed;
2533 op->last_anim = 0;
2534 op->state = 0;
2535 op->face = a->face;
2536
2537 if (NUM_ANIMATIONS(op) > 1)
2538 {
2539 SET_ANIMATION(op, 0);
2540 animate_object (op, op->direction);
2541 }
2542 else
2543 update_object (op, UP_OBJ_FACE);
2544}
2545
2546/**
2547 * Apply for LAMPs and TORCHes.
2548 *
2549 * op - the lamp
2550 * switch_on - a flag which says whether the lamp should be switched on or off
2551 */
2552void apply_lamp (object *op, bool switch_on)
2553{
2554 op->set_glow_radius (switch_on ? op->range : 0);
2555 op->set_speed (switch_on ? op->arch->speed : 0);
2556
2557 // torches wear out if you put them out
2558 if (op->type == TORCH && !switch_on)
2559 {
2560 if (op->flag [FLAG_IS_LIGHTABLE])
2561 {
2562 op->stats.food -= (double) op->arch->stats.food / 15;
2563 if (op->stats.food < 0)
2564 op->stats.food = 0;
2565 }
2566 else
2567 op->stats.food = 0;
2568 }
2569
2570 // lamps and torched get worthless when used up
2571 if (op->stats.food <= 0)
2572 op->value = 0;
2573
2574 // FIXME: This is a hack to make the more sane torches and lamps
2575 // still animated ;-/
2576 if (op->other_arch)
2577 get_animation_from_arch (op, switch_on ? op->other_arch : op->arch);
2578
2579 if (object *pl = op->visible_to ())
2580 esrv_update_item (UPD_ANIM | UPD_FACE | UPD_NAME, pl, op);
2581}
2582
2583/**
2360 * Main apply handler. 2584 * Main apply handler.
2361 * 2585 *
2362 * Checks for unpaid items before applying. 2586 * Checks for unpaid items before applying.
2363 * 2587 *
2364 * Return value: 2588 * Return value:
2365 * 0: player or monster can't apply objects of that type 2589 * 0: player or monster can't apply objects of that type
2366 * 1: has been applied, or there was an error applying the object 2590 * 1: has been applied, or there was an error applying the object
2367 * 2: objects of that type can't be applied if not in inventory 2591 * 2: objects of that type can't be applied if not in inventory
2368 * 2592 *
2369 * op is the object that is causing object to be applied, tmp is the object 2593 * who is the object that is causing object to be applied, op is the object
2370 * being applied. 2594 * being applied.
2371 * 2595 *
2372 * aflag is special (always apply/unapply) flags. Nothing is done with 2596 * aflag is special (always apply/unapply) flags. Nothing is done with
2373 * them in this function - they are passed to apply_special 2597 * them in this function - they are passed to apply_special
2374 */ 2598 */
2375int 2599int
2376manual_apply (object *op, object *tmp, int aflag) 2600manual_apply (object *who, object *op, int aflag)
2377{ 2601{
2378 tmp = tmp->head_ (); 2602 op = op->head_ ();
2379 2603
2380 if (QUERY_FLAG (tmp, FLAG_UNPAID) && !QUERY_FLAG (tmp, FLAG_APPLIED)) 2604 if (QUERY_FLAG (op, FLAG_UNPAID) && !QUERY_FLAG (op, FLAG_APPLIED))
2381 { 2605 {
2382 if (op->type == PLAYER) 2606 if (who->type == PLAYER)
2383 { 2607 {
2608 examine (who, op);
2384 op->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>"); 2609 //who->failmsg ("You should pay for it first! H<You cannot use items marked as unpaid.>");//TODO remove
2385 return 1; 2610 return 1;
2386 } 2611 }
2387 else 2612 else
2388 return 0; /* monsters just skip unpaid items */ 2613 return 0; /* monsters just skip unpaid items */
2389 } 2614 }
2390 2615
2391 if (INVOKE_OBJECT (APPLY, tmp, ARG_OBJECT (op))) 2616 if (INVOKE_OBJECT (APPLY, op, ARG_OBJECT (who)))
2392 return RESULT_INT (0); 2617 return RESULT_INT (0);
2393 2618
2394 switch (tmp->type) 2619 switch (op->type)
2395 { 2620 {
2396 case CF_HANDLE: 2621 case CF_HANDLE:
2397 op->play_sound (sound_find ("turn_handle")); 2622 who->play_sound (sound_find ("turn_handle"));
2398 op->statusmsg ("You turn the handle."); 2623 who->statusmsg ("You turn the handle.");
2399 tmp->value = tmp->value ? 0 : 1; 2624 op->value = op->value ? 0 : 1;
2400 SET_ANIMATION (tmp, tmp->value); 2625 SET_ANIMATION (op, op->value);
2401 update_object (tmp, UP_OBJ_FACE); 2626 update_object (op, UP_OBJ_FACE);
2402 push_button (tmp); 2627 push_button (op, who);
2403 return 1; 2628 return 1;
2404 2629
2405 case TRIGGER: 2630 case TRIGGER:
2406 if (check_trigger (tmp, op)) 2631 if (check_trigger (op, who))
2407 { 2632 {
2408 op->statusmsg ("You turn the handle."); 2633 who->statusmsg ("You turn the handle.");
2409 op->play_sound (sound_find ("turn_handle")); 2634 who->play_sound (sound_find ("turn_handle"));
2410 } 2635 }
2411 else 2636 else
2412 op->failmsg ("The handle doesn't move."); 2637 who->failmsg ("The handle doesn't move.");
2413 2638
2414 return 1; 2639 return 1;
2415 2640
2416 case EXIT: 2641 case EXIT:
2417 if (op->type != PLAYER) 2642 if (who->type != PLAYER)
2418 return 0; 2643 return 0;
2419 2644
2420 if (!EXIT_PATH (tmp) || !is_legal_2ways_exit (op, tmp)) 2645 if (!EXIT_PATH (op) || !is_legal_2ways_exit (who, op))
2421 op->failmsg (format ("The %s is closed.", query_name (tmp))); 2646 who->failmsg (format ("The %s is closed.", query_name (op)));
2422 else 2647 else
2423 { 2648 {
2424 /* Don't display messages for random maps. */ 2649 /* Don't display messages for random maps. */
2425 if (tmp->msg && strncmp (EXIT_PATH (tmp), "/!", 2)) 2650 if (op->msg && !EXIT_PATH (op).starts_with ("/!"))
2426 op->statusmsg (tmp->msg, NDI_NAVY); 2651 who->statusmsg (op->msg, NDI_NAVY);
2427 2652
2428 op->enter_exit (tmp); 2653 who->enter_exit (op);
2429 } 2654 }
2430 2655
2431 return 1; 2656 return 1;
2432 2657
2433 case INSCRIBABLE: 2658 case INSCRIBABLE:
2434 op->statusmsg (tmp->msg); 2659 who->statusmsg (op->msg);
2435 // maybe show a spell menu to chose from or something like that 2660 // maybe show a spell menu to chose from or something like that
2436 return 1; 2661 return 1;
2437 2662
2438 case SIGN: 2663 case SIGN:
2439 apply_sign (op, tmp, 0); 2664 apply_sign (who, op, 0);
2440 return 1; 2665 return 1;
2441 2666
2442 case BOOK: 2667 case BOOK:
2443 if (op->type == PLAYER) 2668 if (who->type == PLAYER)
2444 { 2669 {
2445 apply_book (op, tmp); 2670 apply_book (who, op);
2446 return 1; 2671 return 1;
2447 } 2672 }
2448 else 2673 else
2449 return 0; 2674 return 0;
2450 2675
2451 case SKILLSCROLL: 2676 case SKILLSCROLL:
2452 if (op->type == PLAYER) 2677 if (who->type == PLAYER)
2453 { 2678 {
2454 apply_skillscroll (op, tmp); 2679 apply_skillscroll (who, op);
2455 return 1; 2680 return 1;
2456 } 2681 }
2457 else 2682 else
2458 return 0; 2683 return 0;
2459 2684
2460 case SPELLBOOK: 2685 case SPELLBOOK:
2461 if (op->type == PLAYER) 2686 if (who->type == PLAYER)
2462 { 2687 {
2463 apply_spellbook (op, tmp); 2688 apply_spellbook (who, op);
2464 return 1; 2689 return 1;
2465 } 2690 }
2466 else 2691 else
2467 return 0; 2692 return 0;
2468 2693
2469 case SCROLL: 2694 case SCROLL:
2470 apply_scroll (op, tmp, 0); 2695 apply_scroll (who, op, 0);
2471 return 1; 2696 return 1;
2472 2697
2473 case POTION: 2698 case POTION:
2474 apply_potion (op, tmp); 2699 apply_potion (who, op);
2475 return 1; 2700 return 1;
2476 2701
2477 /* Eneq(@csd.uu.se): Handle apply on containers. */ 2702 /* Eneq(@csd.uu.se): Handle apply on containers. */
2478 //TODO: remove, as it is unsed? 2703 //TODO: remove, as it is unsed?
2479 case CLOSE_CON: 2704 case CLOSE_CON:
2480 apply_container (op, tmp->env); 2705 apply_container (who, op->env);
2481 return 1; 2706 return 1;
2482 2707
2483 case CONTAINER: 2708 case CONTAINER:
2484 apply_container (op, tmp); 2709 apply_container (who, op);
2485 return 1; 2710 return 1;
2486 2711
2487 case TREASURE: 2712 case TREASURE:
2488 if (op->type == PLAYER) 2713 if (who->type == PLAYER)
2489 { 2714 {
2490 apply_treasure (op, tmp); 2715 apply_treasure (who, op);
2491 return 1; 2716 return 1;
2492 } 2717 }
2493 else 2718 else
2494 return 0; 2719 return 0;
2720
2721 case LAMP:
2722 case TORCH:
2723 player_apply_lamp (who, op);
2724 return 1;
2495 2725
2496 case WEAPON: 2726 case WEAPON:
2497 case ARMOUR: 2727 case ARMOUR:
2498 case BOOTS: 2728 case BOOTS:
2499 case GLOVES: 2729 case GLOVES:
… …
2507 case WAND: 2737 case WAND:
2508 case ROD: 2738 case ROD:
2509 case HORN: 2739 case HORN:
2510 case SKILL: 2740 case SKILL:
2511 case BOW: 2741 case BOW:
2512 case LAMP:
2513 case BUILDER: 2742 case BUILDER:
2514 case SKILL_TOOL: 2743 case SKILL_TOOL:
2515 if (tmp->env != op) 2744 if (op->env != who)
2516 return 2; /* not in inventory */ 2745 return 2; /* not in inventory */
2517 2746
2518 apply_special (op, tmp, aflag); 2747 apply_special (who, op, aflag);
2519 return 1; 2748 return 1;
2520 2749
2521 case DRINK: 2750 case DRINK:
2522 case FOOD: 2751 case FOOD:
2523 case FLESH: 2752 case FLESH:
2524 apply_food (op, tmp); 2753 apply_food (who, op);
2525 return 1; 2754 return 1;
2526 2755
2527 case POISON: 2756 case POISON:
2528 apply_poison (op, tmp); 2757 apply_poison (who, op);
2529 return 1; 2758 return 1;
2530 2759
2531 case SAVEBED: 2760 case SAVEBED:
2532 return 1; 2761 return 1;
2533 2762
2534 case ARMOUR_IMPROVER: 2763 case ARMOUR_IMPROVER:
2535 if (op->type == PLAYER) 2764 if (who->type == PLAYER)
2536 { 2765 {
2537 apply_armour_improver (op, tmp); 2766 apply_armour_improver (who, op);
2538 return 1; 2767 return 1;
2539 } 2768 }
2540 else 2769 else
2541 return 0; 2770 return 0;
2542 2771
2543 case WEAPON_IMPROVER: 2772 case WEAPON_IMPROVER:
2544 check_improve_weapon (op, tmp); 2773 check_improve_weapon (who, op);
2545 return 1; 2774 return 1;
2546 2775
2547 case CLOCK: 2776 case CLOCK:
2548 if (op->type == PLAYER) 2777 if (who->type == PLAYER)
2549 { 2778 {
2550 char buf[MAX_BUF]; 2779 char buf[MAX_BUF];
2551 timeofday_t tod; 2780 timeofday_t tod;
2552 2781
2553 get_tod (&tod); 2782 get_tod (&tod);
2554 op->play_sound (sound_find ("sound_clock")); 2783 who->play_sound (sound_find ("sound_clock"));
2555 op->statusmsg (format ( 2784 who->statusmsg (format (
2556 "It is %d minute%s past %d o'clock %s", 2785 "It is %d minute%s past %d o'clock %s",
2557 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"), 2786 tod.minute + 1, ((tod.minute + 1 < 2) ? "" : "s"),
2558 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am") 2787 ((tod.hour % 14 == 0) ? 14 : ((tod.hour) % 14)), ((tod.hour >= 14) ? "pm" : "am")
2559 )); 2788 ));
2560 return 1; 2789 return 1;
2561 } 2790 }
2562 else 2791 else
2563 return 0; 2792 return 0;
2564 2793
2565 case MENU: 2794 case MENU:
2566 if (op->type == PLAYER) 2795 if (who->type == PLAYER)
2567 { 2796 {
2568 shop_listing (tmp, op); 2797 shop_listing (op, who);
2569 return 1; 2798 return 1;
2570 } 2799 }
2571 else 2800 else
2572 return 0; 2801 return 0;
2573 2802
2574 case POWER_CRYSTAL: 2803 case POWER_CRYSTAL:
2575 apply_power_crystal (op, tmp); /* see egoitem.c */ 2804 apply_power_crystal (who, op); /* see egoitem.c */
2576 return 1; 2805 return 1;
2577 2806
2578 case LIGHTER: /* for lighting torches/lanterns/etc */ 2807 case LIGHTER: /* for lighting torches/lanterns/etc */
2579 if (op->type == PLAYER) 2808 if (who->type == PLAYER)
2580 { 2809 {
2581 apply_lighter (op, tmp); 2810 apply_lighter (who, op);
2582 return 1; 2811 return 1;
2583 } 2812 }
2584 else 2813 else
2585 return 0; 2814 return 0;
2586 2815
2587 case ITEM_TRANSFORMER: 2816 case ITEM_TRANSFORMER:
2588 apply_item_transformer (op, tmp); 2817 apply_item_transformer (who, op);
2589 return 1; 2818 return 1;
2590 2819
2591 default: 2820 default:
2592 return 0; 2821 return 0;
2593 } 2822 }
… …
2660 * person moving on it, also activate. Added code to make it 2889 * person moving on it, also activate. Added code to make it
2661 * so that at least one of players movement types be that which 2890 * so that at least one of players movement types be that which
2662 * the item needs. 2891 * the item needs.
2663 */ 2892 */
2664 if (!tmp->invisible || (tmp->move_on & pl->move_type)) 2893 if (!tmp->invisible || (tmp->move_on & pl->move_type))
2665 {
2666 if (player_apply (pl, tmp, 0, 1) == 1) 2894 if (player_apply (pl, tmp, 0, 1) == 1)
2667 return; 2895 return;
2668 } 2896
2669 if (floors >= 2) 2897 if (floors >= 2)
2670 return; /* process at most two floor objects */ 2898 return; /* process at most two floor objects */
2671 } 2899 }
2672} 2900}
2673 2901
… …
2745 case BRACERS: 2973 case BRACERS:
2746 case CLOAK: 2974 case CLOAK:
2747 who->statusmsg (format ("You unwear %s.", query_name (op))); 2975 who->statusmsg (format ("You unwear %s.", query_name (op)));
2748 change_abil (who, op); 2976 change_abil (who, op);
2749 break; 2977 break;
2750
2751 case LAMP:
2752 {
2753 who->statusmsg (format ("You turn off your %s.", &op->name));
2754
2755 object *tmp2 = arch_to_object (op->other_arch);
2756 tmp2->x = op->x;
2757 tmp2->y = op->y;
2758 tmp2->map = op->map;
2759 tmp2->below = op->below;
2760 tmp2->above = op->above;
2761 tmp2->stats.food = op->stats.food;
2762 CLEAR_FLAG (tmp2, FLAG_APPLIED);
2763
2764 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
2765 SET_FLAG (tmp2, FLAG_INV_LOCKED);
2766
2767 op->destroy ();
2768 who->insert (tmp2);
2769 who->update_stats ();
2770
2771 if (who->contr)
2772 {
2773 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
2774 {
2775 who->failmsg ("Oops, it feels deadly cold!");
2776 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
2777 }
2778 }
2779 }
2780
2781 return 1; /* otherwise, an attempt to drop causes problems */
2782 2978
2783 case BOW: 2979 case BOW:
2784 case WAND: 2980 case WAND:
2785 case ROD: 2981 case ROD:
2786 case HORN: 2982 case HORN:
… …
3226 return 1; 3422 return 1;
3227 } 3423 }
3228 3424
3229 //TODO: this obviously fails for players using a shorter prefix 3425 //TODO: this obviously fails for players using a shorter prefix
3230 // i.e. "R" can use Ragnarok's sword. 3426 // i.e. "R" can use Ragnarok's sword.
3231 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3427 if (op->level && !op->name.starts_with (who->name))
3232 { 3428 {
3233 /* if the weapon does not have the name as the character, can't use it. */ 3429 /* if the weapon does not have the name as the character, can't use it. */
3234 /* (Ragnarok's sword attempted to be used by Foo: won't work) */ 3430 /* (Ragnarok's sword attempted to be used by Foo: won't work) */
3235 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>"); 3431 who->failmsg ("The weapon does not recognize you as its owner. H<Its name indicates that it belongs to somebody else.>");
3236 3432
… …
3270 case AMULET: 3466 case AMULET:
3271 SET_FLAG (op, FLAG_APPLIED); 3467 SET_FLAG (op, FLAG_APPLIED);
3272 who->statusmsg (format ("You wear %s.", query_name (op))); 3468 who->statusmsg (format ("You wear %s.", query_name (op)));
3273 change_abil (who, op); 3469 change_abil (who, op);
3274 break; 3470 break;
3275
3276 case LAMP:
3277 if (op->stats.food < 1)
3278 {
3279 who->failmsg (format (
3280 "Your %s is out of fuel! "
3281 "H<Lamps and similar items need fuel. They cannot be refilled.>",
3282 &op->name
3283 ));
3284 return 1;
3285 }
3286
3287 who->statusmsg (format ("You turn on your %s.", &op->name));
3288
3289 tmp2 = arch_to_object (op->other_arch);
3290 tmp2->stats.food = op->stats.food;
3291 SET_FLAG (tmp2, FLAG_APPLIED);
3292
3293 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
3294 SET_FLAG (tmp2, FLAG_INV_LOCKED);
3295
3296 who->insert (tmp2);
3297
3298 /* Remove the old lantern */
3299 op->destroy ();
3300
3301 /* insert the portion that was split off */
3302 if (tmp)
3303 who->insert (tmp);
3304
3305 who->update_stats ();
3306
3307 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3308 if (who->type == PLAYER)
3309 {
3310 who->failmsg ("Oops, it feels deadly cold! H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>");
3311 SET_FLAG (tmp2, FLAG_KNOWN_CURSED);
3312 }
3313
3314 return 0;
3315 3471
3316 case SKILL_TOOL: 3472 case SKILL_TOOL:
3317 // applying a skill tool also readies the skill 3473 // applying a skill tool also readies the skill
3318 SET_FLAG (op, FLAG_APPLIED); 3474 SET_FLAG (op, FLAG_APPLIED);
3319 3475
… …
3409 insert_ob_in_ob (tmp, who); 3565 insert_ob_in_ob (tmp, who);
3410 3566
3411 return 1; 3567 return 1;
3412 } 3568 }
3413 3569
3414 if (op->level && (strncmp (op->name, who->name, strlen (who->name)))) 3570 if (op->level && !op->name.starts_with (who->name))
3415 { 3571 {
3416 who->failmsg ("The weapon does not recognize you as its owner. " 3572 who->failmsg ("The weapon does not recognize you as its owner. "
3417 "H<Its name indicates that it belongs to somebody else.>"); 3573 "H<Its name indicates that it belongs to somebody else.>");
3418 if (tmp) 3574 if (tmp)
3419 insert_ob_in_ob (tmp, who); 3575 insert_ob_in_ob (tmp, who);
… …
3493 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED)) 3649 if (QUERY_FLAG (op, FLAG_CURSED) || QUERY_FLAG (op, FLAG_DAMNED))
3494 if (who->type == PLAYER) 3650 if (who->type == PLAYER)
3495 { 3651 {
3496 who->failmsg ( 3652 who->failmsg (
3497 "Oops, it feels deadly cold! " 3653 "Oops, it feels deadly cold! "
3498 "H<Maybe it wasn't such a bright idea to apply this cursed/damned item.>" 3654 "H<Maybe it wasn't such a bright idea to apply this cursed or damned item.>"
3499 ); 3655 );
3500 SET_FLAG (op, FLAG_KNOWN_CURSED); 3656 SET_FLAG (op, FLAG_KNOWN_CURSED);
3501 } 3657 }
3502 3658
3503 if (object *pl = op->visible_to ()) 3659 if (object *pl = op->visible_to ())
… …
3572 /* If we generated an object and put it in this object inventory, 3728 /* If we generated an object and put it in this object inventory,
3573 * move it to the parent object as the current object is about 3729 * move it to the parent object as the current object is about
3574 * to disappear. An example of this item is the random_* stuff 3730 * to disappear. An example of this item is the random_* stuff
3575 * that is put inside other objects. 3731 * that is put inside other objects.
3576 */ 3732 */
3577 for (tmp = op->inv; tmp; tmp = tmp2)
3578 {
3579 tmp2 = tmp->below;
3580 tmp->remove ();
3581
3582 if (op->env) 3733 if (op->env)
3583 insert_ob_in_ob (tmp, op->env); 3734 while (op->inv)
3584 else 3735 op->env->insert (op->inv);
3585 tmp->destroy ();
3586 }
3587 3736
3588 op->destroy (); 3737 op->destroy ();
3589 break; 3738 break;
3590 } 3739 }
3591 3740
… …
3776 } 3925 }
3777 3926
3778 who->update_stats (); 3927 who->update_stats ();
3779} 3928}
3780 3929
3781/**
3782 * Designed primarily to light torches/lanterns/etc.
3783 * Also burns up burnable material too. First object in the inventory is
3784 * the selected object to "burn". -b.t.
3785 */
3786void
3787apply_lighter (object *who, object *lighter)
3788{
3789 object *item;
3790 int is_player_env = 0;
3791
3792 item = find_marked_object (who);
3793 if (item)
3794 {
3795 if (lighter->last_eat && lighter->stats.food)
3796 { /* lighter gets used up */
3797 object *oneLighter = lighter->split ();
3798 oneLighter->stats.food--;
3799 who->insert (oneLighter);
3800 }
3801 else if (lighter->last_eat)
3802 {
3803 /* no charges left in lighter */
3804 who->failmsg (format ("You attempt to light the %s with a used up %s.", &item->name, &lighter->name));
3805 return;
3806 }
3807
3808 /* Perhaps we should split what we are trying to light on fire?
3809 * I can't see many times when you would want to light multiple
3810 * objects at once.
3811 */
3812
3813 if (who == item->in_player ())
3814 is_player_env = 1;
3815
3816 save_throw_object (item, AT_FIRE, who);
3817
3818 if (item->destroyed ())
3819 {
3820 who->statusmsg (format ("You light the %s with the %s.", &item->name, &lighter->name));
3821 /* Need to update the player so that the players glow radius
3822 * gets changed.
3823 */
3824 if (is_player_env)
3825 who->update_stats ();
3826 }
3827 else
3828 who->failmsg (format ("You attempt to light the %s with the %s and fail.", &item->name, &lighter->name));
3829 }
3830 else
3831 who->failmsg ("You need to mark a lightable object.");
3832}
3833 3930
3834/** 3931/**
3835 * op made some mistake with a scroll, this takes care of punishment. 3932 * op made some mistake with a scroll, this takes care of punishment.
3836 * scroll_failure()- hacked directly from spell_failure 3933 * scroll_failure()- hacked directly from spell_failure
3837 */ 3934 */
… …
3937 } 4034 }
3938 4035
3939 /* insert the randomitems from the change's treasurelist into 4036 /* insert the randomitems from the change's treasurelist into
3940 * the player ref: player.c 4037 * the player ref: player.c
3941 */ 4038 */
3942 if (change->randomitems != NULL) 4039 if (change->randomitems)
3943 give_initial_items (pl, change->randomitems); 4040 give_initial_items (pl, change->randomitems);
3944 4041
3945 /* set up the face, for some races. */ 4042 /* set up the face, for some races. */
3946 4043
3947 /* first, look for the force object banning 4044 /* first, look for the force object banning
3948 * changing the face. Certain races never change face with class. 4045 * changing the face. Certain races never change face with class.
3949 */ 4046 */
3950 for (walk = pl->inv; walk != NULL; walk = walk->below) 4047 for (walk = pl->inv; walk; walk = walk->below)
3951 if (!strcmp (walk->name, "NOCLASSFACECHANGE")) 4048 if (walk->name == shstr_NOCLASSFACECHANGE)
3952 flag_change_face = 0; 4049 flag_change_face = 0;
3953 4050
3954 if (flag_change_face) 4051 if (flag_change_face)
3955 { 4052 {
3956 pl->face = change->face; 4053 pl->face = change->face;
… …
3958 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE]; 4055 pl->flag [FLAG_ANIMATE] = change->flag [FLAG_ANIMATE];
3959 } 4056 }
3960 4057
3961 /* check the special case of can't use weapons */ 4058 /* check the special case of can't use weapons */
3962 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */ 4059 /*if(QUERY_FLAG(change,FLAG_USE_WEAPON)) CLEAR_FLAG(pl,FLAG_USE_WEAPON); */
3963 if (!strcmp (change->name, "monk")) 4060 if (change->name == shstr_monk)
3964 CLEAR_FLAG (pl, FLAG_USE_WEAPON); 4061 CLEAR_FLAG (pl, FLAG_USE_WEAPON);
3965 4062
3966 break; 4063 break;
3967 } 4064 }
3968 } 4065 }
… …
4005 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4102 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4006 return; 4103 return;
4007 } 4104 }
4008 4105
4009 /* check whether they are compatible or not */ 4106 /* check whether they are compatible or not */
4010 find = strstr (marked->slaying, transformer->arch->archname); 4107 find = strstr (&marked->slaying, transformer->arch->archname);
4011 if (!find || (*(find + strlen (transformer->arch->archname)) != ':')) 4108 if (!find || (*(find + strlen (transformer->arch->archname)) != ':'))
4012 { 4109 {
4013 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked))); 4110 pl->failmsg (format ("You can't use the %s with your %s!", query_name (transformer), query_name (marked)));
4014 return; 4111 return;
4015 } 4112 }

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines