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.41 by root, Fri Dec 15 04:21:29 2006 UTC vs.
Revision 1.148 by root, Mon Jun 4 12:19:09 2007 UTC

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

Diff Legend

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