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.35 by root, Thu Dec 14 00:01:35 2006 UTC vs.
Revision 1.198 by root, Sat May 17 00:17:02 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 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
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 25#include <sproto.h>
28#endif
29#include <sounds.h> 26#include <sounds.h>
30#include <living.h> 27#include <living.h>
31#include <object.h> 28#include <object.h>
32#include <spells.h> 29#include <spells.h>
33#include <skills.h> 30#include <skills.h>
34#include <newclient.h>
35 31
36#ifdef COZY_SERVER 32#include <algorithm>
37extern int same_party (partylist *a, partylist *b); 33#include <functional>
38#endif
39 34
40player * 35playervec players;
41find_player (const char *plname)
42{
43 player *pl;
44
45 for (pl = first_player; pl != NULL; pl = pl->next)
46 {
47 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
48 return pl;
49 };
50 return NULL;
51}
52
53player *
54find_player_partial_name (const char *plname)
55{
56 player *pl;
57 player *found = NULL;
58 size_t namelen = strlen (plname);
59
60 for (pl = first_player; pl != NULL; pl = pl->next)
61 {
62 if ((size_t) strlen (pl->ob->name) < namelen)
63 continue;
64
65 if (!strcmp (pl->ob->name, plname))
66 return pl;
67
68 if (!strncasecmp (pl->ob->name, plname, namelen))
69 {
70 if (found)
71 return NULL;
72
73 found = pl;
74 }
75 }
76 return found;
77}
78 36
79void 37void
80display_motd (const object *op) 38display_motd (const object *op)
81{ 39{
82 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
85 int comp; 43 int comp;
86 int size; 44 int size;
87 45
88 sprintf (buf, "%s/%s", settings.confdir, settings.motd); 46 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
89 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 47 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
90 {
91 return; 48 return;
92 } 49
93 motd[0] = '\0'; 50 motd[0] = '\0';
94 size = 0; 51 size = 0;
52
95 while (fgets (buf, MAX_BUF, fp) != NULL) 53 while (fgets (buf, MAX_BUF, fp))
96 { 54 {
97 if (*buf == '#') 55 if (*buf == '#')
98 continue; 56 continue;
57
99 strncat (motd + size, buf, HUGE_BUF - size); 58 strncat (motd + size, buf, HUGE_BUF - size);
100 size += strlen (buf); 59 size += strlen (buf);
101 } 60 }
61
102 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL); 62 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
103 close_and_delete (fp, comp); 63 close_and_delete (fp, comp);
104} 64}
105 65
106void 66void
… …
112 int comp; 72 int comp;
113 int size; 73 int size;
114 74
115 sprintf (buf, "%s/%s", settings.confdir, settings.rules); 75 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
116 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 76 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
117 {
118 return; 77 return;
119 } 78
120 rules[0] = '\0'; 79 rules[0] = '\0';
121 size = 0; 80 size = 0;
81
122 while (fgets (buf, MAX_BUF, fp) != NULL) 82 while (fgets (buf, MAX_BUF, fp))
123 { 83 {
124 if (*buf == '#') 84 if (*buf == '#')
125 continue; 85 continue;
86
126 if (size + strlen (buf) >= HUGE_BUF) 87 if (size + strlen (buf) >= HUGE_BUF)
127 { 88 {
128 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF); 89 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
129 break; 90 break;
130 } 91 }
92
131 strncat (rules + size, buf, HUGE_BUF - size); 93 strncat (rules + size, buf, HUGE_BUF - size);
132 size += strlen (buf); 94 size += strlen (buf);
133 } 95 }
96
134 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL); 97 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
135 close_and_delete (fp, comp); 98 close_and_delete (fp, comp);
136} 99}
137 100
138void 101void
… …
146 int size; 109 int size;
147 110
148 sprintf (buf, "%s/%s", settings.confdir, settings.news); 111 sprintf (buf, "%s/%s", settings.confdir, settings.news);
149 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL) 112 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
150 return; 113 return;
114
151 news[0] = '\0'; 115 news[0] = '\0';
152 subject[0] = '\0'; 116 subject[0] = '\0';
153 size = 0; 117 size = 0;
118
154 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
155 { 120 {
156 if (*buf == '#') 121 if (*buf == '#')
157 continue; 122 continue;
123
158 if (*buf == '%') 124 if (*buf == '%')
159 { /* send one news */ 125 { /* send one news */
160 if (size > 0) 126 if (size > 0)
161 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 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 */
128
162 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
163 strip_endline (subject); 130 strip_endline (subject);
164 size = 0; 131 size = 0;
165 news[0] = '\0'; 132 news[0] = '\0';
166 } 133 }
… …
175 size += strlen (buf); 142 size += strlen (buf);
176 } 143 }
177 } 144 }
178 145
179 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
180 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
181 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
182}
183
184int
185playername_ok (const char *cp)
186{
187 /* Don't allow - or _ as first character in the name */
188 if (*cp == '-' || *cp == '_')
189 return 0;
190
191 for (; *cp != '\0'; cp++)
192 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
193 return 0;
194 return 1;
195}
196
197/* This no longer sets the player map. Also, it now updates
198 * all the pointers so the caller doesn't need to do that.
199 * Caller is responsible for setting the correct map.
200 */
201
202/* Redo this to do both get_player_ob and get_player.
203 * Hopefully this will be less bugfree and simpler.
204 * Returns the player structure. If 'p' is null,
205 * we create a new one. Otherwise, we recycle
206 * the one that is passed.
207 */
208static player *
209get_player (player *p)
210{
211 object *op = arch_to_object (get_player_archetype (NULL));
212 int i;
213
214 if (!p)
215 {
216 p = new player;
217
218 /* This adds the player in the linked list. There is extra
219 * complexity here because we want to add the new player at the
220 * end of the list - there is in fact no compelling reason that
221 * that needs to be done except for things like output of
222 * 'who'.
223 */
224 player *tmp = first_player;
225
226 while (tmp != NULL && tmp->next != NULL)
227 tmp = tmp->next;
228 if (tmp != NULL)
229 tmp->next = p;
230 else
231 first_player = p;
232
233 p->next = NULL;
234 }
235
236 /* Clears basically the entire player structure except
237 * for next and socket.
238 */
239 p->clear ();
240
241 /* There are some elements we want initialized to non zero value -
242 * we deal with that below this point.
243 */
244 p->party = NULL;
245 p->outputs_sync = 16; /* Every 2 seconds */
246 p->outputs_count = 8; /* Keeps present behaviour */
247 p->unapply = unapply_nochoice;
248 p->Swap_First = -1;
249
250#ifdef AUTOSAVE
251 p->last_save_tick = 9999999;
252#endif
253
254 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
255
256 op->contr = p; /* this aren't yet in archetype */
257 p->ob = op;
258 op->speed_left = 0.5;
259 op->speed = 1.0;
260 op->direction = 5; /* So player faces south */
261 op->stats.wc = 2;
262 op->run_away = 25; /* Then we panick... */
263 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
264
265 roll_stats (op);
266 p->state = ST_ROLL_STAT;
267 clear_los (op);
268
269 p->gen_sp_armour = 10;
270 p->last_speed = -1;
271 p->shoottype = range_none;
272 p->bowtype = bow_normal;
273 p->petmode = pet_normal;
274 p->listening = 10;
275 p->usekeys = containers;
276 p->last_weapon_sp = -1;
277 p->peaceful = 1; /* default peaceful */
278 p->do_los = 1;
279 p->explore = 0;
280 p->no_shout = 0; /* default can shout */
281
282 assign (p->title, op->arch->clone.name);
283 op->race = op->arch->clone.race;
284
285 CLEAR_FLAG (op, FLAG_READY_SKILL);
286
287 /* we need to clear these to -1 and not zero - otherwise,
288 * if a player quits and starts a new character, we wont
289 * send new values to the client, as things like exp start
290 * at zero.
291 */
292 for (i = 0; i < NUM_SKILLS; i++)
293 {
294 p->last_skill_exp[i] = -1;
295 p->last_skill_ob[i] = NULL;
296 }
297 for (i = 0; i < NROFATTACKS; i++)
298 {
299 p->last_resist[i] = -1;
300 }
301 p->last_stats.exp = -1;
302 p->last_weight = (uint32) - 1;
303
304 p->socket.update_look = 0;
305 p->socket.look_position = 0;
306 return p;
307} 149}
308 150
309/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
310static void 152static void
311set_first_map (object *op) 153set_first_map (object *op)
312{ 154{
313 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
314 op->x = -1; 156 op->x = -1;
315 op->y = -1; 157 op->y = -1;
316 enter_exit (op, NULL);
317} 158}
318 159
160void
161player::activate ()
162{
163 if (active)
164 return;
165
166 players.insert (this);
167 ob->remove ();
168 ob->map = 0;
169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
173
174void
175player::deactivate ()
176{
177 if (!active)
178 return;
179
180 terminate_all_pets (ob);
181 remove_friendly_object (ob);
182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
187 ob->remove ();
188 ob->enemy = 0; // sometimes keeps an extra refcount on itself
189 ob->map = 0;
190 party = 0;
191
192 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
193
194 players.erase (this);
195}
196
197// connect the player with a specific client
198// also changes, rationalises, and fixes some incorrect settings
199void
200player::connect (client *ns)
201{
202 this->ns = ns;
203 ns->pl = this;
204
205 run_on = 0;
206 fire_on = 0;
207 ob->close_container (); //TODO: client-specific
208
209 ns->update_look = 0;
210 ns->look_position = 0;
211
212 clear_los (this);
213
214 ns->reset_stats ();
215
216 /* make sure he's a player -- needed because of class change. */
217 ob->type = PLAYER; // we are paranoid
218 ob->race = ob->arch->race;
219
220 ob->update_weight ();
221 link_player_skills (ob);
222
223 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
224
225 assign (title, ob->arch->object::name);
226
227 /* if it's a dragon player, set the correct title here */
228 if (is_dragon_pl (ob))
229 {
230 object *tmp, *abil = 0, *skin = 0;
231
232 for (tmp = ob->inv; tmp; tmp = tmp->below)
233 if (tmp->type == FORCE)
234 if (tmp->arch->archname == shstr_dragon_ability_force)
235 abil = tmp;
236 else if (tmp->arch->archname == shstr_dragon_skin_force)
237 skin = tmp;
238
239 set_dragon_name (ob, abil, skin);
240 }
241
242 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
243
244 esrv_new_player (this);
245
246 ob->update_stats ();
247
248 ns->floorbox_update ();
249 esrv_send_inventory (ob, ob);
250 esrv_add_spells (this, 0);
251
252 activate ();
253
254 send_rules (ob);
255 send_news (ob);
256 display_motd (ob);
257
258 INVOKE_PLAYER (CONNECT, this);
259 INVOKE_PLAYER (LOGIN, this);
260}
261
262void
263player::disconnect ()
264{
265 if (ob)
266 {
267 ob->close_container (); //TODO: client-specific
268 ob->drop_unpaid_items ();
269 }
270
271 if (ns)
272 {
273 if (active)
274 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
275
276 INVOKE_PLAYER (DISCONNECT, this);
277
278 ns->reset_stats ();
279 ns->pl = 0;
280 ns = 0;
281 }
282
283 observe = ob;
284
285 deactivate ();
286}
287
288// the need for this function can be explained
289// by load_object not returning the object
290void
291player::set_object (object *op)
292{
293 ob = observe = op;
294 ob->contr = this; /* this aren't yet in archetype */
295
296 ob->speed = 1.0f;
297 ob->speed_left = 0.5f;
298
299 ob->direction = 5; /* So player faces south */
300
301 ob->flag [FLAG_READY_WEAPON] = false;
302 ob->flag [FLAG_READY_SKILL] = false;
303 ob->flag [FLAG_READY_BOW] = false;
304
305 for (object *op = ob->inv; op; op = op->below)
306 if (op->flag [FLAG_APPLIED])
307 switch (op->type)
308 {
309 case SKILL:
310 ob->flag [FLAG_APPLIED] = false;
311 break;
312
313 case WAND:
314 case ROD:
315 case HORN:
316 case BOW:
317 ranged_ob = op;
318 break;
319
320 case WEAPON:
321 combat_ob = op;
322 break;
323 }
324
325 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
326 ob->deactivate (); // change_weapon activates, fix this better
327}
328
329void
330player::set_observe (object *op)
331{
332 observe = op ? op : ob;
333 do_los = 1;
334}
335
336player::player ()
337{
338 /* There are some elements we want initialised to non zero value -
339 * we deal with that below this point.
340 */
341 outputs_sync = 4;
342 outputs_count = 4;
343 unapply = unapply_nochoice;
344
345 savebed_map = first_map_path; /* Init. respawn position */
346
347 gen_sp_armour = 10;
348 bowtype = bow_normal;
349 petmode = pet_normal;
350 listening = 10;
351 usekeys = containers;
352 peaceful = 1; /* default peaceful */
353 do_los = 1;
354
355 weapon_sp = 1.0f;
356 weapon_sp_left = 0.5f;
357}
358
359void
360player::do_destroy ()
361{
362 disconnect ();
363
364 attachable::do_destroy ();
365
366 if (ob)
367 {
368 ob->destroy_inv (false);
369 ob->destroy ();
370 }
371
372 ob = observe = 0;
373}
374
375player::~player ()
376{
377 /* Clear item stack */
378 free (stack_items);
379}
380
319/* Tries to add player on the connection passwd in ns. 381/* Tries to add player on the connection passed in ns.
320 * All we can really get in this is some settings like host and display 382 * All we can really get in this is some settings like host and display
321 * mode. 383 * mode.
322 */ 384 */
323
324int
325add_player (NewSocket * ns)
326{
327 player *p; 385player *
386player::create ()
387{
388 player *pl = new player;
328 389
329 p = get_player (NULL); 390 pl->set_object (arch_to_object (get_player_archetype (0)));
330 p->socket = *ns;
331 p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
332 391
333 if (p->socket.faces_sent == NULL) 392 pl->ob->roll_stats ();
334 fatal (OUT_OF_MEMORY); 393 pl->ob->stats.wc = 2;
394 pl->ob->run_away = 25; /* Then we panick... */
335 395
336 memcpy (p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
337 /* Needed because the socket we just copied over needs to be cleared.
338 * Note that this can result in a client reset if there is partial data
339 * on the uncoming socket.
340 */
341 //TODO socket copying is EVIL, do not do this
342 p->socket.inbuf_len = 0;
343 set_first_map (p->ob); 396 set_first_map (pl->ob);
344 397
345 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
346 add_friendly_object (p->ob);
347 send_rules (p->ob);
348 send_news (p->ob);
349 display_motd (p->ob);
350 get_name (p->ob);
351
352 return 0; 398 return pl;
353} 399}
354 400
355/* 401/*
356 * get_player_archetype() return next player archetype from archetype 402 * get_player_archetype() return next player archetype from archetype
357 * list. Not very efficient routine, but used only creating new players. 403 * list. Not very efficient routine, but used only creating new players.
358 * Note: there MUST be at least one player archetype! 404 * Note: there MUST be at least one player archetype!
359 */ 405 */
360archetype * 406archetype *
361get_player_archetype (archetype *at) 407get_player_archetype (archetype *at)
362{ 408{
363 archetype *start = at; 409 // archetypes could have been reloaded
410 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
411
412 if (!nat)
413 return at;
414
415 archvec::iterator i = archetypes.find (nat);
364 416
365 for (;;) 417 for (;;)
366 { 418 {
367 if (at == NULL || at->next == NULL) 419 if (++i == archetypes.end ())
368 at = first_archetype; 420 i = archetypes.begin ();
369 else 421 else if (*i == at)
370 at = at->next; 422 cleanup ("not a single player archetype found");
423
371 if (at->clone.type == PLAYER) 424 if ((*i)->type == PLAYER)
372 return at; 425 return *i;
373 if (at == start)
374 {
375 LOG (llevError, "No Player archetypes\n");
376 exit (-1);
377 }
378 } 426 }
379} 427}
380
381 428
382object * 429object *
383get_nearest_player (object *mon) 430get_nearest_player (object *mon)
384{ 431{
385 object *op = NULL; 432 object *op = NULL;
386 player *pl = NULL;
387 objectlink *ol; 433 objectlink *ol;
388 unsigned lastdist; 434 unsigned lastdist;
389 rv_vector rv; 435 rv_vector rv;
390 436
391 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 437 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
392 { 438 {
393 /* We should not find free objects on this friendly list, but it
394 * does periodically happen. Given that, lets deal with it.
395 * While unlikely, it is possible the next object on the friendly
396 * list is also free, so encapsulate this in a while loop.
397 */
398 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
399 {
400 object *tmp = ol->ob;
401
402 /* Can't do much more other than log the fact, because the object
403 * itself will have been cleared.
404 */
405 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
406 ol = ol->next;
407 remove_friendly_object (tmp);
408 if (!ol)
409 return op;
410 }
411
412 /* Remove special check for player from this. First, it looks to cause
413 * some crashes (ol->ob->contr not set properly?), but secondly, a more
414 * complicated method of state checking would be needed in any case -
415 * as it was, a clever player could type quit, and the function would
416 * skip them over while waiting for confirmation. Remove
417 * on_same_map check, as can_detect_enemy also does this
418 */
419 if (!can_detect_enemy (mon, ol->ob, &rv)) 439 if (!can_detect_enemy (mon, ol->ob, &rv))
420 continue; 440 continue;
421 441
422 if (lastdist > rv.distance) 442 if (lastdist > rv.distance)
423 { 443 {
424 op = ol->ob; 444 op = ol->ob;
425 lastdist = rv.distance; 445 lastdist = rv.distance;
426 } 446 }
427 } 447 }
428 for (pl = first_player; pl != NULL; pl = pl->next) 448
429 { 449 for_all_players (pl)
430 if (can_detect_enemy (mon, pl->ob, &rv)) 450 if (can_detect_enemy (mon, pl->ob, &rv))
431 {
432
433 if (lastdist > rv.distance) 451 if (lastdist > rv.distance)
434 { 452 {
435 op = pl->ob; 453 op = pl->ob;
436 lastdist = rv.distance; 454 lastdist = rv.distance;
437 } 455 }
438 } 456
439 }
440#if 0 457#if 0
441 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 458 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
442#endif 459#endif
443 return op; 460 return op;
444} 461}
… …
462 * circling behaviour. Unfortunately, this function is also used to determined 479 * circling behaviour. Unfortunately, this function is also used to determined
463 * if the creature should cast a spell, so returning a direction in that case 480 * if the creature should cast a spell, so returning a direction in that case
464 * is probably not a good thing. 481 * is probably not a good thing.
465 */ 482 */
466#define MAX_SPACES 50 483#define MAX_SPACES 50
467
468 484
469/* 485/*
470 * Returns the direction to the player, if valid. Returns 0 otherwise. 486 * Returns the direction to the player, if valid. Returns 0 otherwise.
471 * modified to verify there is a path to the player. Does this by stepping towards 487 * modified to verify there is a path to the player. Does this by stepping towards
472 * player and if path is blocked then see if blockage is close enough to player that 488 * player and if path is blocked then see if blockage is close enough to player that
… …
503 x = mon->x; 519 x = mon->x;
504 y = mon->y; 520 y = mon->y;
505 m = mon->map; 521 m = mon->map;
506 dir = rv.direction; 522 dir = rv.direction;
507 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 523 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
508 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 524 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
525
509 /* If we can't solve it within the search distance, return now. */ 526 /* If we can't solve it within the search distance, return now. */
510 if (diff > max) 527 if (diff > max)
511 return 0; 528 return 0;
529
512 while (diff > 1 && max > 0) 530 while (diff > 1 && max > 0)
513 { 531 {
514 lastx = x; 532 lastx = x;
515 lasty = y; 533 lasty = y;
516 lastmap = m; 534 lastmap = m;
… …
598 max--; 616 max--;
599 lastdir = dir; 617 lastdir = dir;
600 if (!firstdir) 618 if (!firstdir)
601 firstdir = dir; 619 firstdir = dir;
602 } 620 }
621
603 if (diff <= 1) 622 if (diff <= 1)
604 { 623 {
605 /* Recalculate diff (distance) because we may not have actually 624 /* Recalculate diff (distance) because we may not have actually
606 * headed toward player for entire distance. 625 * headed toward player for entire distance.
607 */ 626 */
608 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 627 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
609 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 628 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
610 } 629 }
630
611 if (diff > max) 631 if (diff > max)
612 return 0; 632 return 0;
613 } 633 }
634
614 /* If we reached the max, didn't find a direction in time */ 635 /* If we reached the max, didn't find a direction in time */
615 if (!max) 636 if (!max)
616 return 0; 637 return 0;
617 638
618 return firstdir; 639 return firstdir;
619} 640}
620 641
621void 642void
622give_initial_items (object *pl, treasurelist * items) 643give_initial_items (object *pl, treasurelist *items)
623{ 644{
624 object *op, *next = NULL;
625
626 if (pl->randomitems != NULL) 645 if (pl->randomitems)
627 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0); 646 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
628 647
629 for (op = pl->inv; op; op = next) 648 for (object *next, *op = pl->inv; op; op = next)
630 { 649 {
631 next = op->below; 650 next = op->below;
632 651
633 /* Forces get applied per default, unless they have the 652 /* Forces get applied per default, unless they have the
634 * flag "neutral" set. Sorry but I can't think of a better way 653 * flag "neutral" set. Sorry but I can't think of a better way
… …
639 /* we never give weapons/armour if these cannot be used 658 /* we never give weapons/armour if these cannot be used
640 * by this player due to race restrictions 659 * by this player due to race restrictions
641 */ 660 */
642 if (pl->type == PLAYER) 661 if (pl->type == PLAYER)
643 { 662 {
644 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) && 663 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR)
664 &&
645 (op->type == ARMOUR || op->type == BOOTS || 665 (op->type == ARMOUR || op->type == BOOTS
646 op->type == CLOAK || op->type == HELMET || 666 || op->type == CLOAK || op->type == HELMET
647 op->type == SHIELD || op->type == GLOVES || 667 || op->type == SHIELD || op->type == GLOVES
668 || op->type == BRACERS || op->type == GIRDLE))
648 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON)) 669 || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
649 { 670 {
650 op->destroy (); 671 op->destroy ();
651 continue; 672 continue;
652 } 673 }
653 } 674 }
… …
676 if (op->nrof > 1) 697 if (op->nrof > 1)
677 op->nrof = 1; 698 op->nrof = 1;
678 } 699 }
679 700
680 if (op->type == SPELLBOOK && op->inv) 701 if (op->type == SPELLBOOK && op->inv)
681 {
682 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP); 702 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
683 }
684 703
685 /* Give starting characters identified, uncursed, and undamned 704 /* Give starting characters identified, uncursed, and undamned
686 * items. Just don't identify gold or silver, or it won't be 705 * items. Just don't identify gold or silver, or it won't be
687 * merged properly. 706 * merged properly.
688 */ 707 */
689 if (need_identify (op)) 708 if (need_identify (op))
690 { 709 {
691 SET_FLAG (op, FLAG_IDENTIFIED); 710 SET_FLAG (op, FLAG_IDENTIFIED);
692 CLEAR_FLAG (op, FLAG_CURSED); 711 CLEAR_FLAG (op, FLAG_CURSED);
693 CLEAR_FLAG (op, FLAG_DAMNED); 712 CLEAR_FLAG (op, FLAG_DAMNED);
694 } 713 }
714
695 if (op->type == SPELL) 715 if (op->type == SPELL)
696 { 716 {
697 op->destroy (); 717 op->destroy ();
698 continue; 718 continue;
699 } 719 }
… …
701 { 721 {
702 SET_FLAG (op, FLAG_CAN_USE_SKILL); 722 SET_FLAG (op, FLAG_CAN_USE_SKILL);
703 op->stats.exp = 0; 723 op->stats.exp = 0;
704 op->level = 1; 724 op->level = 1;
705 } 725 }
706 /* lock all 'normal items by default */ 726 else /* lock all 'normal items by default */
707 else
708 SET_FLAG (op, FLAG_INV_LOCKED); 727 SET_FLAG (op, FLAG_INV_LOCKED);
709 } /* for loop of objects in player inv */ 728 } /* for loop of objects in player inv */
710 729
711 /* Need to set up the skill pointers */ 730 /* Need to set up the skill pointers */
712 link_player_skills (pl); 731 link_player_skills (pl);
713} 732}
714 733
715void 734void
716get_name (object *op)
717{
718 op->contr->write_buf[0] = '\0';
719 op->contr->state = ST_GET_NAME;
720 send_query (&op->contr->socket, 0, "What is your name?\n:");
721}
722
723void
724get_password (object *op)
725{
726 op->contr->write_buf[0] = '\0';
727 op->contr->state = ST_GET_PASSWORD;
728 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
729}
730
731void
732play_again (object *op)
733{
734 op->contr->state = ST_PLAY_AGAIN;
735 op->chosen_skill = NULL;
736 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
737 /* a bit of a hack, but there are various places early in th
738 * player creation process that a user can quit (eg, roll
739 * stats) that isn't removing the player. Taking a quick
740 * look, there are many places that call play_again without
741 * removing the player - it probably makes more sense
742 * to leave it to play_again to remove the object in all
743 * cases.
744 */
745 if (!QUERY_FLAG (op, FLAG_REMOVED))
746 op->remove ();
747 /* Need to set this to null - otherwise, it could point to garbage,
748 * and draw() doesn't check to see if the player is removed, only if
749 * the map is null or not swapped out.
750 */
751 op->map = NULL;
752}
753
754int
755receive_play_again (object *op, char key)
756{
757 if (key == 'q' || key == 'Q')
758 {
759 remove_friendly_object (op);
760 leave (op->contr, 0); /* ericserver will draw the message */
761 return 2;
762 }
763 else if (key == 'a' || key == 'A')
764 {
765 player *pl = op->contr;
766 shstr name = op->name;
767
768 op->contr = 0;
769 op->type = 0;
770 op->destroy (1);
771 pl = get_player (pl);
772 op = pl->ob;
773 add_friendly_object (op);
774 op->contr->password[0] = '~';
775 op->name = op->name_pl = 0;
776 /* Lets put a space in here */
777 new_draw_info (NDI_UNIQUE, 0, op, "\n");
778 get_name (op);
779 op->name = op->name_pl = name;
780 set_first_map (op);
781 }
782 else
783 /* user pressed something else so just ask again... */
784 play_again (op);
785
786 return 0;
787}
788
789void
790confirm_password (object *op)
791{
792
793 op->contr->write_buf[0] = '\0';
794 op->contr->state = ST_CONFIRM_PASSWORD;
795 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
796}
797
798void
799get_party_password (object *op, partylist *party) 735get_party_password (object *op, partylist *party)
800{ 736{
801 if (party == NULL) 737 if (party == NULL)
802 { 738 {
803 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name); 739 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
804 return; 740 return;
805 } 741 }
742
806 op->contr->write_buf[0] = '\0'; 743 op->contr->write_buf[0] = '\0';
807 op->contr->state = ST_GET_PARTY_PASSWORD; 744 op->contr->ns->state = ST_GET_PARTY_PASSWORD;
808 op->contr->party_to_join = party; 745 op->contr->party_to_join = party;
809 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 746 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
810} 747}
811
812 748
813/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 749/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
814int 750static int
815roll_stat (void) 751roll_stat (void)
816{ 752{
817 int a[4], i, j, k; 753 int a[4], i, j, k;
818 754
819 for (i = 0; i < 4; i++) 755 for (i = 0; i < 4; i++)
820 a[i] = (int) RANDOM () % 6 + 1; 756 a[i] = (int) rndm (6) + 1;
821 757
822 for (i = 0, j = 0, k = 7; i < 4; i++) 758 for (i = 0, j = 0, k = 7; i < 4; i++)
823 if (a[i] < k) 759 if (a[i] < k)
824 k = a[i], j = i; 760 k = a[i], j = i;
825 761
826 for (i = 0, k = 0; i < 4; i++) 762 for (i = 0, k = 0; i < 4; i++)
827 {
828 if (i != j) 763 if (i != j)
829 k += a[i]; 764 k += a[i];
830 } 765
831 return k; 766 return k;
832} 767}
833 768
834void 769void
835roll_stats (object *op) 770object::roll_stats ()
836{ 771{
772 int statsort [NUM_STATS];
773
774 for (;;)
775 {
837 int sum = 0; 776 int sum = 0;
838 int i = 0, j = 0; 777 for (int i = NUM_STATS; i--; )
839 int statsort[7]; 778 sum += statsort [i] = roll_stat ();
840 779
841 do 780 if (sum >= 82 && sum <= 116)
781 break;
842 { 782 }
843 op->stats.Str = roll_stat ();
844 op->stats.Dex = roll_stat ();
845 op->stats.Int = roll_stat ();
846 op->stats.Con = roll_stat ();
847 op->stats.Wis = roll_stat ();
848 op->stats.Pow = roll_stat ();
849 op->stats.Cha = roll_stat ();
850 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
851 }
852 while (sum < 82 || sum > 116);
853 783
854 /* Sort the stats so that rerolling is easier... */ 784 // Sort the stats so that rerolling is easier...
855 statsort[0] = op->stats.Str; 785 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
856 statsort[1] = op->stats.Dex;
857 statsort[2] = op->stats.Int;
858 statsort[3] = op->stats.Con;
859 statsort[4] = op->stats.Wis;
860 statsort[5] = op->stats.Pow;
861 statsort[6] = op->stats.Cha;
862 786
863 /* a quick and dirty bubblesort? */ 787 for (int i = 0; i < NUM_STATS; ++i)
864 do 788 stats.stat (i) = statsort [i];
865 {
866 if (statsort[i] < statsort[i + 1])
867 {
868 j = statsort[i];
869 statsort[i] = statsort[i + 1];
870 statsort[i + 1] = j;
871 i = 0;
872 }
873 else
874 {
875 i++;
876 }
877 }
878 while (i < 6);
879 789
880 op->stats.Str = statsort[0];
881 op->stats.Dex = statsort[1];
882 op->stats.Con = statsort[2];
883 op->stats.Int = statsort[3];
884 op->stats.Wis = statsort[4];
885 op->stats.Pow = statsort[5];
886 op->stats.Cha = statsort[6];
887
888
889 op->contr->orig_stats.Str = op->stats.Str;
890 op->contr->orig_stats.Dex = op->stats.Dex;
891 op->contr->orig_stats.Int = op->stats.Int;
892 op->contr->orig_stats.Con = op->stats.Con;
893 op->contr->orig_stats.Wis = op->stats.Wis;
894 op->contr->orig_stats.Pow = op->stats.Pow;
895 op->contr->orig_stats.Cha = op->stats.Cha;
896
897 op->level = 1;
898 op->stats.exp = 0; 790 stats.exp = 0;
899 op->stats.ac = 0; 791 stats.ac = 0;
900 792
901 op->contr->levhp[1] = 9;
902 op->contr->levsp[1] = 6;
903 op->contr->levgrace[1] = 3;
904
905 fix_player (op);
906 op->stats.hp = op->stats.maxhp; 793 stats.hp = stats.maxhp;
907 op->stats.sp = op->stats.maxsp; 794 stats.sp = stats.maxsp;
908 op->stats.grace = op->stats.maxgrace; 795 stats.grace = stats.maxgrace;
796
797 if (contr)
798 {
799 contr->levhp[1] = 9;
800 contr->levsp[1] = 6;
801 contr->levgrace[1] = 3;
802
909 op->contr->orig_stats = op->stats; 803 contr->orig_stats = stats;
804 }
910} 805}
911 806
912void 807void
913Roll_Again (object *op) 808object::swap_stats (int a, int b)
914{ 809{
915 esrv_new_player (op->contr, 0); 810 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
916 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
917 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
918}
919 811
920void 812 for (int i = 0; i < NUM_STATS; ++i)
921Swap_Stat (object *op, int Swap_Second) 813 stats.stat (i) = contr->orig_stats.stat (i);
814
815 //TODO: the following code looks so borked and should, at the very least,
816 // be merged with the similar code in roll_stats
817 stats.ac = 0;
818
819 level = 1;
820 stats.exp = 0;
821 stats.ac = 0;
822
823 stats.hp = stats.maxhp;
824 stats.sp = stats.maxsp;
825 stats.grace = stats.maxgrace;
826
827 if (contr)
828 {
829 contr->levhp[1] = 9;
830 contr->levsp[1] = 6;
831 contr->levgrace[1] = 3;
832
833 contr->orig_stats = stats;
834 }
835}
836
837static void
838start_info (object *op)
922{ 839{
923 signed char tmp;
924 char buf[MAX_BUF]; 840 char buf[MAX_BUF];
925 841
926 if (op->contr->Swap_First == -1) 842 sprintf (buf, "Welcome to Deliantra v%s!", VERSION);
927 {
928 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
929 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
930 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
931 return;
932 }
933
934 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
935
936 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
937
938 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
939
940 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
941 new_draw_info (NDI_UNIQUE, 0, op, buf); 843 new_draw_info (NDI_UNIQUE, 0, op, buf);
942 op->stats.Str = op->contr->orig_stats.Str;
943 op->stats.Dex = op->contr->orig_stats.Dex;
944 op->stats.Con = op->contr->orig_stats.Con;
945 op->stats.Int = op->contr->orig_stats.Int;
946 op->stats.Wis = op->contr->orig_stats.Wis;
947 op->stats.Pow = op->contr->orig_stats.Pow;
948 op->stats.Cha = op->contr->orig_stats.Cha;
949 op->stats.ac = 0;
950
951 op->level = 1;
952 op->stats.exp = 0;
953 op->stats.ac = 0;
954
955 op->contr->levhp[1] = 9;
956 op->contr->levsp[1] = 6;
957 op->contr->levgrace[1] = 3;
958
959 fix_player (op);
960 op->stats.hp = op->stats.maxhp;
961 op->stats.sp = op->stats.maxsp;
962 op->stats.grace = op->stats.maxgrace;
963 op->contr->orig_stats = op->stats;
964 op->contr->Swap_First = -1;
965}
966
967
968/* This code has been greatly reduced, because with set_attr_value
969 * and get_attr_value, the stats can be accessed just numeric
970 * ids. stat_trans is a table that translate the number entered
971 * into the actual stat. It is needed because the order the stats
972 * are displayed in the stat window is not the same as how
973 * the number's access that stat. The table does that translation.
974 */
975int
976key_roll_stat (object *op, char key)
977{
978 int keynum = key - '0';
979 char buf[MAX_BUF];
980 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
981
982 if (keynum > 0 && keynum <= 7)
983 {
984 if (op->contr->Swap_First == -1)
985 {
986 op->contr->Swap_First = stat_trans[keynum];
987 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
988 new_draw_info (NDI_UNIQUE, 0, op, buf);
989 }
990 else
991 Swap_Stat (op, stat_trans[keynum]);
992
993 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
994 return 1;
995 }
996 switch (key)
997 {
998 case 'n':
999 case 'N':
1000 {
1001 SET_FLAG (op, FLAG_WIZ);
1002 if (op->map == NULL)
1003 {
1004 LOG (llevError, "Map == NULL in state 2\n");
1005 break;
1006 }
1007
1008#if 0
1009 /* So that enter_exit will put us at startx/starty */
1010 op->x = -1;
1011
1012 enter_exit (op, NULL);
1013#endif
1014 SET_ANIMATION (op, 2); /* So player faces south */
1015 /* Enter exit adds a player otherwise */
1016 add_statbonus (op);
1017 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
1018 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
1019 op->contr->state = ST_CHANGE_CLASS;
1020 if (op->msg)
1021 new_draw_info (NDI_BLUE, 0, op, op->msg);
1022 return 0;
1023 }
1024 case 'y':
1025 case 'Y':
1026 roll_stats (op);
1027 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
1028 return 1;
1029
1030 case 'q':
1031 case 'Q':
1032 play_again (op);
1033 return 1;
1034
1035 default:
1036 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
1037 return 0;
1038 }
1039 return 0;
1040} 844}
1041 845
1042/* This function takes the key that is passed, and does the 846/* This function takes the key that is passed, and does the
1043 * appropriate action with it (change race, or other things). 847 * appropriate action with it (change race, or other things).
1044 * The function name is for historical reasons - now we have 848 * The function name is for historical reasons - now we have
1045 * separate race and class; this actually changes the RACE, 849 * separate race and class; this actually changes the RACE,
1046 * not the class. 850 * not the class.
1047 */ 851 */
1048 852void
1049int 853player::chargen_race_done ()
1050key_change_class (object *op, char key)
1051{ 854{
1052 int tmp_loop;
1053
1054 if (key == 'q' || key == 'Q')
1055 {
1056 op->remove ();
1057 play_again (op);
1058 return 0;
1059 }
1060 if (key == 'd' || key == 'D')
1061 {
1062 char buf[MAX_BUF];
1063
1064 /* this must before then initial items are given */ 855 /* this must before then initial items are given */
1065 esrv_new_player (op->contr, op->weight + op->carrying); 856 esrv_new_player (ob->contr);
1066 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0);
1067 857
858 treasurelist *tl = treasurelist::find ("starting_wealth");
859 if (tl)
860 create_treasure (tl, ob, 0, 0, 0);
861
1068 INVOKE_PLAYER (BIRTH, op->contr); 862 INVOKE_PLAYER (BIRTH, ob->contr);
1069 INVOKE_PLAYER (LOGIN, op->contr); 863 INVOKE_PLAYER (LOGIN, ob->contr);
1070 864
1071 op->contr->state = ST_PLAYING; 865 ob->contr->ns->state = ST_PLAYING;
1072 866
1073 if (op->msg) 867 if (ob->msg)
1074 op->msg = NULL; 868 ob->msg = 0;
1075 869
1076 /* We create this now because some of the unique maps will need it
1077 * to save here.
1078 */
1079 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
1080 make_path_to_file (buf);
1081
1082#ifdef AUTOSAVE
1083 op->contr->last_save_tick = pticks;
1084#endif
1085 start_info (op); 870 start_info (ob);
1086 CLEAR_FLAG (op, FLAG_WIZ); 871 CLEAR_FLAG (ob, FLAG_WIZ);
1087 give_initial_items (op, op->randomitems); 872 give_initial_items (ob, ob->randomitems);
1088 link_player_skills (op); 873 link_player_skills (ob);
1089 esrv_send_inventory (op, op); 874 esrv_send_inventory (ob, ob);
1090 fix_player (op); 875 ob->update_stats ();
1091 876
1092 /* This moves the player to a different start map, if there 877 /* This moves the player to a different start map, if there
1093 * is one for this race 878 * is one for this race
1094 */ 879 */
1095 if (*first_map_ext_path) 880 if (*first_map_ext_path)
1096 { 881 ob->player_goto (format ("%s/%s", &first_map_ext_path, &ob->arch->archname), ob->x, ob->y);
1097 object *tmp;
1098 char mapname[MAX_BUF];
1099
1100 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
1101 tmp = object::create ();
1102 EXIT_PATH (tmp) = mapname;
1103 EXIT_X (tmp) = op->x;
1104 EXIT_Y (tmp) = op->y;
1105 enter_exit (op, tmp); /* we don't really care if it succeeded;
1106 * if the map isn't there, then stay on the
1107 * default initial map */
1108 tmp->destroy ();
1109 }
1110 else 882 else
1111 {
1112 LOG (llevDebug, "first_map_ext_path not set\n"); 883 LOG (llevDebug, "first_map_ext_path not set\n");
1113 } 884}
1114 return 0;
1115 }
1116 885
886void
887player::chargen_race_next ()
888{
1117 /* Following actually changes the race - this is the default command 889 /* Following actually changes the race - this is the default command
1118 * if we don't match with one of the options above. 890 * if we don't match with one of the options above.
1119 */ 891 */
1120 892
1121 tmp_loop = 0; 893 do
1122 while (!tmp_loop)
1123 { 894 {
1124 shstr name = op->name; 895 shstr name = ob->name;
1125 int x = op->x, y = op->y; 896 int x = ob->x, y = ob->y;
1126 897
1127 remove_statbonus (op); 898 ob->remove_statbonus ();
1128 op->remove (); 899 ob->remove ();
1129 op->arch = get_player_archetype (op->arch); 900 ob->arch = get_player_archetype (ob->arch);
1130 op->arch->clone.copy_to (op); 901 ob->arch->copy_to (ob);
1131 op->instantiate (); 902 ob->instantiate ();
1132 op->stats = op->contr->orig_stats; 903 ob->stats = ob->contr->orig_stats;
1133 op->name = op->name_pl = name; 904 ob->name = ob->name_pl = name;
1134 op->x = x; 905 ob->x = x;
1135 op->y = y; 906 ob->y = y;
1136 SET_ANIMATION (op, 2); /* So player faces south */ 907 SET_ANIMATION (ob, 2); /* So player faces south */
1137 insert_ob_in_map (op, op->map, op, 0); 908 insert_ob_in_map (ob, ob->map, ob, 0);
1138 assign (op->contr->title, op->arch->clone.name); 909 assign (ob->contr->title, ob->arch->object::name);
1139 add_statbonus (op); 910 ob->add_statbonus ();
1140 tmp_loop = allowed_class (op);
1141 } 911 }
912 while (!allowed_class (ob));
1142 913
1143 update_object (op, UP_OBJ_FACE); 914 update_object (ob, UP_OBJ_FACE);
1144 esrv_update_item (UPD_FACE, op, op); 915 esrv_update_item (UPD_FACE, ob, ob);
1145 fix_player (op); 916 ob->update_stats ();
1146 op->stats.hp = op->stats.maxhp; 917 ob->stats.hp = ob->stats.maxhp;
1147 op->stats.sp = op->stats.maxsp; 918 ob->stats.sp = ob->stats.maxsp;
1148 op->stats.grace = 0; 919 ob->stats.grace = 0;
1149
1150 if (op->msg)
1151 new_draw_info (NDI_BLUE, 0, op, op->msg);
1152
1153 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1154 return 0;
1155}
1156
1157int
1158key_confirm_quit (object *op, char key)
1159{
1160 char buf[MAX_BUF];
1161
1162 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1163 {
1164 op->contr->state = ST_PLAYING;
1165 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1166 return 1;
1167 }
1168
1169 INVOKE_PLAYER (LOGOUT, op->contr);
1170 INVOKE_PLAYER (QUIT, op->contr);
1171
1172 terminate_all_pets (op);
1173 leave_map (op);
1174 op->direction = 0;
1175 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1176
1177 strcpy (op->contr->killer, "quit");
1178 check_score (op);
1179 op->contr->party = NULL;
1180 if (settings.set_title == TRUE)
1181 op->contr->own_title[0] = '\0';
1182
1183 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1184 {
1185 maptile *mp, *next;
1186
1187 /* We need to hunt for any per player unique maps in memory and
1188 * get rid of them. The trailing slash in the path is intentional,
1189 * so that players named 'Ab' won't match against players 'Abe' pathname
1190 */
1191 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1192 for (mp = first_map; mp != NULL; mp = next)
1193 {
1194 next = mp->next;
1195 if (!strncmp (mp->path, buf, strlen (buf)))
1196 delete_map (mp);
1197 }
1198
1199 delete_character (op->name, 1);
1200 }
1201
1202 play_again (op);
1203 return 1;
1204} 920}
1205 921
1206void 922void
1207flee_player (object *op) 923flee_player (object *op)
1208{ 924{
… …
1238 { 954 {
1239 op->enemy = NULL; 955 op->enemy = NULL;
1240 CLEAR_FLAG (op, FLAG_SCARED); 956 CLEAR_FLAG (op, FLAG_SCARED);
1241 return; 957 return;
1242 } 958 }
959
1243 get_rangevector (op, op->enemy, &rv, 0); 960 get_rangevector (op, op->enemy, &rv, 0);
1244 961
1245 dir = absdir (4 + rv.direction); 962 dir = absdir (4 + rv.direction);
1246 for (diff = 0; diff < 3; diff++) 963 for (diff = 0; diff < 3; diff++)
1247 { 964 {
1248 int m = 1 - (RANDOM () & 2); 965 int m = 1 - (RANDOM () & 2);
1249 966
1250 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 967 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1251 {
1252 return; 968 return;
1253 }
1254 } 969 }
970
1255 /* Cornered, get rid of scared */ 971 /* Cornered, get rid of scared */
1256 CLEAR_FLAG (op, FLAG_SCARED); 972 CLEAR_FLAG (op, FLAG_SCARED);
1257 op->enemy = NULL; 973 op->enemy = NULL;
1258} 974}
1259 975
1260
1261/* check_pick sees if there is stuff to be picked up/picks up stuff. 976/* check_pick sees if there is stuff to be picked up/picks up stuff.
1262 * IT returns 1 if the player should keep on moving, 0 if he should 977 * It returns 1 if the player should keep on moving, 0 if he should
1263 * stop. 978 * stop.
1264 */ 979 */
1265int 980int
1266check_pick (object *op) 981check_pick (object *op)
1267{ 982{
1268 object *tmp, *next; 983 object *tmp, *next;
1269 int stop = 0; 984 int stop = 0;
1270 int j, k, wvratio; 985 int wvratio;
1271 char putstring[128], tmpstr[16]; 986 char putstring[128];
1272 987
1273 /* if you're flying, you cna't pick up anything */ 988 /* if you're flying, you cna't pick up anything */
1274 if (op->move_type & MOVE_FLYING) 989 if (op->move_type & MOVE_FLYING)
1275 return 1; 990 return 1;
1276 991
1277 next = op->below; 992 next = op->below;
1278 993
994 int cnt = MAX_ITEM_PER_DROP;
995#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
996
1279 /* loop while there are items on the floor that are not marked as 997 /* loop while there are items on the floor that are not marked as
1280 * destroyed */ 998 * destroyed */
1281 while (next && !next->destroyed ()) 999 while (next && !next->destroyed ())
1282 { 1000 {
1283 tmp = next; 1001 tmp = next;
1284 next = tmp->below; 1002 next = tmp->below;
1285 1003
1004 if (cnt <= 0)
1005 {
1006 op->failmsg ("Couldn't pickup all items at once.");
1007 return 0;
1008 }
1009
1286 if (op->destroyed ()) 1010 if (op->destroyed ())
1287 return 0; 1011 return 0;
1288 1012
1289 if (!can_pick (op, tmp)) 1013 if (!can_pick (op, tmp))
1290 continue; 1014 continue;
1291 1015
1292 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE) 1016 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1293 { 1017 {
1294 if (item_matched_string (op, tmp, op->contr->search_str)) 1018 if (item_matched_string (op, tmp, op->contr->search_str))
1295 pick_up (op, tmp); 1019 CHK_PICK_PICKUP;
1296 continue; 1020 continue;
1297 } 1021 }
1298 1022
1299 /* high not bit set? We're using the old autopickup model */ 1023 /* high not bit set? We're using the old autopickup model */
1300 if (!(op->contr->mode & PU_NEWMODE)) 1024 if (!(op->contr->mode & PU_NEWMODE))
… …
1302 switch (op->contr->mode) 1026 switch (op->contr->mode)
1303 { 1027 {
1304 case 0: 1028 case 0:
1305 return 1; /* don't pick up */ 1029 return 1; /* don't pick up */
1306 case 1: 1030 case 1:
1307 pick_up (op, tmp); 1031 CHK_PICK_PICKUP;
1308 return 1; 1032 return 1;
1309 case 2: 1033 case 2:
1310 pick_up (op, tmp); 1034 CHK_PICK_PICKUP;
1311 return 0; 1035 return 0;
1312 case 3: 1036 case 3:
1313 return 0; /* stop before pickup */ 1037 return 0; /* stop before pickup */
1314 case 4: 1038 case 4:
1315 pick_up (op, tmp); 1039 CHK_PICK_PICKUP;
1316 break; 1040 break;
1317 case 5: 1041 case 5:
1318 pick_up (op, tmp); 1042 CHK_PICK_PICKUP;
1319 stop = 1; 1043 stop = 1;
1320 break; 1044 break;
1321 case 6: 1045 case 6:
1322 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1046 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1323 pick_up (op, tmp); 1047 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1048 CHK_PICK_PICKUP;
1324 break; 1049 break;
1325 1050
1326 case 7: 1051 case 7:
1327 if (tmp->type == MONEY || tmp->type == GEM) 1052 if (tmp->type == MONEY || tmp->type == GEM)
1328 pick_up (op, tmp); 1053 CHK_PICK_PICKUP;
1329 break; 1054 break;
1330 1055
1331 default: 1056 default:
1332 /* use value density */ 1057 /* use value density */
1333 if (!QUERY_FLAG (tmp, FLAG_UNPAID) 1058 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1334 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode) 1059 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1335 pick_up (op, tmp); 1060 CHK_PICK_PICKUP;
1336 } 1061 }
1337 } 1062 }
1338 else 1063 else
1339 { /* old model */ 1064 { /* old model */
1340 /* NEW pickup handling */ 1065 /* NEW pickup handling */
… …
1344 if (tmp->name != NULL) 1069 if (tmp->name != NULL)
1345 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1070 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1346 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1071 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1347 else 1072 else
1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1073 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1349 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1074 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1075
1350 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1076 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1351
1352 sprintf (putstring, "...flags: ");
1353 for (k = 0; k < 4; k++)
1354 {
1355 for (j = 0; j < 32; j++)
1356 {
1357 if ((tmp->flags[k] >> j) & 0x01)
1358 {
1359 sprintf (tmpstr, "%d ", k * 32 + j);
1360 strcat (putstring, tmpstr);
1361 }
1362 }
1363 }
1364 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1365
1366#if 0
1367 /* print the flags too */
1368 for (k = 0; k < 4; k++)
1369 {
1370 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1371 for (j = 0; j < 32; j++)
1372 {
1373 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1374 if (!((j + 1) % 4))
1375 fprintf (stderr, " ");
1376 }
1377 fprintf (stderr, " [%d]\n", k * 32);
1378 }
1379#endif
1380 } 1077 }
1078
1381 /* philosophy: 1079 /* philosophy:
1382 * It's easy to grab an item type from a pile, as long as it's 1080 * It's easy to grab an item type from a pile, as long as it's
1383 * generic. This takes no game-time. For more detailed pickups 1081 * generic. This takes no game-time. For more detailed pickups
1384 * and selections, select-items shoul dbe used. This is a 1082 * and selections, select-items should be used. This is a
1385 * grab-as-you-run type mode that's really useful for arrows for 1083 * grab-as-you-run type mode that's really useful for arrows for
1386 * example. 1084 * example.
1387 * The drawback: right now it has no frontend, so you need to 1085 * The drawback: right now it has no frontend, so you need to
1388 * stick the bits you want into a calculator in hex mode and then 1086 * stick the bits you want into a calculator in hex mode and then
1389 * convert to decimal and then 'pickup <#> 1087 * convert to decimal and then 'pickup <#>
… …
1422 /* all food and drink if desired */ 1120 /* all food and drink if desired */
1423 /* question: don't pick up known-poisonous stuff? */ 1121 /* question: don't pick up known-poisonous stuff? */
1424 if (op->contr->mode & PU_FOOD) 1122 if (op->contr->mode & PU_FOOD)
1425 if (tmp->type == FOOD) 1123 if (tmp->type == FOOD)
1426 { 1124 {
1427 pick_up (op, tmp); 1125 CHK_PICK_PICKUP;
1428 continue; 1126 continue;
1429 } 1127 }
1430 1128
1431 if (op->contr->mode & PU_DRINK) 1129 if (op->contr->mode & PU_DRINK)
1432 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))) 1130 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1433 { 1131 {
1434 pick_up (op, tmp); 1132 CHK_PICK_PICKUP;
1435 continue; 1133 continue;
1436 } 1134 }
1437 1135
1438 if (op->contr->mode & PU_POTION) 1136 if (op->contr->mode & PU_POTION)
1439 if (tmp->type == POTION) 1137 if (tmp->type == POTION)
1440 { 1138 {
1441 pick_up (op, tmp); 1139 CHK_PICK_PICKUP;
1442 continue; 1140 continue;
1443 } 1141 }
1444 1142
1445 /* spellbooks, skillscrolls and normal books/scrolls */ 1143 /* spellbooks, skillscrolls and normal books/scrolls */
1446 if (op->contr->mode & PU_SPELLBOOK) 1144 if (op->contr->mode & PU_SPELLBOOK)
1447 if (tmp->type == SPELLBOOK) 1145 if (tmp->type == SPELLBOOK)
1448 { 1146 {
1449 pick_up (op, tmp); 1147 CHK_PICK_PICKUP;
1450 continue; 1148 continue;
1451 } 1149 }
1452 1150
1453 if (op->contr->mode & PU_SKILLSCROLL) 1151 if (op->contr->mode & PU_SKILLSCROLL)
1454 if (tmp->type == SKILLSCROLL) 1152 if (tmp->type == SKILLSCROLL)
1455 { 1153 {
1456 pick_up (op, tmp); 1154 CHK_PICK_PICKUP;
1457 continue; 1155 continue;
1458 } 1156 }
1459 1157
1460 if (op->contr->mode & PU_READABLES) 1158 if (op->contr->mode & PU_READABLES)
1461 if (tmp->type == BOOK || tmp->type == SCROLL) 1159 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1462 { 1160 {
1463 pick_up (op, tmp); 1161 CHK_PICK_PICKUP;
1464 continue; 1162 continue;
1465 } 1163 }
1466 1164
1467 /* wands/staves/rods/horns */ 1165 /* wands/staves/rods/horns */
1468 if (op->contr->mode & PU_MAGIC_DEVICE) 1166 if (op->contr->mode & PU_MAGIC_DEVICE)
1469 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1167 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1470 { 1168 {
1471 pick_up (op, tmp); 1169 CHK_PICK_PICKUP;
1472 continue; 1170 continue;
1473 } 1171 }
1474 1172
1475 /* pick up all magical items */ 1173 /* pick up all magical items */
1476 if (op->contr->mode & PU_MAGICAL) 1174 if (op->contr->mode & PU_MAGICAL)
1477 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1175 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1478 { 1176 {
1479 pick_up (op, tmp); 1177 CHK_PICK_PICKUP;
1480 continue; 1178 continue;
1481 } 1179 }
1482 1180
1483 if (op->contr->mode & PU_VALUABLES) 1181 if (op->contr->mode & PU_VALUABLES)
1484 { 1182 {
1485 if (tmp->type == MONEY || tmp->type == GEM) 1183 if (tmp->type == MONEY || tmp->type == GEM)
1486 { 1184 {
1487 pick_up (op, tmp); 1185 CHK_PICK_PICKUP;
1488 continue; 1186 continue;
1489 } 1187 }
1490 } 1188 }
1491 1189
1492 /* rings & amulets - talismans seems to be typed AMULET */ 1190 /* rings & amulets - talismans seems to be typed AMULET */
1493 if (op->contr->mode & PU_JEWELS) 1191 if (op->contr->mode & PU_JEWELS)
1494 if (tmp->type == RING || tmp->type == AMULET) 1192 if (tmp->type == RING || tmp->type == AMULET)
1495 { 1193 {
1496 pick_up (op, tmp); 1194 CHK_PICK_PICKUP;
1497 continue; 1195 continue;
1498 } 1196 }
1499 1197
1500 /* we don't forget dragon food */ 1198 /* we don't forget dragon food */
1501 if (op->contr->mode & PU_FLESH) 1199 if (op->contr->mode & PU_FLESH)
1502 if (tmp->type == FLESH) 1200 if (tmp->type == FLESH)
1503 { 1201 {
1504 pick_up (op, tmp); 1202 CHK_PICK_PICKUP;
1505 continue; 1203 continue;
1506 } 1204 }
1507 1205
1508 /* bows and arrows. Bows are good for selling! */ 1206 /* bows and arrows. Bows are good for selling! */
1509 if (op->contr->mode & PU_BOW) 1207 if (op->contr->mode & PU_BOW)
1510 if (tmp->type == BOW) 1208 if (tmp->type == BOW)
1511 { 1209 {
1512 pick_up (op, tmp); 1210 CHK_PICK_PICKUP;
1513 continue; 1211 continue;
1514 } 1212 }
1515 1213
1516 if (op->contr->mode & PU_ARROW) 1214 if (op->contr->mode & PU_ARROW)
1517 if (tmp->type == ARROW) 1215 if (tmp->type == ARROW)
1518 { 1216 {
1519 pick_up (op, tmp); 1217 CHK_PICK_PICKUP;
1520 continue; 1218 continue;
1521 } 1219 }
1522 1220
1523 /* all kinds of armor etc. */ 1221 /* all kinds of armor etc. */
1524 if (op->contr->mode & PU_ARMOUR) 1222 if (op->contr->mode & PU_ARMOUR)
1525 if (tmp->type == ARMOUR) 1223 if (tmp->type == ARMOUR)
1526 { 1224 {
1527 pick_up (op, tmp); 1225 CHK_PICK_PICKUP;
1528 continue; 1226 continue;
1529 } 1227 }
1530 1228
1531 if (op->contr->mode & PU_HELMET) 1229 if (op->contr->mode & PU_HELMET)
1532 if (tmp->type == HELMET) 1230 if (tmp->type == HELMET)
1533 { 1231 {
1534 pick_up (op, tmp); 1232 CHK_PICK_PICKUP;
1535 continue; 1233 continue;
1536 } 1234 }
1537 1235
1538 if (op->contr->mode & PU_SHIELD) 1236 if (op->contr->mode & PU_SHIELD)
1539 if (tmp->type == SHIELD) 1237 if (tmp->type == SHIELD)
1540 { 1238 {
1541 pick_up (op, tmp); 1239 CHK_PICK_PICKUP;
1542 continue; 1240 continue;
1543 } 1241 }
1544 1242
1545 if (op->contr->mode & PU_BOOTS) 1243 if (op->contr->mode & PU_BOOTS)
1546 if (tmp->type == BOOTS) 1244 if (tmp->type == BOOTS)
1547 { 1245 {
1548 pick_up (op, tmp); 1246 CHK_PICK_PICKUP;
1549 continue; 1247 continue;
1550 } 1248 }
1551 1249
1552 if (op->contr->mode & PU_GLOVES) 1250 if (op->contr->mode & PU_GLOVES)
1553 if (tmp->type == GLOVES) 1251 if (tmp->type == GLOVES)
1554 { 1252 {
1555 pick_up (op, tmp); 1253 CHK_PICK_PICKUP;
1556 continue; 1254 continue;
1557 } 1255 }
1558 1256
1559 if (op->contr->mode & PU_CLOAK) 1257 if (op->contr->mode & PU_CLOAK)
1560 if (tmp->type == CLOAK) 1258 if (tmp->type == CLOAK)
1561 { 1259 {
1562 pick_up (op, tmp); 1260 CHK_PICK_PICKUP;
1563 continue; 1261 continue;
1564 } 1262 }
1565 1263
1566 /* hoping to catch throwing daggers here */ 1264 /* hoping to catch throwing daggers here */
1567 if (op->contr->mode & PU_MISSILEWEAPON) 1265 if (op->contr->mode & PU_MISSILEWEAPON)
1568 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN)) 1266 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1569 { 1267 {
1570 pick_up (op, tmp); 1268 CHK_PICK_PICKUP;
1571 continue; 1269 continue;
1572 } 1270 }
1573 1271
1574 /* careful: chairs and tables are weapons! */ 1272 /* careful: chairs and tables are weapons! */
1575 if (op->contr->mode & PU_ALLWEAPON) 1273 if (op->contr->mode & PU_ALLWEAPON)
1576 { 1274 {
1577 if (tmp->type == WEAPON && tmp->name != NULL) 1275 if (tmp->type == WEAPON && tmp->name != NULL)
1578 { 1276 {
1579 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1277 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1580 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1278 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1581 { 1279 {
1582 pick_up (op, tmp); 1280 CHK_PICK_PICKUP;
1583 continue; 1281 continue;
1584 } 1282 }
1585 } 1283 }
1586 1284
1587 if (tmp->type == WEAPON && tmp->name == NULL) 1285 if (tmp->type == WEAPON && tmp->name == NULL)
1588 { 1286 {
1589 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1287 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1590 { 1288 {
1591 pick_up (op, tmp); 1289 CHK_PICK_PICKUP;
1592 continue; 1290 continue;
1593 } 1291 }
1594 } 1292 }
1595 } 1293 }
1596 1294
1597 /* misc stuff that's useful */ 1295 /* misc stuff that's useful */
1598 if (op->contr->mode & PU_KEY) 1296 if (op->contr->mode & PU_KEY)
1599 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1297 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1600 { 1298 {
1601 pick_up (op, tmp); 1299 CHK_PICK_PICKUP;
1602 continue; 1300 continue;
1603 } 1301 }
1604 1302
1605 /* any of the last 4 bits set means we use the ratio for value 1303 /* any of the last 4 bits set means we use the ratio for value
1606 * pickups */ 1304 * pickups */
… …
1611 /* >=7 is the old standard setting. Now we take the last 4 bits 1309 /* >=7 is the old standard setting. Now we take the last 4 bits
1612 * and multiply them by 5, giving 0..15*5== 5..75 */ 1310 * and multiply them by 5, giving 0..15*5== 5..75 */
1613 wvratio = (op->contr->mode & PU_RATIO) * 5; 1311 wvratio = (op->contr->mode & PU_RATIO) * 5;
1614 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio) 1312 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1615 { 1313 {
1616 pick_up (op, tmp); 1314 CHK_PICK_PICKUP;
1617#if 0 1315#if 0
1618 fprintf (stderr, "HIGH WEIGHT/VALUE ["); 1316 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1619 if (tmp->name != NULL) 1317 if (tmp->name != NULL)
1620 { 1318 {
1621 fprintf (stderr, "%s", tmp->name); 1319 fprintf (stderr, "%s", tmp->name);
1622 } 1320 }
1623 else 1321 else
1624 fprintf (stderr, "%s", tmp->arch->name); 1322 fprintf (stderr, "%s", tmp->arch->archname);
1625 fprintf (stderr, ",%d] = ", tmp->type); 1323 fprintf (stderr, ",%d] = ", tmp->type);
1626 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1324 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1627#endif 1325#endif
1628 continue; 1326 continue;
1629 } 1327 }
… …
1640 * found object is returned. 1338 * found object is returned.
1641 */ 1339 */
1642object * 1340object *
1643find_arrow (object *op, const char *type) 1341find_arrow (object *op, const char *type)
1644{ 1342{
1645 object *tmp = NULL;
1646
1647 for (op = op->inv; op; op = op->below) 1343 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1648 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1649 tmp = find_arrow (op, type);
1650 else if (op->type == ARROW && op->race == type) 1344 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1345 return splay (tmp);
1346
1347 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1348 if (tmp->type == CONTAINER && QUERY_FLAG (tmp, FLAG_APPLIED) && !strcmp (&tmp->race, type))
1349 if (object *arrow = find_arrow (tmp, type))
1350 {
1351 splay (tmp);
1651 return op; 1352 return arrow;
1353 }
1354
1652 return tmp; 1355 return 0;
1653} 1356}
1654 1357
1655/* 1358/*
1656 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1359 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1657 * against the target. A full test is not performed, simply a basic test 1360 * against the target. A full test is not performed, simply a basic test
1658 * of resistances. The archer is making a quick guess at what he sees down 1361 * of resistances. The archer is making a quick guess at what he sees down
1659 * the hall. Failing that it does it's best to pick the highest plus arrow. 1362 * the hall. Failing that it does it's best to pick the highest plus arrow.
1660 */ 1363 */
1661
1662object * 1364object *
1663find_better_arrow (object *op, object *target, const char *type, int *better) 1365find_better_arrow (object *op, object *target, const char *type, int *better)
1664{ 1366{
1665 object *tmp = NULL, *arrow, *ntmp; 1367 object *tmp = NULL, *arrow, *ntmp;
1666 int attacknum, attacktype, betterby = 0, i; 1368 int attacknum, attacktype, betterby = 0, i;
… …
1681 } 1383 }
1682 } 1384 }
1683 else if (arrow->type == ARROW && arrow->race == type) 1385 else if (arrow->type == ARROW && arrow->race == type)
1684 { 1386 {
1685 /* allways prefer assasination/slaying */ 1387 /* allways prefer assasination/slaying */
1686 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race)) 1388 if (target->race && arrow->slaying && strstr (arrow->slaying, target->race))
1687 { 1389 {
1688 if (arrow->attacktype & AT_DEATH) 1390 if (arrow->attacktype & AT_DEATH)
1689 { 1391 {
1690 *better = 100; 1392 *better = 100;
1691 return arrow; 1393 return arrow;
… …
1699 else 1401 else
1700 { 1402 {
1701 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1403 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1702 { 1404 {
1703 attacktype = 1 << attacknum; 1405 attacktype = 1 << attacknum;
1704 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1406 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1705 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1407 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1706 { 1408 {
1707 tmp = arrow; 1409 tmp = arrow;
1708 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1410 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1709 } 1411 }
1710 } 1412 }
1711 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1413 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1712 { 1414 {
1713 tmp = arrow; 1415 tmp = arrow;
… …
1719 betterby = 1 + arrow->magic + arrow->stats.dam; 1421 betterby = 1 + arrow->magic + arrow->stats.dam;
1720 } 1422 }
1721 } 1423 }
1722 } 1424 }
1723 } 1425 }
1426
1724 if (tmp == NULL && arrow == NULL) 1427 if (tmp == NULL && arrow == NULL)
1725 return find_arrow (op, type); 1428 return find_arrow (op, type);
1726 1429
1727 *better = betterby; 1430 *better = betterby;
1728 return tmp; 1431 return tmp;
… …
1732 * find_better_arrow to find a decent arrow to use. 1435 * find_better_arrow to find a decent arrow to use.
1733 * op = the shooter 1436 * op = the shooter
1734 * type = bow->race 1437 * type = bow->race
1735 * dir = fire direction 1438 * dir = fire direction
1736 */ 1439 */
1737
1738object * 1440object *
1739pick_arrow_target (object *op, const char *type, int dir) 1441pick_arrow_target (object *op, const char *type, int dir)
1740{ 1442{
1741 object *tmp = NULL; 1443 object *tmp = NULL;
1742 maptile *m; 1444 maptile *m;
… …
1807 */ 1509 */
1808int 1510int
1809fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1511fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1810{ 1512{
1811 object *left, *bow; 1513 object *left, *bow;
1812 int bowspeed, mflags; 1514 int mflags;
1813 maptile *m; 1515 maptile *m;
1814 1516
1815 if (!dir) 1517 if (!dir)
1816 { 1518 {
1817 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1519 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1818 return 0; 1520 return 0;
1819 } 1521 }
1820 if (op->type == PLAYER) 1522
1821 bow = op->contr->ranges[range_bow]; 1523 if (op->contr)
1524 bow = op->current_weapon;
1822 else 1525 else
1823 { 1526 {
1824 for (bow = op->inv; bow; bow = bow->below) 1527 for (bow = op->inv; bow; bow = bow->below)
1825 /* Don't check for applied - monsters don't apply bows - in that way, they 1528 /* Don't check for applied - monsters don't apply bows - in that way, they
1826 * don't need to switch back and forth between bows and weapons. 1529 * don't need to switch back and forth between bows and weapons.
… …
1831 if (!bow) 1534 if (!bow)
1832 { 1535 {
1833 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1536 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1834 return 0; 1537 return 0;
1835 } 1538 }
1539
1540 // optimisation: move object to top so we will find it quickly again
1541 if (bow->below)
1542 {
1543 bow->remove ();
1544 op->insert (bow);
1545 }
1546
1836 } 1547 }
1548
1837 if (!bow->race || !bow->skill) 1549 if (!bow->race || !bow->skill)
1838 { 1550 {
1839 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1551 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1840 return 0; 1552 return 0;
1841 } 1553 }
1842
1843 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1844
1845 /* penalize ROF for bestarrow */
1846 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1847 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1848 if (bowspeed < 1)
1849 bowspeed = 1;
1850 1554
1851 if (arrow == NULL) 1555 if (arrow == NULL)
1852 { 1556 {
1853 if ((arrow = find_arrow (op, bow->race)) == NULL) 1557 if ((arrow = find_arrow (op, bow->race)) == NULL)
1854 { 1558 {
1855 if (op->type == PLAYER) 1559 if (op->type == PLAYER)
1856 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1560 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1857 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1561 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1858 else 1562 else
1859 CLEAR_FLAG (op, FLAG_READY_BOW); 1563 CLEAR_FLAG (op, FLAG_READY_BOW);
1564
1860 return 0; 1565 return 0;
1861 } 1566 }
1862 } 1567 }
1568
1863 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1569 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1864 if (mflags & P_OUT_OF_MAP) 1570 if (mflags & P_OUT_OF_MAP)
1865 {
1866 return 0; 1571 return 0;
1867 } 1572
1868 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW) 1573 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1869 { 1574 {
1870 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way."); 1575 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1871 return 0; 1576 return 0;
1872 } 1577 }
… …
1877 arrow->destroy (); 1582 arrow->destroy ();
1878 return 0; 1583 return 0;
1879 } 1584 }
1880 1585
1881 left = arrow; /* these are arrows left to the player */ 1586 left = arrow; /* these are arrows left to the player */
1882 arrow = get_split_ob (arrow, 1); 1587 arrow = arrow->split ();
1883 if (arrow == NULL) 1588 if (!arrow)
1884 { 1589 {
1885 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1886 return 0; 1591 return 0;
1887 } 1592 }
1593
1888 arrow->set_owner (op); 1594 arrow->set_owner (op);
1889 arrow->skill = bow->skill; 1595 arrow->skill = bow->skill;
1890
1891 arrow->direction = dir; 1596 arrow->direction = dir;
1892 arrow->x = sx; 1597
1893 arrow->y = sy; 1598 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1599 arrow->stats.hp = arrow->stats.dam;
1600 arrow->stats.grace = arrow->attacktype;
1601
1602 if (arrow->slaying)
1603 arrow->spellarg = strdup (arrow->slaying);
1604
1605#if 0
1606 if (player *pl = op->contr)
1607 {
1608 float speed = pl->weapon_sp;
1609
1610 /* penalize ROF for bestarrow */
1611 if (pl->bowtype == bow_bestarrow)
1612 speed *= .9f;
1613 else
1614 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1615
1616 op->speed_left += speed - op->speed;
1617 }
1618#endif
1619
1620 SET_ANIMATION (arrow, arrow->direction);
1621
1622 /* update the speed */
1623 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1624 + bow->stats.dam / 7.f;
1625
1626 arrow->set_speed (max (arrow->speed, 2.f));
1627 arrow->speed_left = 0;
1628
1629 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1894 1630
1895 if (op->type == PLAYER) 1631 if (op->type == PLAYER)
1896 { 1632 {
1897 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1898 fix_player (op);
1899 }
1900
1901 SET_ANIMATION (arrow, arrow->direction);
1902 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1903 arrow->stats.hp = arrow->stats.dam;
1904 arrow->stats.grace = arrow->attacktype;
1905 if (arrow->slaying != NULL)
1906 arrow->spellarg = strdup_local (arrow->slaying);
1907
1908 /* Note that this was different for monsters - they got their level
1909 * added to the damage. I think the strength bonus is more proper.
1910 */
1911
1912 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1913
1914 /* update the speed */
1915 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1916 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1917
1918 if (arrow->speed < 1.0)
1919 arrow->speed = 1.0;
1920 update_ob_speed (arrow);
1921 arrow->speed_left = 0;
1922
1923 if (op->type == PLAYER)
1924 {
1925 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1926 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1927 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1928
1929 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1633 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1634 wc -= dex_bonus[op->stats.Dex];
1635
1636 if (!arrow->slaying)
1637 arrow->slaying = op->slaying;
1638
1639 arrow->attacktype |= op->attacktype;
1930 } 1640 }
1931 else 1641 else
1932 { 1642 {
1933 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1934 arrow->level = op->level; 1643 arrow->level = op->level;
1935 } 1644 arrow->stats.wc -= bow->magic;
1936 1645
1937 if (arrow->attacktype == AT_PHYSICAL) 1646 if (!arrow->slaying)
1647 arrow->slaying = bow->slaying;
1648
1938 arrow->attacktype |= bow->attacktype; 1649 arrow->attacktype |= bow->attacktype;
1650 }
1939 1651
1940 if (bow->slaying != NULL) 1652 wc -= arrow->level;
1941 arrow->slaying = bow->slaying; 1653 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1942 1654
1943 arrow->map = m; 1655 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1944 arrow->move_type = MOVE_FLY_LOW; 1656 arrow->move_type = MOVE_FLY_LOW;
1945 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1657 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1946 1658
1947 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1659 op->play_sound (sound_find ("fire_arrow"));
1948 insert_ob_in_map (arrow, m, op, 0); 1660 m->insert (arrow, sx, sy, op);
1949 1661
1950 if (!arrow->destroyed ()) 1662 if (!arrow->destroyed ())
1951 move_arrow (arrow); 1663 move_arrow (arrow);
1952
1953 if (op->type == PLAYER)
1954 {
1955 if (left->destroyed ())
1956 esrv_del_item (op->contr, left->count);
1957 else
1958 esrv_send_item (op, left);
1959 }
1960 1664
1961 return 1; 1665 return 1;
1962} 1666}
1963 1667
1964/* Special fire code for players - this takes into 1668/* Special fire code for players - this takes into
… …
1973{ 1677{
1974 int ret = 0, wcmod = 0; 1678 int ret = 0, wcmod = 0;
1975 1679
1976 if (op->contr->bowtype == bow_bestarrow) 1680 if (op->contr->bowtype == bow_bestarrow)
1977 { 1681 {
1978 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1682 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1979 } 1683 }
1980 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1684 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1981 { 1685 {
1982 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1686 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1983 wcmod = -1; 1687 wcmod = -1;
1688
1984 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1689 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1985 } 1690 }
1986 else if (op->contr->bowtype == bow_threewide) 1691 else if (op->contr->bowtype == bow_threewide)
1987 { 1692 {
1988 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1693 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1992 else if (op->contr->bowtype == bow_spreadshot) 1697 else if (op->contr->bowtype == bow_spreadshot)
1993 { 1698 {
1994 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1699 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1995 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1700 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1996 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1701 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1997
1998 } 1702 }
1999 else 1703 else
2000 { 1704 {
2001 /* Simple case */ 1705 /* Simple case */
2002 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1706 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
2003 } 1707 }
1708
2004 return ret; 1709 return ret;
2005} 1710}
2006
2007 1711
2008/* Fires a misc (wand/rod/horn) object in 'dir'. 1712/* Fires a misc (wand/rod/horn) object in 'dir'.
2009 * Broken apart from 'fire' to keep it more readable. 1713 * Broken apart from 'fire' to keep it more readable.
2010 */ 1714 */
2011void 1715void
2012fire_misc_object (object *op, int dir) 1716fire_misc_object (object *op, int dir)
2013{ 1717{
2014 object *item; 1718 object *item = op->contr->ranged_ob;
2015 1719
2016 if (!op->contr->ranges[range_misc]) 1720 if (!item)
2017 { 1721 {
2018 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1722 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
2019 return; 1723 return;
2020 } 1724 }
2021 1725
2022 item = op->contr->ranges[range_misc];
2023 if (!item->inv) 1726 if (!item->inv)
2024 { 1727 {
2025 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1728 LOG (llevError, "Object %s lacks a spell\n", &item->name);
2026 return; 1729 return;
2027 } 1730 }
1731
1732 if (!op->change_weapon (item))
1733 return;
1734
2028 if (item->type == WAND) 1735 if (item->type == WAND)
2029 { 1736 {
2030 if (item->stats.food <= 0) 1737 if (item->stats.food <= 0)
2031 { 1738 {
2032 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1739 op->contr->play_sound (sound_find ("wand_poof"));
2033 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1740 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1741
2034 return; 1742 return;
2035 } 1743 }
2036 } 1744 }
2037 else if (item->type == ROD || item->type == HORN) 1745 else if (item->type == ROD || item->type == HORN)
2038 { 1746 {
2039 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1747 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace);
1748
1749 // using the maximum of the rods charge allows at least one spell cast
1750 // for a rod or horn, this fixes some broken rods.
1751 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp))
2040 { 1752 {
2041 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1753 op->contr->play_sound (sound_find ("wand_poof"));
1754
2042 if (item->type == ROD) 1755 if (item->type == ROD)
2043 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1756 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
2044 else 1757 else
2045 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1758 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1759
2046 return; 1760 return;
2047 } 1761 }
2048 } 1762 }
2049 1763
2050 if (cast_spell (op, item, dir, item->inv, NULL)) 1764 if (cast_spell (op, item, dir, item->inv, NULL))
… …
2057 object *tmp; 1771 object *tmp;
2058 1772
2059 if (item->arch) 1773 if (item->arch)
2060 { 1774 {
2061 CLEAR_FLAG (item, FLAG_ANIMATE); 1775 CLEAR_FLAG (item, FLAG_ANIMATE);
2062 item->face = item->arch->clone.face; 1776 item->face = item->arch->face;
2063 item->speed = 0; 1777 item->set_speed (0);
2064 update_ob_speed (item);
2065 } 1778 }
2066 if ((tmp = is_player_inv (item))) 1779
1780 if (object *pl = item->visible_to ())
2067 esrv_update_item (UPD_ANIM, tmp, item); 1781 esrv_update_item (UPD_ANIM, pl, item);
2068 } 1782 }
2069 } 1783 }
2070 else if (item->type == ROD || item->type == HORN) 1784 else if (item->type == ROD || item->type == HORN)
2071 {
2072 drain_rod_charge (item); 1785 drain_rod_charge (item);
2073 }
2074 } 1786 }
2075} 1787}
2076 1788
2077/* Received a fire command for the player - go and do it. 1789/* Received a fire command for the player - go and do it.
2078 */ 1790 */
2079void 1791bool
2080fire (object *op, int dir) 1792fire (object *op, int dir)
2081{ 1793{
2082 int spellcost = 0; 1794 int spellcost = 0;
2083 1795
2084 /* check for loss of invisiblity/hide */ 1796 /* check for loss of invisiblity/hide */
2085 if (action_makes_visible (op)) 1797 if (action_makes_visible (op))
2086 make_visible (op); 1798 make_visible (op);
2087 1799
2088 switch (op->contr->shoottype) 1800 player *pl = op->contr;
1801
1802 if (pl->golem)
1803 {
1804 control_golem (op->contr->golem, dir);
1805 return false;
2089 { 1806 }
2090 case range_none:
2091 return;
2092 1807
2093 case range_bow: 1808 object *ob = pl->ranged_ob;
1809
1810 if (!ob)
1811 return false;
1812
1813 if (!op->change_weapon (ob))
1814 return false;
1815
1816 if (op->speed_left > 0.f)
1817 --op->speed_left;
1818 else
1819 return false;
1820
1821 switch (ob->type)
1822 {
1823 case BOW:
2094 player_fire_bow (op, dir); 1824 player_fire_bow (op, dir);
2095 return; 1825 break;
2096 1826
2097 case range_magic: /* Casting spells */ 1827 case SPELL:
2098 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1828 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
2099 return; 1829 break;
2100 1830
2101 case range_misc: 1831 case BUILDER:
1832 apply_map_builder (op, dir);
1833 break;
1834
1835 case SKILL:
1836 do_skill (op, op, ob, dir, 0);
1837 break;
1838
1839 default:
2102 fire_misc_object (op, dir); 1840 fire_misc_object (op, dir);
2103 return; 1841 break;
2104
2105 case range_golem: /* Control summoned monsters from scrolls */
2106 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2107 {
2108 op->contr->ranges[range_golem] = 0;
2109 op->contr->shoottype = range_none;
2110 }
2111 else
2112 control_golem (op->contr->ranges[range_golem], dir);
2113 return;
2114
2115 case range_skill:
2116 if (!op->chosen_skill)
2117 {
2118 if (op->type == PLAYER)
2119 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2120 return;
2121 }
2122 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
2123 return;
2124 case range_builder:
2125 apply_map_builder (op, dir);
2126 return;
2127 default:
2128 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
2129 return;
2130 } 1842 }
2131}
2132 1843
2133 1844 return true;
1845}
2134 1846
2135/* find_key 1847/* find_key
2136 * We try to find a key for the door as passed. If we find a key 1848 * We try to find a key for the door as passed. If we find a key
2137 * and successfully use it, we return the key, otherwise NULL 1849 * and successfully use it, we return the key, otherwise NULL
2138 * This function merges both normal and locked door, since the logic 1850 * This function merges both normal and locked door, since the logic
… …
2140 * pl is the player, 1852 * pl is the player,
2141 * inv is the objects inventory to searched 1853 * inv is the objects inventory to searched
2142 * door is the door we are trying to match against. 1854 * door is the door we are trying to match against.
2143 * This function can be called recursively to search containers. 1855 * This function can be called recursively to search containers.
2144 */ 1856 */
2145
2146object * 1857object *
2147find_key (object *pl, object *container, object *door) 1858find_key (object *pl, object *container, object *door)
2148{ 1859{
2149 object *tmp, *key; 1860 object *tmp, *key;
2150 1861
2151 /* Should not happen, but sanity checking is never bad */ 1862 /* Should not happen, but sanity checking is never bad */
2152 if (container->inv == NULL) 1863 if (!container->inv)
2153 return NULL; 1864 return 0;
2154 1865
2155 /* First, lets try to find a key in the top level inventory */ 1866 /* First, lets try to find a key in the top level inventory */
2156 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1867 for (tmp = container->inv; tmp; tmp = tmp->below)
2157 { 1868 {
2158 if (door->type == DOOR && tmp->type == KEY) 1869 if (door->type == DOOR && tmp->type == KEY)
2159 break; 1870 break;
2160 /* For sanity, we should really check door type, but other stuff 1871 /* For sanity, we should really check door type, but other stuff
2161 * (like containers) can be locked with special keys 1872 * (like containers) can be locked with special keys
2162 */ 1873 */
2163 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1874 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
2164 break; 1875 break;
2165 } 1876 }
1877
2166 /* No key found - lets search inventories now */ 1878 /* No key found - lets search inventories now */
2167 /* If we find and use a key in an inventory, return at that time. 1879 /* If we find and use a key in an inventory, return at that time.
2168 * otherwise, if we search all the inventories and still don't find 1880 * otherwise, if we search all the inventories and still don't find
2169 * a key, return 1881 * a key, return
2170 */ 1882 */
2171 if (!tmp) 1883 if (!tmp)
2172 { 1884 {
2173 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1885 for (tmp = container->inv; tmp; tmp = tmp->below)
2174 { 1886 {
2175 /* No reason to search empty containers */ 1887 /* No reason to search empty containers */
2176 if (tmp->type == CONTAINER && tmp->inv) 1888 if (tmp->type == CONTAINER && tmp->inv)
2177 { 1889 {
2178 if ((key = find_key (pl, tmp, door)) != NULL) 1890 if ((key = find_key (pl, tmp, door)))
2179 return key; 1891 return key;
2180 } 1892 }
2181 } 1893 }
1894
2182 if (!tmp) 1895 if (!tmp)
2183 return NULL; 1896 return NULL;
2184 } 1897 }
1898
2185 /* We get down here if we have found a key. Now if its in a container, 1899 /* We get down here if we have found a key. Now if its in a container,
2186 * see if we actually want to use it 1900 * see if we actually want to use it
2187 */ 1901 */
2188 if (pl != container) 1902 if (pl != container)
2189 { 1903 {
… …
2210 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1924 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2211 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1925 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2212 return NULL; 1926 return NULL;
2213 } 1927 }
2214 } 1928 }
1929
2215 return tmp; 1930 return tmp;
2216} 1931}
2217 1932
2218/* moved door processing out of move_player_attack. 1933/* moved door processing out of move_player_attack.
2219 * returns 1 if player has opened the door with a key 1934 * returns 1 if player has opened the door with a key
… …
2221 * 0 otherwise 1936 * 0 otherwise
2222 */ 1937 */
2223static int 1938static int
2224player_attack_door (object *op, object *door) 1939player_attack_door (object *op, object *door)
2225{ 1940{
2226
2227 /* If its a door, try to find a use a key. If we do destroy the door, 1941 /* If its a door, try to find a key. If we do destroy the door,
2228 * might as well return immediately as there is nothing more to do - 1942 * might as well return immediately as there is nothing more to do -
2229 * otherwise, we fall through to the rest of the code. 1943 * otherwise, we fall through to the rest of the code.
2230 */ 1944 */
2231 object *key = find_key (op, op, door); 1945 object *key = find_key (op, op, door);
2232 1946
2233 /* IF we found a key, do some extra work */ 1947 /* If we found a key, do some extra work */
2234 if (key) 1948 if (key)
2235 { 1949 {
2236 object *container = key->env; 1950 object *container = key->env;
2237 1951
2238 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
2239 if (action_makes_visible (op)) 1952 if (action_makes_visible (op))
2240 make_visible (op); 1953 make_visible (op);
1954
2241 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1955 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2242 spring_trap (door->inv, op); 1956 spring_trap (door->inv, op);
1957
2243 if (door->type == DOOR) 1958 if (door->type == DOOR)
2244 {
2245 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1959 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2246 }
2247 else if (door->type == LOCKED_DOOR) 1960 else if (door->type == LOCKED_DOOR)
2248 { 1961 {
2249 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1962 op->statusmsg (format ("You open the door with the %s", query_short_name (key)), NDI_BROWN);
2250 remove_door2 (door); /* remove door without violence ;-) */ 1963 remove_door2 (door); /* remove door without violence ;-) */
2251 } 1964 }
1965
2252 /* Do this after we print the message */ 1966 /* Do this after we print the message */
2253 decrease_ob (key); /* Use up one of the keys */ 1967 key->decrease (); /* Use up one of the keys */
2254 /* Need to update the weight the container the key was in */ 1968
2255 if (container != op)
2256 esrv_update_item (UPD_WEIGHT, op, container);
2257 return 1; /* Nothing more to do below */ 1969 return 1; /* Nothing more to do below */
2258 } 1970 }
2259 else if (door->type == LOCKED_DOOR) 1971 else if (door->type == LOCKED_DOOR)
2260 { 1972 {
2261 /* Might as well return now - no other way to open this */ 1973 /* Might as well return now - no other way to open this */
2262 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 1974 op->failmsg (door->msg ? &door->msg : "Hmm, you miss the certain something to open this door...");
2263 return 1; 1975 return 1;
2264 } 1976 }
1977
2265 return 0; 1978 return 0;
2266} 1979}
2267 1980
2268/* This function is just part of a breakup from move_player. 1981/* This function is just part of a breakup from move_player.
2269 * It should keep the code cleaner. 1982 * It should keep the code cleaner.
2270 * When this is called, the players direction has been updated 1983 * When this is called, the players direction has been updated
2271 * (taking into account confusion.) The player is also actually 1984 * (taking into account confusion.) The player is also actually
2272 * going to try and move (not fire weapons). 1985 * going to try and move (not fire weapons).
2273 */ 1986 */
2274 1987bool
2275void
2276move_player_attack (object *op, int dir) 1988move_player_attack (object *op, int dir)
2277{ 1989{
2278 object *tmp, *mon;
2279 sint16 nx, ny;
2280 int on_battleground; 1990 int on_battleground;
2281 maptile *m;
2282 1991
2283 nx = freearr_x[dir] + op->x; 1992 sint16 nx = freearr_x[dir] + op->x;
2284 ny = freearr_y[dir] + op->y; 1993 sint16 ny = freearr_y[dir] + op->y;
2285 1994
2286 on_battleground = op_on_battleground (op, NULL, NULL); 1995 on_battleground = op_on_battleground (op, 0, 0);
1996
1997 if (out_of_map (op->map, nx, ny))
1998 return false;
1999
2000 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2001 {
2002 --op->speed_left;
2003 return true;
2004 }
2287 2005
2288 /* If braced, or can't move to the square, and it is not out of the 2006 /* If braced, or can't move to the square, and it is not out of the
2289 * map, attack it. Note order of if statement is important - don't 2007 * map, attack it. Note order of if statement is important - don't
2290 * want to be calling move_ob if braced, because move_ob will move the 2008 * want to be calling move_ob if braced, because move_ob will move the
2291 * player. This is a pretty nasty hack, because if we could 2009 * player. This is a pretty nasty hack, because if we could
2292 * move to some space, it then means that if we are braced, we should 2010 * move to some space, it then means that if we are braced, we should
2293 * do nothing at all. As it is, if we are braced, we go through 2011 * do nothing at all. As it is, if we are braced, we go through
2294 * quite a bit of processing. However, it probably is less than what 2012 * quite a bit of processing. However, it probably is less than what
2295 * move_ob uses. 2013 * move_ob uses.
2296 */ 2014 */
2297 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2015 maptile *m = op->map->xy_find (nx, ny);
2298 {
2299 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2300 {
2301 m = get_map_from_coord (op->map, &nx, &ny);
2302 if (!m)
2303 return; /* Don't think this should happen */
2304 }
2305 else
2306 m = op->map;
2307 2016
2308 if ((tmp = get_map_ob (m, nx, ny)) == NULL)
2309 {
2310 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2311 return;
2312 }
2313
2314 mon = NULL;
2315 /* Go through all the objects, and find ones of interest. Only stop if 2017 /* Go through all the objects, and find ones of interest. Only stop if
2316 * we find a monster - that is something we know we want to attack. 2018 * we find a monster - that is something we know we want to attack.
2317 * if its a door or barrel (can roll) see if there may be monsters 2019 * if its a door or barrel (can roll) see if there may be monsters
2318 * on the space 2020 * on the space
2319 */ 2021 */
2320 while (tmp != NULL) 2022 object *mon;
2321 { 2023 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2322 if (tmp == op) 2024 {
2323 { 2025 if ((mon->flag [FLAG_ALIVE]
2324 tmp = tmp->above; 2026 || mon->type == LOCKED_DOOR
2325 continue; 2027 || mon->flag [FLAG_CAN_ROLL])
2326 }
2327
2328 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2329 {
2330 mon = tmp; 2028 && mon != op)
2331 break; 2029 break;
2332 } 2030 }
2333 2031
2334 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2335 mon = tmp;
2336
2337 tmp = tmp->above;
2338 }
2339
2340 if (mon == NULL) /* This happens anytime the player tries to move */ 2032 if (!mon) /* This happens anytime the player tries to move */
2341 return; /* into a wall */ 2033 return false; /* into a wall */
2342 2034
2343 if (mon->head != NULL)
2344 mon = mon->head; 2035 mon = mon->head_ ();
2345 2036
2346 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2037 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2038 if (op->contr->weapon_sp_left > 0.f)
2347 if (player_attack_door (op, mon)) 2039 if (player_attack_door (op, mon))
2040 {
2041 --op->contr->weapon_sp_left;
2348 return; 2042 return true;
2043 }
2349 2044
2350 /* The following deals with possibly attacking peaceful 2045 /* The following deals with possibly attacking peaceful
2351 * or frienddly creatures. Basically, all players are considered 2046 * or friendly creatures. Basically, all players are considered
2352 * unaggressive. If the moving player has peaceful set, then the 2047 * unaggressive. If the moving player has peaceful set, then the
2353 * object should be pushed instead of attacked. It is assumed that 2048 * object should be pushed instead of attacked. It is assumed that
2354 * if you are braced, you will not attack friends accidently, 2049 * if you are braced, you will not attack friends accidently,
2355 * and thus will not push them. 2050 * and thus will not push them.
2356 */ 2051 */
2357 2052
2358 /* If the creature is a pet, push it even if the player is not 2053 /* If the creature is a pet, push it even if the player is not
2359 * peaceful. Our assumption is the creature is a pet if the 2054 * peaceful. Our assumption is the creature is a pet if the
2360 * player owns it and it is either friendly or unagressive. 2055 * player owns it and it is either friendly or unagressive.
2361 */ 2056 */
2362 if ((op->type == PLAYER) 2057 if (op->type == PLAYER
2363#if COZY_SERVER
2364 &&
2365 ((mon->owner && mon->owner->contr 2058 && ((mon->owner && mon->owner->contr
2366 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2059 && same_party (mon->owner->contr->party, op->contr->party))
2367#else
2368 && mon->owner == op 2060 || mon->owner == op)
2369#endif
2370 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2061 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2371 { 2062 {
2372 /* If we're braced, we don't want to switch places with it */ 2063 /* If we're braced, we don't want to switch places with it */
2373 if (op->contr->braced) 2064 if (op->contr->braced)
2374 return; 2065 return false;
2375 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2066
2067 if (op->speed_left > 0.f)
2068 {
2069 --op->speed_left;
2070
2071 op->play_sound (sound_find ("push_player"));
2376 (void) push_ob (mon, dir, op); 2072 push_ob (mon, dir, op);
2073
2377 if (op->contr->tmp_invis || op->hide) 2074 if (op->contr->tmp_invis || op->hide)
2378 make_visible (op); 2075 make_visible (op);
2076
2379 return; 2077 return true;
2380 } 2078 }
2079 else
2080 return false;
2081 }
2381 2082
2382 /* in certain circumstances, you shouldn't attack friendly 2083 /* in certain circumstances, you shouldn't attack friendly
2383 * creatures. Note that if you are braced, you can't push 2084 * creatures. Note that if you are braced, you can't push
2384 * someone, but put it inside this loop so that you won't 2085 * someone, but put it inside this loop so that you won't
2385 * attack them either. 2086 * attack them either.
2386 */ 2087 */
2387 if ((mon->type == PLAYER || mon->enemy != op) && 2088 if ((mon->type == PLAYER || mon->enemy != op)
2388 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2089 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2389#ifdef PROHIBIT_PLAYERKILL 2090 && ((op->contr->peaceful
2390 (op->contr->peaceful 2091 || (mon->type == PLAYER && mon->contr->peaceful))
2391 || (mon->type == PLAYER 2092 && !on_battleground))
2392 && mon->contr-> 2093 {
2393 peaceful)) && 2094 if (op->speed_left > 0.f)
2394#else
2395 op->contr->peaceful &&
2396#endif
2397 !on_battleground))
2398 { 2095 {
2096 --op->speed_left;
2097
2399 if (!op->contr->braced) 2098 if (!op->contr->braced)
2400 { 2099 {
2401 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2100 op->play_sound (sound_find ("push_player"));
2402 (void) push_ob (mon, dir, op); 2101 push_ob (mon, dir, op);
2403 } 2102 }
2404 else 2103 else
2405 { 2104 op->statusmsg ("You withhold your attack");
2406 new_draw_info (0, 0, op, "You withhold your attack"); 2105
2407 }
2408 if (op->contr->tmp_invis || op->hide) 2106 if (op->contr->tmp_invis || op->hide)
2409 make_visible (op); 2107 make_visible (op);
2410 }
2411 2108
2109 return true;
2110 }
2111 }
2412 /* If the object is a boulder or other rollable object, then 2112 /* If the object is a boulder or other rollable object, then
2413 * roll it if not braced. You can't roll it if you are braced. 2113 * roll it if not braced. You can't roll it if you are braced.
2414 */ 2114 */
2415 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2115 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2116 {
2117 if (op->speed_left > 0.f)
2416 { 2118 {
2119 --op->speed_left;
2120
2417 recursive_roll (mon, dir, op); 2121 recursive_roll (mon, dir, op);
2418 if (action_makes_visible (op)) 2122 if (action_makes_visible (op))
2419 make_visible (op); 2123 make_visible (op);
2420 }
2421 2124
2125 return true;
2126 }
2127 }
2422 /* Any generic living creature. Including things like doors. 2128 /* Any generic living creature. Including things like doors.
2423 * Way it works is like this: First, it must have some hit points 2129 * Way it works is like this: First, it must have some hit points
2424 * and be living. Then, it must be one of the following: 2130 * and be living. Then, it must be one of the following:
2425 * 1) Not a player, 2) A player, but of a different party. Note 2131 * 1) Not a player, 2) A player, but of a different party. Note
2426 * that party_number -1 is no party, so attacks can still happen. 2132 * that party_number -1 is no party, so attacks can still happen.
2427 */ 2133 */
2428
2429 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2134 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2430 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2135 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2431 { 2136 {
2432 2137 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2433 /* If the player hasn't hit something this tick, and does
2434 * so, give them speed boost based on weapon speed. Doing
2435 * it here is better than process_players2, which basically
2436 * incurred a 1 tick offset.
2437 */
2438 if (!op->contr->has_hit)
2439 { 2138 {
2440 op->speed_left += op->speed / op->contr->weapon_sp; 2139 --op->contr->weapon_sp_left;
2441 2140
2442 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2443 }
2444
2445 skill_attack (mon, op, 0, NULL, NULL); 2141 skill_attack (mon, op, 0, 0, 0);
2446 2142
2447 /* If attacking another player, that player gets automatic
2448 * hitback, and doesn't loose luck either.
2449 * Disable hitback on the battleground or if the target is
2450 * the wiz.
2451 */
2452 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2453 {
2454 short luck = mon->stats.luck;
2455
2456 mon->contr->has_hit = 1;
2457 skill_attack (op, mon, 0, NULL, NULL);
2458 mon->stats.luck = luck;
2459 }
2460 if (action_makes_visible (op)) 2143 if (action_makes_visible (op))
2461 make_visible (op); 2144 make_visible (op);
2462 }
2463 } /* if player should attack something */
2464}
2465 2145
2466int 2146 return true;
2147 }
2148 }
2149
2150 return false;
2151}
2152
2153bool
2467move_player (object *op, int dir) 2154move_player (object *op, int dir)
2468{ 2155{
2469 int pick; 2156 int pick;
2470 2157
2471 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2158 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2472 return 0; 2159 return 0;
2473 2160
2474 /* Sanity check: make sure dir is valid */ 2161 /* Sanity check: make sure dir is valid */
2475 if ((dir < 0) || (dir >= 9)) 2162 if ((dir < 0) || (dir >= 9))
2476 { 2163 {
2477 LOG (llevError, "move_player: invalid direction %d\n", dir); 2164 LOG (llevError, "move_player: invalid direction %d\n", dir);
2478 return 0; 2165 return 0;
2479 } 2166 }
2480 2167
2481 /* peterm: added following line */ 2168 /* peterm: added following line */
2482 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2169 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2483 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2170 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2484 2171
2485 op->facing = dir; 2172 op->facing = dir;
2486 2173
2487 if (op->hide) 2174 if (op->hide)
2488 do_hidden_move (op); 2175 do_hidden_move (op);
2489 2176
2177 bool retval;
2178
2490 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2179 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2491 /*nop */ ; 2180 retval = RESULT_INT (0);
2492 else if (op->contr->fire_on) 2181 else if (op->contr->fire_on)
2493 fire (op, dir); 2182 retval = fire (op, dir);
2494 else 2183 else
2495 { 2184 {
2496 move_player_attack (op, dir); 2185 retval = move_player_attack (op, dir);
2497 pick = check_pick (op); 2186 pick = check_pick (op);
2498 } 2187 }
2499 2188
2500 /* Add special check for newcs players and fire on - this way, the 2189 /* Add special check for newcs players and fire on - this way, the
2501 * server can handle repeat firing. 2190 * server can handle repeat firing.
2502 */ 2191 */
2503 if (op->contr->fire_on || (op->contr->run_on && pick != 0)) 2192 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2504 {
2505 op->direction = dir; 2193 op->direction = dir;
2506 }
2507 else 2194 else
2508 {
2509 op->direction = 0; 2195 op->direction = 0;
2510 } 2196
2511 /* Update how the player looks. Use the facing, so direction may 2197 /* Update how the player looks. Use the facing, so direction may
2512 * get reset to zero. This allows for full animation capabilities 2198 * get reset to zero. This allows for full animation capabilities
2513 * for players. 2199 * for players.
2514 */ 2200 */
2515 animate_object (op, op->facing); 2201 animate_object (op, op->facing);
2516 return 0; 2202
2203 return retval;
2517} 2204}
2518 2205
2519/* This is similar to handle_player, below, but is only used by the 2206/* This is similar to handle_player, below, but is only used by the
2520 * new client/server stuff. 2207 * new client/server stuff.
2521 * This is sort of special, in that the new client/server actually uses 2208 * This is sort of special, in that the new client/server actually uses
2522 * the new speed values for commands. 2209 * the new speed values for commands.
2523 * 2210 *
2524 * Returns true if there are more actions we can do. 2211 * Returns true if there are more actions we can do. Should not do
2212 * many actions in a row, as that would be too unfair to other
2213 * players.
2525 */ 2214 */
2526int 2215bool
2527handle_newcs_player (object *op) 2216handle_newcs_player (object *op)
2528{ 2217{
2529 if (op->contr->hidden)
2530 {
2531 op->invisible = 1000;
2532 /* the socket code flashes the player visible/invisible
2533 * depending on the value of invisible, so we need to
2534 * alternate it here for it to work correctly.
2535 */
2536 if (pticks & 2)
2537 op->invisible--;
2538 }
2539 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2540 {
2541 op->invisible--;
2542 if (!op->invisible)
2543 {
2544 make_visible (op);
2545 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2546 }
2547 }
2548
2549 if (QUERY_FLAG (op, FLAG_SCARED)) 2218 if (QUERY_FLAG (op, FLAG_SCARED))
2550 { 2219 {
2551 flee_player (op); 2220 if (op->speed_left > 0.f)
2552 /* If player is still scared, that is his action for this tick */
2553 if (QUERY_FLAG (op, FLAG_SCARED))
2554 { 2221 {
2555 op->speed_left--; 2222 --op->speed_left;
2223 flee_player (op);
2224
2556 return 0; 2225 return true;
2557 } 2226 }
2227 else
2228 return false;
2558 } 2229 }
2559
2560 /* I've been seeing crashes where the golem has been destroyed, but
2561 * the player object still points to the defunct golem. The code that
2562 * destroys the golem looks correct, and it doesn't always happen, so
2563 * put this in a a workaround to clean up the golem pointer.
2564 */
2565 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2566 op->contr->ranges[range_golem] = 0;
2567 2230
2568 /* call this here - we also will call this in do_ericserver, but 2231 /* call this here - we also will call this in do_ericserver, but
2569 * the players time has been increased when doericserver has been 2232 * the players time has been increased when doericserver has been
2570 * called, so we recheck it here. 2233 * called, so we recheck it here.
2571 */ 2234 */
2572 HandleClient (&op->contr->socket, op->contr); 2235 if (op->contr->ns->handle_command ())
2573 if (op->speed_left < 0)
2574 return 0; 2236 return true;
2575 2237
2576 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2238 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2577 {
2578 /* All move commands take 1 tick, at least for now */
2579 op->speed_left--;
2580
2581 /* Instead of all the stuff below, let move_player take care
2582 * of it. Also, some of the skill stuff is only put in
2583 * there, as well as the confusion stuff.
2584 */
2585 move_player (op, op->direction); 2239 return move_player (op, op->direction);
2586 if (op->speed_left > 0) 2240
2587 return 1;
2588 else
2589 return 0;
2590 }
2591 return 0; 2241 return false;
2592} 2242}
2593 2243
2594int 2244int
2595save_life (object *op) 2245save_life (object *op)
2596{ 2246{
2597 object *tmp;
2598
2599 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2247 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2600 return 0; 2248 return 0;
2601 2249
2602 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2250 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2603 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2251 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2604 { 2252 {
2605 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2253 op->play_sound (sound_find ("ob_evaporate"));
2606 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2254 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2607
2608 if (op->contr)
2609 esrv_del_item (op->contr, tmp->count);
2610 2255
2611 tmp->destroy (); 2256 tmp->destroy ();
2612 CLEAR_FLAG (op, FLAG_LIFESAVE); 2257 CLEAR_FLAG (op, FLAG_LIFESAVE);
2613 2258
2614 if (op->stats.hp < 0) 2259 if (op->stats.hp < 0)
2615 op->stats.hp = op->stats.maxhp; 2260 op->stats.hp = op->stats.maxhp;
2616 2261
2617 if (op->stats.food < 0) 2262 if (op->stats.food < 0)
2618 op->stats.food = 999; 2263 op->stats.food = 999;
2619 2264
2620 fix_player (op); 2265 op->update_stats ();
2621 return 1; 2266 return 1;
2622 } 2267 }
2268
2623 LOG (llevError, "Error: LIFESAVE set without applied object.\n"); 2269 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2624 CLEAR_FLAG (op, FLAG_LIFESAVE); 2270 CLEAR_FLAG (op, FLAG_LIFESAVE);
2625 enter_player_savebed (op); /* bring him home. */ 2271 enter_player_savebed (op); /* bring him home. */
2626 return 0; 2272 return 0;
2627} 2273}
2628 2274
2629/* This goes throws the inventory and removes unpaid objects, and puts them 2275/* This goes throws the inventory and removes unpaid objects, and puts them
2630 * back in the map (location and map determined by values of env). This 2276 * back in the map (location and map determined by values of env). This
2631 * function will descend into containers. op is the object to start the search 2277 * function will descend into containers. op is the object to start the search
2632 * from. 2278 * from.
2633 */ 2279 */
2280static void
2281drop_unpaid_items (object *op, object *env)
2282{
2283 while (op)
2284 {
2285 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2286
2287 if (QUERY_FLAG (op, FLAG_UNPAID))
2288 op->insert_at (env);
2289 else if (op->inv)
2290 drop_unpaid_items (op->inv, env);
2291
2292 op = next;
2293 }
2294}
2295
2634void 2296void
2635remove_unpaid_objects (object *op, object *env) 2297object::drop_unpaid_items ()
2636{ 2298{
2637 object *next; 2299 if (!flag [FLAG_REMOVED])
2638 2300 ::drop_unpaid_items (inv, this);
2639 while (op)
2640 {
2641 next = op->below; /* Make sure we have a good value, in case
2642 * we remove object 'op'
2643 */
2644 if (QUERY_FLAG (op, FLAG_UNPAID))
2645 {
2646 op->remove ();
2647 op->x = env->x;
2648 op->y = env->y;
2649 if (env->type == PLAYER)
2650 esrv_del_item (env->contr, op->count);
2651 insert_ob_in_map (op, env->map, NULL, 0);
2652 }
2653 else if (op->inv)
2654 remove_unpaid_objects (op->inv, env);
2655 op = next;
2656 }
2657} 2301}
2658
2659 2302
2660/* 2303/*
2661 * Returns pointer a static string containing gravestone text 2304 * Returns pointer a static string containing gravestone text
2662 * Moved from apply.c to player.c - player.c is what 2305 * Moved from apply.c to player.c - player.c is what
2663 * actually uses this function. player.c may not be quite the 2306 * actually uses this function. player.c may not be quite the
2664 * best, a misc file for object actions is probably better, 2307 * best, a misc file for object actions is probably better,
2665 * but there isn't one in the server directory. 2308 * but there isn't one in the server directory.
2666 */ 2309 */
2667char * 2310const char *
2668gravestone_text (object *op) 2311gravestone_text (object *op)
2669{ 2312{
2670 static char buf2[MAX_BUF]; 2313 static dynbuf_text buf;
2671 char buf[MAX_BUF];
2672 time_t now = time (NULL);
2673 2314
2674 strcpy (buf2, " R.I.P.\n\n"); 2315 buf << "---- R.I.P. ----\n\n";
2316 op->name;
2317
2675 if (op->type == PLAYER) 2318 if (op->type == PLAYER)
2676 sprintf (buf, "%s the %s\n", &op->name, op->contr->title); 2319 buf << " the " << op->contr->title;
2677 else 2320
2678 sprintf (buf, "%s\n", &op->name); 2321 buf << "\n\n";
2679 strncat (buf2, " ", 20 - strlen (buf) / 2); 2322
2680 strcat (buf2, buf); 2323 buf << "who was level ";
2324 buf << (sint32)op->level << "\n\n" // OO breakdown
2325 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2326
2681 if (op->type == PLAYER) 2327 if (op->type == PLAYER)
2682 sprintf (buf, "who was in level %d when killed\n", op->level); 2328 buf << "by " << op->contr->killer_name () << ".\n\n";
2683 else 2329
2684 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2685 strncat (buf2, " ", 20 - strlen (buf) / 2);
2686 strcat (buf2, buf);
2687 if (op->type == PLAYER)
2688 { 2330 {
2689 sprintf (buf, "by %s.\n\n", op->contr->killer); 2331 static char buf2[128];
2690 strncat (buf2, " ", 21 - strlen (buf) / 2); 2332 time_t now = time (NULL);
2691 strcat (buf2, buf);
2692 }
2693 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2333 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2694 strncat (buf2, " ", 20 - strlen (buf) / 2); 2334 buf << buf2;
2695 strcat (buf2, buf); 2335 }
2336
2696 return buf2; 2337 return buf;
2697} 2338}
2698
2699
2700 2339
2701void 2340void
2702do_some_living (object *op) 2341do_some_living (object *op)
2703{ 2342{
2704 int last_food = op->stats.food; 2343 int last_food = op->stats.food;
… …
2710 int rate_grace = 2000; 2349 int rate_grace = 2000;
2711 const int max_hp = 1; 2350 const int max_hp = 1;
2712 const int max_sp = 1; 2351 const int max_sp = 1;
2713 const int max_grace = 1; 2352 const int max_grace = 1;
2714 2353
2715 if (op->contr->outputs_sync) 2354 if (op->contr->hidden)
2716 {
2717 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2718 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2719 flush_output_element (op, &op->contr->outputs[i]);
2720 } 2355 {
2356 op->invisible = 1000;
2357 /* the socket code flashes the player visible/invisible
2358 * depending on the value of invisible, so we need to
2359 * alternate it here for it to work correctly.
2360 */
2361 if (pticks & 2)
2362 op->invisible--;
2363 }
2364 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2365 {
2366 if (!op->invisible--)
2367 {
2368 make_visible (op);
2369 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2370 }
2371 }
2721 2372
2722 if (op->contr->state == ST_PLAYING) 2373 if (op->contr->ns->state == ST_PLAYING)
2723 { 2374 {
2724
2725 /* these next three if clauses make it possible to SLOW DOWN 2375 /* these next three if clauses make it possible to SLOW DOWN
2726 hp/grace/spellpoint regeneration. */ 2376 hp/grace/spellpoint regeneration. */
2727 if (op->contr->gen_hp >= 0) 2377 if (op->contr->gen_hp >= 0)
2728 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp; 2378 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2729 else 2379 else
2730 { 2380 {
2731 gen_hp = op->stats.maxhp; 2381 gen_hp = op->stats.maxhp;
2732 rate_hp -= rate_hp / 2 * op->contr->gen_hp; 2382 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2733 } 2383 }
2384
2734 if (op->contr->gen_sp >= 0) 2385 if (op->contr->gen_sp >= 0)
2735 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp; 2386 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2736 else 2387 else
2737 { 2388 {
2738 gen_sp = op->stats.maxsp; 2389 gen_sp = op->stats.maxsp;
2739 rate_sp -= rate_sp / 2 * op->contr->gen_sp; 2390 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2740 } 2391 }
2392
2741 if (op->contr->gen_grace >= 0) 2393 if (op->contr->gen_grace >= 0)
2742 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace; 2394 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2743 else 2395 else
2744 { 2396 {
2745 gen_grace = op->stats.maxgrace; 2397 gen_grace = op->stats.maxgrace;
2746 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2398 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2747 } 2399 }
2748 2400
2749 /* Regenerate Spell Points */
2750 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2751 {
2752 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2753 if (op->stats.sp < op->stats.maxsp)
2754 {
2755 op->stats.sp++;
2756 /* dms do not consume food */
2757 if (!QUERY_FLAG (op, FLAG_WIZ))
2758 {
2759 op->stats.food--;
2760 if (op->contr->digestion < 0)
2761 op->stats.food += op->contr->digestion;
2762 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2763 op->stats.food = last_food;
2764 }
2765 }
2766 if (max_sp > 1)
2767 {
2768 over_sp = (gen_sp + 10) / rate_sp;
2769 if (over_sp > 0)
2770 {
2771 if (op->stats.sp < op->stats.maxsp)
2772 {
2773 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2774 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2775 op->stats.sp--;
2776 if (op->stats.sp > op->stats.maxsp)
2777 op->stats.sp = op->stats.maxsp;
2778 }
2779 op->last_sp = 0;
2780 }
2781 else
2782 {
2783 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2784 }
2785 }
2786 else
2787 {
2788 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2789 }
2790 }
2791
2792 /* Regenerate Grace */ 2401 /* Regenerate Grace */
2793 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */ 2402 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2794 if (--op->last_grace < 0) 2403 if (--op->last_grace < 0)
2795 { 2404 {
2796 if (op->stats.grace < op->stats.maxgrace / 2) 2405 if (op->stats.grace < op->stats.maxgrace / 2)
2797 op->stats.grace++; /* no penalty in food for regaining grace */ 2406 op->stats.grace++; /* no penalty in food for regaining grace */
2407
2798 if (max_grace > 1) 2408 if (max_grace > 1)
2799 { 2409 {
2800 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace; 2410 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2801 if (over_grace > 0) 2411 if (over_grace > 0)
2802 { 2412 {
… …
2814 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10); 2424 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2815 } 2425 }
2816 /* wearing stuff doesn't detract from grace generation. */ 2426 /* wearing stuff doesn't detract from grace generation. */
2817 } 2427 }
2818 2428
2429 if (op->stats.food > 0)
2430 {
2819 /* Regenerate Hit Points */ 2431 /* Regenerate Spell Points */
2820 if (--op->last_heal < 0) 2432 if (!op->contr->golem && --op->last_sp < 0)
2821 {
2822 if (op->stats.hp < op->stats.maxhp)
2823 { 2433 {
2824 op->stats.hp++; 2434 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2825 /* dms do not consume food */ 2435
2826 if (!QUERY_FLAG (op, FLAG_WIZ)) 2436 if (op->stats.sp < op->stats.maxsp)
2827 { 2437 {
2438 op->stats.sp++;
2439
2440 /* dms do not consume food */
2441 if (!QUERY_FLAG (op, FLAG_WIZ))
2442 {
2828 op->stats.food--; 2443 op->stats.food--;
2444
2829 if (op->contr->digestion < 0) 2445 if (op->contr->digestion < 0)
2830 op->stats.food += op->contr->digestion; 2446 op->stats.food += op->contr->digestion;
2831 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH)) 2447 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2832 op->stats.food = last_food; 2448 op->stats.food = last_food;
2449 }
2833 } 2450 }
2834 } 2451
2835 if (max_hp > 1) 2452 if (max_sp > 1)
2836 {
2837 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2838 if (over_hp > 0)
2839 { 2453 {
2840 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0; 2454 over_sp = (gen_sp + 10) / rate_sp;
2455 if (over_sp > 0)
2456 {
2457 if (op->stats.sp < op->stats.maxsp)
2458 {
2459 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2460
2461 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2462 op->stats.sp--;
2463
2464 if (op->stats.sp > op->stats.maxsp)
2465 op->stats.sp = op->stats.maxsp;
2466 }
2467
2841 op->last_heal = 0; 2468 op->last_sp = 0;
2469 }
2470 else
2471 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2842 } 2472 }
2843 else 2473 else
2474 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2475 }
2476
2477 /* Regenerate Hit Points */
2478 if (--op->last_heal < 0)
2479 {
2480 if (op->stats.hp < op->stats.maxhp)
2844 { 2481 {
2845 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2482 op->stats.hp++;
2483
2484 /* dms do not consume food */
2485 if (!QUERY_FLAG (op, FLAG_WIZ))
2486 {
2487 op->stats.food--;
2488
2489 if (op->contr->digestion < 0)
2490 op->stats.food += op->contr->digestion;
2491 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2492 op->stats.food = last_food;
2493 }
2846 } 2494 }
2495
2496 if (max_hp > 1)
2497 {
2498 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2499
2500 if (over_hp > 0)
2501 {
2502 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2503 op->last_heal = 0;
2504 }
2505 else
2506 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2847 } 2507 }
2848 else 2508 else
2849 {
2850 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10); 2509 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2851 } 2510 }
2852 } 2511 }
2853 2512
2854 /* Digestion */ 2513 /* Digestion */
2855 if (--op->last_eat < 0) 2514 if (--op->last_eat < 0)
2856 { 2515 {
2857#ifdef COZY_SERVER 2516 int bonus = max (0, op->contr->digestion),
2858 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2517 penalty = max (0, -op->contr->digestion);
2859 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2860#else
2861 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2862#endif
2863 2518
2864 if (op->contr->gen_hp > 0)
2865 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2519 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2866 else 2520
2867 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2868 /* dms do not consume food */ 2521 /* dms do not consume food */
2869 if (!QUERY_FLAG (op, FLAG_WIZ)) 2522 if (!QUERY_FLAG (op, FLAG_WIZ))
2870 op->stats.food--; 2523 op->stats.food--;
2871 } 2524 }
2872 }
2873 2525
2874 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0) 2526 if (op->stats.food < 0 && op->stats.hp >= 0)
2875 { 2527 {
2876 object *tmp, *flesh = NULL; 2528 object *flesh = 0;
2877 2529
2878 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 2530 for_inv_removable (op, tmp)
2879 {
2880 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2881 { 2531 {
2532 if (QUERY_FLAG (tmp, FLAG_UNPAID))
2533 continue;
2534
2882 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2535 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2883 { 2536 {
2884 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2537 op->statusmsg ("You blindly grab for a bite of food. "
2538 "H<To prevent you from starving, you ate some random item from your backpack.>");
2885 manual_apply (op, tmp, 0); 2539 manual_apply (op, tmp, 0);
2540
2886 if (op->stats.food >= 0 || op->stats.hp < 0) 2541 if (op->stats.food >= 0 || op->stats.hp < 0)
2887 break; 2542 break;
2888 } 2543 }
2889 else if (tmp->type == FLESH) 2544 else if (tmp->type == FLESH)
2890 flesh = tmp; 2545 flesh = tmp;
2891 } /* End if paid for object */ 2546 }
2892 } /* end of for loop */ 2547
2893 /* If player is still starving, it means they don't have any food, so 2548 /* If player is still starving, it means they don't have any food, so
2894 * eat flesh instead. 2549 * eat flesh instead.
2895 */ 2550 */
2896 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2551 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2897 { 2552 {
2898 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food."); 2553 op->statusmsg ("You blindly grab for a bite of food. "
2554 "H<To prevent you from starving, you ate some random item from your backpack.>");
2899 manual_apply (op, flesh, 0); 2555 manual_apply (op, flesh, 0);
2556 }
2557
2558 // If player is still starving, alert him!
2559 if (op->stats.food < 0)
2560 op->failmsg ("You are starving! "
2561 "H<Eat some food to increase your food and prevent you from an untimely death.>");
2562 }
2563
2564 if (op->stats.food < 0)
2900 } 2565 {
2901 } /* end if player is starving */ 2566 op->stats.hp += op->stats.food;
2567 op->stats.food = 0;
2568 }
2902 2569
2903 while (op->stats.food < 0 && op->stats.hp > 0) 2570 if (op->stats.hp < 0 && !QUERY_FLAG (op, FLAG_WIZ))
2904 op->stats.food++, op->stats.hp--;
2905
2906 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
2907 kill_player (op); 2571 kill_player (op);
2572 }
2908} 2573}
2909
2910
2911 2574
2912/* If the player should die (lack of hp, food, etc), we call this. 2575/* If the player should die (lack of hp, food, etc), we call this.
2913 * op is the player in jeopardy. If the player can not be saved (not 2576 * op is the player in jeopardy. If the player can not be saved (not
2914 * permadeath, no lifesave), this will take care of removing the player 2577 * permadeath, no lifesave), this will take care of removing the player
2915 * file. 2578 * file.
2916 */ 2579 */
2917void 2580void
2918kill_player (object *op) 2581kill_player (object *op)
2919{ 2582{
2583 int x, y;
2920 char buf[MAX_BUF]; 2584 char buf[MAX_BUF];
2921 int x, y;
2922
2923 //int i;
2924 maptile *map; /* this is for resurrection */ 2585 maptile *map; /* this is for resurrection */
2925
2926 /* int z;
2927 int num_stats_lose;
2928 int lost_a_stat;
2929 int lose_this_stat;
2930 int this_stat; */
2931 int will_kill_again; 2586 int will_kill_again;
2932 archetype *at; 2587 archetype *at;
2933 object *tmp; 2588 object *tmp;
2934 2589
2935 if (save_life (op)) 2590 if (save_life (op))
2936 return; 2591 return;
2937
2938 2592
2939 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2593 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2940 * in cities ONLY!!! It is very important that this doesn't get abused. 2594 * in cities ONLY!!! It is very important that this doesn't get abused.
2941 * Look at op_on_battleground() for more info --AndreasV 2595 * Look at op_on_battleground() for more info --AndreasV
2942 */ 2596 */
… …
2945 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2599 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2946 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2600 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2947 2601
2948 /* restore player */ 2602 /* restore player */
2949 at = archetype::find ("poisoning"); 2603 at = archetype::find ("poisoning");
2950 tmp = present_arch_in_ob (at, op); 2604 if (object *tmp = present_arch_in_ob (at, op))
2951 if (tmp)
2952 { 2605 {
2953 tmp->destroy (); 2606 tmp->destroy ();
2954 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2607 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2955 } 2608 }
2956 2609
2957 at = archetype::find ("confusion"); 2610 at = archetype::find ("confusion");
2958 tmp = present_arch_in_ob (at, op); 2611 if (object *tmp = present_arch_in_ob (at, op))
2959 if (tmp)
2960 { 2612 {
2961 tmp->destroy (); 2613 tmp->destroy ();
2962 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2614 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2963 } 2615 }
2964 2616
2965 cure_disease (op, 0); /* remove any disease */ 2617 cure_disease (op, 0, 0); /* remove any disease */
2966 op->stats.hp = op->stats.maxhp; 2618 op->stats.hp = op->stats.maxhp;
2967 if (op->stats.food <= 0) 2619 if (op->stats.food <= 0)
2968 op->stats.food = 999; 2620 op->stats.food = 999;
2969 2621
2970 /* create a bodypart-trophy to make the winner happy */ 2622 /* create a bodypart-trophy to make the winner happy */
2971 tmp = arch_to_object (archetype::find ("finger")); 2623 if (object *tmp = arch_to_object (archetype::find ("finger")))
2972 if (tmp != NULL)
2973 { 2624 {
2974 sprintf (buf, "%s's finger", &op->name); 2625 tmp->name = format ("%s's finger" , &op->name);
2975 tmp->name = buf; 2626 tmp->name_pl = format ("%s's fingers", &op->name);
2976 sprintf (buf, " This finger has been cut off %s\n"
2977 " the %s, when he was defeated at\n level %d by %s.\n",
2978 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2979 tmp->msg = buf; 2627 tmp->msg = format (
2628 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2629 &op->name, op->contr->title,
2630 (int)op->level,
2631 op->contr->killer_name ()
2632 );
2980 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2633 tmp->value = 0, tmp->type = 0;
2981 tmp->materialname = NULL; 2634 tmp->materialname = "organics";
2982 tmp->x = op->x, tmp->y = op->y; 2635 tmp->insert_at (op, tmp);
2983 insert_ob_in_map (tmp, op->map, op, 0);
2984 } 2636 }
2985 2637
2986 /* teleport defeated player to new destination */ 2638 /* teleport defeated player to new destination */
2987 transfer_ob (op, x, y, 0, NULL); 2639 transfer_ob (op, x, y, 0, NULL);
2988 op->contr->braced = 0; 2640 op->contr->braced = 0;
… …
2993 2645
2994 command_kill_pets (op, 0); 2646 command_kill_pets (op, 0);
2995 2647
2996 if (op->stats.food < 0) 2648 if (op->stats.food < 0)
2997 { 2649 {
2998 if (op->contr->explore) 2650 op->contr->killer = archetype::get ("killer_starvation");
2999 { 2651 op->contr->killer->destroy ();
3000 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are"); 2652 }
3001 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2653
3002 op->stats.food = 999; 2654 op->contr->play_sound (sound_find ("player_dies"));
3003 return; 2655
3004 } 2656 /* save the map location for corpse, gravestone */
3005 sprintf (buf, "%s starved to death.", &op->name); 2657 x = op->x;
3006 strcpy (op->contr->killer, "starvation"); 2658 y = op->y;
2659 map = op->map;
2660
2661 /* NOT_PERMADEATH code. This basically brings the character back to
2662 * life if they are dead - it takes some exp and a random stat.
2663 * See the config.h file for a little more in depth detail about this.
2664 */
2665
2666 /* Basically two ways to go - remove a stat permanently, or just
2667 * make it depletion. This bunch of code deals with that aspect
2668 * of death.
2669 */
2670#ifndef COZY_SERVER
2671 if (settings.balanced_stat_loss)
2672 {
2673 /* If stat loss is permanent, lose one stat only. */
2674 /* Lower level chars don't lose as many stats because they suffer
2675 more if they do. */
2676 /* Higher level characters can afford things such as potions of
2677 restoration, or better, stat potions. So we slug them that
2678 little bit harder. */
2679 /* GD */
2680 if (settings.stat_loss_on_death)
2681 num_stats_lose = 1;
2682 else
2683 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
3007 } 2684 }
3008 else 2685 else
3009 { 2686 num_stats_lose = 1;
3010 if (op->contr->explore) 2687
3011 { 2688 lost_a_stat = 0;
3012 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are"); 2689
3013 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so..."); 2690 for (z = 0; z < num_stats_lose; z++)
3014 op->stats.hp = op->stats.maxhp;
3015 return;
3016 }
3017 sprintf (buf, "%s died.", &op->name);
3018 } 2691 {
3019 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2692 i = RANDOM () % NUM_STATS;
3020 2693
3021 /* save the map location for corpse, gravestone */
3022 x = op->x;
3023 y = op->y;
3024 map = op->map;
3025
3026
3027 if (settings.not_permadeth == TRUE)
3028 {
3029 /* NOT_PERMADEATH code. This basically brings the character back to
3030 * life if they are dead - it takes some exp and a random stat.
3031 * See the config.h file for a little more in depth detail about this.
3032 */
3033
3034 /* Basically two ways to go - remove a stat permanently, or just
3035 * make it depletion. This bunch of code deals with that aspect
3036 * of death.
3037 */
3038#ifndef COZY_SERVER
3039 if (settings.balanced_stat_loss)
3040 {
3041 /* If stat loss is permanent, lose one stat only. */
3042 /* Lower level chars don't lose as many stats because they suffer
3043 more if they do. */
3044 /* Higher level characters can afford things such as potions of
3045 restoration, or better, stat potions. So we slug them that
3046 little bit harder. */
3047 /* GD */
3048 if (settings.stat_loss_on_death) 2694 if (settings.stat_loss_on_death)
3049 num_stats_lose = 1; 2695 {
3050 else 2696 /* Pick a random stat and take a point off it. Tell the player
3051 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2697 * what he lost.
2698 */
2699 change_attr_value (&(op->stats), i, -1);
2700 check_stat_bounds (&(op->stats));
2701 change_attr_value (&(op->contr->orig_stats), i, -1);
2702 check_stat_bounds (&(op->contr->orig_stats));
2703 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2704 lost_a_stat = 1;
3052 } 2705 }
3053 else 2706 else
3054 { 2707 {
3055 num_stats_lose = 1; 2708 /* deplete a stat */
3056 } 2709 archetype *deparch = archetype::find ("depletion");
3057 lost_a_stat = 0; 2710 object *dep;
3058 2711
3059 for (z = 0; z < num_stats_lose; z++) 2712 dep = present_arch_in_ob (deparch, op);
3060 { 2713 if (!dep)
3061 i = RANDOM () % NUM_STATS;
3062
3063 if (settings.stat_loss_on_death)
3064 { 2714 {
3065 /* Pick a random stat and take a point off it. Tell the player 2715 dep = arch_to_object (deparch);
3066 * what he lost. 2716 insert_ob_in_ob (dep, op);
3067 */
3068 change_attr_value (&(op->stats), i, -1);
3069 check_stat_bounds (&(op->stats));
3070 change_attr_value (&(op->contr->orig_stats), i, -1);
3071 check_stat_bounds (&(op->contr->orig_stats));
3072 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3073 lost_a_stat = 1;
3074 } 2717 }
3075 else 2718 lose_this_stat = 1;
2719 if (settings.balanced_stat_loss)
3076 { 2720 {
3077 /* deplete a stat */ 2721 /* GD */
3078 archetype *deparch = archetype::find ("depletion"); 2722 /* Get the stat that we're about to deplete. */
3079 object *dep; 2723 this_stat = get_attr_value (&(dep->stats), i);
3080 2724 if (this_stat < 0)
3081 dep = present_arch_in_ob (deparch, op);
3082 if (!dep)
3083 { 2725 {
3084 dep = arch_to_object (deparch); 2726 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3085 insert_ob_in_ob (dep, op); 2727 int keep_chance = this_stat * this_stat;
3086 } 2728
3087 lose_this_stat = 1; 2729 /* Yes, I am paranoid. Sue me. */
3088 if (settings.balanced_stat_loss)
3089 {
3090 /* GD */
3091 /* Get the stat that we're about to deplete. */
3092 this_stat = get_attr_value (&(dep->stats), i);
3093 if (this_stat < 0) 2730 if (keep_chance < 1)
2731 keep_chance = 1;
2732
2733 /* There is a maximum depletion total per level. */
2734 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3094 { 2735 {
3095 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3096 int keep_chance = this_stat * this_stat;
3097
3098 /* Yes, I am paranoid. Sue me. */
3099 if (keep_chance < 1)
3100 keep_chance = 1;
3101
3102 /* There is a maximum depletion total per level. */
3103 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3104 {
3105 lose_this_stat = 0; 2736 lose_this_stat = 0;
3106 /* Take loss chance vs keep chance to see if we 2737 /* Take loss chance vs keep chance to see if we
3107 retain the stat. */ 2738 retain the stat. */
3108 }
3109 else
3110 {
3111 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3112 lose_this_stat = 0;
3113 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3114 this_stat, keep_chance, loss_chance,
3115 lose_this_stat?"LOSE":"KEEP"); */
3116 }
3117 } 2739 }
3118 }
3119
3120 if (lose_this_stat)
3121 {
3122 this_stat = get_attr_value (&(dep->stats), i);
3123 /* We could try to do something clever like find another
3124 * stat to reduce if this fails. But chances are, if
3125 * stats have been depleted to -50, all are pretty low
3126 * and should be roughly the same, so it shouldn't make a
3127 * difference.
3128 */ 2740 else
3129 if (this_stat >= -50)
3130 { 2741 {
3131 change_attr_value (&(dep->stats), i, -1); 2742 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3132 SET_FLAG (dep, FLAG_APPLIED);
3133 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
3134 fix_player (op);
3135 lost_a_stat = 1; 2743 lose_this_stat = 0;
2744 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2745 this_stat, keep_chance, loss_chance,
2746 lose_this_stat?"LOSE":"KEEP"); */
3136 } 2747 }
3137 } 2748 }
3138 } 2749 }
2750
2751 if (lose_this_stat)
2752 {
2753 this_stat = get_attr_value (&(dep->stats), i);
2754 /* We could try to do something clever like find another
2755 * stat to reduce if this fails. But chances are, if
2756 * stats have been depleted to -50, all are pretty low
2757 * and should be roughly the same, so it shouldn't make a
2758 * difference.
2759 */
2760 if (this_stat >= -50)
2761 {
2762 change_attr_value (&(dep->stats), i, -1);
2763 SET_FLAG (dep, FLAG_APPLIED);
2764 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2765 op->update_stats ();
2766 lost_a_stat = 1;
2767 }
3139 } 2768 }
2769 }
2770 }
2771
3140 /* If no stat lost, tell the player. */ 2772 /* If no stat lost, tell the player. */
3141 if (!lost_a_stat) 2773 if (!lost_a_stat)
3142 { 2774 {
3143 /* determine_god() seems to not work sometimes... why is this? 2775 /* determine_god() seems to not work sometimes... why is this?
3144 Should I be using something else? GD */ 2776 Should I be using something else? GD */
3145 const char *god = determine_god (op); 2777 const char *god = determine_god (op);
3146 2778
3147 if (god && (strcmp (god, "none"))) 2779 if (god && (strcmp (god, "none")))
3148 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god); 2780 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief moment you feel the holy presence of %s protecting" " you.", god);
3149 else 2781 else
3150 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you."); 2782 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you.");
3151 } 2783 }
3152#else 2784#else
3153 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely."); 2785 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you feel a holy presence protecting you from losing yourself completely.");
3154#endif 2786#endif
3155 2787
3156 /* Put a gravestone up where the character 'almost' died. List the 2788 /* Put a gravestone up where the character 'almost' died. List the
3157 * exp loss on the stone. 2789 * exp loss on the stone.
3158 */ 2790 */
3159 tmp = arch_to_object (archetype::find ("gravestone")); 2791 tmp = arch_to_object (archetype::find ("gravestone"));
3160 sprintf (buf, "%s's gravestone", &op->name); 2792 tmp->name = format ("%s's gravestone", &op->name);
3161 tmp->name = buf; 2793 tmp->name_pl = format ("%s's gravestones", &op->name);
3162 sprintf (buf, "%s's gravestones", &op->name);
3163 tmp->name_pl = buf;
3164 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer); 2794 tmp->msg = format ("RIP\nHere rests the hero %s the %s,\nwho was killed\nby %s.\n", &op->name, op->contr->title, op->contr->killer_name ());
3165 tmp->msg = buf;
3166 tmp->x = op->x, tmp->y = op->y; 2795 tmp->x = op->x, tmp->y = op->y;
3167 insert_ob_in_map (tmp, op->map, NULL, 0); 2796 insert_ob_in_map (tmp, op->map, NULL, 0);
3168 2797
3169 /**************************************/ 2798 /**************************************/
3170 /* */ 2799 /* */
3171 /* Subtract the experience points, */ 2800 /* Subtract the experience points, */
3172 /* if we died cause of food, give us */ 2801 /* if we died cause of food, give us */
3173 /* food, and reset HP's... */ 2802 /* food, and reset HP's... */
3174 /* */ 2803 /* */
3175 /**************************************/ 2804 /**************************************/
3176 2805
3177 /* remove any poisoning and confusion the character may be suffering. */ 2806 /* remove any poisoning and confusion the character may be suffering. */
3178 /* restore player */ 2807 /* restore player */
3179 at = archetype::find ("poisoning"); 2808 at = archetype::find ("poisoning");
3180 tmp = present_arch_in_ob (at, op); 2809 tmp = present_arch_in_ob (at, op);
3181 2810
3182 if (tmp) 2811 if (tmp)
3183 { 2812 {
3184 tmp->destroy (); 2813 tmp->destroy ();
3185 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2814 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
3186 } 2815 }
3187 2816
3188 at = archetype::find ("confusion"); 2817 at = archetype::find ("confusion");
3189 tmp = present_arch_in_ob (at, op); 2818 tmp = present_arch_in_ob (at, op);
3190 if (tmp) 2819 if (tmp)
3191 { 2820 {
3192 tmp->destroy (); 2821 tmp->destroy ();
3193 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2822 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
3194 } 2823 }
3195 2824
3196 cure_disease (op, 0); /* remove any disease */ 2825 cure_disease (op, 0, 0); /* remove any disease */
3197 2826
2827 // remove all spell effects that are active
2828 // to avoid long-term effects such as word-of-recall
2829 for (object *item = op->inv; item; )
2830 {
2831 object *next = item->below;
2832
2833 if (item->type == SPELL_EFFECT && item->active)
2834 item->destroy ();
2835
2836 item = next;
2837 }
2838
3198 /*add_exp(op, (op->stats.exp * -0.20)); */ 2839 /*add_exp(op, (op->stats.exp * -0.20)); */
3199 apply_death_exp_penalty (op); 2840 apply_death_exp_penalty (op);
2841
3200 if (op->stats.food < 100) 2842 if (op->stats.food < 100)
3201 op->stats.food = 900; 2843 op->stats.food = 900;
2844
3202 op->stats.hp = op->stats.maxhp; 2845 op->stats.hp = op->stats.maxhp;
3203 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2846 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
3204 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2847 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
3205 2848
3206 /* 2849 /*
3207 * Check to see if the player is in a shop. IF so, then check to see if 2850 * Check to see if the player has any unpaid items. If so, remove them
3208 * the player has any unpaid items. If so, remove them and put them back 2851 * and put them back in the map.
3209 * in the map. 2852 */
3210 */ 2853 op->drop_unpaid_items ();
3211 2854
3212 if (is_in_shop (op))
3213 remove_unpaid_objects (op->inv, op);
3214
3215 /****************************************/ 2855 /****************************************/
3216 /* */ 2856 /* */
3217 /* Move player to his current respawn- */ 2857 /* Move player to his current respawn- */
3218 /* position (usually last savebed) */ 2858 /* position (usually last savebed) */
3219 /* */ 2859 /* */
3220 /****************************************/ 2860 /****************************************/
3221 2861
3222 enter_player_savebed (op); 2862 enter_player_savebed (op);
3223 2863
3224 /* Save the player before inserting the force to reduce
3225 * chance of abuse.
3226 */
3227 op->contr->braced = 0; 2864 op->contr->braced = 0;
3228 save_player (op, 1);
3229 2865
3230 /* it is possible that the player has blown something up 2866 /* it is possible that the player has blown something up
3231 * at his savebed location, and that can have long lasting 2867 * at his savebed location, and that can have long lasting
3232 * spell effects. So first see if there is a spell effect 2868 * spell effects. So first see if there is a spell effect
3233 * on the space that might harm the player. 2869 * on the space that might harm the player.
3234 */ 2870 */
3235 will_kill_again = 0; 2871 will_kill_again = 0;
3236 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above) 2872 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp; tmp = tmp->above)
3237 if (tmp->type == SPELL_EFFECT) 2873 if (tmp->type == SPELL_EFFECT)
3238 will_kill_again |= tmp->attacktype; 2874 will_kill_again |= tmp->attacktype;
3239 2875
3240 if (will_kill_again) 2876 if (will_kill_again)
3241 { 2877 {
3242 object *force; 2878 object *force;
3243 int at; 2879 int at;
3244 2880
3245 force = get_archetype (FORCE_NAME); 2881 force = get_archetype (FORCE_NAME);
3246 /* 50 ticks should be enough time for the spell to abate */ 2882 /* 50 ticks should be enough time for the spell to abate */
3247 force->speed = 0.1; 2883 force->speed = 0.1f;
3248 force->speed_left = -5.0; 2884 force->speed_left = -5.f;
3249 SET_FLAG (force, FLAG_APPLIED); 2885 SET_FLAG (force, FLAG_APPLIED);
3250 for (at = 0; at < NROFATTACKS; at++) 2886 for (at = 0; at < NROFATTACKS; at++)
3251 if (will_kill_again & (1 << at)) 2887 if (will_kill_again & (1 << at))
3252 force->resist[at] = 100; 2888 force->resist[at] = 100;
3253 2889
3254 insert_ob_in_ob (force, op); 2890 insert_ob_in_ob (force, op);
3255 fix_player (op); 2891 op->update_stats ();
3256 2892
3257 } 2893 }
3258 2894
3259 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED."); 2895 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
3260 return;
3261 } /* NOT_PERMADETH */
3262 else
3263 {
3264 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
3265 * should probably be embedded in an else statement.
3266 */
3267
3268 op->contr->party = NULL;
3269 if (settings.set_title == TRUE)
3270 op->contr->own_title[0] = '\0';
3271 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
3272 check_score (op);
3273
3274 if (op->contr->ranges[range_golem])
3275 {
3276 remove_friendly_object (op->contr->ranges[range_golem]);
3277 op->contr->ranges[range_golem]->destroy ();
3278 op->contr->ranges[range_golem] = 0;
3279 }
3280
3281 loot_object (op); /* Remove some of the items for good */
3282 op->remove ();
3283 op->direction = 0;
3284
3285 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3286 {
3287 delete_character (op->name, 0);
3288 if (settings.resurrection == TRUE)
3289 {
3290 /* save playerfile sans equipment when player dies
3291 ** then save it as player.pl.dead so that future resurrection
3292 ** type spells will work on them nicely
3293 */
3294 delete_character (op->name, 0);
3295 op->stats.hp = op->stats.maxhp;
3296 op->stats.food = 999;
3297
3298 /* set the location of where the person will reappear when */
3299 /* maybe resurrection code should fix map also */
3300 strcpy (op->contr->maplevel, settings.emergency_mapname);
3301 if (op->map != NULL)
3302 op->map = NULL;
3303 op->x = settings.emergency_x;
3304 op->y = settings.emergency_y;
3305 save_player (op, 0);
3306 op->map = map;
3307 /* please see resurrection.c: peterm */
3308 dead_player (op);
3309 }
3310 else
3311 delete_character (op->name, 1);
3312 }
3313
3314 play_again (op);
3315
3316 /* peterm: added to create a corpse at deathsite. */
3317 tmp = arch_to_object (archetype::find ("corpse_pl"));
3318 sprintf (buf, "%s", &op->name);
3319 tmp->name = tmp->name_pl = buf;
3320 tmp->level = op->level;
3321 tmp->x = x;
3322 tmp->y = y;
3323 tmp->msg = gravestone_text (op);
3324 SET_FLAG (tmp, FLAG_UNIQUE);
3325 insert_ob_in_map (tmp, map, NULL, 0);
3326 }
3327} 2896}
3328
3329 2897
3330void 2898void
3331loot_object (object *op) 2899loot_object (object *op)
3332{ /* Grab and destroy some treasure */ 2900{ /* Grab and destroy some treasure */
3333 object *tmp, *tmp2, *next; 2901 object *tmp, *tmp2, *next;
3334 2902
3335 if (op->container) 2903 op->close_container (); /* close open sack first */
3336 { /* close open sack first */
3337 esrv_apply_container (op, op->container);
3338 }
3339 2904
3340 for (tmp = op->inv; tmp != NULL; tmp = next) 2905 for (tmp = op->inv; tmp; tmp = next)
3341 { 2906 {
3342 next = tmp->below; 2907 next = tmp->below;
3343 if (tmp->type == EXPERIENCE || tmp->invisible) 2908
2909 if (tmp->invisible)
3344 continue; 2910 continue;
2911
3345 tmp->remove (); 2912 tmp->remove ();
3346 tmp->x = op->x, tmp->y = op->y; 2913 tmp->x = op->x, tmp->y = op->y;
2914
3347 if (tmp->type == CONTAINER) 2915 if (tmp->type == CONTAINER)
3348 { /* empty container to ground */ 2916 loot_object (tmp); /* empty container to ground */
3349 loot_object (tmp); 2917
3350 }
3351 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2918 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3352 { 2919 {
3353 if (tmp->nrof > 1) 2920 if (tmp->nrof > 1)
3354 { 2921 {
3355 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2922 tmp->decrease (rndm (1, tmp->nrof - 1));
3356 tmp2->destroy ();
3357 insert_ob_in_map (tmp, op->map, NULL, 0); 2923 insert_ob_in_map (tmp, op->map, NULL, 0);
3358 } 2924 }
3359 else 2925 else
3360 tmp->destroy (); 2926 tmp->destroy ();
3361 } 2927 }
… …
3367/* 2933/*
3368 * fix_weight(): Check recursively the weight of all players, and fix 2934 * fix_weight(): Check recursively the weight of all players, and fix
3369 * what needs to be fixed. Refresh windows and fix speed if anything 2935 * what needs to be fixed. Refresh windows and fix speed if anything
3370 * was changed. 2936 * was changed.
3371 */ 2937 */
3372
3373void 2938void
3374fix_weight (void) 2939fix_weight (void)
3375{ 2940{
3376 player *pl; 2941 for_all_players (pl)
3377
3378 for (pl = first_player; pl != NULL; pl = pl->next)
3379 { 2942 {
3380 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 2943 sint32 old = pl->ob->carrying;
3381 2944
3382 if (old == sum) 2945 pl->ob->update_weight ();
3383 continue; 2946
3384 fix_player (pl->ob); 2947 if (old != pl->ob->carrying)
2948 {
2949 pl->ob->update_stats ();
3385 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum); 2950 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, (int)old, (int)pl->ob->carrying);
2951 }
3386 } 2952 }
3387} 2953}
3388 2954
3389void 2955void
3390fix_luck (void) 2956fix_luck (void)
3391{ 2957{
3392 player *pl; 2958 for_all_players (pl)
3393
3394 for (pl = first_player; pl != NULL; pl = pl->next)
3395 if (!pl->ob->contr->state) 2959 if (!pl->ob->contr->ns->state)
3396 change_luck (pl->ob, 0); 2960 pl->ob->change_luck (0);
3397} 2961}
3398
3399 2962
3400/* cast_dust() - handles op throwing objects of type 'DUST'. 2963/* cast_dust() - handles op throwing objects of type 'DUST'.
3401 * This is much simpler in the new spell code - we basically 2964 * This is much simpler in the new spell code - we basically
3402 * just treat this as any other spell casting object. 2965 * just treat this as any other spell casting object.
3403 */ 2966 */
3404
3405void 2967void
3406cast_dust (object *op, object *throw_ob, int dir) 2968cast_dust (object *op, object *throw_ob, int dir)
3407{ 2969{
3408 object *skop, *spob; 2970 object *skop, *spob;
3409 2971
… …
3438void 3000void
3439make_visible (object *op) 3001make_visible (object *op)
3440{ 3002{
3441 op->hide = 0; 3003 op->hide = 0;
3442 op->invisible = 0; 3004 op->invisible = 0;
3005
3443 if (op->type == PLAYER) 3006 if (op->type == PLAYER)
3444 { 3007 {
3445 op->contr->tmp_invis = 0; 3008 op->contr->tmp_invis = 0;
3446 op->contr->invis_race = 0; 3009 op->contr->invis_race = 0;
3447 } 3010 }
3011
3448 update_object (op, UP_OBJ_FACE); 3012 update_object (op, UP_OBJ_CHANGE);
3449} 3013}
3450 3014
3451int 3015int
3452is_true_undead (object *op) 3016is_true_undead (object *op)
3453{ 3017{
3454 object *tmp = NULL;
3455
3456 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3018 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3457 return 1; 3019 return 1;
3458 3020
3459 if (op->type == PLAYER)
3460 for (tmp = op->inv; tmp; tmp = tmp->below)
3461 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3462 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3463 return 1;
3464 return 0; 3021 return 0;
3465} 3022}
3466 3023
3467/* look at the surrounding terrain to determine 3024/* look at the surrounding terrain to determine
3468 * the hideability of this object. Positive levels 3025 * the hideability of this object. Positive levels
3469 * indicate greater hideability. 3026 * indicate greater hideability.
3470 */ 3027 */
3471
3472int 3028int
3473hideability (object *ob) 3029hideability (object *ob)
3474{ 3030{
3475 int i, level = 0, mflag; 3031 int i, level = 0, mflag;
3476 sint16 x, y; 3032 sint16 x, y;
… …
3486 * as bad as carrying a light on a pitch dark map */ 3042 * as bad as carrying a light on a pitch dark map */
3487 if (has_carried_lights (ob)) 3043 if (has_carried_lights (ob))
3488 level = -(10 + (2 * ob->map->darkness)); 3044 level = -(10 + (2 * ob->map->darkness));
3489 3045
3490 /* scan through all nearby squares for terrain to hide in */ 3046 /* scan through all nearby squares for terrain to hide in */
3491 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i]) 3047 for (i = 0, x = ob->x, y = ob->y;
3048 i <= SIZEOFFREE1;
3049 i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3492 { 3050 {
3493 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL); 3051 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3494 if (mflag & P_OUT_OF_MAP) 3052 if (mflag & P_OUT_OF_MAP)
3495 {
3496 continue; 3053 continue;
3497 } 3054
3498 if (mflag & P_BLOCKSVIEW) /* something to hide near! */ 3055 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3499 level += 2; 3056 level += 2;
3500 else /* open terrain! */ 3057 else /* open terrain! */
3501 level -= 1; 3058 level -= 1;
3502 } 3059 }
… …
3510/* For Hidden creatures - a chance of becoming 'unhidden' 3067/* For Hidden creatures - a chance of becoming 'unhidden'
3511 * every time they move - as we subtract off 'invisibility' 3068 * every time they move - as we subtract off 'invisibility'
3512 * AND, for players, if they move into a ridiculously unhideable 3069 * AND, for players, if they move into a ridiculously unhideable
3513 * spot (surrounded by clear terrain in broad daylight). -b.t. 3070 * spot (surrounded by clear terrain in broad daylight). -b.t.
3514 */ 3071 */
3515
3516void 3072void
3517do_hidden_move (object *op) 3073do_hidden_move (object *op)
3518{ 3074{
3519 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3075 int hide = 0;
3520 object *skop;
3521 3076
3522 if (!op || !op->map) 3077 if (!op || !op->map)
3523 return; 3078 return;
3524 3079
3525 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3080 object *skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3081 int num = random_roll (0, 19, op, PREFER_LOW);
3526 3082
3527 /* its *extremely* hard to run and sneak/hide at the same time! */ 3083 /* its *extremely* hard to run and sneak/hide at the same time! */
3528 if (op->type == PLAYER && op->contr->run_on) 3084 if (op->type == PLAYER && op->contr->run_on)
3529 {
3530 if (!skop || num >= skop->level) 3085 if (!skop || num >= skop->level)
3531 { 3086 {
3532 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3087 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3533 make_visible (op); 3088 make_visible (op);
3534 return; 3089 return;
3535 } 3090 }
3536 else 3091 else
3537 num += 20; 3092 num += 20;
3538 } 3093
3539 num += op->map->difficulty; 3094 num += op->map->difficulty;
3540 hide = hideability (op); /* modify by terrain hidden level */ 3095 hide = hideability (op); /* modify by terrain hidden level */
3541 num -= hide; 3096 num -= hide;
3097
3542 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3098 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3543 { 3099 {
3544 make_visible (op); 3100 make_visible (op);
3101
3545 if (op->type == PLAYER) 3102 if (op->type == PLAYER)
3546 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3103 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3547 } 3104 }
3548 else if (op->type == PLAYER && skop) 3105 else if (op->type == PLAYER && skop)
3549 {
3550 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3106 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3551 }
3552} 3107}
3553 3108
3554/* determine if who is standing near a hostile creature. */ 3109/* determine if who is standing near a hostile creature. */
3555 3110
3556int 3111int
… …
3583 if (mflags & P_OUT_OF_MAP) 3138 if (mflags & P_OUT_OF_MAP)
3584 continue; 3139 continue;
3585 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y))) 3140 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3586 continue; 3141 continue;
3587 3142
3588 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above) 3143 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
3589 { 3144 {
3590 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE)) 3145 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3591 return 1; 3146 return 1;
3592 else if (tmp->type == PLAYER) 3147 else if (tmp->type == PLAYER)
3593 { 3148 {
… …
3604 * object op. This function works fine for monsters, 3159 * object op. This function works fine for monsters,
3605 * but we dont worry if the object isnt the top one in 3160 * but we dont worry if the object isnt the top one in
3606 * a pile (say a coin under a table would return "viewable" 3161 * a pile (say a coin under a table would return "viewable"
3607 * by this routine). Another question, should we be 3162 * by this routine). Another question, should we be
3608 * concerned with the direction the player is looking 3163 * concerned with the direction the player is looking
3609 * in? Realistically, most of use cant see stuff behind 3164 * in? Realistically, most of us can't see stuff behind
3610 * our backs...on the other hand, does the "facing" direction 3165 * our backs...on the other hand, does the "facing" direction
3611 * imply the way your head, or body is facing? Its possible 3166 * imply the way your head, or body is facing? It's possible
3612 * for them to differ. Sigh, this fctn could get a bit more complex. 3167 * for them to differ. Sigh, this fctn could get a bit more complex.
3613 * -b.t. 3168 * -b.t.
3614 * This function is now map tiling safe. 3169 * This function is now map tiling safe.
3615 */ 3170 */
3616
3617int 3171int
3618player_can_view (object *pl, object *op) 3172player_can_view (object *pl, object *op)
3619{ 3173{
3620 rv_vector rv; 3174 rv_vector rv;
3621 int dx, dy; 3175 int dx, dy;
… …
3623 if (pl->type != PLAYER) 3177 if (pl->type != PLAYER)
3624 { 3178 {
3625 LOG (llevError, "player_can_view() called for non-player object\n"); 3179 LOG (llevError, "player_can_view() called for non-player object\n");
3626 return -1; 3180 return -1;
3627 } 3181 }
3182
3628 if (!pl || !op) 3183 if (!pl || !op)
3629 return 0; 3184 return 0;
3630 3185
3631 if (op->head)
3632 {
3633 op = op->head; 3186 op = op->head_ ();
3634 } 3187
3635 get_rangevector (pl, op, &rv, 0x1); 3188 get_rangevector (pl, op, &rv, 0x1);
3636 3189
3637 /* starting with the 'head' part, lets loop 3190 /* starting with the 'head' part, lets loop
3638 * through the object and find if it has any 3191 * through the object and find if it has any
3639 * part that is in the los array but isnt on 3192 * part that is in the los array but isn't on
3640 * a blocked los square. 3193 * a blocked los square.
3641 * we use the archetype to figure out offsets. 3194 * we use the archetype to figure out offsets.
3642 */ 3195 */
3643 while (op) 3196 while (op)
3644 { 3197 {
3645 dx = rv.distance_x + op->arch->clone.x; 3198 dx = rv.distance_x + op->arch->x;
3646 dy = rv.distance_y + op->arch->clone.y; 3199 dy = rv.distance_y + op->arch->y;
3647 3200
3648 /* only the viewable area the player sees is updated by LOS 3201 /* only the viewable area the player sees is updated by LOS
3649 * code, so we need to restrict ourselves to that range of values 3202 * code, so we need to restrict ourselves to that range of values
3650 * for any meaningful values. 3203 * for any meaningful values.
3651 */ 3204 */
3652 if (FABS (dx) <= (pl->contr->socket.mapx / 2) && 3205 if (abs (dx) <= (pl->contr->ns->mapx / 2) &&
3653 FABS (dy) <= (pl->contr->socket.mapy / 2) && 3206 abs (dy) <= (pl->contr->ns->mapy / 2) &&
3654 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)]) 3207 !pl->contr->blocked_los[dx + (pl->contr->ns->mapx / 2)][dy + (pl->contr->ns->mapy / 2)])
3655 return 1; 3208 return 1;
3209
3656 op = op->more; 3210 op = op->more;
3657 } 3211 }
3212
3658 return 0; 3213 return 0;
3659} 3214}
3660 3215
3661/* routine for both players and monsters. We call this when 3216/* routine for both players and monsters. We call this when
3662 * there is a possibility for our action distrubing our hiding 3217 * there is a possibility for our action distrubing our hiding
… …
3665 * return 0. 3220 * return 0.
3666 */ 3221 */
3667int 3222int
3668action_makes_visible (object *op) 3223action_makes_visible (object *op)
3669{ 3224{
3670
3671 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE)) 3225 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3672 { 3226 {
3673 if (QUERY_FLAG (op, FLAG_MAKE_INVIS)) 3227 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3674 return 0; 3228 return 0;
3675 3229
… …
3681 { 3235 {
3682 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible"); 3236 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3683 return 1; 3237 return 1;
3684 } 3238 }
3685 } 3239 }
3240
3686 return 0; 3241 return 0;
3687} 3242}
3688 3243
3689/* op_on_battleground - checks if the given object op (usually 3244/* op_on_battleground - checks if the given object op (usually
3690 * a player) is standing on a valid battleground-tile, 3245 * a player) is standing on a valid battleground-tile,
… …
3695 * Default is to do the same as before, so only people wanting to have different points need worry about this 3250 * Default is to do the same as before, so only people wanting to have different points need worry about this
3696 */ 3251 */
3697int 3252int
3698op_on_battleground (object *op, int *x, int *y) 3253op_on_battleground (object *op, int *x, int *y)
3699{ 3254{
3700 object *tmp;
3701
3702 /* A battleground-tile needs the following attributes to be valid: 3255 /* A battleground-tile needs the following attributes to be valid:
3703 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3256 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3704 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3257 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3705 * and the exit-coordinates sp/hp must both be > 0. 3258 * and the exit-coordinates sp/hp must both be > 0.
3706 * => The intention here is to prevent abuse of the battleground- 3259 * => The intention here is to prevent abuse of the battleground-
3707 * feature (like pickable or hidden battleground tiles). */ 3260 * feature (like pickable or hidden battleground tiles). */
3708 for (tmp = op->below; tmp != NULL; tmp = tmp->below) 3261 for (object *tmp = op->below; tmp; tmp = tmp->below)
3709 { 3262 {
3710 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) 3263 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3711 { 3264 {
3712 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3265 if (QUERY_FLAG (tmp, FLAG_NO_PICK)
3713 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp)) 3266 && tmp->type == BATTLEGROUND
3267 && tmp->name == shstr_battleground
3268 && EXIT_X (tmp) && EXIT_Y (tmp))
3714 { 3269 {
3715 /*before we assign the exit, check if this is a teambattle */ 3270 /* before we assign the exit, check if this is a teambattle */
3716 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3271 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3717 { 3272 {
3718 object *invtmp;
3719
3720 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below) 3273 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3721 { 3274 {
3722 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying)) 3275 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3723 { 3276 {
3724 if (x != NULL && y != NULL) 3277 if (x && y)
3725 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3278 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3279
3726 return 1; 3280 return 1;
3727 } 3281 }
3728 } 3282 }
3729 } 3283 }
3284
3730 if (x != NULL && y != NULL) 3285 if (x && y)
3731 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3286 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3287
3732 return 1; 3288 return 1;
3733 } 3289 }
3734 } 3290 }
3735 } 3291 }
3292
3736 /* If we got here, did not find a battleground */ 3293 /* If we got here, did not find a battleground */
3737 return 0; 3294 return 0;
3738} 3295}
3739 3296
3740/* 3297/*
… …
3756 char buf[MAX_BUF]; /* tmp. string buffer */ 3313 char buf[MAX_BUF]; /* tmp. string buffer */
3757 int i = 0, j = 0; 3314 int i = 0, j = 0;
3758 3315
3759 /* get the appropriate treasurelist */ 3316 /* get the appropriate treasurelist */
3760 if (atnr == ATNR_FIRE) 3317 if (atnr == ATNR_FIRE)
3761 trlist = find_treasurelist ("dragon_ability_fire"); 3318 trlist = treasurelist::find (shstr_dragon_ability_fire);
3762 else if (atnr == ATNR_COLD) 3319 else if (atnr == ATNR_COLD)
3763 trlist = find_treasurelist ("dragon_ability_cold"); 3320 trlist = treasurelist::find (shstr_dragon_ability_cold);
3764 else if (atnr == ATNR_ELECTRICITY) 3321 else if (atnr == ATNR_ELECTRICITY)
3765 trlist = find_treasurelist ("dragon_ability_elec"); 3322 trlist = treasurelist::find (shstr_dragon_ability_elec);
3766 else if (atnr == ATNR_POISON) 3323 else if (atnr == ATNR_POISON)
3767 trlist = find_treasurelist ("dragon_ability_poison"); 3324 trlist = treasurelist::find (shstr_dragon_ability_poison);
3768 3325
3769 if (trlist == NULL || who->type != PLAYER) 3326 if (trlist == NULL || who->type != PLAYER)
3770 return; 3327 return;
3771 3328
3772 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3329 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3773 3330
3774 if (tr == NULL || tr->item == NULL) 3331 if (!tr || !tr->item)
3775 { 3332 {
3776 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3333 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3777 return; 3334 return;
3778 } 3335 }
3779 3336
3780 /* everything seems okay - now bring on the gift: */ 3337 /* everything seems okay - now bring on the gift: */
3781 item = &(tr->item->clone); 3338 item = tr->item;
3782 3339
3783 if (item->type == SPELL) 3340 if (item->type == SPELL)
3784 { 3341 {
3785 if (check_spell_known (who, item->name)) 3342 if (check_spell_known (who, item->name))
3786 return; 3343 return;
… …
3845 { 3402 {
3846 /* forces in the treasurelist can alter the player's stats */ 3403 /* forces in the treasurelist can alter the player's stats */
3847 object *skin; 3404 object *skin;
3848 3405
3849 /* first get the dragon skin force */ 3406 /* first get the dragon skin force */
3850 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below); 3407 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3408 ;
3409
3851 if (skin == NULL) 3410 if (!skin)
3852 return; 3411 return;
3853 3412
3854 /* adding new spellpath attunements */ 3413 /* adding new spellpath attunements */
3855 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) 3414 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3856 { 3415 {
… …
3888 else 3447 else
3889 { 3448 {
3890 /* generate misc. treasure */ 3449 /* generate misc. treasure */
3891 tmp = arch_to_object (tr->item); 3450 tmp = arch_to_object (tr->item);
3892 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3451 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3893 tmp = insert_ob_in_ob (tmp, who); 3452 who->insert (tmp);
3894 if (who->type == PLAYER)
3895 esrv_send_item (who, tmp);
3896 } 3453 }
3897} 3454}
3898 3455
3899/** 3456/**
3900 * Unready an object for a player. This function does nothing if the object was 3457 * Unready an object for a player. This function does nothing if the object was
3901 * not readied. 3458 * not readied.
3902 */ 3459 */
3903void 3460void
3904player_unready_range_ob (player *pl, object *ob) 3461player_unready_range_ob (player *pl, object *ob)
3905{ 3462{
3906 rangetype i; 3463 if (pl->ob->current_weapon == ob)
3464 pl->ob->current_weapon = 0;
3907 3465
3908 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3466 if (pl->combat_ob == ob)
3909 { 3467 pl->combat_ob = 0;
3468
3910 if (pl->ranges[i] == ob) 3469 if (pl->ranged_ob == ob)
3911 { 3470 pl->ranged_ob = 0;
3912 pl->ranges[i] = NULL;
3913 if (pl->shoottype == i)
3914 {
3915 pl->shoottype = range_none;
3916 }
3917 }
3918 }
3919} 3471}
3472
3473sint8
3474player::visibility_at (maptile *map, int x, int y) const
3475{
3476 if (!ns)
3477 return 0;
3478
3479 int dx, dy;
3480 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3481 return 0;
3482
3483 x += dx - ns->current_x + ns->mapx / 2;
3484 y += dy - ns->current_y + ns->mapy / 2;
3485
3486 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3487 return 0;
3488
3489 return 100 - blocked_los [x][y];
3490}
3491
3492void
3493player::infobox (const char *title, const char *msg, int color)
3494{
3495 send_msg (color | NDI_DEF | NDI_REPLY | NDI_CLEAR, title, msg);
3496}
3497
3498void
3499player::statusmsg (const char *msg, int color)
3500{
3501 send_msg (color | NDI_REPLY, INFO_CHANNEL, msg);
3502}
3503
3504void
3505player::failmsg (const char *msg, int color)
3506{
3507 play_sound (sound_find ("generic_failure"));
3508 statusmsg (msg, color);
3509}
3510

Diff Legend

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