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.76 by root, Sun Dec 31 17:17:23 2006 UTC vs.
Revision 1.153 by root, Tue Jul 10 05:51:38 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
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20
21 The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24#include <global.h> 24#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
28#include <living.h> 27#include <living.h>
29#include <object.h> 28#include <object.h>
30#include <spells.h> 29#include <spells.h>
31#include <skills.h> 30#include <skills.h>
32 31
33#include <algorithm> 32#include <algorithm>
34#include <functional> 33#include <functional>
35 34
36player * 35playervec players;
37find_player (const char *plname)
38{
39 for_all_players (pl)
40 if (pl->ob && !strcmp (query_name (pl->ob), plname))
41 return pl;
42
43 return 0;
44}
45 36
46void 37void
47display_motd (const object *op) 38display_motd (const object *op)
48{ 39{
49 char buf[MAX_BUF]; 40 char buf[MAX_BUF];
… …
123 114
124 news[0] = '\0'; 115 news[0] = '\0';
125 subject[0] = '\0'; 116 subject[0] = '\0';
126 size = 0; 117 size = 0;
127 118
128 while (fgets (buf, MAX_BUF, fp) != NULL) 119 while (fgets (buf, MAX_BUF, fp))
129 { 120 {
130 if (*buf == '#') 121 if (*buf == '#')
131 continue; 122 continue;
132 123
133 if (*buf == '%') 124 if (*buf == '%')
134 { /* send one news */ 125 { /* send one news */
135 if (size > 0) 126 if (size > 0)
136 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */ 127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
128
137 strcpy (subject, buf + 1); 129 strcpy (subject, buf + 1);
138 strip_endline (subject); 130 strip_endline (subject);
139 size = 0; 131 size = 0;
140 news[0] = '\0'; 132 news[0] = '\0';
141 } 133 }
… …
150 size += strlen (buf); 142 size += strlen (buf);
151 } 143 }
152 } 144 }
153 145
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
155 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
157} 149}
158 150
159/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
160static void 152static void
161set_first_map (object *op) 153set_first_map (object *op)
162{ 154{
163 strcpy (op->contr->maplevel, first_map_path); 155 op->contr->maplevel = first_map_path;
164 op->x = -1; 156 op->x = -1;
165 op->y = -1; 157 op->y = -1;
166} 158}
167 159
168void 160void
169player::enter_map () 161player::activate ()
170{ 162{
171 object *tmp = object::create (); 163 if (active)
164 return;
172 165
173 EXIT_PATH (tmp) = maplevel; 166 players.insert (this);
174 EXIT_X (tmp) = ob->x; 167 ob->remove ();
175 EXIT_Y (tmp) = ob->y; 168 ob->map = 0;
176 ob->enter_exit (tmp); 169 ob->activate_recursive ();
170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
171 add_friendly_object (ob);
172}
177 173
178 tmp->destroy (); 174void
175player::deactivate ()
176{
177 if (!active)
178 return;
179
180 terminate_all_pets (ob);
181 remove_friendly_object (ob);
182 ob->deactivate_recursive ();
183
184 if (ob->map)
185 maplevel = ob->map->path;
186
187 ob->remove ();
188 ob->map = 0;
189 party = 0;
190
191 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
192
193 players.erase (this);
179} 194}
180 195
181// connect the player with a specific client 196// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 197// also changes, rationalises, and fixes some incorrect settings
183void 198void
184player::connect (client *ns) 199player::connect (client *ns)
185{ 200{
186 this->ns = ns; 201 this->ns = ns;
187 ns->pl = this; 202 ns->pl = this;
188 203
189 next = first_player; 204 run_on = 0;
190 first_player = this; 205 fire_on = 0;
206 ob->close_container (); //TODO: client-specific
191 207
192 ns->update_look = 0; 208 ns->update_look = 0;
193 ns->look_position = 0; 209 ns->look_position = 0;
194 210
195 clear_los (ob); 211 clear_los (this);
212
213 ns->reset_stats ();
196 214
197 /* make sure he's a player -- needed because of class change. */ 215 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
200
201 if (!legal_range (ob, shoottype))
202 shoottype = range_none;
203 218
204 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 220 link_player_skills (ob);
206 221
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 223
209 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
210
211 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
212 * from the class, and not race. I don't see any way to get the class information
213 * to then update this. I don't think this will actually break anything - anyone
214 * that can use armour should be able to use a shield. What this may 'break'
215 * are features new characters get, eg, if someone starts up with a Q, they
216 * should be able to use a shield. However, old Q's won't get that advantage.
217 */
218 if (QUERY_FLAG (ob, FLAG_USE_ARMOUR))
219 SET_FLAG (ob, FLAG_USE_SHIELD);
220 225
221 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
223 { 228 {
224 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
225 230
226 shstr_cmp dragon_ability_force ("dragon_ability_force");
227 shstr_cmp dragon_skin_force ("dragon_skin_force");
228
229 for (tmp = ob->inv; tmp; tmp = tmp->below) 231 for (tmp = ob->inv; tmp; tmp = tmp->below)
230 if (tmp->type == FORCE) 232 if (tmp->type == FORCE)
231 if (tmp->arch->name == dragon_ability_force) 233 if (tmp->arch->archname == shstr_dragon_ability_force)
232 abil = tmp; 234 abil = tmp;
233 else if (tmp->arch->name == dragon_skin_force) 235 else if (tmp->arch->archname == shstr_dragon_skin_force)
234 skin = tmp; 236 skin = tmp;
235 237
236 set_dragon_name (ob, abil, skin); 238 set_dragon_name (ob, abil, skin);
237 } 239 }
238 240
239 CLEAR_FLAG (ob, FLAG_FRIENDLY);
240 add_friendly_object (ob);
241
242 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
243
244 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 241 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 242
246 esrv_new_player (this, ob->weight + ob->carrying); 243 esrv_new_player (this, ob->weight + ob->carrying);
247 244
245 ob->flag [FLAG_READY_WEAPON] = false;
246 ob->flag [FLAG_READY_SKILL] = false;
247 ob->flag [FLAG_READY_BOW] = false;
248
249 for (object *op = ob->inv; op; op = op->below)
250 if (op->flag [FLAG_APPLIED])
251 switch (op->type)
252 {
253 case SKILL:
254 ob->flag [FLAG_APPLIED] = false;
255 break;
256
257 case WAND:
258 case ROD:
259 case HORN:
260 case BOW:
261 ranged_ob = op;
262 break;
263
264 case WEAPON:
265 combat_ob = op;
266 break;
267 }
268
269 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
248 ob->update_stats (); 270 ob->update_stats ();
271
249 ns->floorbox_update (); 272 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 273 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 274 esrv_add_spells (this, 0);
253 275
254 ob->activate_recursive (); 276 activate ();
255 enter_map ();
256 277
257 send_rules (ob); 278 send_rules (ob);
258 send_news (ob); 279 send_news (ob);
259 display_motd (ob); 280 display_motd (ob);
281
282 INVOKE_PLAYER (CONNECT, this);
260 INVOKE_PLAYER (LOGIN, this); 283 INVOKE_PLAYER (LOGIN, this);
261} 284}
262 285
263void 286void
264player::disconnect () 287player::disconnect ()
265{ 288{
289 if (ns)
290 {
291 if (active)
292 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
293
294 INVOKE_PLAYER (DISCONNECT, this);
295
296 ns->reset_stats ();
297 ns->pl = 0;
298 ns = 0;
299 }
300
266 if (ob) 301 if (ob)
267 ob->deactivate_recursive (); 302 ob->close_container (); //TODO: client-specific
268 303
269 //TODO: don't be so harsh and destroy :) 304 observe = ob;
270 if (ns)
271 {
272 if (enable_save)
273 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
274 305
275 client *ns = this->ns; 306 deactivate ();
276 ns->send_packet ("goodbye");
277 ns->flush ();
278 ns->pl = 0;
279 this->ns = 0;
280
281 ns->destroy ();
282 destroy ();
283 }
284} 307}
285 308
286// the need for this function can be explained 309// the need for this function can be explained
287// by load_object not returning the object 310// by load_object not returning the object
288void 311void
289player::set_object (object *op) 312player::set_object (object *op)
290{ 313{
291 ob = op; 314 ob = observe = op;
292 ob->contr = this; /* this aren't yet in archetype */ 315 ob->contr = this; /* this aren't yet in archetype */
293 316
317 ob->speed = 1.0f;
294 ob->speed_left = 0.5; 318 ob->speed_left = 0.5f;
295 ob->speed = 1.0; 319
296 ob->direction = 5; /* So player faces south */ 320 ob->direction = 5; /* So player faces south */
297 ob->stats.wc = 2; 321}
298 ob->run_away = 25; /* Then we panick... */
299 322
300 ob->roll_stats (); 323void
324player::set_observe (object *op)
325{
326 observe = op ? op : ob;
327 do_los = 1;
301} 328}
302 329
303player::player () 330player::player ()
304{ 331{
305 /* There are some elements we want initialized to non zero value - 332 /* There are some elements we want initialised to non zero value -
306 * we deal with that below this point. 333 * we deal with that below this point.
307 */ 334 */
308 outputs_sync = 16; /* Every 2 seconds */ 335 outputs_sync = 4;
309 outputs_count = 8; /* Keeps present behaviour */ 336 outputs_count = 4;
310 unapply = unapply_nochoice; 337 unapply = unapply_nochoice;
311 338
312 assign (savebed_map, first_map_path); /* Init. respawn position */ 339 savebed_map = first_map_path; /* Init. respawn position */
313 340
314 gen_sp_armour = 10; 341 gen_sp_armour = 10;
315 last_speed = -1;
316 shoottype = range_none;
317 bowtype = bow_normal; 342 bowtype = bow_normal;
318 petmode = pet_normal; 343 petmode = pet_normal;
319 listening = 10; 344 listening = 10;
320 usekeys = containers; 345 usekeys = containers;
321 last_weapon_sp = -1;
322 peaceful = 1; /* default peaceful */ 346 peaceful = 1; /* default peaceful */
323 do_los = 1; 347 do_los = 1;
324 348
325 /* we need to clear these to -1 and not zero - otherwise, 349 weapon_sp = 1.0f;
326 * if a player quits and starts a new character, we wont 350 weapon_sp_left = 0.5f;
327 * send new values to the client, as things like exp start
328 * at zero.
329 */
330 for (int i = 0; i < NUM_SKILLS; i++)
331 last_skill_exp[i] = -1;
332
333 for (int i = 0; i < NROFATTACKS; i++)
334 last_resist[i] = -1;
335
336 last_stats.exp = -1;
337 last_weight = (uint32) - 1;
338} 351}
339 352
340void 353void
341player::do_destroy () 354player::do_destroy ()
342{ 355{
343 disconnect (); 356 disconnect ();
344 357
345 save (false);
346 enable_save = false;
347
348 attachable::do_destroy (); 358 attachable::do_destroy ();
349
350 terminate_all_pets (ob);
351
352 if (first_player != this)
353 {
354 player *prev = first_player;
355
356 while (prev && prev->next && prev->next != this)
357 prev = prev->next;
358
359 if (prev->next != this)
360 {
361 LOG (llevError, "Free_player: Can't find previous player.\n");
362 abort ();
363 }
364
365 prev->next = next;
366 }
367 else
368 first_player = next;
369 359
370 if (ob) 360 if (ob)
371 { 361 {
372 ob->destroy_inv (false); 362 ob->destroy_inv (false);
373 ob->destroy (); 363 ob->destroy ();
374 } 364 }
365
366 ob = observe = 0;
375} 367}
376 368
377player::~player () 369player::~player ()
378{ 370{
379 /* Clear item stack */ 371 /* Clear item stack */
… …
388player::create () 380player::create ()
389{ 381{
390 player *pl = new player; 382 player *pl = new player;
391 383
392 pl->set_object (arch_to_object (get_player_archetype (0))); 384 pl->set_object (arch_to_object (get_player_archetype (0)));
385
386 pl->ob->roll_stats ();
387 pl->ob->stats.wc = 2;
388 pl->ob->run_away = 25; /* Then we panick... */
389
393 set_first_map (pl->ob); 390 set_first_map (pl->ob);
394 391
395 return pl; 392 return pl;
396} 393}
397 394
… …
401 * Note: there MUST be at least one player archetype! 398 * Note: there MUST be at least one player archetype!
402 */ 399 */
403archetype * 400archetype *
404get_player_archetype (archetype *at) 401get_player_archetype (archetype *at)
405{ 402{
406 archetype *start = at; 403 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
407 404
408 for (;;) 405 for (;;)
409 { 406 {
410 if (at == NULL || at->next == NULL) 407 if (++i == archetypes.end ())
411 at = first_archetype; 408 i = archetypes.begin ();
412 else 409 else if (*i == at)
413 at = at->next; 410 cleanup ("not a single player archetype found");
414 411
415 if (at->clone.type == PLAYER) 412 if ((*i)->type == PLAYER)
416 return at; 413 return *i;
417
418 if (at == start)
419 {
420 LOG (llevError, "No Player archetypes\n");
421 exit (-1);
422 }
423 } 414 }
424} 415}
425 416
426object * 417object *
427get_nearest_player (object *mon) 418get_nearest_player (object *mon)
… …
429 object *op = NULL; 420 object *op = NULL;
430 objectlink *ol; 421 objectlink *ol;
431 unsigned lastdist; 422 unsigned lastdist;
432 rv_vector rv; 423 rv_vector rv;
433 424
434 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 425 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
435 { 426 {
436 /* We should not find free objects on this friendly list, but it 427 /* We should not find free objects on this friendly list, but it
437 * does periodically happen. Given that, lets deal with it. 428 * does periodically happen. Given that, lets deal with it.
438 * While unlikely, it is possible the next object on the friendly 429 * While unlikely, it is possible the next object on the friendly
439 * list is also free, so encapsulate this in a while loop. 430 * list is also free, so encapsulate this in a while loop.
… …
443 object *tmp = ol->ob; 434 object *tmp = ol->ob;
444 435
445 /* Can't do much more other than log the fact, because the object 436 /* Can't do much more other than log the fact, because the object
446 * itself will have been cleared. 437 * itself will have been cleared.
447 */ 438 */
448 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 439 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
440 tmp->debug_desc ());
449 ol = ol->next; 441 ol = ol->next;
450 remove_friendly_object (tmp); 442 remove_friendly_object (tmp);
451 if (!ol) 443 if (!ol)
452 return op; 444 return op;
453 } 445 }
… …
542 x = mon->x; 534 x = mon->x;
543 y = mon->y; 535 y = mon->y;
544 m = mon->map; 536 m = mon->map;
545 dir = rv.direction; 537 dir = rv.direction;
546 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 538 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
547 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 539 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
540
548 /* If we can't solve it within the search distance, return now. */ 541 /* If we can't solve it within the search distance, return now. */
549 if (diff > max) 542 if (diff > max)
550 return 0; 543 return 0;
544
551 while (diff > 1 && max > 0) 545 while (diff > 1 && max > 0)
552 { 546 {
553 lastx = x; 547 lastx = x;
554 lasty = y; 548 lasty = y;
555 lastmap = m; 549 lastmap = m;
… …
637 max--; 631 max--;
638 lastdir = dir; 632 lastdir = dir;
639 if (!firstdir) 633 if (!firstdir)
640 firstdir = dir; 634 firstdir = dir;
641 } 635 }
636
642 if (diff <= 1) 637 if (diff <= 1)
643 { 638 {
644 /* Recalculate diff (distance) because we may not have actually 639 /* Recalculate diff (distance) because we may not have actually
645 * headed toward player for entire distance. 640 * headed toward player for entire distance.
646 */ 641 */
647 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 642 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
648 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 643 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
649 } 644 }
645
650 if (diff > max) 646 if (diff > max)
651 return 0; 647 return 0;
652 } 648 }
649
653 /* If we reached the max, didn't find a direction in time */ 650 /* If we reached the max, didn't find a direction in time */
654 if (!max) 651 if (!max)
655 return 0; 652 return 0;
656 653
657 return firstdir; 654 return firstdir;
… …
771roll_stat (void) 768roll_stat (void)
772{ 769{
773 int a[4], i, j, k; 770 int a[4], i, j, k;
774 771
775 for (i = 0; i < 4; i++) 772 for (i = 0; i < 4; i++)
776 a[i] = (int) RANDOM () % 6 + 1; 773 a[i] = (int) rndm (6) + 1;
777 774
778 for (i = 0, j = 0, k = 7; i < 4; i++) 775 for (i = 0, j = 0, k = 7; i < 4; i++)
779 if (a[i] < k) 776 if (a[i] < k)
780 k = a[i], j = i; 777 k = a[i], j = i;
781 778
… …
787} 784}
788 785
789void 786void
790object::roll_stats () 787object::roll_stats ()
791{ 788{
792 int statsort [7]; 789 int statsort [NUM_STATS];
793 790
794 for (;;) 791 for (;;)
795 { 792 {
796 int sum = 0; 793 int sum = 0;
797 for (int i = 7; i--; ) 794 for (int i = NUM_STATS; i--; )
798 sum += statsort [i] = roll_stat (); 795 sum += statsort [i] = roll_stat ();
799 796
800 if (sum >= 82 && sum <= 116) 797 if (sum >= 82 && sum <= 116)
801 break; 798 break;
802 } 799 }
803 800
804 // Sort the stats so that rerolling is easier... 801 // Sort the stats so that rerolling is easier...
805 std::sort (statsort, statsort + 7, std::greater<int>()); 802 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
806 803
804 for (int i = 0; i < NUM_STATS; ++i)
807 stats.Str = statsort[0]; 805 stats.stat (i) = statsort [i];
808 stats.Dex = statsort[1];
809 stats.Con = statsort[2];
810 stats.Int = statsort[3];
811 stats.Wis = statsort[4];
812 stats.Pow = statsort[5];
813 stats.Cha = statsort[6];
814 806
815 stats.exp = 0; 807 stats.exp = 0;
816 stats.ac = 0; 808 stats.ac = 0;
817 809
818 stats.hp = stats.maxhp; 810 stats.hp = stats.maxhp;
… …
830} 822}
831 823
832void 824void
833object::swap_stats (int a, int b) 825object::swap_stats (int a, int b)
834{ 826{
835 int tmp = get_attr_value (&contr->orig_stats, a); 827 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
836 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
837 set_attr_value (&contr->orig_stats, b, tmp);
838 828
829 for (int i = 0; i < NUM_STATS; ++i)
839 stats.Str = contr->orig_stats.Str; 830 stats.stat (i) = contr->orig_stats.stat (i);
840 stats.Dex = contr->orig_stats.Dex;
841 stats.Con = contr->orig_stats.Con;
842 stats.Int = contr->orig_stats.Int;
843 stats.Wis = contr->orig_stats.Wis;
844 stats.Pow = contr->orig_stats.Pow;
845 stats.Cha = contr->orig_stats.Cha;
846 831
847 //TODO: the following code looks so borked and should, at the very least, 832 //TODO: the following code looks so borked and should, at the very least,
848 // be merged with the similar code in roll_stats 833 // be merged with the similar code in roll_stats
849 stats.ac = 0; 834 stats.ac = 0;
850 835
… …
881 * appropriate action with it (change race, or other things). 866 * appropriate action with it (change race, or other things).
882 * The function name is for historical reasons - now we have 867 * The function name is for historical reasons - now we have
883 * separate race and class; this actually changes the RACE, 868 * separate race and class; this actually changes the RACE,
884 * not the class. 869 * not the class.
885 */ 870 */
886int 871void
887key_change_class (object *op, char key) 872player::chargen_race_done ()
888{ 873{
889 int tmp_loop;
890
891 if (key == 'd' || key == 'D')
892 {
893 char buf[MAX_BUF];
894
895 /* this must before then initial items are given */ 874 /* this must before then initial items are given */
896 esrv_new_player (op->contr, op->weight + op->carrying); 875 esrv_new_player (ob->contr, ob->weight + ob->carrying);
897 876
898 treasurelist *tl = find_treasurelist ("starting_wealth"); 877 treasurelist *tl = treasurelist::find ("starting_wealth");
899 if (tl) 878 if (tl)
900 create_treasure (tl, op, 0, 0, 0); 879 create_treasure (tl, ob, 0, 0, 0);
901 880
902 INVOKE_PLAYER (BIRTH, op->contr); 881 INVOKE_PLAYER (BIRTH, ob->contr);
903 INVOKE_PLAYER (LOGIN, op->contr); 882 INVOKE_PLAYER (LOGIN, ob->contr);
904 883
905 op->contr->ns->state = ST_PLAYING; 884 ob->contr->ns->state = ST_PLAYING;
906 885
907 if (op->msg) 886 if (ob->msg)
908 op->msg = NULL; 887 ob->msg = 0;
909 888
910 /* We create this now because some of the unique maps will need it 889 /* We create this now because some of the unique maps will need it
911 * to save here. 890 * to save here.
912 */ 891 */
892 {
893 char buf[MAX_BUF];
913 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 894 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
914 make_path_to_file (buf); 895 make_path_to_file (buf);
896 }
915 897
916#ifdef AUTOSAVE
917 op->contr->last_save_tick = pticks;
918#endif
919 start_info (op); 898 start_info (ob);
920 CLEAR_FLAG (op, FLAG_WIZ); 899 CLEAR_FLAG (ob, FLAG_WIZ);
921 give_initial_items (op, op->randomitems); 900 give_initial_items (ob, ob->randomitems);
922 link_player_skills (op); 901 link_player_skills (ob);
923 esrv_send_inventory (op, op); 902 esrv_send_inventory (ob, ob);
924 op->update_stats (); 903 ob->update_stats ();
925 904
926 /* This moves the player to a different start map, if there 905 /* This moves the player to a different start map, if there
927 * is one for this race 906 * is one for this race
928 */ 907 */
929 if (*first_map_ext_path) 908 if (*first_map_ext_path)
930 { 909 {
931 object *tmp; 910 object *tmp;
932 char mapname[MAX_BUF]; 911 char mapname[MAX_BUF];
933 912
934 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 913 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
935 tmp = object::create (); 914 tmp = object::create ();
936 EXIT_PATH (tmp) = mapname; 915 EXIT_PATH (tmp) = mapname;
937 EXIT_X (tmp) = op->x; 916 EXIT_X (tmp) = ob->x;
938 EXIT_Y (tmp) = op->y; 917 EXIT_Y (tmp) = ob->y;
939 op->enter_exit (tmp); /* we don't really care if it succeeded; 918 ob->enter_exit (tmp); /* we don't really care if it succeeded;
940 * if the map isn't there, then stay on the 919 * if the map isn't there, then stay on the
941 * default initial map */ 920 * default initial map */
942 tmp->destroy (); 921 tmp->destroy ();
943 } 922 }
944 else 923 else
945 LOG (llevDebug, "first_map_ext_path not set\n"); 924 LOG (llevDebug, "first_map_ext_path not set\n");
925}
946 926
947 return 0; 927void
948 } 928player::chargen_race_next ()
949 929{
950 /* Following actually changes the race - this is the default command 930 /* Following actually changes the race - this is the default command
951 * if we don't match with one of the options above. 931 * if we don't match with one of the options above.
952 */ 932 */
953 933
954 tmp_loop = 0; 934 do
955 while (!tmp_loop)
956 { 935 {
957 shstr name = op->name; 936 shstr name = ob->name;
958 int x = op->x, y = op->y; 937 int x = ob->x, y = ob->y;
959 938
960 op->remove_statbonus (); 939 ob->remove_statbonus ();
961 op->remove (); 940 ob->remove ();
962 op->arch = get_player_archetype (op->arch); 941 ob->arch = get_player_archetype (ob->arch);
963 op->arch->clone.copy_to (op); 942 ob->arch->copy_to (ob);
964 op->instantiate (); 943 ob->instantiate ();
965 op->stats = op->contr->orig_stats; 944 ob->stats = ob->contr->orig_stats;
966 op->name = op->name_pl = name; 945 ob->name = ob->name_pl = name;
967 op->x = x; 946 ob->x = x;
968 op->y = y; 947 ob->y = y;
969 SET_ANIMATION (op, 2); /* So player faces south */ 948 SET_ANIMATION (ob, 2); /* So player faces south */
970 insert_ob_in_map (op, op->map, op, 0); 949 insert_ob_in_map (ob, ob->map, ob, 0);
971 assign (op->contr->title, op->arch->clone.name); 950 assign (ob->contr->title, ob->arch->object::name);
972 op->add_statbonus (); 951 ob->add_statbonus ();
973 tmp_loop = allowed_class (op);
974 } 952 }
953 while (!allowed_class (ob));
975 954
976 update_object (op, UP_OBJ_FACE); 955 update_object (ob, UP_OBJ_FACE);
977 esrv_update_item (UPD_FACE, op, op); 956 esrv_update_item (UPD_FACE, ob, ob);
978 op->update_stats (); 957 ob->update_stats ();
979 op->stats.hp = op->stats.maxhp; 958 ob->stats.hp = ob->stats.maxhp;
980 op->stats.sp = op->stats.maxsp; 959 ob->stats.sp = ob->stats.maxsp;
981 op->stats.grace = 0; 960 ob->stats.grace = 0;
982
983 if (op->msg)
984 new_draw_info (NDI_BLUE, 0, op, op->msg);
985
986 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
987 return 0;
988}
989
990int
991key_confirm_quit (object *op, char key)
992{
993 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
994 {
995 op->contr->ns->state = ST_PLAYING;
996 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
997 return 1;
998 }
999
1000 INVOKE_PLAYER (LOGOUT, op->contr);
1001 INVOKE_PLAYER (QUIT, op->contr);
1002
1003 op->contr->enable_save = false;
1004
1005 terminate_all_pets (op);
1006 op->remove ();
1007 op->direction = 0;
1008 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1009
1010 strcpy (op->contr->killer, "quit");
1011 check_score (op);
1012 op->contr->party = 0;
1013 op->contr->own_title[0] = '\0';
1014 op->contr->destroy ();
1015
1016 return 1;
1017} 961}
1018 962
1019void 963void
1020flee_player (object *op) 964flee_player (object *op)
1021{ 965{
… …
1068 /* Cornered, get rid of scared */ 1012 /* Cornered, get rid of scared */
1069 CLEAR_FLAG (op, FLAG_SCARED); 1013 CLEAR_FLAG (op, FLAG_SCARED);
1070 op->enemy = NULL; 1014 op->enemy = NULL;
1071} 1015}
1072 1016
1073
1074/* check_pick sees if there is stuff to be picked up/picks up stuff. 1017/* check_pick sees if there is stuff to be picked up/picks up stuff.
1075 * IT returns 1 if the player should keep on moving, 0 if he should 1018 * It returns 1 if the player should keep on moving, 0 if he should
1076 * stop. 1019 * stop.
1077 */ 1020 */
1078int 1021int
1079check_pick (object *op) 1022check_pick (object *op)
1080{ 1023{
1081 object *tmp, *next; 1024 object *tmp, *next;
1082 int stop = 0; 1025 int stop = 0;
1083 int j, k, wvratio; 1026 int wvratio;
1084 char putstring[128], tmpstr[16]; 1027 char putstring[128];
1085 1028
1086 /* if you're flying, you cna't pick up anything */ 1029 /* if you're flying, you cna't pick up anything */
1087 if (op->move_type & MOVE_FLYING) 1030 if (op->move_type & MOVE_FLYING)
1088 return 1; 1031 return 1;
1089 1032
… …
1157 if (tmp->name != NULL) 1100 if (tmp->name != NULL)
1158 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1101 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1159 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1102 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1160 else 1103 else
1161 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1162 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1163 1106
1164 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1107 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1165 } 1108 }
1166 1109
1167 /* philosophy: 1110 /* philosophy:
… …
1360 /* careful: chairs and tables are weapons! */ 1303 /* careful: chairs and tables are weapons! */
1361 if (op->contr->mode & PU_ALLWEAPON) 1304 if (op->contr->mode & PU_ALLWEAPON)
1362 { 1305 {
1363 if (tmp->type == WEAPON && tmp->name != NULL) 1306 if (tmp->type == WEAPON && tmp->name != NULL)
1364 { 1307 {
1365 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1308 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1366 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1309 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1367 { 1310 {
1368 pick_up (op, tmp); 1311 pick_up (op, tmp);
1369 continue; 1312 continue;
1370 } 1313 }
1371 } 1314 }
1372 1315
1373 if (tmp->type == WEAPON && tmp->name == NULL) 1316 if (tmp->type == WEAPON && tmp->name == NULL)
1374 { 1317 {
1375 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1318 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1376 { 1319 {
1377 pick_up (op, tmp); 1320 pick_up (op, tmp);
1378 continue; 1321 continue;
1379 } 1322 }
1380 } 1323 }
… …
1405 if (tmp->name != NULL) 1348 if (tmp->name != NULL)
1406 { 1349 {
1407 fprintf (stderr, "%s", tmp->name); 1350 fprintf (stderr, "%s", tmp->name);
1408 } 1351 }
1409 else 1352 else
1410 fprintf (stderr, "%s", tmp->arch->name); 1353 fprintf (stderr, "%s", tmp->arch->archname);
1411 fprintf (stderr, ",%d] = ", tmp->type); 1354 fprintf (stderr, ",%d] = ", tmp->type);
1412 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1355 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1413#endif 1356#endif
1414 continue; 1357 continue;
1415 } 1358 }
… …
1426 * found object is returned. 1369 * found object is returned.
1427 */ 1370 */
1428object * 1371object *
1429find_arrow (object *op, const char *type) 1372find_arrow (object *op, const char *type)
1430{ 1373{
1431 object *tmp = NULL; 1374 object *tmp = 0;
1432 1375
1433 for (op = op->inv; op; op = op->below) 1376 for (op = op->inv; op; op = op->below)
1434 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1377 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1435 tmp = find_arrow (op, type); 1378 tmp = find_arrow (op, type);
1436 else if (op->type == ARROW && op->race == type) 1379 else if (op->type == ARROW && op->race == type)
1437 return op; 1380 return op;
1381
1438 return tmp; 1382 return tmp;
1439} 1383}
1440 1384
1441/* 1385/*
1442 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1386 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1443 * against the target. A full test is not performed, simply a basic test 1387 * against the target. A full test is not performed, simply a basic test
1444 * of resistances. The archer is making a quick guess at what he sees down 1388 * of resistances. The archer is making a quick guess at what he sees down
1445 * the hall. Failing that it does it's best to pick the highest plus arrow. 1389 * the hall. Failing that it does it's best to pick the highest plus arrow.
1446 */ 1390 */
1447
1448object * 1391object *
1449find_better_arrow (object *op, object *target, const char *type, int *better) 1392find_better_arrow (object *op, object *target, const char *type, int *better)
1450{ 1393{
1451 object *tmp = NULL, *arrow, *ntmp; 1394 object *tmp = NULL, *arrow, *ntmp;
1452 int attacknum, attacktype, betterby = 0, i; 1395 int attacknum, attacktype, betterby = 0, i;
… …
1485 else 1428 else
1486 { 1429 {
1487 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1430 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1488 { 1431 {
1489 attacktype = 1 << attacknum; 1432 attacktype = 1 << attacknum;
1490 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1433 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1491 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1434 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1492 { 1435 {
1493 tmp = arrow; 1436 tmp = arrow;
1494 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1437 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1495 } 1438 }
1496 } 1439 }
1497 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1440 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1498 { 1441 {
1499 tmp = arrow; 1442 tmp = arrow;
… …
1518 * find_better_arrow to find a decent arrow to use. 1461 * find_better_arrow to find a decent arrow to use.
1519 * op = the shooter 1462 * op = the shooter
1520 * type = bow->race 1463 * type = bow->race
1521 * dir = fire direction 1464 * dir = fire direction
1522 */ 1465 */
1523
1524object * 1466object *
1525pick_arrow_target (object *op, const char *type, int dir) 1467pick_arrow_target (object *op, const char *type, int dir)
1526{ 1468{
1527 object *tmp = NULL; 1469 object *tmp = NULL;
1528 maptile *m; 1470 maptile *m;
… …
1593 */ 1535 */
1594int 1536int
1595fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1537fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1596{ 1538{
1597 object *left, *bow; 1539 object *left, *bow;
1598 int bowspeed, mflags; 1540 int mflags;
1599 maptile *m; 1541 maptile *m;
1600 1542
1601 if (!dir) 1543 if (!dir)
1602 { 1544 {
1603 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1545 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1604 return 0; 1546 return 0;
1605 } 1547 }
1606 1548
1607 if (op->type == PLAYER) 1549 if (op->contr)
1608 bow = op->contr->ranges[range_bow]; 1550 bow = op->current_weapon;
1609 else 1551 else
1610 { 1552 {
1611 for (bow = op->inv; bow; bow = bow->below) 1553 for (bow = op->inv; bow; bow = bow->below)
1612 /* Don't check for applied - monsters don't apply bows - in that way, they 1554 /* Don't check for applied - monsters don't apply bows - in that way, they
1613 * don't need to switch back and forth between bows and weapons. 1555 * don't need to switch back and forth between bows and weapons.
… …
1618 if (!bow) 1560 if (!bow)
1619 { 1561 {
1620 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1562 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1621 return 0; 1563 return 0;
1622 } 1564 }
1565
1566 // optimisation: move object to top so we will find it quickly again
1567 if (bow->below)
1568 {
1569 bow->remove ();
1570 op->insert (bow);
1571 }
1572
1623 } 1573 }
1624 1574
1625 if (!bow->race || !bow->skill) 1575 if (!bow->race || !bow->skill)
1626 { 1576 {
1627 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1577 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1628 return 0; 1578 return 0;
1629 } 1579 }
1630
1631 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1632
1633 /* penalize ROF for bestarrow */
1634 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1635 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1636
1637 if (bowspeed < 1)
1638 bowspeed = 1;
1639 1580
1640 if (arrow == NULL) 1581 if (arrow == NULL)
1641 { 1582 {
1642 if ((arrow = find_arrow (op, bow->race)) == NULL) 1583 if ((arrow = find_arrow (op, bow->race)) == NULL)
1643 { 1584 {
1644 if (op->type == PLAYER) 1585 if (op->type == PLAYER)
1645 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1586 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1646 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1587 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1647 else 1588 else
1648 CLEAR_FLAG (op, FLAG_READY_BOW); 1589 CLEAR_FLAG (op, FLAG_READY_BOW);
1590
1649 return 0; 1591 return 0;
1650 } 1592 }
1651 } 1593 }
1652 1594
1653 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1595 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1677 1619
1678 arrow->set_owner (op); 1620 arrow->set_owner (op);
1679 arrow->skill = bow->skill; 1621 arrow->skill = bow->skill;
1680 arrow->direction = dir; 1622 arrow->direction = dir;
1681 1623
1624 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1625 arrow->stats.hp = arrow->stats.dam;
1626 arrow->stats.grace = arrow->attacktype;
1627
1628 if (arrow->slaying)
1629 arrow->spellarg = strdup (arrow->slaying);
1630
1631#if 0
1632 if (player *pl = op->contr)
1633 {
1634 float speed = pl->weapon_sp;
1635
1636 /* penalize ROF for bestarrow */
1637 if (pl->bowtype == bow_bestarrow)
1638 speed *= .9f;
1639 else
1640 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1641
1642 op->speed_left += speed - op->speed;
1643 }
1644#endif
1645
1646 SET_ANIMATION (arrow, arrow->direction);
1647
1648 /* update the speed */
1649 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1650 + bow->stats.dam / 7.f;
1651
1652 arrow->set_speed (max (arrow->speed, 2.f));
1653 arrow->speed_left = 0;
1654
1655 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1656
1682 if (op->type == PLAYER) 1657 if (op->type == PLAYER)
1683 { 1658 {
1684 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1685 op->update_stats ();
1686 }
1687
1688 SET_ANIMATION (arrow, arrow->direction);
1689 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1690 arrow->stats.hp = arrow->stats.dam;
1691 arrow->stats.grace = arrow->attacktype;
1692 if (arrow->slaying != NULL)
1693 arrow->spellarg = strdup (arrow->slaying);
1694
1695 /* Note that this was different for monsters - they got their level
1696 * added to the damage. I think the strength bonus is more proper.
1697 */
1698
1699 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1700
1701 /* update the speed */
1702 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1703 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1704
1705 arrow->set_speed (max (arrow->speed, 1.0));
1706 arrow->speed_left = 0;
1707
1708 if (op->type == PLAYER)
1709 {
1710 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1711 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1712 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1713
1714 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1659 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1660 wc -= dex_bonus[op->stats.Dex];
1661
1662 if (!arrow->slaying)
1663 arrow->slaying = op->slaying;
1664
1665 arrow->attacktype |= op->attacktype;
1715 } 1666 }
1716 else 1667 else
1717 { 1668 {
1718 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1719 arrow->level = op->level; 1669 arrow->level = op->level;
1720 } 1670 arrow->stats.wc -= bow->magic;
1721 1671
1722 if (arrow->attacktype == AT_PHYSICAL) 1672 if (!arrow->slaying)
1673 arrow->slaying = bow->slaying;
1674
1723 arrow->attacktype |= bow->attacktype; 1675 arrow->attacktype |= bow->attacktype;
1676 }
1724 1677
1725 if (bow->slaying) 1678 wc -= arrow->level;
1726 arrow->slaying = bow->slaying; 1679 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1727 1680
1681 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1728 arrow->move_type = MOVE_FLY_LOW; 1682 arrow->move_type = MOVE_FLY_LOW;
1729 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1683 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1730 1684
1731 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1685 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1732 m->insert (arrow, sx, sy, op); 1686 m->insert (arrow, sx, sy, op);
… …
1757{ 1711{
1758 int ret = 0, wcmod = 0; 1712 int ret = 0, wcmod = 0;
1759 1713
1760 if (op->contr->bowtype == bow_bestarrow) 1714 if (op->contr->bowtype == bow_bestarrow)
1761 { 1715 {
1762 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1716 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1763 } 1717 }
1764 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1718 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1765 { 1719 {
1766 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1720 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1767 wcmod = -1; 1721 wcmod = -1;
… …
1777 else if (op->contr->bowtype == bow_spreadshot) 1731 else if (op->contr->bowtype == bow_spreadshot)
1778 { 1732 {
1779 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);
1780 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1734 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1781 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1735 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1782
1783 } 1736 }
1784 else 1737 else
1785 { 1738 {
1786 /* Simple case */ 1739 /* Simple case */
1787 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1740 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1788 } 1741 }
1742
1789 return ret; 1743 return ret;
1790} 1744}
1791
1792 1745
1793/* Fires a misc (wand/rod/horn) object in 'dir'. 1746/* Fires a misc (wand/rod/horn) object in 'dir'.
1794 * Broken apart from 'fire' to keep it more readable. 1747 * Broken apart from 'fire' to keep it more readable.
1795 */ 1748 */
1796void 1749void
1797fire_misc_object (object *op, int dir) 1750fire_misc_object (object *op, int dir)
1798{ 1751{
1799 object *item; 1752 object *item = op->contr->ranged_ob;
1800 1753
1801 if (!op->contr->ranges[range_misc]) 1754 if (!item)
1802 { 1755 {
1803 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1756 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1804 return; 1757 return;
1805 } 1758 }
1806 1759
1807 item = op->contr->ranges[range_misc];
1808 if (!item->inv) 1760 if (!item->inv)
1809 { 1761 {
1810 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1762 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1811 return; 1763 return;
1812 } 1764 }
1765
1766 if (!op->change_weapon (item))
1767 return;
1768
1813 if (item->type == WAND) 1769 if (item->type == WAND)
1814 { 1770 {
1815 if (item->stats.food <= 0) 1771 if (item->stats.food <= 0)
1816 { 1772 {
1817 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1773 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1818 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1774 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1775
1819 return; 1776 return;
1820 } 1777 }
1821 } 1778 }
1822 else if (item->type == ROD || item->type == HORN) 1779 else if (item->type == ROD || item->type == HORN)
1823 { 1780 {
1824 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1781 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1825 { 1782 {
1826 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1783 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1784
1827 if (item->type == ROD) 1785 if (item->type == ROD)
1828 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1786 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1829 else 1787 else
1830 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1788 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1789
1831 return; 1790 return;
1832 } 1791 }
1833 } 1792 }
1834 1793
1835 if (cast_spell (op, item, dir, item->inv, NULL)) 1794 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1842 object *tmp; 1801 object *tmp;
1843 1802
1844 if (item->arch) 1803 if (item->arch)
1845 { 1804 {
1846 CLEAR_FLAG (item, FLAG_ANIMATE); 1805 CLEAR_FLAG (item, FLAG_ANIMATE);
1847 item->face = item->arch->clone.face; 1806 item->face = item->arch->face;
1848 item->set_speed (0); 1807 item->set_speed (0);
1849 } 1808 }
1850 1809
1851 if ((tmp = item->in_player ())) 1810 if ((tmp = item->in_player ()))
1852 esrv_update_item (UPD_ANIM, tmp, item); 1811 esrv_update_item (UPD_ANIM, tmp, item);
… …
1857 } 1816 }
1858} 1817}
1859 1818
1860/* Received a fire command for the player - go and do it. 1819/* Received a fire command for the player - go and do it.
1861 */ 1820 */
1862void 1821bool
1863fire (object *op, int dir) 1822fire (object *op, int dir)
1864{ 1823{
1865 int spellcost = 0; 1824 int spellcost = 0;
1866 1825
1867 /* check for loss of invisiblity/hide */ 1826 /* check for loss of invisiblity/hide */
1868 if (action_makes_visible (op)) 1827 if (action_makes_visible (op))
1869 make_visible (op); 1828 make_visible (op);
1870 1829
1871 switch (op->contr->shoottype) 1830 player *pl = op->contr;
1831
1832 if (pl->golem)
1833 {
1834 control_golem (op->contr->golem, dir);
1835 return false;
1872 { 1836 }
1873 case range_none:
1874 return;
1875 1837
1876 case range_bow: 1838 object *ob = pl->ranged_ob;
1839
1840 if (!ob)
1841 return false;
1842
1843 if (!op->change_weapon (ob))
1844 return false;
1845
1846 if (op->speed_left > 0.f)
1847 --op->speed_left;
1848 else
1849 return false;
1850
1851 switch (ob->type)
1852 {
1853 case BOW:
1877 player_fire_bow (op, dir); 1854 player_fire_bow (op, dir);
1878 return; 1855 break;
1879 1856
1880 case range_magic: /* Casting spells */ 1857 case SPELL:
1881 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1858 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1882 return; 1859 break;
1883 1860
1884 case range_misc: 1861 case BUILDER:
1862 apply_map_builder (op, dir);
1863 break;
1864
1865 case SKILL:
1866 do_skill (op, op, ob, dir, 0);
1867 break;
1868
1869 default:
1885 fire_misc_object (op, dir); 1870 fire_misc_object (op, dir);
1886 return; 1871 break;
1887
1888 case range_golem: /* Control summoned monsters from scrolls */
1889 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1890 {
1891 op->contr->ranges[range_golem] = 0;
1892 op->contr->shoottype = range_none;
1893 }
1894 else
1895 control_golem (op->contr->ranges[range_golem], dir);
1896 return;
1897
1898 case range_skill:
1899 if (!op->chosen_skill)
1900 {
1901 if (op->type == PLAYER)
1902 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1903 return;
1904 }
1905 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1906 return;
1907 case range_builder:
1908 apply_map_builder (op, dir);
1909 return;
1910 default:
1911 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1912 return;
1913 } 1872 }
1914}
1915 1873
1916 1874 return true;
1875}
1917 1876
1918/* find_key 1877/* find_key
1919 * We try to find a key for the door as passed. If we find a key 1878 * We try to find a key for the door as passed. If we find a key
1920 * and successfully use it, we return the key, otherwise NULL 1879 * and successfully use it, we return the key, otherwise NULL
1921 * This function merges both normal and locked door, since the logic 1880 * This function merges both normal and locked door, since the logic
… …
1923 * pl is the player, 1882 * pl is the player,
1924 * inv is the objects inventory to searched 1883 * inv is the objects inventory to searched
1925 * door is the door we are trying to match against. 1884 * door is the door we are trying to match against.
1926 * This function can be called recursively to search containers. 1885 * This function can be called recursively to search containers.
1927 */ 1886 */
1928
1929object * 1887object *
1930find_key (object *pl, object *container, object *door) 1888find_key (object *pl, object *container, object *door)
1931{ 1889{
1932 object *tmp, *key; 1890 object *tmp, *key;
1933 1891
1934 /* Should not happen, but sanity checking is never bad */ 1892 /* Should not happen, but sanity checking is never bad */
1935 if (container->inv == NULL) 1893 if (!container->inv)
1936 return NULL; 1894 return 0;
1937 1895
1938 /* First, lets try to find a key in the top level inventory */ 1896 /* First, lets try to find a key in the top level inventory */
1939 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1897 for (tmp = container->inv; tmp; tmp = tmp->below)
1940 { 1898 {
1941 if (door->type == DOOR && tmp->type == KEY) 1899 if (door->type == DOOR && tmp->type == KEY)
1942 break; 1900 break;
1943 /* For sanity, we should really check door type, but other stuff 1901 /* For sanity, we should really check door type, but other stuff
1944 * (like containers) can be locked with special keys 1902 * (like containers) can be locked with special keys
1945 */ 1903 */
1946 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1904 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1947 break; 1905 break;
1948 } 1906 }
1907
1949 /* No key found - lets search inventories now */ 1908 /* No key found - lets search inventories now */
1950 /* If we find and use a key in an inventory, return at that time. 1909 /* If we find and use a key in an inventory, return at that time.
1951 * otherwise, if we search all the inventories and still don't find 1910 * otherwise, if we search all the inventories and still don't find
1952 * a key, return 1911 * a key, return
1953 */ 1912 */
1954 if (!tmp) 1913 if (!tmp)
1955 { 1914 {
1956 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1915 for (tmp = container->inv; tmp; tmp = tmp->below)
1957 { 1916 {
1958 /* No reason to search empty containers */ 1917 /* No reason to search empty containers */
1959 if (tmp->type == CONTAINER && tmp->inv) 1918 if (tmp->type == CONTAINER && tmp->inv)
1960 { 1919 {
1961 if ((key = find_key (pl, tmp, door)) != NULL) 1920 if ((key = find_key (pl, tmp, door)))
1962 return key; 1921 return key;
1963 } 1922 }
1964 } 1923 }
1924
1965 if (!tmp) 1925 if (!tmp)
1966 return NULL; 1926 return NULL;
1967 } 1927 }
1928
1968 /* We get down here if we have found a key. Now if its in a container, 1929 /* We get down here if we have found a key. Now if its in a container,
1969 * see if we actually want to use it 1930 * see if we actually want to use it
1970 */ 1931 */
1971 if (pl != container) 1932 if (pl != container)
1972 { 1933 {
… …
1993 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1954 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1994 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1955 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1995 return NULL; 1956 return NULL;
1996 } 1957 }
1997 } 1958 }
1959
1998 return tmp; 1960 return tmp;
1999} 1961}
2000 1962
2001/* moved door processing out of move_player_attack. 1963/* moved door processing out of move_player_attack.
2002 * returns 1 if player has opened the door with a key 1964 * returns 1 if player has opened the door with a key
… …
2004 * 0 otherwise 1966 * 0 otherwise
2005 */ 1967 */
2006static int 1968static int
2007player_attack_door (object *op, object *door) 1969player_attack_door (object *op, object *door)
2008{ 1970{
2009 /* If its a door, try to find a use a key. If we do destroy the door, 1971 /* If its a door, try to find a key. If we do destroy the door,
2010 * might as well return immediately as there is nothing more to do - 1972 * might as well return immediately as there is nothing more to do -
2011 * otherwise, we fall through to the rest of the code. 1973 * otherwise, we fall through to the rest of the code.
2012 */ 1974 */
2013 object *key = find_key (op, op, door); 1975 object *key = find_key (op, op, door);
2014 1976
2015 /* IF we found a key, do some extra work */ 1977 /* If we found a key, do some extra work */
2016 if (key) 1978 if (key)
2017 { 1979 {
2018 object *container = key->env; 1980 object *container = key->env;
2019 1981
2020 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1982 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1983
2021 if (action_makes_visible (op)) 1984 if (action_makes_visible (op))
2022 make_visible (op); 1985 make_visible (op);
1986
2023 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1987 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2024 spring_trap (door->inv, op); 1988 spring_trap (door->inv, op);
1989
2025 if (door->type == DOOR) 1990 if (door->type == DOOR)
2026 {
2027 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 1991 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2028 }
2029 else if (door->type == LOCKED_DOOR) 1992 else if (door->type == LOCKED_DOOR)
2030 { 1993 {
2031 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 1994 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2032 remove_door2 (door); /* remove door without violence ;-) */ 1995 remove_door2 (door); /* remove door without violence ;-) */
2033 } 1996 }
1997
2034 /* Do this after we print the message */ 1998 /* Do this after we print the message */
2035 decrease_ob (key); /* Use up one of the keys */ 1999 decrease_ob (key); /* Use up one of the keys */
2036 /* Need to update the weight the container the key was in */ 2000 /* Need to update the weight the container the key was in */
2037 if (container != op) 2001 if (container != op)
2038 esrv_update_item (UPD_WEIGHT, op, container); 2002 esrv_update_item (UPD_WEIGHT, op, container);
2003
2039 return 1; /* Nothing more to do below */ 2004 return 1; /* Nothing more to do below */
2040 } 2005 }
2041 else if (door->type == LOCKED_DOOR) 2006 else if (door->type == LOCKED_DOOR)
2042 { 2007 {
2043 /* Might as well return now - no other way to open this */ 2008 /* Might as well return now - no other way to open this */
2044 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2009 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2045 return 1; 2010 return 1;
2046 } 2011 }
2012
2047 return 0; 2013 return 0;
2048} 2014}
2049 2015
2050/* This function is just part of a breakup from move_player. 2016/* This function is just part of a breakup from move_player.
2051 * It should keep the code cleaner. 2017 * It should keep the code cleaner.
2052 * When this is called, the players direction has been updated 2018 * When this is called, the players direction has been updated
2053 * (taking into account confusion.) The player is also actually 2019 * (taking into account confusion.) The player is also actually
2054 * going to try and move (not fire weapons). 2020 * going to try and move (not fire weapons).
2055 */ 2021 */
2056void 2022bool
2057move_player_attack (object *op, int dir) 2023move_player_attack (object *op, int dir)
2058{ 2024{
2059 object *tmp, *mon;
2060 sint16 nx, ny;
2061 int on_battleground; 2025 int on_battleground;
2062 maptile *m;
2063 2026
2064 nx = freearr_x[dir] + op->x; 2027 sint16 nx = freearr_x[dir] + op->x;
2065 ny = freearr_y[dir] + op->y; 2028 sint16 ny = freearr_y[dir] + op->y;
2066 2029
2067 on_battleground = op_on_battleground (op, 0, 0); 2030 on_battleground = op_on_battleground (op, 0, 0);
2031
2032 if (out_of_map (op->map, nx, ny))
2033 return false;
2034
2035 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2036 {
2037 --op->speed_left;
2038 return true;
2039 }
2068 2040
2069 /* If braced, or can't move to the square, and it is not out of the 2041 /* If braced, or can't move to the square, and it is not out of the
2070 * map, attack it. Note order of if statement is important - don't 2042 * map, attack it. Note order of if statement is important - don't
2071 * want to be calling move_ob if braced, because move_ob will move the 2043 * want to be calling move_ob if braced, because move_ob will move the
2072 * player. This is a pretty nasty hack, because if we could 2044 * player. This is a pretty nasty hack, because if we could
2073 * move to some space, it then means that if we are braced, we should 2045 * move to some space, it then means that if we are braced, we should
2074 * do nothing at all. As it is, if we are braced, we go through 2046 * do nothing at all. As it is, if we are braced, we go through
2075 * quite a bit of processing. However, it probably is less than what 2047 * quite a bit of processing. However, it probably is less than what
2076 * move_ob uses. 2048 * move_ob uses.
2077 */ 2049 */
2078 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2050 maptile *m = op->map->xy_find (nx, ny);
2079 {
2080 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2081 {
2082 m = get_map_from_coord (op->map, &nx, &ny);
2083 if (!m)
2084 return; /* Don't think this should happen */
2085 }
2086 else
2087 m = op->map;
2088 2051
2089 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL)
2090 {
2091 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2092 return;
2093 }
2094
2095 mon = 0;
2096 /* Go through all the objects, and find ones of interest. Only stop if 2052 /* Go through all the objects, and find ones of interest. Only stop if
2097 * we find a monster - that is something we know we want to attack. 2053 * we find a monster - that is something we know we want to attack.
2098 * if its a door or barrel (can roll) see if there may be monsters 2054 * if its a door or barrel (can roll) see if there may be monsters
2099 * on the space 2055 * on the space
2100 */ 2056 */
2101 while (tmp) 2057 object *mon;
2102 { 2058 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2103 if (tmp == op) 2059 {
2104 { 2060 if ((mon->flag [FLAG_ALIVE]
2105 tmp = tmp->above; 2061 || mon->type == LOCKED_DOOR
2106 continue; 2062 || mon->flag [FLAG_CAN_ROLL])
2107 }
2108
2109 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2110 {
2111 mon = tmp; 2063 && mon != op)
2112 break; 2064 break;
2113 } 2065 }
2114 2066
2115 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2116 mon = tmp;
2117
2118 tmp = tmp->above;
2119 }
2120
2121 if (!mon) /* This happens anytime the player tries to move */ 2067 if (!mon) /* This happens anytime the player tries to move */
2122 return; /* into a wall */ 2068 return false; /* into a wall */
2123 2069
2124 if (mon->head)
2125 mon = mon->head; 2070 mon = mon->head_ ();
2126 2071
2127 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2072 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2073 if (op->contr->weapon_sp_left > 0.f)
2128 if (player_attack_door (op, mon)) 2074 if (player_attack_door (op, mon))
2075 {
2076 --op->contr->weapon_sp_left;
2129 return; 2077 return true;
2078 }
2130 2079
2131 /* The following deals with possibly attacking peaceful 2080 /* The following deals with possibly attacking peaceful
2132 * or frienddly creatures. Basically, all players are considered 2081 * or friendly creatures. Basically, all players are considered
2133 * unaggressive. If the moving player has peaceful set, then the 2082 * unaggressive. If the moving player has peaceful set, then the
2134 * object should be pushed instead of attacked. It is assumed that 2083 * object should be pushed instead of attacked. It is assumed that
2135 * if you are braced, you will not attack friends accidently, 2084 * if you are braced, you will not attack friends accidently,
2136 * and thus will not push them. 2085 * and thus will not push them.
2137 */ 2086 */
2138 2087
2139 /* If the creature is a pet, push it even if the player is not 2088 /* If the creature is a pet, push it even if the player is not
2140 * peaceful. Our assumption is the creature is a pet if the 2089 * peaceful. Our assumption is the creature is a pet if the
2141 * player owns it and it is either friendly or unagressive. 2090 * player owns it and it is either friendly or unagressive.
2142 */ 2091 */
2143 if ((op->type == PLAYER) 2092 if (op->type == PLAYER
2144#if COZY_SERVER
2145 &&
2146 ((mon->owner && mon->owner->contr 2093 && ((mon->owner && mon->owner->contr
2147 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2094 && same_party (mon->owner->contr->party, op->contr->party))
2148#else
2149 && mon->owner == op 2095 || mon->owner == op)
2150#endif
2151 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2096 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2152 { 2097 {
2153 /* If we're braced, we don't want to switch places with it */ 2098 /* If we're braced, we don't want to switch places with it */
2154 if (op->contr->braced) 2099 if (op->contr->braced)
2155 return; 2100 return false;
2101
2102 if (op->speed_left > 0.f)
2103 {
2104 --op->speed_left;
2105
2156 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2106 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2157 (void) push_ob (mon, dir, op); 2107 push_ob (mon, dir, op);
2108
2158 if (op->contr->tmp_invis || op->hide) 2109 if (op->contr->tmp_invis || op->hide)
2159 make_visible (op); 2110 make_visible (op);
2111
2160 return; 2112 return true;
2161 } 2113 }
2114 else
2115 return false;
2116 }
2162 2117
2163 /* in certain circumstances, you shouldn't attack friendly 2118 /* in certain circumstances, you shouldn't attack friendly
2164 * creatures. Note that if you are braced, you can't push 2119 * creatures. Note that if you are braced, you can't push
2165 * someone, but put it inside this loop so that you won't 2120 * someone, but put it inside this loop so that you won't
2166 * attack them either. 2121 * attack them either.
2167 */ 2122 */
2168 if ((mon->type == PLAYER || mon->enemy != op) && 2123 if ((mon->type == PLAYER || mon->enemy != op)
2169 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2124 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2170#ifdef PROHIBIT_PLAYERKILL
2171 (op->contr->peaceful 2125 && ((op->contr->peaceful
2172 || (mon->type == PLAYER 2126 || (mon->type == PLAYER && mon->contr->peaceful))
2173 && mon->contr->
2174 peaceful)) &&
2175#else
2176 op->contr->peaceful &&
2177#endif
2178 !on_battleground)) 2127 && !on_battleground))
2128 {
2129 if (op->speed_left > 0.f)
2179 { 2130 {
2131 --op->speed_left;
2132
2180 if (!op->contr->braced) 2133 if (!op->contr->braced)
2181 { 2134 {
2182 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2135 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2183 (void) push_ob (mon, dir, op); 2136 push_ob (mon, dir, op);
2184 } 2137 }
2185 else 2138 else
2186 new_draw_info (0, 0, op, "You withhold your attack"); 2139 new_draw_info (0, 0, op, "You withhold your attack");
2187 2140
2188 if (op->contr->tmp_invis || op->hide) 2141 if (op->contr->tmp_invis || op->hide)
2189 make_visible (op); 2142 make_visible (op);
2190 }
2191 2143
2144 return true;
2145 }
2146 }
2192 /* If the object is a boulder or other rollable object, then 2147 /* If the object is a boulder or other rollable object, then
2193 * roll it if not braced. You can't roll it if you are braced. 2148 * roll it if not braced. You can't roll it if you are braced.
2194 */ 2149 */
2195 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2150 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2151 {
2152 if (op->speed_left > 0.f)
2196 { 2153 {
2154 --op->speed_left;
2155
2197 recursive_roll (mon, dir, op); 2156 recursive_roll (mon, dir, op);
2198 if (action_makes_visible (op)) 2157 if (action_makes_visible (op))
2199 make_visible (op); 2158 make_visible (op);
2200 }
2201 2159
2160 return true;
2161 }
2162 }
2202 /* Any generic living creature. Including things like doors. 2163 /* Any generic living creature. Including things like doors.
2203 * Way it works is like this: First, it must have some hit points 2164 * Way it works is like this: First, it must have some hit points
2204 * and be living. Then, it must be one of the following: 2165 * and be living. Then, it must be one of the following:
2205 * 1) Not a player, 2) A player, but of a different party. Note 2166 * 1) Not a player, 2) A player, but of a different party. Note
2206 * that party_number -1 is no party, so attacks can still happen. 2167 * that party_number -1 is no party, so attacks can still happen.
2207 */ 2168 */
2208
2209 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2169 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2210 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2170 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2211 { 2171 {
2212 2172 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2213 /* If the player hasn't hit something this tick, and does
2214 * so, give them speed boost based on weapon speed. Doing
2215 * it here is better than process_players2, which basically
2216 * incurred a 1 tick offset.
2217 */
2218 if (!op->contr->has_hit)
2219 { 2173 {
2220 op->speed_left += op->speed / op->contr->weapon_sp; 2174 --op->contr->weapon_sp_left;
2221
2222 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2223 }
2224 2175
2225 skill_attack (mon, op, 0, 0, 0); 2176 skill_attack (mon, op, 0, 0, 0);
2226
2227 /* If attacking another player, that player gets automatic
2228 * hitback, and doesn't loose luck either.
2229 * Disable hitback on the battleground or if the target is
2230 * the wiz.
2231 */
2232 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2233 {
2234 short luck = mon->stats.luck;
2235
2236 mon->contr->has_hit = 1;
2237 skill_attack (op, mon, 0, 0, 0);
2238 mon->stats.luck = luck;
2239 }
2240 2177
2241 if (action_makes_visible (op)) 2178 if (action_makes_visible (op))
2242 make_visible (op); 2179 make_visible (op);
2243 }
2244 } /* if player should attack something */
2245}
2246 2180
2247int 2181 return true;
2182 }
2183 }
2184
2185 return false;
2186}
2187
2188bool
2248move_player (object *op, int dir) 2189move_player (object *op, int dir)
2249{ 2190{
2250 int pick; 2191 int pick;
2251 2192
2252 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2193 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2253 return 0; 2194 return 0;
2254 2195
2255 /* Sanity check: make sure dir is valid */ 2196 /* Sanity check: make sure dir is valid */
2256 if ((dir < 0) || (dir >= 9)) 2197 if ((dir < 0) || (dir >= 9))
2257 { 2198 {
2258 LOG (llevError, "move_player: invalid direction %d\n", dir); 2199 LOG (llevError, "move_player: invalid direction %d\n", dir);
2259 return 0; 2200 return 0;
2260 } 2201 }
2261 2202
2262 /* peterm: added following line */ 2203 /* peterm: added following line */
2263 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2204 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2264 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2205 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2265 2206
2266 op->facing = dir; 2207 op->facing = dir;
2267 2208
2268 if (op->hide) 2209 if (op->hide)
2269 do_hidden_move (op); 2210 do_hidden_move (op);
2270 2211
2212 bool retval;
2213
2271 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2214 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2272 /*nop */ ; 2215 retval = RESULT_INT (0);
2273 else if (op->contr->fire_on) 2216 else if (op->contr->fire_on)
2274 fire (op, dir); 2217 retval = fire (op, dir);
2275 else 2218 else
2276 { 2219 {
2277 move_player_attack (op, dir); 2220 retval = move_player_attack (op, dir);
2278 pick = check_pick (op); 2221 pick = check_pick (op);
2279 } 2222 }
2280 2223
2281 /* Add special check for newcs players and fire on - this way, the 2224 /* Add special check for newcs players and fire on - this way, the
2282 * server can handle repeat firing. 2225 * server can handle repeat firing.
… …
2289 /* Update how the player looks. Use the facing, so direction may 2232 /* Update how the player looks. Use the facing, so direction may
2290 * get reset to zero. This allows for full animation capabilities 2233 * get reset to zero. This allows for full animation capabilities
2291 * for players. 2234 * for players.
2292 */ 2235 */
2293 animate_object (op, op->facing); 2236 animate_object (op, op->facing);
2294 return 0; 2237
2238 return retval;
2295} 2239}
2296 2240
2297/* This is similar to handle_player, below, but is only used by the 2241/* This is similar to handle_player, below, but is only used by the
2298 * new client/server stuff. 2242 * new client/server stuff.
2299 * This is sort of special, in that the new client/server actually uses 2243 * This is sort of special, in that the new client/server actually uses
2300 * the new speed values for commands. 2244 * the new speed values for commands.
2301 * 2245 *
2302 * Returns true if there are more actions we can do. 2246 * Returns true if there are more actions we can do. Should not do
2247 * many actions in a row, as that would be too unfair to other
2248 * players.
2303 */ 2249 */
2304int 2250bool
2305handle_newcs_player (object *op) 2251handle_newcs_player (object *op)
2306{ 2252{
2307 if (op->contr->hidden)
2308 {
2309 op->invisible = 1000;
2310 /* the socket code flashes the player visible/invisible
2311 * depending on the value of invisible, so we need to
2312 * alternate it here for it to work correctly.
2313 */
2314 if (pticks & 2)
2315 op->invisible--;
2316 }
2317 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2318 {
2319 op->invisible--;
2320 if (!op->invisible)
2321 {
2322 make_visible (op);
2323 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2324 }
2325 }
2326
2327 if (QUERY_FLAG (op, FLAG_SCARED)) 2253 if (QUERY_FLAG (op, FLAG_SCARED))
2328 { 2254 {
2329 flee_player (op); 2255 if (op->speed_left > 0.f)
2330 /* If player is still scared, that is his action for this tick */
2331 if (QUERY_FLAG (op, FLAG_SCARED))
2332 { 2256 {
2333 op->speed_left--; 2257 --op->speed_left;
2258 flee_player (op);
2259
2334 return 0; 2260 return true;
2335 } 2261 }
2262 else
2263 return false;
2336 } 2264 }
2337
2338 /* I've been seeing crashes where the golem has been destroyed, but
2339 * the player object still points to the defunct golem. The code that
2340 * destroys the golem looks correct, and it doesn't always happen, so
2341 * put this in a a workaround to clean up the golem pointer.
2342 */
2343 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2344 op->contr->ranges[range_golem] = 0;
2345 2265
2346 /* call this here - we also will call this in do_ericserver, but 2266 /* call this here - we also will call this in do_ericserver, but
2347 * the players time has been increased when doericserver has been 2267 * the players time has been increased when doericserver has been
2348 * called, so we recheck it here. 2268 * called, so we recheck it here.
2349 */ 2269 */
2350 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2270 if (op->contr->ns->handle_command ())
2351 for (int rep = 8; --rep && op->contr->ns->handle_command (); )
2352 ;
2353
2354 if (op->speed_left < 0)
2355 return 0; 2271 return true;
2356 2272
2357 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2273 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2358 {
2359 /* All move commands take 1 tick, at least for now */
2360 op->speed_left--;
2361
2362 /* Instead of all the stuff below, let move_player take care
2363 * of it. Also, some of the skill stuff is only put in
2364 * there, as well as the confusion stuff.
2365 */
2366 move_player (op, op->direction); 2274 return move_player (op, op->direction);
2367 if (op->speed_left > 0)
2368 return 1;
2369 else
2370 return 0;
2371 }
2372 2275
2373 return 0; 2276 return false;
2374} 2277}
2375 2278
2376int 2279int
2377save_life (object *op) 2280save_life (object *op)
2378{ 2281{
… …
2413 * from. 2316 * from.
2414 */ 2317 */
2415void 2318void
2416remove_unpaid_objects (object *op, object *env) 2319remove_unpaid_objects (object *op, object *env)
2417{ 2320{
2418 object *next;
2419
2420 while (op) 2321 while (op)
2421 { 2322 {
2422 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2323 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2423 2324
2424 if (QUERY_FLAG (op, FLAG_UNPAID)) 2325 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2490 int rate_grace = 2000; 2391 int rate_grace = 2000;
2491 const int max_hp = 1; 2392 const int max_hp = 1;
2492 const int max_sp = 1; 2393 const int max_sp = 1;
2493 const int max_grace = 1; 2394 const int max_grace = 1;
2494 2395
2495 if (op->contr->outputs_sync) 2396 if (op->contr->hidden)
2397 {
2398 op->invisible = 1000;
2399 /* the socket code flashes the player visible/invisible
2400 * depending on the value of invisible, so we need to
2401 * alternate it here for it to work correctly.
2402 */
2403 if (pticks & 2)
2404 op->invisible--;
2496 { 2405 }
2497 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2406 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2498 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2407 {
2499 flush_output_element (op, &op->contr->outputs[i]); 2408 if (!op->invisible--)
2409 {
2410 make_visible (op);
2411 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2412 }
2500 } 2413 }
2501 2414
2502 if (op->contr->ns->state == ST_PLAYING) 2415 if (op->contr->ns->state == ST_PLAYING)
2503 { 2416 {
2504 /* these next three if clauses make it possible to SLOW DOWN 2417 /* these next three if clauses make it possible to SLOW DOWN
… …
2526 gen_grace = op->stats.maxgrace; 2439 gen_grace = op->stats.maxgrace;
2527 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2440 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2528 } 2441 }
2529 2442
2530 /* Regenerate Spell Points */ 2443 /* Regenerate Spell Points */
2531 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2444 if (!op->contr->golem && --op->last_sp < 0)
2532 { 2445 {
2533 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2446 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2534 if (op->stats.sp < op->stats.maxsp) 2447 if (op->stats.sp < op->stats.maxsp)
2535 { 2448 {
2536 op->stats.sp++; 2449 op->stats.sp++;
… …
2634 } 2547 }
2635 2548
2636 /* Digestion */ 2549 /* Digestion */
2637 if (--op->last_eat < 0) 2550 if (--op->last_eat < 0)
2638 { 2551 {
2639#ifdef COZY_SERVER
2640 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2641 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2642#else
2643 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2552 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2644#endif
2645 2553
2646 if (op->contr->gen_hp > 0) 2554 if (op->contr->gen_hp > 0)
2647 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2555 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2648 else 2556 else
2649 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2557 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
… …
2754 tmp->name = buf; 2662 tmp->name = buf;
2755 sprintf (buf, " This finger has been cut off %s\n" 2663 sprintf (buf, " This finger has been cut off %s\n"
2756 " the %s, when he was defeated at\n level %d by %s.\n", 2664 " the %s, when he was defeated at\n level %d by %s.\n",
2757 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2665 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2758 tmp->msg = buf; 2666 tmp->msg = buf;
2759 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2667 tmp->value = 0, tmp->type = 0;
2760 tmp->materialname = NULL; 2668 tmp->materialname = "organics";
2761 op->insert_at (tmp, op); 2669 tmp->insert_at (op, tmp);
2762 } 2670 }
2763 2671
2764 /* teleport defeated player to new destination */ 2672 /* teleport defeated player to new destination */
2765 transfer_ob (op, x, y, 0, NULL); 2673 transfer_ob (op, x, y, 0, NULL);
2766 op->contr->braced = 0; 2674 op->contr->braced = 0;
… …
2771 2679
2772 command_kill_pets (op, 0); 2680 command_kill_pets (op, 0);
2773 2681
2774 if (op->stats.food < 0) 2682 if (op->stats.food < 0)
2775 { 2683 {
2776 if (op->contr->explore)
2777 {
2778 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2779 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2780 op->stats.food = 999;
2781 return;
2782 }
2783 sprintf (buf, "%s starved to death.", &op->name); 2684 sprintf (buf, "%s starved to death.", &op->name);
2784 strcpy (op->contr->killer, "starvation"); 2685 strcpy (op->contr->killer, "starvation");
2785 } 2686 }
2786 else 2687 else
2787 {
2788 if (op->contr->explore)
2789 {
2790 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2791 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2792 op->stats.hp = op->stats.maxhp;
2793 return;
2794 }
2795 sprintf (buf, "%s died.", &op->name); 2688 sprintf (buf, "%s died.", &op->name);
2796 }
2797 2689
2798 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2690 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2799 2691
2800 /* save the map location for corpse, gravestone */ 2692 /* save the map location for corpse, gravestone */
2801 x = op->x; 2693 x = op->x;
… …
2977 op->stats.hp = op->stats.maxhp; 2869 op->stats.hp = op->stats.maxhp;
2978 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2870 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2979 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2871 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2980 2872
2981 /* 2873 /*
2982 * Check to see if the player is in a shop. IF so, then check to see if
2983 * the player has any unpaid items. If so, remove them and put them back 2874 * Check to see if the player has any unpaid items. If so, remove them
2984 * in the map. 2875 * and put them back in the map.
2985 */ 2876 */
2986
2987 if (is_in_shop (op))
2988 remove_unpaid_objects (op->inv, op); 2877 remove_unpaid_objects (op->inv, op);
2989 2878
2990 /****************************************/ 2879 /****************************************/
2991 /* */ 2880 /* */
2992 /* Move player to his current respawn- */ 2881 /* Move player to his current respawn- */
2993 /* position (usually last savebed) */ 2882 /* position (usually last savebed) */
2994 /* */ 2883 /* */
2995 /****************************************/ 2884 /****************************************/
2996 2885
2997 enter_player_savebed (op); 2886 enter_player_savebed (op);
2998 2887
2999 /* Save the player before inserting the force to reduce
3000 * chance of abuse.
3001 */
3002 op->contr->braced = 0; 2888 op->contr->braced = 0;
3003 op->contr->save ();
3004 2889
3005 /* it is possible that the player has blown something up 2890 /* it is possible that the player has blown something up
3006 * at his savebed location, and that can have long lasting 2891 * at his savebed location, and that can have long lasting
3007 * spell effects. So first see if there is a spell effect 2892 * spell effects. So first see if there is a spell effect
3008 * on the space that might harm the player. 2893 * on the space that might harm the player.
… …
3017 object *force; 2902 object *force;
3018 int at; 2903 int at;
3019 2904
3020 force = get_archetype (FORCE_NAME); 2905 force = get_archetype (FORCE_NAME);
3021 /* 50 ticks should be enough time for the spell to abate */ 2906 /* 50 ticks should be enough time for the spell to abate */
3022 force->speed = 0.1; 2907 force->speed = 0.1f;
3023 force->speed_left = -5.0; 2908 force->speed_left = -5.f;
3024 SET_FLAG (force, FLAG_APPLIED); 2909 SET_FLAG (force, FLAG_APPLIED);
3025 for (at = 0; at < NROFATTACKS; at++) 2910 for (at = 0; at < NROFATTACKS; at++)
3026 if (will_kill_again & (1 << at)) 2911 if (will_kill_again & (1 << at))
3027 force->resist[at] = 100; 2912 force->resist[at] = 100;
3028 2913
… …
3037void 2922void
3038loot_object (object *op) 2923loot_object (object *op)
3039{ /* Grab and destroy some treasure */ 2924{ /* Grab and destroy some treasure */
3040 object *tmp, *tmp2, *next; 2925 object *tmp, *tmp2, *next;
3041 2926
3042 if (op->container) 2927 op->close_container (); /* close open sack first */
3043 esrv_apply_container (op, op->container); /* close open sack first */
3044 2928
3045 for (tmp = op->inv; tmp; tmp = next) 2929 for (tmp = op->inv; tmp; tmp = next)
3046 { 2930 {
3047 next = tmp->below; 2931 next = tmp->below;
3048 2932
3049 if (tmp->invisible) 2933 if (tmp->invisible)
3050 continue; 2934 continue;
3051 2935
3052 tmp->remove (); 2936 tmp->remove ();
3053 tmp->x = op->x, tmp->y = op->y; 2937 tmp->x = op->x, tmp->y = op->y;
2938
3054 if (tmp->type == CONTAINER) 2939 if (tmp->type == CONTAINER)
3055 { /* empty container to ground */ 2940 loot_object (tmp); /* empty container to ground */
3056 loot_object (tmp); 2941
3057 }
3058 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2942 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3059 { 2943 {
3060 if (tmp->nrof > 1) 2944 if (tmp->nrof > 1)
3061 { 2945 {
3062 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2946 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3063 tmp2->destroy (); 2947 tmp2->destroy ();
… …
3074/* 2958/*
3075 * fix_weight(): Check recursively the weight of all players, and fix 2959 * fix_weight(): Check recursively the weight of all players, and fix
3076 * what needs to be fixed. Refresh windows and fix speed if anything 2960 * what needs to be fixed. Refresh windows and fix speed if anything
3077 * was changed. 2961 * was changed.
3078 */ 2962 */
3079
3080void 2963void
3081fix_weight (void) 2964fix_weight (void)
3082{ 2965{
3083 for_all_players (pl) 2966 for_all_players (pl)
3084 { 2967 {
… …
3144 if (op->type == PLAYER) 3027 if (op->type == PLAYER)
3145 { 3028 {
3146 op->contr->tmp_invis = 0; 3029 op->contr->tmp_invis = 0;
3147 op->contr->invis_race = 0; 3030 op->contr->invis_race = 0;
3148 } 3031 }
3032
3149 update_object (op, UP_OBJ_FACE); 3033 update_object (op, UP_OBJ_CHANGE);
3150} 3034}
3151 3035
3152int 3036int
3153is_true_undead (object *op) 3037is_true_undead (object *op)
3154{ 3038{
3155 object *tmp = NULL;
3156
3157 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3039 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3158 return 1; 3040 return 1;
3159 3041
3160 return 0; 3042 return 0;
3161} 3043}
3162 3044
… …
3206/* For Hidden creatures - a chance of becoming 'unhidden' 3088/* For Hidden creatures - a chance of becoming 'unhidden'
3207 * every time they move - as we subtract off 'invisibility' 3089 * every time they move - as we subtract off 'invisibility'
3208 * AND, for players, if they move into a ridiculously unhideable 3090 * AND, for players, if they move into a ridiculously unhideable
3209 * spot (surrounded by clear terrain in broad daylight). -b.t. 3091 * spot (surrounded by clear terrain in broad daylight). -b.t.
3210 */ 3092 */
3211
3212void 3093void
3213do_hidden_move (object *op) 3094do_hidden_move (object *op)
3214{ 3095{
3215 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3096 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3216 object *skop; 3097 object *skop;
… …
3220 3101
3221 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3102 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3222 3103
3223 /* its *extremely* hard to run and sneak/hide at the same time! */ 3104 /* its *extremely* hard to run and sneak/hide at the same time! */
3224 if (op->type == PLAYER && op->contr->run_on) 3105 if (op->type == PLAYER && op->contr->run_on)
3225 {
3226 if (!skop || num >= skop->level) 3106 if (!skop || num >= skop->level)
3227 { 3107 {
3228 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3108 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3229 make_visible (op); 3109 make_visible (op);
3230 return; 3110 return;
3231 } 3111 }
3232 else 3112 else
3233 num += 20; 3113 num += 20;
3234 } 3114
3235 num += op->map->difficulty; 3115 num += op->map->difficulty;
3236 hide = hideability (op); /* modify by terrain hidden level */ 3116 hide = hideability (op); /* modify by terrain hidden level */
3237 num -= hide; 3117 num -= hide;
3118
3238 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3119 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3239 { 3120 {
3240 make_visible (op); 3121 make_visible (op);
3241 if (op->type == PLAYER) 3122 if (op->type == PLAYER)
3242 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3123 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3243 } 3124 }
3244 else if (op->type == PLAYER && skop) 3125 else if (op->type == PLAYER && skop)
3245 {
3246 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3126 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3247 }
3248} 3127}
3249 3128
3250/* determine if who is standing near a hostile creature. */ 3129/* determine if who is standing near a hostile creature. */
3251 3130
3252int 3131int
… …
3335 * a blocked los square. 3214 * a blocked los square.
3336 * we use the archetype to figure out offsets. 3215 * we use the archetype to figure out offsets.
3337 */ 3216 */
3338 while (op) 3217 while (op)
3339 { 3218 {
3340 dx = rv.distance_x + op->arch->clone.x; 3219 dx = rv.distance_x + op->arch->x;
3341 dy = rv.distance_y + op->arch->clone.y; 3220 dy = rv.distance_y + op->arch->y;
3342 3221
3343 /* only the viewable area the player sees is updated by LOS 3222 /* only the viewable area the player sees is updated by LOS
3344 * code, so we need to restrict ourselves to that range of values 3223 * code, so we need to restrict ourselves to that range of values
3345 * for any meaningful values. 3224 * for any meaningful values.
3346 */ 3225 */
… …
3451 char buf[MAX_BUF]; /* tmp. string buffer */ 3330 char buf[MAX_BUF]; /* tmp. string buffer */
3452 int i = 0, j = 0; 3331 int i = 0, j = 0;
3453 3332
3454 /* get the appropriate treasurelist */ 3333 /* get the appropriate treasurelist */
3455 if (atnr == ATNR_FIRE) 3334 if (atnr == ATNR_FIRE)
3456 trlist = find_treasurelist ("dragon_ability_fire"); 3335 trlist = treasurelist::find ("dragon_ability_fire");
3457 else if (atnr == ATNR_COLD) 3336 else if (atnr == ATNR_COLD)
3458 trlist = find_treasurelist ("dragon_ability_cold"); 3337 trlist = treasurelist::find ("dragon_ability_cold");
3459 else if (atnr == ATNR_ELECTRICITY) 3338 else if (atnr == ATNR_ELECTRICITY)
3460 trlist = find_treasurelist ("dragon_ability_elec"); 3339 trlist = treasurelist::find ("dragon_ability_elec");
3461 else if (atnr == ATNR_POISON) 3340 else if (atnr == ATNR_POISON)
3462 trlist = find_treasurelist ("dragon_ability_poison"); 3341 trlist = treasurelist::find ("dragon_ability_poison");
3463 3342
3464 if (trlist == NULL || who->type != PLAYER) 3343 if (trlist == NULL || who->type != PLAYER)
3465 return; 3344 return;
3466 3345
3467 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3346 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3468 3347
3469 if (tr == NULL || tr->item == NULL) 3348 if (!tr || !tr->item)
3470 { 3349 {
3471 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3350 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3472 return; 3351 return;
3473 } 3352 }
3474 3353
3475 /* everything seems okay - now bring on the gift: */ 3354 /* everything seems okay - now bring on the gift: */
3476 item = &(tr->item->clone); 3355 item = tr->item;
3477 3356
3478 if (item->type == SPELL) 3357 if (item->type == SPELL)
3479 { 3358 {
3480 if (check_spell_known (who, item->name)) 3359 if (check_spell_known (who, item->name))
3481 return; 3360 return;
… …
3540 { 3419 {
3541 /* forces in the treasurelist can alter the player's stats */ 3420 /* forces in the treasurelist can alter the player's stats */
3542 object *skin; 3421 object *skin;
3543 3422
3544 /* first get the dragon skin force */ 3423 /* first get the dragon skin force */
3545 shstr_cmp dragon_skin_force ("dragon_skin_force");
3546 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3424 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3547 ; 3425 ;
3548 3426
3549 if (!skin) 3427 if (!skin)
3550 return; 3428 return;
3551 3429
… …
3599 * not readied. 3477 * not readied.
3600 */ 3478 */
3601void 3479void
3602player_unready_range_ob (player *pl, object *ob) 3480player_unready_range_ob (player *pl, object *ob)
3603{ 3481{
3604 rangetype i; 3482 if (pl->ob->current_weapon == ob)
3483 pl->ob->current_weapon = 0;
3605 3484
3606 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3485 if (pl->combat_ob == ob)
3607 { 3486 pl->combat_ob = 0;
3487
3608 if (pl->ranges[i] == ob) 3488 if (pl->ranged_ob == ob)
3609 { 3489 pl->ranged_ob = 0;
3610 pl->ranges[i] = NULL;
3611 if (pl->shoottype == i)
3612 {
3613 pl->shoottype = range_none;
3614 }
3615 }
3616 }
3617} 3490}
3491
3492sint8
3493player::visibility_at (maptile *map, int x, int y) const
3494{
3495 if (!ns)
3496 return 0;
3497
3498 int dx, dy;
3499 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3500 return 0;
3501
3502 x += dx - ns->current_x + ns->mapx / 2;
3503 y += dy - ns->current_y + ns->mapy / 2;
3504
3505 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3506 return 0;
3507
3508 return 100 - blocked_los [x][y];
3509}

Diff Legend

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