| … | |
… | |
| 122 | continue; |
122 | continue; |
| 123 | |
123 | |
| 124 | if (*buf == '%') |
124 | if (*buf == '%') |
| 125 | { /* send one news */ |
125 | { /* send one news */ |
| 126 | if (size > 0) |
126 | if (size > 0) |
| 127 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */ |
127 | draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, |
|
|
128 | MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, |
|
|
129 | "INFORMATION: %s\n%s", (char *)"%s\n%s", |
|
|
130 | subject, news); /*send previously read news */ |
| 128 | |
131 | |
| 129 | strcpy (subject, buf + 1); |
132 | strcpy (subject, buf + 1); |
| 130 | strip_endline (subject); |
133 | strip_endline (subject); |
| 131 | size = 0; |
134 | size = 0; |
| 132 | news[0] = '\0'; |
135 | news[0] = '\0'; |
| … | |
… | |
| 345 | savebed_map = first_map_path; /* Init. respawn position */ |
348 | savebed_map = first_map_path; /* Init. respawn position */ |
| 346 | |
349 | |
| 347 | gen_sp_armour = 10; |
350 | gen_sp_armour = 10; |
| 348 | bowtype = bow_normal; |
351 | bowtype = bow_normal; |
| 349 | petmode = pet_normal; |
352 | petmode = pet_normal; |
| 350 | listening = 10; |
|
|
| 351 | usekeys = containers; |
353 | usekeys = containers; |
| 352 | peaceful = 1; /* default peaceful */ |
354 | peaceful = 1; /* default peaceful */ |
| 353 | do_los = 1; |
355 | do_los = 1; |
| 354 | |
356 | |
| 355 | weapon_sp = 1.0f; |
357 | weapon_sp = 1.0f; |
| … | |
… | |
| 1305 | if (op->contr->mode & PU_RATIO) |
1307 | if (op->contr->mode & PU_RATIO) |
| 1306 | { |
1308 | { |
| 1307 | /* use value density to decide what else to grab */ |
1309 | /* use value density to decide what else to grab */ |
| 1308 | /* >=7 was >= op->contr->mode */ |
1310 | /* >=7 was >= op->contr->mode */ |
| 1309 | /* >=7 is the old standard setting. Now we take the last 4 bits |
1311 | /* >=7 is the old standard setting. Now we take the last 4 bits |
| 1310 | * and multiply them by 5, giving 0..15*5== 5..75 */ |
1312 | */ |
| 1311 | wvratio = (op->contr->mode & PU_RATIO) * 5; |
1313 | wvratio = op->contr->mode & PU_RATIO; |
| 1312 | if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) |
1314 | if (1000 * query_cost (tmp, op, F_TRUE) / tmp->total_weight () >= wvratio * 100) |
| 1313 | { |
1315 | { |
| 1314 | CHK_PICK_PICKUP; |
1316 | CHK_PICK_PICKUP; |
| 1315 | #if 0 |
1317 | #if 0 |
| 1316 | fprintf (stderr, "HIGH WEIGHT/VALUE ["); |
1318 | fprintf (stderr, "HIGH WEIGHT/VALUE ["); |
| 1317 | if (tmp->name != NULL) |
1319 | if (tmp->name != NULL) |
| … | |
… | |
| 2563 | |
2565 | |
| 2564 | if (op->stats.food < 0) |
2566 | if (op->stats.food < 0) |
| 2565 | { |
2567 | { |
| 2566 | op->stats.hp += op->stats.food; |
2568 | op->stats.hp += op->stats.food; |
| 2567 | op->stats.food = 0; |
2569 | op->stats.food = 0; |
|
|
2570 | |
|
|
2571 | if (op->stats.hp < 0) |
|
|
2572 | { |
|
|
2573 | op->contr->killer = archetype::get ("killer_starvation"); |
|
|
2574 | op->contr->killer->destroy (); |
| 2568 | } |
2575 | } |
|
|
2576 | } |
| 2569 | |
2577 | |
|
|
2578 | /* killer should be set here already */ |
| 2570 | if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) |
2579 | if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ)) |
| 2571 | kill_player (op); |
2580 | kill_player (op); |
| 2572 | } |
2581 | } |
| 2573 | } |
2582 | } |
| 2574 | |
2583 | |
| … | |
… | |
| 2642 | } |
2651 | } |
| 2643 | |
2652 | |
| 2644 | INVOKE_PLAYER (DEATH, op->contr); |
2653 | INVOKE_PLAYER (DEATH, op->contr); |
| 2645 | |
2654 | |
| 2646 | command_kill_pets (op, 0); |
2655 | command_kill_pets (op, 0); |
| 2647 | |
|
|
| 2648 | if (op->stats.food < 0) |
|
|
| 2649 | { |
|
|
| 2650 | op->contr->killer = archetype::get ("killer_starvation"); |
|
|
| 2651 | op->contr->killer->destroy (); |
|
|
| 2652 | } |
|
|
| 2653 | |
2656 | |
| 2654 | op->contr->play_sound (sound_find ("player_dies")); |
2657 | op->contr->play_sound (sound_find ("player_dies")); |
| 2655 | |
2658 | |
| 2656 | /* save the map location for corpse, gravestone */ |
2659 | /* save the map location for corpse, gravestone */ |
| 2657 | x = op->x; |
2660 | x = op->x; |
