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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.236 by root, Thu Nov 5 14:56:06 2009 UTC vs.
Revision 1.268 by root, Wed Apr 7 19:54:45 2010 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,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25//+GPL
26
25#include <global.h> 27#include <global.h>
26#include <sproto.h> 28#include <sproto.h>
27#include <sounds.h> 29#include <sounds.h>
28#include <living.h> 30#include <living.h>
29#include <object.h> 31#include <object.h>
… …
74 ob->remove (); 76 ob->remove ();
75 ob->enemy = 0; // sometimes keeps an extra refcount on itself 77 ob->enemy = 0; // sometimes keeps an extra refcount on itself
76 ob->map = 0; 78 ob->map = 0;
77 party = 0; 79 party = 0;
78 80
79 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
80
81 players.erase (this); 81 players.erase (this);
82} 82}
83 83
84// connect the player with a specific client 84// connect the player with a specific client
85// also changes, rationalises, and fixes some incorrect settings 85// also changes, rationalises, and fixes some incorrect settings
… …
105 ob->race = ob->arch->race; 105 ob->race = ob->arch->race;
106 106
107 ob->update_weight (); 107 ob->update_weight ();
108 link_skills (); 108 link_skills ();
109 109
110 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
111
112 assign (title, ob->arch->object::name); 110 assign (title, ob->arch->object::name);
113 111
114 /* if it's a dragon player, set the correct title here */ 112 /* if it's a dragon player, set the correct title here */
115 if (is_dragon_pl (ob)) 113 if (ob->is_dragon ())
116 { 114 {
117 object *tmp, *abil = 0, *skin = 0; 115 object *tmp, *abil = 0, *skin = 0;
118 116
119 for (tmp = ob->inv; tmp; tmp = tmp->below) 117 for (tmp = ob->inv; tmp; tmp = tmp->below)
120 if (tmp->type == FORCE) 118 if (tmp->type == FORCE)
… …
134 132
135 ns->floorbox_update (); 133 ns->floorbox_update ();
136 esrv_send_inventory (ob, ob); 134 esrv_send_inventory (ob, ob);
137 esrv_add_spells (this, 0); 135 esrv_add_spells (this, 0);
138 136
137 ob->flag [FLAG_READY_WEAPON] = false;
138 ob->flag [FLAG_READY_SKILL] = false;
139 ob->flag [FLAG_READY_RANGE] = false;
140 ob->flag [FLAG_READY_BOW] = false;
141
142 ob->update_stats (); // we unapplied stuff above
139 activate (); 143 activate ();
140 144
141 INVOKE_PLAYER (CONNECT, this); 145 INVOKE_PLAYER (CONNECT, this);
142 INVOKE_PLAYER (LOGIN, this); 146 INVOKE_PLAYER (LOGIN, this);
143} 147}
… …
167 // when ns = 0 171 // when ns = 0
168 observe = viewpoint = ob; 172 observe = viewpoint = ob;
169 173
170 deactivate (); 174 deactivate ();
171} 175}
176
177//-GPL
172 178
173// the need for this function can be explained 179// the need for this function can be explained
174// by load_object not returning the object 180// by load_object not returning the object
175void 181void
176player::set_object (object *op) 182player::set_object (object *op)
… …
180 186
181 ob->speed = 1.0f; 187 ob->speed = 1.0f;
182 ob->speed_left = 0.5f; 188 ob->speed_left = 0.5f;
183 189
184 ob->direction = 5; /* So player faces south */ 190 ob->direction = 5; /* So player faces south */
185
186 ob->flag [FLAG_READY_WEAPON] = false;
187 ob->flag [FLAG_READY_SKILL] = false;
188 ob->flag [FLAG_READY_BOW] = false;
189
190 for (object *op = ob->inv; op; op = op->below)
191 if (op->flag [FLAG_APPLIED])
192 switch (op->type)
193 {
194 case SKILL:
195 ob->flag [FLAG_APPLIED] = false;
196 break;
197
198 case WAND:
199 case ROD:
200 case HORN:
201 case BOW:
202 ranged_ob = op;
203 break;
204
205 case WEAPON:
206 combat_ob = op;
207 break;
208 }
209
210 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
211 ob->deactivate (); // change_weapon activates, fix this better
212} 191}
213 192
214void 193void
215player::set_observe (object *op) 194player::set_observe (object *op)
216{ 195{
… …
222player::set_viewpoint (object *op) 201player::set_viewpoint (object *op)
223{ 202{
224 viewpoint = op ? op : (object *)observe; 203 viewpoint = op ? op : (object *)observe;
225 do_los = 1; 204 do_los = 1;
226} 205}
206
207//+GPL
227 208
228player::player () 209player::player ()
229{ 210{
230 /* There are some elements we want initialised to non zero value - 211 /* There are some elements we want initialised to non zero value -
231 * we deal with that below this point. 212 * we deal with that below this point.
… …
253 disconnect (); 234 disconnect ();
254 235
255 attachable::do_destroy (); 236 attachable::do_destroy ();
256 237
257 if (ob) 238 if (ob)
258 {
259 ob->destroy_inv (false);
260 ob->destroy (); 239 ob->destroy ();
261 }
262 240
263 ob = observe = viewpoint = 0; 241 ob = observe = viewpoint = 0;
264} 242}
265 243
266player::~player () 244player::~player ()
267{ 245{
268 /* Clear item stack */ 246 /* Clear item stack */
269 free (stack_items); 247 free (stack_items);
248}
249
250/*
251 * get_player_archetype() return next player archetype from archetype
252 * list. Not very efficient routine, but used only creating new players.
253 * Note: there MUST be at least one player archetype!
254 */
255static archetype *
256get_player_archetype (archetype *at)
257{
258 // archetypes could have been reloaded
259 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
260
261 if (!nat)
262 return at;
263
264 archvec::iterator i = archetypes.find (nat);
265
266 for (;;)
267 {
268 if (++i == archetypes.end ())
269 i = archetypes.begin ();
270 else if (*i == at)
271 cleanup ("not a single player archetype found");
272
273 if ((*i)->type == PLAYER)
274 return *i;
275 }
270} 276}
271 277
272/* Tries to add player on the connection passed in ns. 278/* Tries to add player on the connection passed in ns.
273 * All we can really get in this is some settings like host and display 279 * All we can really get in this is some settings like host and display
274 * mode. 280 * mode.
… …
276player * 282player *
277player::create () 283player::create ()
278{ 284{
279 player *pl = new player; 285 player *pl = new player;
280 286
281 pl->set_object (arch_to_object (get_player_archetype (0))); 287 pl->set_object (get_player_archetype (0)->instance ());
282 288
283 pl->ob->roll_stats (); 289 pl->ob->roll_stats ();
284 pl->ob->stats.wc = 2; 290 pl->ob->stats.wc = 2;
285 pl->ob->run_away = 25; /* Then we panick... */ 291 pl->ob->run_away = 25; /* Then we panick... */
286 292
287 set_first_map (pl->ob); 293 set_first_map (pl->ob);
288 294
289 return pl; 295 return pl;
290}
291
292/*
293 * get_player_archetype() return next player archetype from archetype
294 * list. Not very efficient routine, but used only creating new players.
295 * Note: there MUST be at least one player archetype!
296 */
297archetype *
298get_player_archetype (archetype *at)
299{
300 // archetypes could have been reloaded
301 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
302
303 if (!nat)
304 return at;
305
306 archvec::iterator i = archetypes.find (nat);
307
308 for (;;)
309 {
310 if (++i == archetypes.end ())
311 i = archetypes.begin ();
312 else if (*i == at)
313 cleanup ("not a single player archetype found");
314
315 if ((*i)->type == PLAYER)
316 return *i;
317 }
318} 296}
319 297
320object * 298object *
321get_nearest_player (object *mon) 299get_nearest_player (object *mon)
322{ 300{
… …
631 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 609 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
632} 610}
633 611
634/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 612/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
635static int 613static int
636roll_stat (void) 614roll_stat ()
637{ 615{
638 int a[4], i, j, k; 616 int a[4], i, j, k;
639 617
640 for (i = 0; i < 4; i++) 618 for (i = 0; i < 4; i++)
641 a[i] = (int) rndm (6) + 1; 619 a[i] = (int) rndm (6) + 1;
… …
738player::chargen_race_done () 716player::chargen_race_done ()
739{ 717{
740 /* this must before then initial items are given */ 718 /* this must before then initial items are given */
741 esrv_new_player (ob->contr); 719 esrv_new_player (ob->contr);
742 720
743 treasurelist *tl = treasurelist::find ("starting_wealth"); 721 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
744 if (tl) 722 if (tl)
745 create_treasure (tl, ob, 0, 0, 0); 723 create_treasure (tl, ob, 0, 0, 0);
746 724
747 INVOKE_PLAYER (BIRTH, ob->contr); 725 INVOKE_PLAYER (BIRTH, ob->contr);
748 INVOKE_PLAYER (LOGIN, ob->contr); 726 INVOKE_PLAYER (LOGIN, ob->contr);
… …
801 ob->stats.hp = ob->stats.maxhp; 779 ob->stats.hp = ob->stats.maxhp;
802 ob->stats.sp = ob->stats.maxsp; 780 ob->stats.sp = ob->stats.maxsp;
803 ob->stats.grace = 0; 781 ob->stats.grace = 0;
804} 782}
805 783
806void 784static void
807flee_player (object *op) 785flee_player (object *op)
808{ 786{
809 int dir, diff; 787 int dir, diff;
810 rv_vector rv; 788 rv_vector rv;
811 789
… …
835 dir = absdir (4 + rv.direction); 813 dir = absdir (4 + rv.direction);
836 for (diff = 0; diff < 3; diff++) 814 for (diff = 0; diff < 3; diff++)
837 { 815 {
838 int m = 1 - rndm (2) * 2; 816 int m = 1 - rndm (2) * 2;
839 817
840 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 818 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
841 return; 819 return;
842 } 820 }
843 821
844 /* Cornered, get rid of scared */ 822 /* Cornered, get rid of scared */
845 CLEAR_FLAG (op, FLAG_SCARED); 823 CLEAR_FLAG (op, FLAG_SCARED);
… …
855{ 833{
856 object *tmp, *next; 834 object *tmp, *next;
857 int stop = 0; 835 int stop = 0;
858 int wvratio; 836 int wvratio;
859 837
860 /* if you're flying, you cna't pick up anything */ 838 /* if you're flying, you can't pick up anything */
861 if (op->move_type & MOVE_FLYING) 839 if (op->move_type & MOVE_FLYING)
862 return 1; 840 return 1;
863 841
864 next = op->below; 842 next = op->below;
865 843
866 int cnt = MAX_ITEM_PER_DROP; 844 int cnt = MAX_ITEM_PER_ACTION;
867#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 845#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
868 846
869 /* loop while there are items on the floor that are not marked as 847 /* loop while there are items on the floor that are not marked as
870 * destroyed */ 848 * destroyed */
871 while (next && !next->destroyed ()) 849 while (next && !next->destroyed ())
… …
897 if (op->contr->mode & PU_DEBUG) 875 if (op->contr->mode & PU_DEBUG)
898 { 876 {
899 /* some debugging code to figure out item information */ 877 /* some debugging code to figure out item information */
900 const char *str = tmp->name 878 const char *str = tmp->name
901 ? format ("item name: %s item type: %d weight/value: %d", 879 ? format ("item name: %s item type: %d weight/value: %d",
902 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) 880 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
903 : format ("item name: %s item type: %d weight/value: %d", 881 : format ("item name: %s item type: %d weight/value: %d",
904 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 882 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
905 883
906 new_draw_info (NDI_UNIQUE, 0, op, str); 884 new_draw_info (NDI_UNIQUE, 0, op, str);
907 } 885 }
908 886
909 if (op->contr->mode & PU_INHIBIT) 887 if (op->contr->mode & PU_INHIBIT)
… …
996 continue; 974 continue;
997 } 975 }
998 976
999 /* wands/staves/rods/horns */ 977 /* wands/staves/rods/horns */
1000 if (op->contr->mode & PU_MAGIC_DEVICE) 978 if (op->contr->mode & PU_MAGIC_DEVICE)
1001 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 979 if (tmp->type == WAND
980 || tmp->type == ROD
981 || tmp->type == HORN
982 || tmp->type == POWER_CRYSTAL)
1002 { 983 {
1003 CHK_PICK_PICKUP; 984 CHK_PICK_PICKUP;
1004 continue; 985 continue;
1005 } 986 }
1006 987
1007 /* pick up all magical items */ 988 /* pick up all magical items */
1008 if (op->contr->mode & PU_MAGICAL) 989 if (op->contr->mode & PU_MAGICAL)
1009 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 990 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
991 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1010 { 992 {
1011 CHK_PICK_PICKUP; 993 CHK_PICK_PICKUP;
1012 continue; 994 continue;
1013 } 995 }
1014 996
… …
1021 } 1003 }
1022 } 1004 }
1023 1005
1024 /* rings & amulets - talismans seems to be typed AMULET */ 1006 /* rings & amulets - talismans seems to be typed AMULET */
1025 if (op->contr->mode & PU_JEWELS) 1007 if (op->contr->mode & PU_JEWELS)
1026 if (tmp->type == RING || tmp->type == AMULET) 1008 if (tmp->type == RING
1009 || tmp->type == AMULET
1010 || tmp->type == GIRDLE
1011 || tmp->type == SKILL_TOOL)
1027 { 1012 {
1028 CHK_PICK_PICKUP; 1013 CHK_PICK_PICKUP;
1029 continue; 1014 continue;
1030 } 1015 }
1031 1016
… …
1080 CHK_PICK_PICKUP; 1065 CHK_PICK_PICKUP;
1081 continue; 1066 continue;
1082 } 1067 }
1083 1068
1084 if (op->contr->mode & PU_GLOVES) 1069 if (op->contr->mode & PU_GLOVES)
1085 if (tmp->type == GLOVES) 1070 if (tmp->type == GLOVES || tmp->type == BRACERS)
1086 { 1071 {
1087 CHK_PICK_PICKUP; 1072 CHK_PICK_PICKUP;
1088 continue; 1073 continue;
1089 } 1074 }
1090 1075
… …
1140 fprintf (stderr, "%s", tmp->name); 1125 fprintf (stderr, "%s", tmp->name);
1141 } 1126 }
1142 else 1127 else
1143 fprintf (stderr, "%s", tmp->arch->archname); 1128 fprintf (stderr, "%s", tmp->arch->archname);
1144 fprintf (stderr, ",%d] = ", tmp->type); 1129 fprintf (stderr, ",%d] = ", tmp->type);
1145 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1130 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1146#endif 1131#endif
1147 CHK_PICK_PICKUP; 1132 CHK_PICK_PICKUP;
1148 continue; 1133 continue;
1149 } 1134 }
1150 } /* the new pickup model */ 1135 } /* the new pickup model */
1151 } 1136 }
1152 1137
1153 return !stop; 1138 return !stop;
1154} 1139}
1155 1140
1141/* routine for both players and monsters. We call this when
1142 * there is a possibility for our action distrubing our hiding
1143 * place or invisiblity spell. Artefact invisiblity causes
1144 * "noise" instead. If we arent invisible to begin with, we
1145 * return 0.
1146 */
1147static int
1148action_makes_visible (object *op)
1149{
1150 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
1151 {
1152 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
1153 {
1154 // artefact invisibility is permanent, but we still make noise
1155 // this is important for game-balance.
1156 if (op->contr)
1157 op->make_noise ();
1158
1159 return 0;
1160 }
1161
1162 if (op->contr && op->contr->tmp_invis == 0)
1163 return 0;
1164
1165 /* If monsters, they should become visible */
1166 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1167 {
1168 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1169 return 1;
1170 }
1171 }
1172
1173 return 0;
1174}
1175
1156/* 1176/*
1157 * Find an arrow in the inventory and after that 1177 * Find an arrow in the inventory and after that
1158 * in the right type container (quiver). Pointer to the 1178 * in the right type container (quiver). Pointer to the
1159 * found object is returned. 1179 * found object is returned.
1160 */ 1180 */
1161object * 1181static object *
1162find_arrow (object *op, const char *type) 1182find_arrow (object *op, const char *type)
1163{ 1183{
1164 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1184 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1165 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1185 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1166 return splay (tmp); 1186 return splay (tmp);
… …
1180 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1200 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1181 * against the target. A full test is not performed, simply a basic test 1201 * against the target. A full test is not performed, simply a basic test
1182 * of resistances. The archer is making a quick guess at what he sees down 1202 * of resistances. The archer is making a quick guess at what he sees down
1183 * the hall. Failing that it does it's best to pick the highest plus arrow. 1203 * the hall. Failing that it does it's best to pick the highest plus arrow.
1184 */ 1204 */
1185object * 1205static object *
1186find_better_arrow (object *op, object *target, shstr_cmp type, int *better) 1206find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1187{ 1207{
1188 object *tmp = NULL, *arrow, *ntmp; 1208 object *tmp = NULL, *arrow, *ntmp;
1189 int attacknum, attacktype, betterby = 0, i; 1209 int attacknum, attacktype, betterby = 0, i;
1190 1210
… …
1259 * find_better_arrow to find a decent arrow to use. 1279 * find_better_arrow to find a decent arrow to use.
1260 * op = the shooter 1280 * op = the shooter
1261 * type = bow->race 1281 * type = bow->race
1262 * dir = fire direction 1282 * dir = fire direction
1263 */ 1283 */
1264object * 1284static object *
1265pick_arrow_target (object *op, shstr_cmp type, int dir) 1285pick_arrow_target (object *op, shstr_cmp type, int dir)
1266{ 1286{
1267 object *tmp = NULL; 1287 object *tmp = NULL;
1268 maptile *m; 1288 maptile *m;
1269 int i, mflags, found, number; 1289 int i, mflags, found, number;
… …
1484 * but monsters can't. Putting that code here 1504 * but monsters can't. Putting that code here
1485 * makes the fire_bow code much cleaner. 1505 * makes the fire_bow code much cleaner.
1486 * this function should only be called if 'op' is a player, 1506 * this function should only be called if 'op' is a player,
1487 * hence the function name. 1507 * hence the function name.
1488 */ 1508 */
1489int 1509static int
1490player_fire_bow (object *op, int dir) 1510player_fire_bow (object *op, int dir)
1491{ 1511{
1492 int ret; 1512 int ret;
1493 1513
1494 if (op->contr->bowtype == bow_bestarrow) 1514 if (op->contr->bowtype == bow_bestarrow)
… …
1522} 1542}
1523 1543
1524/* Fires a misc (wand/rod/horn) object in 'dir'. 1544/* Fires a misc (wand/rod/horn) object in 'dir'.
1525 * Broken apart from 'fire' to keep it more readable. 1545 * Broken apart from 'fire' to keep it more readable.
1526 */ 1546 */
1527void 1547static void
1528fire_misc_object (object *op, int dir) 1548fire_misc_object (object *op, int dir)
1529{ 1549{
1530 object *item = op->contr->ranged_ob; 1550 object *item = op->contr->ranged_ob;
1531 1551
1532 if (!item) 1552 if (!item)
… …
1539 { 1559 {
1540 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1560 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1541 return; 1561 return;
1542 } 1562 }
1543 1563
1544 if (!op->change_weapon (item)) 1564 if (!op->apply (item))
1545 return; 1565 return;
1546 1566
1547 if (item->type == WAND) 1567 if (item->type == WAND)
1548 { 1568 {
1549 if (item->stats.food <= 0) 1569 if (item->stats.food <= 0)
… …
1554 return; 1574 return;
1555 } 1575 }
1556 } 1576 }
1557 else if (item->type == ROD || item->type == HORN) 1577 else if (item->type == ROD || item->type == HORN)
1558 { 1578 {
1559 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); 1579 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1560 1580
1561 // using the maximum of the rods charge allows at least one spell cast 1581 // using the maximum of the rods charge allows at least one spell cast
1562 // for a rod or horn, this fixes some broken rods. 1582 // for a rod or horn, this fixes some broken rods.
1563 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1583 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1564 { 1584 {
1565 op->contr->play_sound (sound_find ("wand_poof")); 1585 op->contr->play_sound (sound_find ("wand_poof"));
1566 1586
1567 if (item->type == ROD) 1587 if (item->type == ROD)
1568 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1588 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
… …
1600} 1620}
1601 1621
1602/* Received a fire command for the player - go and do it. 1622/* Received a fire command for the player - go and do it.
1603 */ 1623 */
1604bool 1624bool
1605fire (object *op, int dir) 1625fire (object *who, int dir)
1606{ 1626{
1607 int spellcost = 0; 1627 int spellcost = 0;
1608 1628
1609 player *pl = op->contr; 1629 player *pl = who->contr;
1610 1630
1611 if (pl->golem) 1631 if (pl->golem)
1612 { 1632 {
1613 control_golem (op->contr->golem, dir); 1633 control_golem (who->contr->golem, dir);
1614 return false; 1634 return false;
1615 } 1635 }
1616 1636
1617 object *ob = pl->ranged_ob; 1637 object *ob = pl->ranged_ob;
1618 1638
1619 if (!ob) 1639 if (!ob)
1620 return false; 1640 return false;
1621 1641
1622 if (op->speed_left > 0.f) 1642 if (who->speed_left > 0.f)
1623 --op->speed_left; 1643 --who->speed_left;
1624 else 1644 else
1625 return false; 1645 return false;
1626 1646
1627 if (!op->change_weapon (ob)) 1647 if (!who->apply (ob))
1628 return false; 1648 return false;
1629 1649
1630 /* check for loss of invisiblity/hide */ 1650 /* check for loss of invisiblity/hide */
1631 if (action_makes_visible (op)) 1651 if (action_makes_visible (who))
1632 make_visible (op); 1652 make_visible (who);
1633 1653
1634 switch (ob->type) 1654 switch (ob->type)
1635 { 1655 {
1636 case BOW: 1656 case BOW:
1637 player_fire_bow (op, dir); 1657 player_fire_bow (who, dir);
1638 break; 1658 break;
1639 1659
1640 case SPELL: 1660 case SPELL:
1641 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1661 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1642 break; 1662 break;
1643 1663
1644 case BUILDER: 1664 case BUILDER:
1645 apply_map_builder (op, dir); 1665 apply_map_builder (who, dir);
1646 break; 1666 break;
1647 1667
1648 case SKILL: 1668 case SKILL:
1649 do_skill (op, op, ob, dir, 0); 1669 do_skill (who, who, ob, dir, 0);
1650 break; 1670 break;
1651 1671
1672 case RANGED:
1673 do_skill (who, ob, who->chosen_skill, dir, 0);
1674 break;
1675
1652 default: 1676 default:
1653 fire_misc_object (op, dir); 1677 fire_misc_object (who, dir);
1654 break; 1678 break;
1655 } 1679 }
1656 1680
1657 return true; 1681 return true;
1658} 1682}
1659 1683
1660/* find_key 1684static object *
1661 * We try to find a key for the door as passed. If we find a key
1662 * and successfully use it, we return the key, otherwise NULL
1663 * This function merges both normal and locked door, since the logic
1664 * for both is the same - just the specific key is different.
1665 * pl is the player,
1666 * inv is the objects inventory to searched
1667 * door is the door we are trying to match against.
1668 * This function can be called recursively to search containers.
1669 */
1670object *
1671find_key (object *pl, object *container, object *door) 1685find_key_ (object *pl, object *container, object *door)
1672{ 1686{
1673 object *tmp, *key; 1687 object *tmp, *key;
1674 1688
1675 /* Should not happen, but sanity checking is never bad */ 1689 /* Should not happen, but sanity checking is never bad */
1676 if (!container->inv) 1690 if (!container->inv)
… …
1697 if (!tmp) 1711 if (!tmp)
1698 { 1712 {
1699 for (tmp = container->inv; tmp; tmp = tmp->below) 1713 for (tmp = container->inv; tmp; tmp = tmp->below)
1700 /* No reason to search empty containers */ 1714 /* No reason to search empty containers */
1701 if (tmp->type == CONTAINER && tmp->inv) 1715 if (tmp->type == CONTAINER && tmp->inv)
1702 if ((key = find_key (pl, tmp, door))) 1716 if ((key = find_key_ (pl, tmp, door)))
1703 return key; 1717 return key;
1704 1718
1705 if (!tmp) 1719 if (!tmp)
1706 return 0; 1720 return 0;
1707 } 1721 }
… …
1739 } 1753 }
1740 1754
1741 return tmp; 1755 return tmp;
1742} 1756}
1743 1757
1758/* find_key
1759 * We try to find a key for the door as passed. If we find a key
1760 * and successfully use it, we return the key, otherwise NULL
1761 * This function merges both normal and locked door, since the logic
1762 * for both is the same - just the specific key is different.
1763 * pl is the player,
1764 * inv is the objects inventory to searched
1765 * door is the door we are trying to match against.
1766 * This function can be called recursively to search containers.
1767 */
1768object *
1769find_key (object *pl, object *container, object *door)
1770{
1771 if (door->slaying && is_match_expr (door->slaying))
1772 {
1773 // for match expressions, we try to find the key by applying the match
1774 // to the op itself, which is supposed to find the "key", instead
1775 // of searching through containers ourselves.
1776
1777 return match_one (door->slaying, container, door, pl, pl);
1778 }
1779 else
1780 return find_key_ (pl, container, door);
1781}
1782
1744/* moved door processing out of move_player_attack. 1783/* moved door processing out of move_player_attack.
1745 * returns 1 if player has opened the door with a key 1784 * returns 1 if player has opened the door with a key
1746 * such that the caller should not do anything more, 1785 * such that the caller should not do anything more,
1747 * 0 otherwise 1786 * 0 otherwise
1748 */ 1787 */
… …
1751{ 1790{
1752 /* If its a door, try to find a key. If we do destroy the door, 1791 /* If its a door, try to find a key. If we do destroy the door,
1753 * might as well return immediately as there is nothing more to do - 1792 * might as well return immediately as there is nothing more to do -
1754 * otherwise, we fall through to the rest of the code. 1793 * otherwise, we fall through to the rest of the code.
1755 */ 1794 */
1756 object *key;
1757
1758 if (door->slaying && is_match_expr (door->slaying))
1759 {
1760 // for match expressions, we try to find the key by applying the match
1761 // to the op itself, which is supposed to find the "key", instead
1762 // of searching through containers ourselves.
1763
1764 key = match_one (door->slaying, op, door, op, op);
1765 }
1766 else
1767 key = find_key (op, op, door); 1795 object *key = find_key (op, op, door);
1768 1796
1769 /* If we found a key, do some extra work */ 1797 /* If we found a key, do some extra work */
1770 if (key) 1798 if (key)
1771 { 1799 {
1772 object *container = key->env; 1800 object *container = key->env;
… …
1807 * going to try and move (not fire weapons). 1835 * going to try and move (not fire weapons).
1808 */ 1836 */
1809bool 1837bool
1810move_player_attack (object *op, int dir) 1838move_player_attack (object *op, int dir)
1811{ 1839{
1812 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op)) 1840 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1813 { 1841 {
1814 --op->speed_left; 1842 --op->speed_left;
1815 return true; 1843 return true;
1816 } 1844 }
1817 1845
1818 int on_battleground;
1819
1820 sint16 nx = freearr_x[dir] + op->x; 1846 sint16 nx = freearr_x[dir] + op->x;
1821 sint16 ny = freearr_y[dir] + op->y; 1847 sint16 ny = freearr_y[dir] + op->y;
1822
1823 on_battleground = op_on_battleground (op, 0, 0);
1824 1848
1825 if (out_of_map (op->map, nx, ny)) 1849 if (out_of_map (op->map, nx, ny))
1826 return false; 1850 return false;
1827 1851
1828 /* If braced, or can't move to the square, and it is not out of the 1852 /* If braced, or can't move to the square, and it is not out of the
… …
1900 } 1924 }
1901 else 1925 else
1902 return false; 1926 return false;
1903 } 1927 }
1904 1928
1929 bool on_battleground = op_on_battleground (op, 0, 0);
1930
1905 /* in certain circumstances, you shouldn't attack friendly 1931 /* in certain circumstances, you shouldn't attack friendly
1906 * creatures. Note that if you are braced, you can't push 1932 * creatures. Note that if you are braced, you can't push
1907 * someone, but put it inside this loop so that you won't 1933 * someone, but put it inside this loop so that you won't
1908 * attack them either. 1934 * attack them either.
1909 */ 1935 */
… …
1973} 1999}
1974 2000
1975bool 2001bool
1976move_player (object *op, int dir) 2002move_player (object *op, int dir)
1977{ 2003{
1978 int pick;
1979
1980 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2004 if (!op->map || op->map->in_memory != MAP_ACTIVE)
1981 return 0; 2005 return 0;
1982 2006
1983 /* Sanity check: make sure dir is valid */ 2007 /* Sanity check: make sure dir is valid */
1984 if ((dir < 0) || (dir >= 9)) 2008 if (dir < 0 || dir >= 9)
1985 { 2009 {
1986 LOG (llevError, "move_player: invalid direction %d\n", dir); 2010 LOG (llevError, "move_player: invalid direction %d\n", dir);
1987 return 0; 2011 return 0;
1988 } 2012 }
1989 2013
… …
1995 2019
1996 if (op->flag [FLAG_HIDDEN]) 2020 if (op->flag [FLAG_HIDDEN])
1997 do_hidden_move (op); 2021 do_hidden_move (op);
1998 2022
1999 bool retval; 2023 bool retval;
2024 int pick = 0;
2000 2025
2001 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2026 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2002 retval = RESULT_INT (0); 2027 retval = RESULT_INT (0);
2003 else if (op->contr->fire_on) 2028 else if (op->contr->fire_on)
2004 retval = fire (op, dir); 2029 retval = fire (op, dir);
… …
2061 return move_player (op, op->direction); 2086 return move_player (op, op->direction);
2062 2087
2063 return false; 2088 return false;
2064} 2089}
2065 2090
2066int 2091static int
2067save_life (object *op) 2092save_life (object *op)
2068{ 2093{
2069 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2094 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2070 return 0; 2095 return 0;
2071 2096
… …
2080 2105
2081 if (op->stats.hp < 0) 2106 if (op->stats.hp < 0)
2082 op->stats.hp = op->stats.maxhp; 2107 op->stats.hp = op->stats.maxhp;
2083 2108
2084 if (op->stats.food < 0) 2109 if (op->stats.food < 0)
2085 op->stats.food = 999; 2110 op->stats.food = MAX_FOOD;
2086 2111
2087 op->update_stats (); 2112 op->update_stats ();
2088 return 1; 2113 return 1;
2089 } 2114 }
2090 2115
… …
2118void 2143void
2119object::drop_unpaid_items () 2144object::drop_unpaid_items ()
2120{ 2145{
2121 if (!flag [FLAG_REMOVED]) 2146 if (!flag [FLAG_REMOVED])
2122 ::drop_unpaid_items (inv, this); 2147 ::drop_unpaid_items (inv, this);
2123}
2124
2125/*
2126 * Returns pointer a static string containing gravestone text
2127 * Moved from apply.c to player.c - player.c is what
2128 * actually uses this function. player.c may not be quite the
2129 * best, a misc file for object actions is probably better,
2130 * but there isn't one in the server directory.
2131 */
2132const char *
2133gravestone_text (object *op)
2134{
2135 static dynbuf_text buf;
2136
2137 buf << "---- R.I.P. ----\n\n"
2138 << op->name;
2139
2140 if (op->type == PLAYER)
2141 buf << " the " << op->contr->title;
2142
2143 buf << "\n\n";
2144
2145 buf << "who was level ";
2146 buf << (sint32)op->level << "\n\n" // OO breakdown
2147 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2148
2149 if (op->type == PLAYER)
2150 buf << "by " << op->contr->killer_name () << ".\n\n";
2151
2152 {
2153 static char buf2[128];
2154 time_t now = time (NULL);
2155 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2156 buf << buf2;
2157 }
2158
2159 return buf;
2160} 2148}
2161 2149
2162void 2150void
2163do_some_living (object *op) 2151do_some_living (object *op)
2164{ 2152{
… …
2356 2344
2357 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2345 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2358 { 2346 {
2359 op->statusmsg ("You blindly grab for a bite of food. " 2347 op->statusmsg ("You blindly grab for a bite of food. "
2360 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2348 "H<To prevent you from starving, you ate some random item from your backpack.>");
2361 manual_apply (op, tmp, 0); 2349 op->apply (tmp);
2362 2350
2363 if (op->stats.food >= 0 || op->stats.hp < 0) 2351 if (op->stats.food >= 0 || op->stats.hp < 0)
2364 break; 2352 break;
2365 } 2353 }
2366 else if (tmp->type == FLESH) 2354 else if (tmp->type == FLESH)
… …
2372 */ 2360 */
2373 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2361 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2374 { 2362 {
2375 op->statusmsg ("You blindly grab for a bite of food. " 2363 op->statusmsg ("You blindly grab for a bite of food. "
2376 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2364 "H<To prevent you from starving, you ate some random item from your backpack.>");
2377 manual_apply (op, flesh, 0); 2365 op->apply (flesh);
2378 } 2366 }
2379 2367
2380 // If player is still starving, alert him! 2368 // If player is still starving, alert him!
2381 if (op->stats.food < 0) 2369 if (op->stats.food < 0)
2382 op->failmsg ("You are starving! " 2370 op->failmsg ("You are starving! "
… …
2419 return; 2407 return;
2420 2408
2421 dynbuf_text deathtab; 2409 dynbuf_text deathtab;
2422 2410
2423 /* restore player */ 2411 /* restore player */
2424 at = archetype::find ("poisoning"); 2412 at = archetype::find (shstr_poisoning);
2425 if (object *tmp = present_arch_in_ob (at, op)) 2413 if (object *tmp = present_arch_in_ob (at, op))
2426 { 2414 {
2427 tmp->destroy (); 2415 tmp->destroy ();
2428 deathtab << "Your body feels cleansed...\r"; 2416 deathtab << "Your body feels cleansed...\r";
2429 } 2417 }
2430 2418
2431 at = archetype::find ("confusion"); 2419 at = archetype::find (shstr_confusion);
2432 if (object *tmp = present_arch_in_ob (at, op)) 2420 if (object *tmp = present_arch_in_ob (at, op))
2433 { 2421 {
2434 tmp->destroy (); 2422 tmp->destroy ();
2435 deathtab << "Your mind feels clearer...\r"; 2423 deathtab << "Your mind feels clearer...\r";
2436 } 2424 }
… …
2438 cure_disease (op, 0, 0); /* remove any disease */ 2426 cure_disease (op, 0, 0); /* remove any disease */
2439 2427
2440 max_it (op->stats.hp , op->stats.maxhp); 2428 max_it (op->stats.hp , op->stats.maxhp);
2441 max_it (op->stats.sp , op->stats.maxsp); 2429 max_it (op->stats.sp , op->stats.maxsp);
2442 max_it (op->stats.grace, op->stats.maxgrace); 2430 max_it (op->stats.grace, op->stats.maxgrace);
2443
2444 if (op->stats.food <= 0) 2431 max_it (op->stats.food , 200);
2445 op->stats.food = 999;
2446 2432
2447 // remove all spell effects that are active 2433 // remove all spell effects that are active
2448 // to avoid long-term effects such as word-of-recall 2434 // to avoid long-term effects such as word-of-recall
2449 for (object *item = op->inv; item; ) 2435 for (object *item = op->inv; item; )
2450 { 2436 {
… …
2463 if (op_on_battleground (op, &x, &y)) 2449 if (op_on_battleground (op, &x, &y))
2464 { 2450 {
2465 deathtab << "You almost died in combat, but local medics have saved your life...\r"; 2451 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2466 2452
2467 /* create a bodypart-trophy to make the winner happy */ 2453 /* create a bodypart-trophy to make the winner happy */
2468 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2454 object *tmp = archetype::find (shstr_finger)->instance ();
2469 { 2455
2470 tmp->name = format ("%s's finger" , &op->name); 2456 tmp->name = format ("%s's finger" , &op->name);
2471 tmp->name_pl = format ("%s's fingers", &op->name); 2457 tmp->name_pl = format ("%s's fingers", &op->name);
2472 tmp->msg = format ( 2458 tmp->msg = format (
2473 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2459 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2474 &op->name, op->contr->title, 2460 &op->name, op->contr->title,
2475 (int)op->level, 2461 (int)op->level,
2476 op->contr->killer_name () 2462 op->contr->killer_name ()
2477 ); 2463 );
2478 tmp->value = 0, tmp->type = 0; 2464 tmp->value = 0, tmp->type = 0;
2479 tmp->materialname = "organics"; 2465 tmp->material = name_to_material (shstr_organic);
2480 tmp->insert_at (op, tmp); 2466 tmp->insert_at (op, tmp);
2481 }
2482 2467
2483 /* teleport defeated player to new destination */ 2468 /* teleport defeated player to new destination */
2484 transfer_ob (op, x, y, 0, NULL); 2469 transfer_ob (op, x, y, 0, NULL);
2485 op->contr->braced = 0; 2470 op->contr->braced = 0;
2486 2471
… …
2548 lost_a_stat = 1; 2533 lost_a_stat = 1;
2549 } 2534 }
2550 else 2535 else
2551 { 2536 {
2552 /* deplete a stat */ 2537 /* deplete a stat */
2553 archetype *deparch = archetype::find ("depletion"); 2538 archetype *deparch = archetype::find (shstr_depletion);
2554 object *dep; 2539 object *dep;
2555 2540
2556 dep = present_arch_in_ob (deparch, op); 2541 dep = present_arch_in_ob (deparch, op);
2557 if (!dep) 2542 if (!dep)
2558 { 2543 {
2559 dep = arch_to_object (deparch); 2544 dep = deparch->instance ();
2560 insert_ob_in_ob (dep, op); 2545 insert_ob_in_ob (dep, op);
2561 } 2546 }
2562 lose_this_stat = 1; 2547 lose_this_stat = 1;
2563 if (settings.balanced_stat_loss) 2548 if (settings.balanced_stat_loss)
2564 { 2549 {
… …
2630#endif 2615#endif
2631 2616
2632 /* Put a gravestone up where the character 'almost' died. List the 2617 /* Put a gravestone up where the character 'almost' died. List the
2633 * exp loss on the stone. 2618 * exp loss on the stone.
2634 */ 2619 */
2635 tmp = arch_to_object (archetype::find ("gravestone")); 2620 tmp = archetype::find (shstr_gravestone)->instance ();
2636 tmp->name = format ("%s's gravestone", &op->name); 2621 tmp->name = format ("%s's gravestone", &op->name);
2637 tmp->name_pl = format ("%s's gravestones", &op->name); 2622 tmp->name_pl = format ("%s's gravestones", &op->name);
2638 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", 2623 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2639 &op->name, op->contr->title, op->contr->killer_name ()); 2624 &op->name, op->contr->title, op->contr->killer_name ());
2640 tmp->x = op->x, tmp->y = op->y; 2625 tmp->x = op->x, tmp->y = op->y;
… …
2695 } 2680 }
2696 2681
2697 op->contr->infobox (MSG_CHANNEL ("death"), deathtab); 2682 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2698} 2683}
2699 2684
2700void 2685static void
2701loot_object (object *op) 2686loot_object (object *op)
2702{ /* Grab and destroy some treasure */ 2687{ /* Grab and destroy some treasure */
2703 object *tmp, *tmp2, *next; 2688 object *tmp, *tmp2, *next;
2704 2689
2705 op->close_container (); /* close open sack first */ 2690 op->close_container (); /* close open sack first */
… …
2736 * fix_weight(): Check recursively the weight of all players, and fix 2721 * fix_weight(): Check recursively the weight of all players, and fix
2737 * what needs to be fixed. Refresh windows and fix speed if anything 2722 * what needs to be fixed. Refresh windows and fix speed if anything
2738 * was changed. 2723 * was changed.
2739 */ 2724 */
2740void 2725void
2741fix_weight (void) 2726fix_weight ()
2742{ 2727{
2743 for_all_players (pl) 2728 for_all_players (pl)
2744 { 2729 {
2745 sint32 old = pl->ob->carrying; 2730 sint32 old = pl->ob->carrying;
2746 2731
… …
2753 } 2738 }
2754 } 2739 }
2755} 2740}
2756 2741
2757void 2742void
2758fix_luck (void) 2743fix_luck ()
2759{ 2744{
2760 for_all_players (pl) 2745 for_all_players (pl)
2761 if (!pl->ob->contr->ns->state) 2746 if (!pl->ob->contr->ns->state)
2762 pl->ob->change_luck (0); 2747 pl->ob->change_luck (0);
2763} 2748}
… …
3007 } 2992 }
3008 2993
3009 return 0; 2994 return 0;
3010} 2995}
3011 2996
3012/* routine for both players and monsters. We call this when
3013 * there is a possibility for our action distrubing our hiding
3014 * place or invisiblity spell. Artefact invisiblity causes
3015 * "noise" instead. If we arent invisible to begin with, we
3016 * return 0.
3017 */
3018int
3019action_makes_visible (object *op)
3020{
3021 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3022 {
3023 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3024 {
3025 // artefact invisibility is permanent, but we still make noise
3026 // this is important for game-balance.
3027 if (op->contr)
3028 op->make_noise ();
3029
3030 return 0;
3031 }
3032
3033 if (op->contr && op->contr->tmp_invis == 0)
3034 return 0;
3035
3036 /* If monsters, they should become visible */
3037 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3038 {
3039 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3040 return 1;
3041 }
3042 }
3043
3044 return 0;
3045}
3046
3047/* op_on_battleground - checks if the given object op (usually 2997/* op_on_battleground - checks if the given object op (usually
3048 * a player) is standing on a valid battleground-tile, 2998 * a player) is standing on a valid battleground-tile,
3049 * function returns TRUE/FALSE. If true x, y returns the battleground 2999 * function returns TRUE/FALSE. If true x, y returns the battleground
3050 * -exit-coord. (and if x, y not NULL) 3000 * -exit-coord. (and if x, y not NULL)
3051 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set 3001 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
… …
3070 && tmp->name == shstr_battleground 3020 && tmp->name == shstr_battleground
3071 && EXIT_X (tmp) && EXIT_Y (tmp)) 3021 && EXIT_X (tmp) && EXIT_Y (tmp))
3072 { 3022 {
3073 /* before we assign the exit, check if this is a teambattle */ 3023 /* before we assign the exit, check if this is a teambattle */
3074 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3024 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3075 {
3076 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3025 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3026 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3077 { 3027 {
3078 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3079 {
3080 if (x && y) 3028 if (x && y)
3081 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3029 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3082 3030
3083 return 1; 3031 return 1;
3084 }
3085 } 3032 }
3086 }
3087 3033
3088 if (x && y) 3034 if (x && y)
3089 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3035 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3090 3036
3091 return 1; 3037 return 1;
… …
3229 else 3175 else
3230 j = 1; 3176 j = 1;
3231 strcat (buf, spellpathnames[i]); 3177 strcat (buf, spellpathnames[i]);
3232 } 3178 }
3233 } 3179 }
3180
3234 strcat (buf, "."); 3181 strcat (buf, ".");
3235 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf); 3182 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3236 } 3183 }
3237 3184
3238 /* evtl. adding flags: */ 3185 /* evtl. adding flags: */
… …
3248 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3195 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3249 } 3196 }
3250 else 3197 else
3251 { 3198 {
3252 /* generate misc. treasure */ 3199 /* generate misc. treasure */
3253 tmp = arch_to_object (tr->item); 3200 tmp = tr->item->instance ();
3254 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3201 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3255 who->insert (tmp); 3202 who->insert (tmp);
3256 } 3203 }
3257} 3204}
3258 3205
3259/** 3206//-GPL
3260 * Unready an object for a player. This function does nothing if the object was
3261 * not readied.
3262 */
3263void
3264player_unready_range_ob (player *pl, object *ob)
3265{
3266 if (pl->ob->current_weapon == ob)
3267 pl->ob->current_weapon = 0;
3268
3269 if (pl->combat_ob == ob)
3270 pl->combat_ob = 0;
3271
3272 if (pl->ranged_ob == ob)
3273 pl->ranged_ob = 0;
3274}
3275 3207
3276sint8 3208sint8
3277player::darkness_at (maptile *map, int x, int y) const 3209player::darkness_at (maptile *map, int x, int y) const
3278{ 3210{
3279 if (!ns) 3211 if (!ns)

Diff Legend

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