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.87 by elmex, Fri Jan 5 16:17:29 2007 UTC vs.
Revision 1.143 by root, Fri May 18 21:12:40 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <pwd.h>
26#include <sproto.h> 26#include <sproto.h>
27#include <sounds.h> 27#include <sounds.h>
28#include <living.h> 28#include <living.h>
29#include <object.h> 29#include <object.h>
30#include <spells.h> 30#include <spells.h>
31#include <skills.h> 31#include <skills.h>
32 32
33#include <algorithm> 33#include <algorithm>
34#include <functional> 34#include <functional>
35 35
36player * 36playervec 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 37
46void 38void
47display_motd (const object *op) 39display_motd (const object *op)
48{ 40{
49 char buf[MAX_BUF]; 41 char buf[MAX_BUF];
… …
123 115
124 news[0] = '\0'; 116 news[0] = '\0';
125 subject[0] = '\0'; 117 subject[0] = '\0';
126 size = 0; 118 size = 0;
127 119
128 while (fgets (buf, MAX_BUF, fp) != NULL) 120 while (fgets (buf, MAX_BUF, fp))
129 { 121 {
130 if (*buf == '#') 122 if (*buf == '#')
131 continue; 123 continue;
132 124
133 if (*buf == '%') 125 if (*buf == '%')
134 { /* send one news */ 126 { /* send one news */
135 if (size > 0) 127 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 */ 128 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", (char *)"%s\n%s", subject, news); /*send previously read news */
129
137 strcpy (subject, buf + 1); 130 strcpy (subject, buf + 1);
138 strip_endline (subject); 131 strip_endline (subject);
139 size = 0; 132 size = 0;
140 news[0] = '\0'; 133 news[0] = '\0';
141 } 134 }
… …
150 size += strlen (buf); 143 size += strlen (buf);
151 } 144 }
152 } 145 }
153 146
154 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 147 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); 148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
156 close_and_delete (fp, comp); 149 close_and_delete (fp, comp);
157} 150}
158 151
159/* This loads the first map an puts the player on it. */ 152/* This loads the first map an puts the player on it. */
160static void 153static void
… …
176 ob->enter_exit (tmp); 169 ob->enter_exit (tmp);
177 170
178 tmp->destroy (); 171 tmp->destroy ();
179} 172}
180 173
174void
175player::activate ()
176{
177 if (active)
178 return;
179
180 players.insert (this);
181 ob->remove ();
182 ob->map = 0;
183 ob->activate_recursive ();
184 CLEAR_FLAG (ob, FLAG_FRIENDLY);
185 add_friendly_object (ob);
186 enter_map ();
187}
188
189void
190player::deactivate ()
191{
192 if (!active)
193 return;
194
195 terminate_all_pets (ob);
196 remove_friendly_object (ob);
197 ob->deactivate_recursive ();
198
199 if (ob->map)
200 maplevel = ob->map->path;
201
202 ob->remove ();
203 ob->map = 0;
204 party = 0;
205
206 combat_ob = ranged_ob = 0; //TODO, should be special marker, non-refcounted, not this
207
208 players.erase (this);
209}
210
181// connect the player with a specific client 211// connect the player with a specific client
182// also changed, rationalises, and fixes some incorrect settings 212// also changes, rationalises, and fixes some incorrect settings
183void 213void
184player::connect (client *ns) 214player::connect (client *ns)
185{ 215{
186 this->ns = ns; 216 this->ns = ns;
187 ns->pl = this; 217 ns->pl = this;
188 218
189 next = first_player; 219 run_on = 0;
190 first_player = this; 220 fire_on = 0;
221 ob->close_container (); //TODO: client-specific
191 222
192 ns->update_look = 0; 223 ns->update_look = 0;
193 ns->look_position = 0; 224 ns->look_position = 0;
194 225
195 clear_los (ob); 226 clear_los (ob);
227
228 ns->reset_stats ();
196 229
197 /* make sure he's a player -- needed because of class change. */ 230 /* make sure he's a player -- needed because of class change. */
198 ob->type = PLAYER; // we are paranoid 231 ob->type = PLAYER; // we are paranoid
199 ob->race = ob->arch->clone.race; 232 ob->race = ob->arch->clone.race;
200 233
201 if (!legal_range (ob, shoottype))
202 shoottype = range_none;
203
204 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
205 link_player_skills (ob); 235 link_player_skills (ob);
206 236
207 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
208 238
209 assign (title, ob->arch->clone.name); 239 assign (title, ob->arch->clone.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 240
221 /* if it's a dragon player, set the correct title here */ 241 /* if it's a dragon player, set the correct title here */
222 if (is_dragon_pl (ob)) 242 if (is_dragon_pl (ob))
223 { 243 {
224 object *tmp, *abil = 0, *skin = 0; 244 object *tmp, *abil = 0, *skin = 0;
… …
234 skin = tmp; 254 skin = tmp;
235 255
236 set_dragon_name (ob, abil, skin); 256 set_dragon_name (ob, abil, skin);
237 } 257 }
238 258
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!"); 259 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
245 260
246 esrv_new_player (this, ob->weight + ob->carrying); 261 esrv_new_player (this, ob->weight + ob->carrying);
247 262
263 ob->flag [FLAG_READY_WEAPON] = false;
264 ob->flag [FLAG_READY_SKILL] = false;
265 ob->flag [FLAG_READY_BOW] = false;
266
267 for (object *op = ob->inv; op; op = op->below)
268 if (op->flag [FLAG_APPLIED])
269 switch (op->type)
270 {
271 case SKILL:
272 ob->flag [FLAG_APPLIED] = false;
273 break;
274
275 case WAND:
276 case ROD:
277 case HORN:
278 case BOW:
279 ranged_ob = op;
280 break;
281
282 case WEAPON:
283 combat_ob = op;
284 break;
285 }
286
287 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
248 ob->update_stats (); 288 ob->update_stats ();
289
249 ns->floorbox_update (); 290 ns->floorbox_update ();
250
251 esrv_send_inventory (ob, ob); 291 esrv_send_inventory (ob, ob);
252 esrv_add_spells (this, 0); 292 esrv_add_spells (this, 0);
253 293
254 ob->activate_recursive (); 294 activate ();
255 enter_map ();
256 295
257 send_rules (ob); 296 send_rules (ob);
258 send_news (ob); 297 send_news (ob);
259 display_motd (ob); 298 display_motd (ob);
260 299
… …
263} 302}
264 303
265void 304void
266player::disconnect () 305player::disconnect ()
267{ 306{
307 if (ns)
308 {
309 if (active)
310 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
311
312 INVOKE_PLAYER (DISCONNECT, this);
313
314 ns->reset_stats ();
315 ns->pl = 0;
316 ns = 0;
317 }
318
268 if (ob) 319 if (ob)
269 ob->deactivate_recursive (); 320 ob->close_container (); //TODO: client-specific
270 321
271 //TODO: don't be so harsh and destroy :) 322 deactivate ();
272 if (ns)
273 {
274 if (enable_save)
275 {
276 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
277 save (true);
278 }
279
280 INVOKE_PLAYER (DISCONNECT, this);
281
282 client *ns = this->ns;
283 ns->send_packet ("goodbye");
284 ns->flush ();
285 ns->pl = 0;
286 this->ns = 0;
287
288 ns->destroy ();
289 destroy ();
290 }
291} 323}
292 324
293// the need for this function can be explained 325// the need for this function can be explained
294// by load_object not returning the object 326// by load_object not returning the object
295void 327void
296player::set_object (object *op) 328player::set_object (object *op)
297{ 329{
298 ob = op; 330 ob = op;
299 ob->contr = this; /* this aren't yet in archetype */ 331 ob->contr = this; /* this aren't yet in archetype */
300 332
333 ob->speed = 1.0f;
301 ob->speed_left = 0.5; 334 ob->speed_left = 0.5f;
302 ob->speed = 1.0; 335
303 ob->direction = 5; /* So player faces south */ 336 ob->direction = 5; /* So player faces south */
304 ob->stats.wc = 2;
305 ob->run_away = 25; /* Then we panick... */
306
307 ob->roll_stats ();
308} 337}
309 338
310player::player () 339player::player ()
311{ 340{
312 /* There are some elements we want initialised to non zero value - 341 /* There are some elements we want initialised to non zero value -
313 * we deal with that below this point. 342 * we deal with that below this point.
314 */ 343 */
315 outputs_sync = 16; /* Every 2 seconds */ 344 outputs_sync = 4;
316 outputs_count = 8; /* Keeps present behaviour */ 345 outputs_count = 4;
317 unapply = unapply_nochoice; 346 unapply = unapply_nochoice;
318 347
319 savebed_map = first_map_path; /* Init. respawn position */ 348 savebed_map = first_map_path; /* Init. respawn position */
320 349
321 gen_sp_armour = 10; 350 gen_sp_armour = 10;
322 last_speed = -1;
323 shoottype = range_none;
324 bowtype = bow_normal; 351 bowtype = bow_normal;
325 petmode = pet_normal; 352 petmode = pet_normal;
326 listening = 10; 353 listening = 10;
327 usekeys = containers; 354 usekeys = containers;
328 last_weapon_sp = -1;
329 peaceful = 1; /* default peaceful */ 355 peaceful = 1; /* default peaceful */
330 do_los = 1; 356 do_los = 1;
331 357
332 /* we need to clear these to -1 and not zero - otherwise, 358 weapon_sp = 1.0f;
333 * if a player quits and starts a new character, we wont 359 weapon_sp_left = 0.5f;
334 * send new values to the client, as things like exp start
335 * at zero.
336 */
337 for (int i = 0; i < NUM_SKILLS; i++)
338 last_skill_exp[i] = -1;
339
340 for (int i = 0; i < NROFATTACKS; i++)
341 last_resist[i] = -1;
342
343 last_stats.exp = -1;
344 last_weight = (uint32) - 1;
345} 360}
346 361
347void 362void
348player::do_destroy () 363player::do_destroy ()
349{ 364{
350 disconnect (); 365 disconnect ();
351 366
352 save (false);
353 enable_save = false;
354
355 attachable::do_destroy (); 367 attachable::do_destroy ();
356
357 terminate_all_pets (ob);
358
359 if (first_player != this)
360 {
361 player *prev = first_player;
362
363 while (prev && prev->next && prev->next != this)
364 prev = prev->next;
365
366 if (prev->next != this)
367 {
368 LOG (llevError, "Free_player: Can't find previous player.\n");
369 abort ();
370 }
371
372 prev->next = next;
373 }
374 else
375 first_player = next;
376 368
377 if (ob) 369 if (ob)
378 { 370 {
379 ob->destroy_inv (false); 371 ob->destroy_inv (false);
380 ob->destroy (); 372 ob->destroy ();
… …
395player::create () 387player::create ()
396{ 388{
397 player *pl = new player; 389 player *pl = new player;
398 390
399 pl->set_object (arch_to_object (get_player_archetype (0))); 391 pl->set_object (arch_to_object (get_player_archetype (0)));
392
393 pl->ob->roll_stats ();
394 pl->ob->stats.wc = 2;
395 pl->ob->run_away = 25; /* Then we panick... */
396
400 set_first_map (pl->ob); 397 set_first_map (pl->ob);
401 398
402 return pl; 399 return pl;
403} 400}
404 401
… …
436 object *op = NULL; 433 object *op = NULL;
437 objectlink *ol; 434 objectlink *ol;
438 unsigned lastdist; 435 unsigned lastdist;
439 rv_vector rv; 436 rv_vector rv;
440 437
441 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 438 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
442 { 439 {
443 /* We should not find free objects on this friendly list, but it 440 /* We should not find free objects on this friendly list, but it
444 * does periodically happen. Given that, lets deal with it. 441 * does periodically happen. Given that, lets deal with it.
445 * While unlikely, it is possible the next object on the friendly 442 * While unlikely, it is possible the next object on the friendly
446 * list is also free, so encapsulate this in a while loop. 443 * list is also free, so encapsulate this in a while loop.
… …
450 object *tmp = ol->ob; 447 object *tmp = ol->ob;
451 448
452 /* Can't do much more other than log the fact, because the object 449 /* Can't do much more other than log the fact, because the object
453 * itself will have been cleared. 450 * itself will have been cleared.
454 */ 451 */
455 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 452 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
453 tmp->debug_desc ());
456 ol = ol->next; 454 ol = ol->next;
457 remove_friendly_object (tmp); 455 remove_friendly_object (tmp);
458 if (!ol) 456 if (!ol)
459 return op; 457 return op;
460 } 458 }
… …
549 x = mon->x; 547 x = mon->x;
550 y = mon->y; 548 y = mon->y;
551 m = mon->map; 549 m = mon->map;
552 dir = rv.direction; 550 dir = rv.direction;
553 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */ 551 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
554 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 552 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
553
555 /* If we can't solve it within the search distance, return now. */ 554 /* If we can't solve it within the search distance, return now. */
556 if (diff > max) 555 if (diff > max)
557 return 0; 556 return 0;
557
558 while (diff > 1 && max > 0) 558 while (diff > 1 && max > 0)
559 { 559 {
560 lastx = x; 560 lastx = x;
561 lasty = y; 561 lasty = y;
562 lastmap = m; 562 lastmap = m;
… …
644 max--; 644 max--;
645 lastdir = dir; 645 lastdir = dir;
646 if (!firstdir) 646 if (!firstdir)
647 firstdir = dir; 647 firstdir = dir;
648 } 648 }
649
649 if (diff <= 1) 650 if (diff <= 1)
650 { 651 {
651 /* Recalculate diff (distance) because we may not have actually 652 /* Recalculate diff (distance) because we may not have actually
652 * headed toward player for entire distance. 653 * headed toward player for entire distance.
653 */ 654 */
654 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0); 655 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
655 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y); 656 diff = ::max (abs (rv.distance_x), abs (rv.distance_y));
656 } 657 }
658
657 if (diff > max) 659 if (diff > max)
658 return 0; 660 return 0;
659 } 661 }
662
660 /* If we reached the max, didn't find a direction in time */ 663 /* If we reached the max, didn't find a direction in time */
661 if (!max) 664 if (!max)
662 return 0; 665 return 0;
663 666
664 return firstdir; 667 return firstdir;
… …
778roll_stat (void) 781roll_stat (void)
779{ 782{
780 int a[4], i, j, k; 783 int a[4], i, j, k;
781 784
782 for (i = 0; i < 4; i++) 785 for (i = 0; i < 4; i++)
783 a[i] = (int) RANDOM () % 6 + 1; 786 a[i] = (int) rndm (6) + 1;
784 787
785 for (i = 0, j = 0, k = 7; i < 4; i++) 788 for (i = 0, j = 0, k = 7; i < 4; i++)
786 if (a[i] < k) 789 if (a[i] < k)
787 k = a[i], j = i; 790 k = a[i], j = i;
788 791
… …
794} 797}
795 798
796void 799void
797object::roll_stats () 800object::roll_stats ()
798{ 801{
799 int statsort [7]; 802 int statsort [NUM_STATS];
800 803
801 for (;;) 804 for (;;)
802 { 805 {
803 int sum = 0; 806 int sum = 0;
804 for (int i = 7; i--; ) 807 for (int i = NUM_STATS; i--; )
805 sum += statsort [i] = roll_stat (); 808 sum += statsort [i] = roll_stat ();
806 809
807 if (sum >= 82 && sum <= 116) 810 if (sum >= 82 && sum <= 116)
808 break; 811 break;
809 } 812 }
810 813
811 // Sort the stats so that rerolling is easier... 814 // Sort the stats so that rerolling is easier...
812 std::sort (statsort, statsort + 7, std::greater<int>()); 815 std::sort (statsort, statsort + NUM_STATS, std::greater<int>());
813 816
817 for (int i = 0; i < NUM_STATS; ++i)
814 stats.Str = statsort[0]; 818 stats.stat (i) = statsort [i];
815 stats.Dex = statsort[1];
816 stats.Con = statsort[2];
817 stats.Int = statsort[3];
818 stats.Wis = statsort[4];
819 stats.Pow = statsort[5];
820 stats.Cha = statsort[6];
821 819
822 stats.exp = 0; 820 stats.exp = 0;
823 stats.ac = 0; 821 stats.ac = 0;
824 822
825 stats.hp = stats.maxhp; 823 stats.hp = stats.maxhp;
… …
837} 835}
838 836
839void 837void
840object::swap_stats (int a, int b) 838object::swap_stats (int a, int b)
841{ 839{
842 int tmp = get_attr_value (&contr->orig_stats, a); 840 swap (contr->orig_stats.stat (a), contr->orig_stats.stat (b));
843 set_attr_value (&contr->orig_stats, a, get_attr_value (&contr->orig_stats, b));
844 set_attr_value (&contr->orig_stats, b, tmp);
845 841
842 for (int i = 0; i < NUM_STATS; ++i)
846 stats.Str = contr->orig_stats.Str; 843 stats.stat (i) = contr->orig_stats.stat (i);
847 stats.Dex = contr->orig_stats.Dex;
848 stats.Con = contr->orig_stats.Con;
849 stats.Int = contr->orig_stats.Int;
850 stats.Wis = contr->orig_stats.Wis;
851 stats.Pow = contr->orig_stats.Pow;
852 stats.Cha = contr->orig_stats.Cha;
853 844
854 //TODO: the following code looks so borked and should, at the very least, 845 //TODO: the following code looks so borked and should, at the very least,
855 // be merged with the similar code in roll_stats 846 // be merged with the similar code in roll_stats
856 stats.ac = 0; 847 stats.ac = 0;
857 848
… …
888 * appropriate action with it (change race, or other things). 879 * appropriate action with it (change race, or other things).
889 * The function name is for historical reasons - now we have 880 * The function name is for historical reasons - now we have
890 * separate race and class; this actually changes the RACE, 881 * separate race and class; this actually changes the RACE,
891 * not the class. 882 * not the class.
892 */ 883 */
893int 884void
894key_change_class (object *op, char key) 885player::chargen_race_done ()
895{ 886{
896 int tmp_loop;
897
898 if (key == 'd' || key == 'D')
899 {
900 char buf[MAX_BUF];
901
902 /* this must before then initial items are given */ 887 /* this must before then initial items are given */
903 esrv_new_player (op->contr, op->weight + op->carrying); 888 esrv_new_player (ob->contr, ob->weight + ob->carrying);
904 889
905 treasurelist *tl = find_treasurelist ("starting_wealth"); 890 treasurelist *tl = treasurelist::find ("starting_wealth");
906 if (tl) 891 if (tl)
907 create_treasure (tl, op, 0, 0, 0); 892 create_treasure (tl, ob, 0, 0, 0);
908 893
909 INVOKE_PLAYER (BIRTH, op->contr); 894 INVOKE_PLAYER (BIRTH, ob->contr);
910 INVOKE_PLAYER (LOGIN, op->contr); 895 INVOKE_PLAYER (LOGIN, ob->contr);
911 896
912 op->contr->ns->state = ST_PLAYING; 897 ob->contr->ns->state = ST_PLAYING;
913 898
914 if (op->msg) 899 if (ob->msg)
915 op->msg = NULL; 900 ob->msg = 0;
916 901
917 /* We create this now because some of the unique maps will need it 902 /* We create this now because some of the unique maps will need it
918 * to save here. 903 * to save here.
919 */ 904 */
905 {
906 char buf[MAX_BUF];
920 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 907 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &ob->name);
921 make_path_to_file (buf); 908 make_path_to_file (buf);
909 }
922 910
923#ifdef AUTOSAVE
924 op->contr->last_save_tick = pticks;
925#endif
926 start_info (op); 911 start_info (ob);
927 CLEAR_FLAG (op, FLAG_WIZ); 912 CLEAR_FLAG (ob, FLAG_WIZ);
928 give_initial_items (op, op->randomitems); 913 give_initial_items (ob, ob->randomitems);
929 link_player_skills (op); 914 link_player_skills (ob);
930 esrv_send_inventory (op, op); 915 esrv_send_inventory (ob, ob);
931 op->update_stats (); 916 ob->update_stats ();
932 917
933 /* This moves the player to a different start map, if there 918 /* This moves the player to a different start map, if there
934 * is one for this race 919 * is one for this race
935 */ 920 */
936 if (*first_map_ext_path) 921 if (*first_map_ext_path)
937 { 922 {
938 object *tmp; 923 object *tmp;
939 char mapname[MAX_BUF]; 924 char mapname[MAX_BUF];
940 925
941 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name); 926 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name);
942 tmp = object::create (); 927 tmp = object::create ();
943 EXIT_PATH (tmp) = mapname; 928 EXIT_PATH (tmp) = mapname;
944 EXIT_X (tmp) = op->x; 929 EXIT_X (tmp) = ob->x;
945 EXIT_Y (tmp) = op->y; 930 EXIT_Y (tmp) = ob->y;
946 op->enter_exit (tmp); /* we don't really care if it succeeded; 931 ob->enter_exit (tmp); /* we don't really care if it succeeded;
947 * if the map isn't there, then stay on the 932 * if the map isn't there, then stay on the
948 * default initial map */ 933 * default initial map */
949 tmp->destroy (); 934 tmp->destroy ();
950 } 935 }
951 else 936 else
952 LOG (llevDebug, "first_map_ext_path not set\n"); 937 LOG (llevDebug, "first_map_ext_path not set\n");
938}
953 939
954 return 0; 940void
955 } 941player::chargen_race_next ()
956 942{
957 /* Following actually changes the race - this is the default command 943 /* Following actually changes the race - this is the default command
958 * if we don't match with one of the options above. 944 * if we don't match with one of the options above.
959 */ 945 */
960 946
961 tmp_loop = 0; 947 do
962 while (!tmp_loop)
963 { 948 {
964 shstr name = op->name; 949 shstr name = ob->name;
965 int x = op->x, y = op->y; 950 int x = ob->x, y = ob->y;
966 951
967 op->remove_statbonus (); 952 ob->remove_statbonus ();
968 op->remove (); 953 ob->remove ();
969 op->arch = get_player_archetype (op->arch); 954 ob->arch = get_player_archetype (ob->arch);
970 op->arch->clone.copy_to (op); 955 ob->arch->clone.copy_to (ob);
971 op->instantiate (); 956 ob->instantiate ();
972 op->stats = op->contr->orig_stats; 957 ob->stats = ob->contr->orig_stats;
973 op->name = op->name_pl = name; 958 ob->name = ob->name_pl = name;
974 op->x = x; 959 ob->x = x;
975 op->y = y; 960 ob->y = y;
976 SET_ANIMATION (op, 2); /* So player faces south */ 961 SET_ANIMATION (ob, 2); /* So player faces south */
977 insert_ob_in_map (op, op->map, op, 0); 962 insert_ob_in_map (ob, ob->map, ob, 0);
978 assign (op->contr->title, op->arch->clone.name); 963 assign (ob->contr->title, ob->arch->clone.name);
979 op->add_statbonus (); 964 ob->add_statbonus ();
980 tmp_loop = allowed_class (op);
981 } 965 }
966 while (!allowed_class (ob));
982 967
983 update_object (op, UP_OBJ_FACE); 968 update_object (ob, UP_OBJ_FACE);
984 esrv_update_item (UPD_FACE, op, op); 969 esrv_update_item (UPD_FACE, ob, ob);
985 op->update_stats (); 970 ob->update_stats ();
986 op->stats.hp = op->stats.maxhp; 971 ob->stats.hp = ob->stats.maxhp;
987 op->stats.sp = op->stats.maxsp; 972 ob->stats.sp = ob->stats.maxsp;
988 op->stats.grace = 0; 973 ob->stats.grace = 0;
989
990 if (op->msg)
991 new_draw_info (NDI_BLUE, 0, op, op->msg);
992
993 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
994 return 0;
995}
996
997int
998key_confirm_quit (object *op, char key)
999{
1000 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1001 {
1002 op->contr->ns->state = ST_PLAYING;
1003 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1004 return 1;
1005 }
1006
1007 INVOKE_PLAYER (LOGOUT, op->contr);
1008 INVOKE_PLAYER (QUIT, op->contr);
1009
1010 op->contr->enable_save = false;
1011 delete_character (op->name);
1012
1013 terminate_all_pets (op);
1014 op->remove ();
1015 op->direction = 0;
1016 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1017
1018 strcpy (op->contr->killer, "quit");
1019 check_score (op);
1020 op->contr->party = 0;
1021 op->contr->own_title[0] = '\0';
1022 op->contr->destroy ();
1023
1024 return 1;
1025} 974}
1026 975
1027void 976void
1028flee_player (object *op) 977flee_player (object *op)
1029{ 978{
… …
1076 /* Cornered, get rid of scared */ 1025 /* Cornered, get rid of scared */
1077 CLEAR_FLAG (op, FLAG_SCARED); 1026 CLEAR_FLAG (op, FLAG_SCARED);
1078 op->enemy = NULL; 1027 op->enemy = NULL;
1079} 1028}
1080 1029
1081
1082/* check_pick sees if there is stuff to be picked up/picks up stuff. 1030/* check_pick sees if there is stuff to be picked up/picks up stuff.
1083 * IT returns 1 if the player should keep on moving, 0 if he should 1031 * It returns 1 if the player should keep on moving, 0 if he should
1084 * stop. 1032 * stop.
1085 */ 1033 */
1086int 1034int
1087check_pick (object *op) 1035check_pick (object *op)
1088{ 1036{
1089 object *tmp, *next; 1037 object *tmp, *next;
1090 int stop = 0; 1038 int stop = 0;
1091 int j, k, wvratio; 1039 int wvratio;
1092 char putstring[128], tmpstr[16]; 1040 char putstring[128];
1093 1041
1094 /* if you're flying, you cna't pick up anything */ 1042 /* if you're flying, you cna't pick up anything */
1095 if (op->move_type & MOVE_FLYING) 1043 if (op->move_type & MOVE_FLYING)
1096 return 1; 1044 return 1;
1097 1045
… …
1434 * found object is returned. 1382 * found object is returned.
1435 */ 1383 */
1436object * 1384object *
1437find_arrow (object *op, const char *type) 1385find_arrow (object *op, const char *type)
1438{ 1386{
1439 object *tmp = NULL; 1387 object *tmp = 0;
1440 1388
1441 for (op = op->inv; op; op = op->below) 1389 for (op = op->inv; op; op = op->below)
1442 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED)) 1390 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1443 tmp = find_arrow (op, type); 1391 tmp = find_arrow (op, type);
1444 else if (op->type == ARROW && op->race == type) 1392 else if (op->type == ARROW && op->race == type)
1445 return op; 1393 return op;
1394
1446 return tmp; 1395 return tmp;
1447} 1396}
1448 1397
1449/* 1398/*
1450 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1399 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1451 * against the target. A full test is not performed, simply a basic test 1400 * against the target. A full test is not performed, simply a basic test
1452 * of resistances. The archer is making a quick guess at what he sees down 1401 * of resistances. The archer is making a quick guess at what he sees down
1453 * the hall. Failing that it does it's best to pick the highest plus arrow. 1402 * the hall. Failing that it does it's best to pick the highest plus arrow.
1454 */ 1403 */
1455
1456object * 1404object *
1457find_better_arrow (object *op, object *target, const char *type, int *better) 1405find_better_arrow (object *op, object *target, const char *type, int *better)
1458{ 1406{
1459 object *tmp = NULL, *arrow, *ntmp; 1407 object *tmp = NULL, *arrow, *ntmp;
1460 int attacknum, attacktype, betterby = 0, i; 1408 int attacknum, attacktype, betterby = 0, i;
… …
1526 * find_better_arrow to find a decent arrow to use. 1474 * find_better_arrow to find a decent arrow to use.
1527 * op = the shooter 1475 * op = the shooter
1528 * type = bow->race 1476 * type = bow->race
1529 * dir = fire direction 1477 * dir = fire direction
1530 */ 1478 */
1531
1532object * 1479object *
1533pick_arrow_target (object *op, const char *type, int dir) 1480pick_arrow_target (object *op, const char *type, int dir)
1534{ 1481{
1535 object *tmp = NULL; 1482 object *tmp = NULL;
1536 maptile *m; 1483 maptile *m;
… …
1601 */ 1548 */
1602int 1549int
1603fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy) 1550fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1604{ 1551{
1605 object *left, *bow; 1552 object *left, *bow;
1606 int bowspeed, mflags; 1553 int mflags;
1607 maptile *m; 1554 maptile *m;
1608 1555
1609 if (!dir) 1556 if (!dir)
1610 { 1557 {
1611 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1558 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1612 return 0; 1559 return 0;
1613 } 1560 }
1614 1561
1615 if (op->type == PLAYER) 1562 if (op->contr)
1616 bow = op->contr->ranges[range_bow]; 1563 bow = op->current_weapon;
1617 else 1564 else
1618 { 1565 {
1619 for (bow = op->inv; bow; bow = bow->below) 1566 for (bow = op->inv; bow; bow = bow->below)
1620 /* Don't check for applied - monsters don't apply bows - in that way, they 1567 /* Don't check for applied - monsters don't apply bows - in that way, they
1621 * don't need to switch back and forth between bows and weapons. 1568 * don't need to switch back and forth between bows and weapons.
… …
1626 if (!bow) 1573 if (!bow)
1627 { 1574 {
1628 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1575 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1629 return 0; 1576 return 0;
1630 } 1577 }
1578
1579 // optimisation: move object to top so we will find it quickly again
1580 if (bow->below)
1581 {
1582 bow->remove ();
1583 op->insert (bow);
1584 }
1585
1631 } 1586 }
1632 1587
1633 if (!bow->race || !bow->skill) 1588 if (!bow->race || !bow->skill)
1634 { 1589 {
1635 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1590 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1636 return 0; 1591 return 0;
1637 } 1592 }
1638
1639 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1640
1641 /* penalize ROF for bestarrow */
1642 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1643 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1644
1645 if (bowspeed < 1)
1646 bowspeed = 1;
1647 1593
1648 if (arrow == NULL) 1594 if (arrow == NULL)
1649 { 1595 {
1650 if ((arrow = find_arrow (op, bow->race)) == NULL) 1596 if ((arrow = find_arrow (op, bow->race)) == NULL)
1651 { 1597 {
1652 if (op->type == PLAYER) 1598 if (op->type == PLAYER)
1653 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race); 1599 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1654 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1600 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1655 else 1601 else
1656 CLEAR_FLAG (op, FLAG_READY_BOW); 1602 CLEAR_FLAG (op, FLAG_READY_BOW);
1603
1657 return 0; 1604 return 0;
1658 } 1605 }
1659 } 1606 }
1660 1607
1661 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy); 1608 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
… …
1685 1632
1686 arrow->set_owner (op); 1633 arrow->set_owner (op);
1687 arrow->skill = bow->skill; 1634 arrow->skill = bow->skill;
1688 arrow->direction = dir; 1635 arrow->direction = dir;
1689 1636
1637 arrow->stats.sp = arrow->stats.wc; /* save original wc, dam, attacktype and slaying */
1638 arrow->stats.hp = arrow->stats.dam;
1639 arrow->stats.grace = arrow->attacktype;
1640
1641 if (arrow->slaying)
1642 arrow->spellarg = strdup (arrow->slaying);
1643
1644#if 0
1645 if (player *pl = op->contr)
1646 {
1647 float speed = pl->weapon_sp;
1648
1649 /* penalize ROF for bestarrow */
1650 if (pl->bowtype == bow_bestarrow)
1651 speed *= .9f;
1652 else
1653 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1654
1655 op->speed_left += speed - op->speed;
1656 }
1657#endif
1658
1659 SET_ANIMATION (arrow, arrow->direction);
1660
1661 /* update the speed */
1662 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1663 + bow->stats.dam / 7.f;
1664
1665 arrow->set_speed (max (arrow->speed, 2.f));
1666 arrow->speed_left = 0;
1667
1668 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1669
1690 if (op->type == PLAYER) 1670 if (op->type == PLAYER)
1691 { 1671 {
1692 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1693 op->update_stats ();
1694 }
1695
1696 SET_ANIMATION (arrow, arrow->direction);
1697 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1698 arrow->stats.hp = arrow->stats.dam;
1699 arrow->stats.grace = arrow->attacktype;
1700 if (arrow->slaying != NULL)
1701 arrow->spellarg = strdup (arrow->slaying);
1702
1703 /* Note that this was different for monsters - they got their level
1704 * added to the damage. I think the strength bonus is more proper.
1705 */
1706
1707 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1708
1709 /* update the speed */
1710 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1711 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1712
1713 arrow->set_speed (max (arrow->speed, 1.0));
1714 arrow->speed_left = 0;
1715
1716 if (op->type == PLAYER)
1717 {
1718 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1719 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1720 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1721
1722 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level; 1672 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1673 wc -= dex_bonus[op->stats.Dex];
1674
1675 if (!arrow->slaying)
1676 arrow->slaying = op->slaying;
1677
1678 arrow->attacktype |= op->attacktype;
1723 } 1679 }
1724 else 1680 else
1725 { 1681 {
1726 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1727 arrow->level = op->level; 1682 arrow->level = op->level;
1728 } 1683 arrow->stats.wc -= bow->magic;
1729 1684
1730 if (arrow->attacktype == AT_PHYSICAL) 1685 if (!arrow->slaying)
1686 arrow->slaying = bow->slaying;
1687
1731 arrow->attacktype |= bow->attacktype; 1688 arrow->attacktype |= bow->attacktype;
1689 }
1732 1690
1733 if (bow->slaying) 1691 wc -= arrow->level;
1734 arrow->slaying = bow->slaying; 1692 arrow->stats.dam = clamp (arrow->stats.dam + op->stats.dam + arrow->magic, MIN_DAM, MAX_DAM);
1735 1693
1694 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1736 arrow->move_type = MOVE_FLY_LOW; 1695 arrow->move_type = MOVE_FLY_LOW;
1737 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1696 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1738 1697
1739 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1698 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1740 m->insert (arrow, sx, sy, op); 1699 m->insert (arrow, sx, sy, op);
… …
1765{ 1724{
1766 int ret = 0, wcmod = 0; 1725 int ret = 0, wcmod = 0;
1767 1726
1768 if (op->contr->bowtype == bow_bestarrow) 1727 if (op->contr->bowtype == bow_bestarrow)
1769 { 1728 {
1770 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y); 1729 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranged_ob->race, dir), dir, 0, op->x, op->y);
1771 } 1730 }
1772 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1731 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1773 { 1732 {
1774 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1733 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1775 wcmod = -1; 1734 wcmod = -1;
… …
1785 else if (op->contr->bowtype == bow_spreadshot) 1744 else if (op->contr->bowtype == bow_spreadshot)
1786 { 1745 {
1787 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1746 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1788 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y); 1747 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1789 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y); 1748 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1790
1791 } 1749 }
1792 else 1750 else
1793 { 1751 {
1794 /* Simple case */ 1752 /* Simple case */
1795 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1753 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1796 } 1754 }
1755
1797 return ret; 1756 return ret;
1798} 1757}
1799
1800 1758
1801/* Fires a misc (wand/rod/horn) object in 'dir'. 1759/* Fires a misc (wand/rod/horn) object in 'dir'.
1802 * Broken apart from 'fire' to keep it more readable. 1760 * Broken apart from 'fire' to keep it more readable.
1803 */ 1761 */
1804void 1762void
1805fire_misc_object (object *op, int dir) 1763fire_misc_object (object *op, int dir)
1806{ 1764{
1807 object *item; 1765 object *item = op->contr->ranged_ob;
1808 1766
1809 if (!op->contr->ranges[range_misc]) 1767 if (!item)
1810 { 1768 {
1811 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied."); 1769 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1812 return; 1770 return;
1813 } 1771 }
1814 1772
1815 item = op->contr->ranges[range_misc];
1816 if (!item->inv) 1773 if (!item->inv)
1817 { 1774 {
1818 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1775 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1819 return; 1776 return;
1820 } 1777 }
1778
1779 if (!op->change_weapon (item))
1780 return;
1781
1821 if (item->type == WAND) 1782 if (item->type == WAND)
1822 { 1783 {
1823 if (item->stats.food <= 0) 1784 if (item->stats.food <= 0)
1824 { 1785 {
1825 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1786 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1826 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1787 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1788
1827 return; 1789 return;
1828 } 1790 }
1829 } 1791 }
1830 else if (item->type == ROD || item->type == HORN) 1792 else if (item->type == ROD || item->type == HORN)
1831 { 1793 {
1832 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1794 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1833 { 1795 {
1834 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1796 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1797
1835 if (item->type == ROD) 1798 if (item->type == ROD)
1836 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1799 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1837 else 1800 else
1838 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1801 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1802
1839 return; 1803 return;
1840 } 1804 }
1841 } 1805 }
1842 1806
1843 if (cast_spell (op, item, dir, item->inv, NULL)) 1807 if (cast_spell (op, item, dir, item->inv, NULL))
… …
1865 } 1829 }
1866} 1830}
1867 1831
1868/* Received a fire command for the player - go and do it. 1832/* Received a fire command for the player - go and do it.
1869 */ 1833 */
1870void 1834bool
1871fire (object *op, int dir) 1835fire (object *op, int dir)
1872{ 1836{
1873 int spellcost = 0; 1837 int spellcost = 0;
1874 1838
1875 /* check for loss of invisiblity/hide */ 1839 /* check for loss of invisiblity/hide */
1876 if (action_makes_visible (op)) 1840 if (action_makes_visible (op))
1877 make_visible (op); 1841 make_visible (op);
1878 1842
1879 switch (op->contr->shoottype) 1843 player *pl = op->contr;
1844
1845 if (pl->golem)
1846 {
1847 control_golem (op->contr->golem, dir);
1848 return false;
1880 { 1849 }
1881 case range_none:
1882 return;
1883 1850
1884 case range_bow: 1851 object *ob = pl->ranged_ob;
1852
1853 if (!ob)
1854 return false;
1855
1856 if (!op->change_weapon (ob))
1857 return false;
1858
1859 if (op->speed_left > 0.f)
1860 --op->speed_left;
1861 else
1862 return false;
1863
1864 switch (ob->type)
1865 {
1866 case BOW:
1885 player_fire_bow (op, dir); 1867 player_fire_bow (op, dir);
1886 return; 1868 break;
1887 1869
1888 case range_magic: /* Casting spells */ 1870 case SPELL:
1889 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0)); 1871 spellcost = cast_spell (op, op, dir, ob, pl->spellparam[0] ? pl->spellparam : 0);
1890 return; 1872 break;
1891 1873
1892 case range_misc: 1874 case BUILDER:
1875 apply_map_builder (op, dir);
1876 break;
1877
1878 case SKILL:
1879 do_skill (op, op, ob, dir, 0);
1880 break;
1881
1882 default:
1893 fire_misc_object (op, dir); 1883 fire_misc_object (op, dir);
1894 return; 1884 break;
1895
1896 case range_golem: /* Control summoned monsters from scrolls */
1897 if (QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
1898 {
1899 op->contr->ranges[range_golem] = 0;
1900 op->contr->shoottype = range_none;
1901 }
1902 else
1903 control_golem (op->contr->ranges[range_golem], dir);
1904 return;
1905
1906 case range_skill:
1907 if (!op->chosen_skill)
1908 {
1909 if (op->type == PLAYER)
1910 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1911 return;
1912 }
1913 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
1914 return;
1915 case range_builder:
1916 apply_map_builder (op, dir);
1917 return;
1918 default:
1919 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1920 return;
1921 } 1885 }
1922}
1923 1886
1924 1887 return true;
1888}
1925 1889
1926/* find_key 1890/* find_key
1927 * We try to find a key for the door as passed. If we find a key 1891 * We try to find a key for the door as passed. If we find a key
1928 * and successfully use it, we return the key, otherwise NULL 1892 * and successfully use it, we return the key, otherwise NULL
1929 * This function merges both normal and locked door, since the logic 1893 * This function merges both normal and locked door, since the logic
… …
1931 * pl is the player, 1895 * pl is the player,
1932 * inv is the objects inventory to searched 1896 * inv is the objects inventory to searched
1933 * door is the door we are trying to match against. 1897 * door is the door we are trying to match against.
1934 * This function can be called recursively to search containers. 1898 * This function can be called recursively to search containers.
1935 */ 1899 */
1936
1937object * 1900object *
1938find_key (object *pl, object *container, object *door) 1901find_key (object *pl, object *container, object *door)
1939{ 1902{
1940 object *tmp, *key; 1903 object *tmp, *key;
1941 1904
1942 /* Should not happen, but sanity checking is never bad */ 1905 /* Should not happen, but sanity checking is never bad */
1943 if (container->inv == NULL) 1906 if (!container->inv)
1944 return NULL; 1907 return 0;
1945 1908
1946 /* First, lets try to find a key in the top level inventory */ 1909 /* First, lets try to find a key in the top level inventory */
1947 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1910 for (tmp = container->inv; tmp; tmp = tmp->below)
1948 { 1911 {
1949 if (door->type == DOOR && tmp->type == KEY) 1912 if (door->type == DOOR && tmp->type == KEY)
1950 break; 1913 break;
1951 /* For sanity, we should really check door type, but other stuff 1914 /* For sanity, we should really check door type, but other stuff
1952 * (like containers) can be locked with special keys 1915 * (like containers) can be locked with special keys
1953 */ 1916 */
1954 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1917 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1955 break; 1918 break;
1956 } 1919 }
1920
1957 /* No key found - lets search inventories now */ 1921 /* No key found - lets search inventories now */
1958 /* If we find and use a key in an inventory, return at that time. 1922 /* If we find and use a key in an inventory, return at that time.
1959 * otherwise, if we search all the inventories and still don't find 1923 * otherwise, if we search all the inventories and still don't find
1960 * a key, return 1924 * a key, return
1961 */ 1925 */
1962 if (!tmp) 1926 if (!tmp)
1963 { 1927 {
1964 for (tmp = container->inv; tmp != NULL; tmp = tmp->below) 1928 for (tmp = container->inv; tmp; tmp = tmp->below)
1965 { 1929 {
1966 /* No reason to search empty containers */ 1930 /* No reason to search empty containers */
1967 if (tmp->type == CONTAINER && tmp->inv) 1931 if (tmp->type == CONTAINER && tmp->inv)
1968 { 1932 {
1969 if ((key = find_key (pl, tmp, door)) != NULL) 1933 if ((key = find_key (pl, tmp, door)))
1970 return key; 1934 return key;
1971 } 1935 }
1972 } 1936 }
1937
1973 if (!tmp) 1938 if (!tmp)
1974 return NULL; 1939 return NULL;
1975 } 1940 }
1941
1976 /* We get down here if we have found a key. Now if its in a container, 1942 /* We get down here if we have found a key. Now if its in a container,
1977 * see if we actually want to use it 1943 * see if we actually want to use it
1978 */ 1944 */
1979 if (pl != container) 1945 if (pl != container)
1980 { 1946 {
… …
2001 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1967 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
2002 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1968 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
2003 return NULL; 1969 return NULL;
2004 } 1970 }
2005 } 1971 }
1972
2006 return tmp; 1973 return tmp;
2007} 1974}
2008 1975
2009/* moved door processing out of move_player_attack. 1976/* moved door processing out of move_player_attack.
2010 * returns 1 if player has opened the door with a key 1977 * returns 1 if player has opened the door with a key
… …
2012 * 0 otherwise 1979 * 0 otherwise
2013 */ 1980 */
2014static int 1981static int
2015player_attack_door (object *op, object *door) 1982player_attack_door (object *op, object *door)
2016{ 1983{
2017 /* If its a door, try to find a use a key. If we do destroy the door, 1984 /* If its a door, try to find a key. If we do destroy the door,
2018 * might as well return immediately as there is nothing more to do - 1985 * might as well return immediately as there is nothing more to do -
2019 * otherwise, we fall through to the rest of the code. 1986 * otherwise, we fall through to the rest of the code.
2020 */ 1987 */
2021 object *key = find_key (op, op, door); 1988 object *key = find_key (op, op, door);
2022 1989
2023 /* IF we found a key, do some extra work */ 1990 /* If we found a key, do some extra work */
2024 if (key) 1991 if (key)
2025 { 1992 {
2026 object *container = key->env; 1993 object *container = key->env;
2027 1994
2028 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR); 1995 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1996
2029 if (action_makes_visible (op)) 1997 if (action_makes_visible (op))
2030 make_visible (op); 1998 make_visible (op);
1999
2031 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 2000 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2032 spring_trap (door->inv, op); 2001 spring_trap (door->inv, op);
2002
2033 if (door->type == DOOR) 2003 if (door->type == DOOR)
2034 {
2035 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */ 2004 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
2036 }
2037 else if (door->type == LOCKED_DOOR) 2005 else if (door->type == LOCKED_DOOR)
2038 { 2006 {
2039 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key)); 2007 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
2040 remove_door2 (door); /* remove door without violence ;-) */ 2008 remove_door2 (door); /* remove door without violence ;-) */
2041 } 2009 }
2010
2042 /* Do this after we print the message */ 2011 /* Do this after we print the message */
2043 decrease_ob (key); /* Use up one of the keys */ 2012 decrease_ob (key); /* Use up one of the keys */
2044 /* Need to update the weight the container the key was in */ 2013 /* Need to update the weight the container the key was in */
2045 if (container != op) 2014 if (container != op)
2046 esrv_update_item (UPD_WEIGHT, op, container); 2015 esrv_update_item (UPD_WEIGHT, op, container);
2016
2047 return 1; /* Nothing more to do below */ 2017 return 1; /* Nothing more to do below */
2048 } 2018 }
2049 else if (door->type == LOCKED_DOOR) 2019 else if (door->type == LOCKED_DOOR)
2050 { 2020 {
2051 /* Might as well return now - no other way to open this */ 2021 /* Might as well return now - no other way to open this */
2052 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2022 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2053 return 1; 2023 return 1;
2054 } 2024 }
2025
2055 return 0; 2026 return 0;
2056} 2027}
2057 2028
2058/* This function is just part of a breakup from move_player. 2029/* This function is just part of a breakup from move_player.
2059 * It should keep the code cleaner. 2030 * It should keep the code cleaner.
2060 * When this is called, the players direction has been updated 2031 * When this is called, the players direction has been updated
2061 * (taking into account confusion.) The player is also actually 2032 * (taking into account confusion.) The player is also actually
2062 * going to try and move (not fire weapons). 2033 * going to try and move (not fire weapons).
2063 */ 2034 */
2064void 2035bool
2065move_player_attack (object *op, int dir) 2036move_player_attack (object *op, int dir)
2066{ 2037{
2067 object *tmp, *mon;
2068 sint16 nx, ny;
2069 int on_battleground; 2038 int on_battleground;
2070 maptile *m;
2071 2039
2072 nx = freearr_x[dir] + op->x; 2040 sint16 nx = freearr_x[dir] + op->x;
2073 ny = freearr_y[dir] + op->y; 2041 sint16 ny = freearr_y[dir] + op->y;
2074 2042
2075 on_battleground = op_on_battleground (op, 0, 0); 2043 on_battleground = op_on_battleground (op, 0, 0);
2044
2045 if (out_of_map (op->map, nx, ny))
2046 return false;
2047
2048 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2049 {
2050 --op->speed_left;
2051 return true;
2052 }
2076 2053
2077 /* If braced, or can't move to the square, and it is not out of the 2054 /* If braced, or can't move to the square, and it is not out of the
2078 * map, attack it. Note order of if statement is important - don't 2055 * map, attack it. Note order of if statement is important - don't
2079 * want to be calling move_ob if braced, because move_ob will move the 2056 * want to be calling move_ob if braced, because move_ob will move the
2080 * player. This is a pretty nasty hack, because if we could 2057 * player. This is a pretty nasty hack, because if we could
2081 * move to some space, it then means that if we are braced, we should 2058 * move to some space, it then means that if we are braced, we should
2082 * do nothing at all. As it is, if we are braced, we go through 2059 * do nothing at all. As it is, if we are braced, we go through
2083 * quite a bit of processing. However, it probably is less than what 2060 * quite a bit of processing. However, it probably is less than what
2084 * move_ob uses. 2061 * move_ob uses.
2085 */ 2062 */
2086 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2087 {
2088 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2089 {
2090 m = op->map->xy_find (nx, ny); 2063 maptile *m = op->map->xy_find (nx, ny);
2091 if (!m)
2092 return; /* Don't think this should happen */
2093 }
2094 else
2095 m = op->map;
2096 2064
2097 if (!(tmp = m->at (nx, ny).bot))
2098 return;
2099
2100 mon = 0;
2101 /* Go through all the objects, and find ones of interest. Only stop if 2065 /* Go through all the objects, and find ones of interest. Only stop if
2102 * we find a monster - that is something we know we want to attack. 2066 * we find a monster - that is something we know we want to attack.
2103 * if its a door or barrel (can roll) see if there may be monsters 2067 * if its a door or barrel (can roll) see if there may be monsters
2104 * on the space 2068 * on the space
2105 */ 2069 */
2106 while (tmp) 2070 object *mon;
2107 { 2071 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2108 if (tmp == op) 2072 {
2109 { 2073 if ((mon->flag [FLAG_ALIVE]
2110 tmp = tmp->above; 2074 || mon->type == LOCKED_DOOR
2111 continue; 2075 || mon->flag [FLAG_CAN_ROLL])
2112 }
2113
2114 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2115 {
2116 mon = tmp; 2076 && mon != op)
2117 break; 2077 break;
2118 } 2078 }
2119 2079
2120 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2121 mon = tmp;
2122
2123 tmp = tmp->above;
2124 }
2125
2126 if (!mon) /* This happens anytime the player tries to move */ 2080 if (!mon) /* This happens anytime the player tries to move */
2127 return; /* into a wall */ 2081 return false; /* into a wall */
2128 2082
2129 if (mon->head)
2130 mon = mon->head; 2083 mon = mon->head_ ();
2131 2084
2132 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2085 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2086 if (op->contr->weapon_sp_left > 0.f)
2133 if (player_attack_door (op, mon)) 2087 if (player_attack_door (op, mon))
2088 {
2089 --op->contr->weapon_sp_left;
2134 return; 2090 return true;
2091 }
2135 2092
2136 /* The following deals with possibly attacking peaceful 2093 /* The following deals with possibly attacking peaceful
2137 * or frienddly creatures. Basically, all players are considered 2094 * or friendly creatures. Basically, all players are considered
2138 * unaggressive. If the moving player has peaceful set, then the 2095 * unaggressive. If the moving player has peaceful set, then the
2139 * object should be pushed instead of attacked. It is assumed that 2096 * object should be pushed instead of attacked. It is assumed that
2140 * if you are braced, you will not attack friends accidently, 2097 * if you are braced, you will not attack friends accidently,
2141 * and thus will not push them. 2098 * and thus will not push them.
2142 */ 2099 */
2143 2100
2144 /* If the creature is a pet, push it even if the player is not 2101 /* If the creature is a pet, push it even if the player is not
2145 * peaceful. Our assumption is the creature is a pet if the 2102 * peaceful. Our assumption is the creature is a pet if the
2146 * player owns it and it is either friendly or unagressive. 2103 * player owns it and it is either friendly or unagressive.
2147 */ 2104 */
2148 if ((op->type == PLAYER) 2105 if (op->type == PLAYER
2149#if COZY_SERVER
2150 &&
2151 ((mon->owner && mon->owner->contr 2106 && ((mon->owner && mon->owner->contr
2152 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2107 && same_party (mon->owner->contr->party, op->contr->party))
2153#else
2154 && mon->owner == op 2108 || mon->owner == op)
2155#endif
2156 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2109 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2157 { 2110 {
2158 /* If we're braced, we don't want to switch places with it */ 2111 /* If we're braced, we don't want to switch places with it */
2159 if (op->contr->braced) 2112 if (op->contr->braced)
2160 return; 2113 return false;
2114
2115 if (op->speed_left > 0.f)
2116 {
2117 --op->speed_left;
2161 2118
2162 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2119 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2163 (void) push_ob (mon, dir, op); 2120 push_ob (mon, dir, op);
2121
2164 if (op->contr->tmp_invis || op->hide) 2122 if (op->contr->tmp_invis || op->hide)
2165 make_visible (op); 2123 make_visible (op);
2166 2124
2167 return; 2125 return true;
2168 } 2126 }
2127 else
2128 return false;
2129 }
2169 2130
2170 /* in certain circumstances, you shouldn't attack friendly 2131 /* in certain circumstances, you shouldn't attack friendly
2171 * creatures. Note that if you are braced, you can't push 2132 * creatures. Note that if you are braced, you can't push
2172 * someone, but put it inside this loop so that you won't 2133 * someone, but put it inside this loop so that you won't
2173 * attack them either. 2134 * attack them either.
2174 */ 2135 */
2175 if ((mon->type == PLAYER || mon->enemy != op) && 2136 if ((mon->type == PLAYER || mon->enemy != op)
2176 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2137 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2177#ifdef PROHIBIT_PLAYERKILL
2178 (op->contr->peaceful 2138 && ((op->contr->peaceful
2179 || (mon->type == PLAYER 2139 || (mon->type == PLAYER && mon->contr->peaceful))
2180 && mon->contr->
2181 peaceful)) &&
2182#else
2183 op->contr->peaceful &&
2184#endif
2185 !on_battleground)) 2140 && !on_battleground))
2141 {
2142 if (op->speed_left > 0.f)
2186 { 2143 {
2144 --op->speed_left;
2145
2187 if (!op->contr->braced) 2146 if (!op->contr->braced)
2188 { 2147 {
2189 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2148 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2190 push_ob (mon, dir, op); 2149 push_ob (mon, dir, op);
2191 } 2150 }
2192 else 2151 else
2193 new_draw_info (0, 0, op, "You withhold your attack"); 2152 new_draw_info (0, 0, op, "You withhold your attack");
2194 2153
2195 if (op->contr->tmp_invis || op->hide) 2154 if (op->contr->tmp_invis || op->hide)
2196 make_visible (op); 2155 make_visible (op);
2197 }
2198 2156
2157 return true;
2158 }
2159 }
2199 /* If the object is a boulder or other rollable object, then 2160 /* If the object is a boulder or other rollable object, then
2200 * roll it if not braced. You can't roll it if you are braced. 2161 * roll it if not braced. You can't roll it if you are braced.
2201 */ 2162 */
2202 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2163 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2164 {
2165 if (op->speed_left > 0.f)
2203 { 2166 {
2167 --op->speed_left;
2168
2204 recursive_roll (mon, dir, op); 2169 recursive_roll (mon, dir, op);
2205 if (action_makes_visible (op)) 2170 if (action_makes_visible (op))
2206 make_visible (op); 2171 make_visible (op);
2207 }
2208 2172
2173 return true;
2174 }
2175 }
2209 /* Any generic living creature. Including things like doors. 2176 /* Any generic living creature. Including things like doors.
2210 * Way it works is like this: First, it must have some hit points 2177 * Way it works is like this: First, it must have some hit points
2211 * and be living. Then, it must be one of the following: 2178 * and be living. Then, it must be one of the following:
2212 * 1) Not a player, 2) A player, but of a different party. Note 2179 * 1) Not a player, 2) A player, but of a different party. Note
2213 * that party_number -1 is no party, so attacks can still happen. 2180 * that party_number -1 is no party, so attacks can still happen.
2214 */ 2181 */
2215 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2182 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2216 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2183 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2217 { 2184 {
2218 2185 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2219 /* If the player hasn't hit something this tick, and does
2220 * so, give them speed boost based on weapon speed. Doing
2221 * it here is better than process_players2, which basically
2222 * incurred a 1 tick offset.
2223 */
2224 if (!op->contr->has_hit)
2225 { 2186 {
2226 op->speed_left += op->speed / op->contr->weapon_sp; 2187 --op->contr->weapon_sp_left;
2227
2228 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2229 }
2230 2188
2231 skill_attack (mon, op, 0, 0, 0); 2189 skill_attack (mon, op, 0, 0, 0);
2232
2233 /* If attacking another player, that player gets automatic
2234 * hitback, and doesn't loose luck either.
2235 * Disable hitback on the battleground or if the target is
2236 * the wiz.
2237 */
2238 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2239 {
2240 short luck = mon->stats.luck;
2241
2242 mon->contr->has_hit = 1;
2243 skill_attack (op, mon, 0, 0, 0);
2244 mon->stats.luck = luck;
2245 }
2246 2190
2247 if (action_makes_visible (op)) 2191 if (action_makes_visible (op))
2248 make_visible (op); 2192 make_visible (op);
2249 }
2250 } /* if player should attack something */
2251}
2252 2193
2253int 2194 return true;
2195 }
2196 }
2197
2198 return false;
2199}
2200
2201bool
2254move_player (object *op, int dir) 2202move_player (object *op, int dir)
2255{ 2203{
2256 int pick; 2204 int pick;
2257 2205
2258 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2206 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
… …
2265 return 0; 2213 return 0;
2266 } 2214 }
2267 2215
2268 /* peterm: added following line */ 2216 /* peterm: added following line */
2269 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2217 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2270 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2218 dir = absdir (dir + rndm (3) + rndm (3) - 2);
2271 2219
2272 op->facing = dir; 2220 op->facing = dir;
2273 2221
2274 if (op->hide) 2222 if (op->hide)
2275 do_hidden_move (op); 2223 do_hidden_move (op);
2276 2224
2225 bool retval;
2226
2277 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2227 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2278 /*nop */ ; 2228 retval = RESULT_INT (0);
2279 else if (op->contr->fire_on) 2229 else if (op->contr->fire_on)
2280 fire (op, dir); 2230 retval = fire (op, dir);
2281 else 2231 else
2282 { 2232 {
2283 move_player_attack (op, dir); 2233 retval = move_player_attack (op, dir);
2284 pick = check_pick (op); 2234 pick = check_pick (op);
2285 } 2235 }
2286 2236
2287 /* Add special check for newcs players and fire on - this way, the 2237 /* Add special check for newcs players and fire on - this way, the
2288 * server can handle repeat firing. 2238 * server can handle repeat firing.
… …
2295 /* Update how the player looks. Use the facing, so direction may 2245 /* Update how the player looks. Use the facing, so direction may
2296 * get reset to zero. This allows for full animation capabilities 2246 * get reset to zero. This allows for full animation capabilities
2297 * for players. 2247 * for players.
2298 */ 2248 */
2299 animate_object (op, op->facing); 2249 animate_object (op, op->facing);
2300 return 0; 2250
2251 return retval;
2301} 2252}
2302 2253
2303/* This is similar to handle_player, below, but is only used by the 2254/* This is similar to handle_player, below, but is only used by the
2304 * new client/server stuff. 2255 * new client/server stuff.
2305 * This is sort of special, in that the new client/server actually uses 2256 * This is sort of special, in that the new client/server actually uses
2306 * the new speed values for commands. 2257 * the new speed values for commands.
2307 * 2258 *
2308 * Returns true if there are more actions we can do. 2259 * Returns true if there are more actions we can do. Should not do
2260 * many actions in a row, as that would be too unfair to other
2261 * players.
2309 */ 2262 */
2310int 2263bool
2311handle_newcs_player (object *op) 2264handle_newcs_player (object *op)
2312{ 2265{
2313 if (op->contr->hidden)
2314 {
2315 op->invisible = 1000;
2316 /* the socket code flashes the player visible/invisible
2317 * depending on the value of invisible, so we need to
2318 * alternate it here for it to work correctly.
2319 */
2320 if (pticks & 2)
2321 op->invisible--;
2322 }
2323 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2324 {
2325 op->invisible--;
2326 if (!op->invisible)
2327 {
2328 make_visible (op);
2329 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2330 }
2331 }
2332
2333 if (QUERY_FLAG (op, FLAG_SCARED)) 2266 if (QUERY_FLAG (op, FLAG_SCARED))
2334 { 2267 {
2335 flee_player (op); 2268 if (op->speed_left > 0.f)
2336 /* If player is still scared, that is his action for this tick */
2337 if (QUERY_FLAG (op, FLAG_SCARED))
2338 { 2269 {
2339 op->speed_left--; 2270 --op->speed_left;
2271 flee_player (op);
2272
2340 return 0; 2273 return true;
2341 } 2274 }
2275 else
2276 return false;
2342 } 2277 }
2343
2344 /* I've been seeing crashes where the golem has been destroyed, but
2345 * the player object still points to the defunct golem. The code that
2346 * destroys the golem looks correct, and it doesn't always happen, so
2347 * put this in a a workaround to clean up the golem pointer.
2348 */
2349 if (op->contr->ranges[range_golem] && QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED))
2350 op->contr->ranges[range_golem] = 0;
2351 2278
2352 /* call this here - we also will call this in do_ericserver, but 2279 /* call this here - we also will call this in do_ericserver, but
2353 * the players time has been increased when doericserver has been 2280 * the players time has been increased when doericserver has been
2354 * called, so we recheck it here. 2281 * called, so we recheck it here.
2355 */ 2282 */
2356 if (op->contr->ns->handle_command ()) 2283 if (op->contr->ns->handle_command ())
2357 return 1; 2284 return true;
2358 2285
2359 if (op->speed_left > 0)
2360 {
2361 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2286 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2362 {
2363 /* All move commands take 1 tick, at least for now */
2364 op->speed_left--;
2365
2366 /* Instead of all the stuff below, let move_player take care
2367 * of it. Also, some of the skill stuff is only put in
2368 * there, as well as the confusion stuff.
2369 */
2370 move_player (op, op->direction); 2287 return move_player (op, op->direction);
2371 2288
2372 return op->speed_left > 0;
2373 }
2374 }
2375
2376 return 0; 2289 return false;
2377} 2290}
2378 2291
2379int 2292int
2380save_life (object *op) 2293save_life (object *op)
2381{ 2294{
… …
2416 * from. 2329 * from.
2417 */ 2330 */
2418void 2331void
2419remove_unpaid_objects (object *op, object *env) 2332remove_unpaid_objects (object *op, object *env)
2420{ 2333{
2421 object *next;
2422
2423 while (op) 2334 while (op)
2424 { 2335 {
2425 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2336 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2426 2337
2427 if (QUERY_FLAG (op, FLAG_UNPAID)) 2338 if (QUERY_FLAG (op, FLAG_UNPAID))
… …
2493 int rate_grace = 2000; 2404 int rate_grace = 2000;
2494 const int max_hp = 1; 2405 const int max_hp = 1;
2495 const int max_sp = 1; 2406 const int max_sp = 1;
2496 const int max_grace = 1; 2407 const int max_grace = 1;
2497 2408
2498 if (op->contr->outputs_sync) 2409 if (op->contr->hidden)
2410 {
2411 op->invisible = 1000;
2412 /* the socket code flashes the player visible/invisible
2413 * depending on the value of invisible, so we need to
2414 * alternate it here for it to work correctly.
2415 */
2416 if (pticks & 2)
2417 op->invisible--;
2499 { 2418 }
2500 for (i = 0; i < NUM_OUTPUT_BUFS; i++) 2419 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2501 if (op->contr->outputs[i].buf && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks) 2420 {
2502 flush_output_element (op, &op->contr->outputs[i]); 2421 if (!op->invisible--)
2422 {
2423 make_visible (op);
2424 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2425 }
2503 } 2426 }
2504 2427
2505 if (op->contr->ns->state == ST_PLAYING) 2428 if (op->contr->ns->state == ST_PLAYING)
2506 { 2429 {
2507 /* these next three if clauses make it possible to SLOW DOWN 2430 /* these next three if clauses make it possible to SLOW DOWN
… …
2529 gen_grace = op->stats.maxgrace; 2452 gen_grace = op->stats.maxgrace;
2530 rate_grace -= rate_grace / 2 * op->contr->gen_grace; 2453 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2531 } 2454 }
2532 2455
2533 /* Regenerate Spell Points */ 2456 /* Regenerate Spell Points */
2534 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0) 2457 if (!op->contr->golem && --op->last_sp < 0)
2535 { 2458 {
2536 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour); 2459 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2537 if (op->stats.sp < op->stats.maxsp) 2460 if (op->stats.sp < op->stats.maxsp)
2538 { 2461 {
2539 op->stats.sp++; 2462 op->stats.sp++;
… …
2637 } 2560 }
2638 2561
2639 /* Digestion */ 2562 /* Digestion */
2640 if (--op->last_eat < 0) 2563 if (--op->last_eat < 0)
2641 { 2564 {
2642#ifdef COZY_SERVER
2643 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2644 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2645#else
2646 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0; 2565 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2647#endif
2648 2566
2649 if (op->contr->gen_hp > 0) 2567 if (op->contr->gen_hp > 0)
2650 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2568 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2651 else 2569 else
2652 op->last_eat = 25 * (1 + bonus) / (penalty + 1); 2570 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
… …
2757 tmp->name = buf; 2675 tmp->name = buf;
2758 sprintf (buf, " This finger has been cut off %s\n" 2676 sprintf (buf, " This finger has been cut off %s\n"
2759 " the %s, when he was defeated at\n level %d by %s.\n", 2677 " the %s, when he was defeated at\n level %d by %s.\n",
2760 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2678 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2761 tmp->msg = buf; 2679 tmp->msg = buf;
2762 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2680 tmp->value = 0, tmp->type = 0;
2763 tmp->materialname = NULL; 2681 tmp->materialname = "organics";
2764 tmp->insert_at (op, tmp); 2682 tmp->insert_at (op, tmp);
2765 } 2683 }
2766 2684
2767 /* teleport defeated player to new destination */ 2685 /* teleport defeated player to new destination */
2768 transfer_ob (op, x, y, 0, NULL); 2686 transfer_ob (op, x, y, 0, NULL);
… …
2774 2692
2775 command_kill_pets (op, 0); 2693 command_kill_pets (op, 0);
2776 2694
2777 if (op->stats.food < 0) 2695 if (op->stats.food < 0)
2778 { 2696 {
2779 if (op->contr->explore)
2780 {
2781 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2782 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2783 op->stats.food = 999;
2784 return;
2785 }
2786 sprintf (buf, "%s starved to death.", &op->name); 2697 sprintf (buf, "%s starved to death.", &op->name);
2787 strcpy (op->contr->killer, "starvation"); 2698 strcpy (op->contr->killer, "starvation");
2788 } 2699 }
2789 else 2700 else
2790 {
2791 if (op->contr->explore)
2792 {
2793 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2794 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2795 op->stats.hp = op->stats.maxhp;
2796 return;
2797 }
2798 sprintf (buf, "%s died.", &op->name); 2701 sprintf (buf, "%s died.", &op->name);
2799 }
2800 2702
2801 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2703 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2802 2704
2803 /* save the map location for corpse, gravestone */ 2705 /* save the map location for corpse, gravestone */
2804 x = op->x; 2706 x = op->x;
… …
2980 op->stats.hp = op->stats.maxhp; 2882 op->stats.hp = op->stats.maxhp;
2981 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp); 2883 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2982 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace); 2884 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2983 2885
2984 /* 2886 /*
2985 * Check to see if the player is in a shop. IF so, then check to see if
2986 * the player has any unpaid items. If so, remove them and put them back 2887 * Check to see if the player has any unpaid items. If so, remove them
2987 * in the map. 2888 * and put them back in the map.
2988 */ 2889 */
2989
2990 if (is_in_shop (op))
2991 remove_unpaid_objects (op->inv, op); 2890 remove_unpaid_objects (op->inv, op);
2992 2891
2993 /****************************************/ 2892 /****************************************/
2994 /* */ 2893 /* */
2995 /* Move player to his current respawn- */ 2894 /* Move player to his current respawn- */
2996 /* position (usually last savebed) */ 2895 /* position (usually last savebed) */
2997 /* */ 2896 /* */
2998 /****************************************/ 2897 /****************************************/
2999 2898
3000 enter_player_savebed (op); 2899 enter_player_savebed (op);
3001 2900
3002 /* Save the player before inserting the force to reduce
3003 * chance of abuse.
3004 */
3005 op->contr->braced = 0; 2901 op->contr->braced = 0;
3006 op->contr->save ();
3007 2902
3008 /* it is possible that the player has blown something up 2903 /* it is possible that the player has blown something up
3009 * at his savebed location, and that can have long lasting 2904 * at his savebed location, and that can have long lasting
3010 * spell effects. So first see if there is a spell effect 2905 * spell effects. So first see if there is a spell effect
3011 * on the space that might harm the player. 2906 * on the space that might harm the player.
… …
3020 object *force; 2915 object *force;
3021 int at; 2916 int at;
3022 2917
3023 force = get_archetype (FORCE_NAME); 2918 force = get_archetype (FORCE_NAME);
3024 /* 50 ticks should be enough time for the spell to abate */ 2919 /* 50 ticks should be enough time for the spell to abate */
3025 force->speed = 0.1; 2920 force->speed = 0.1f;
3026 force->speed_left = -5.0; 2921 force->speed_left = -5.f;
3027 SET_FLAG (force, FLAG_APPLIED); 2922 SET_FLAG (force, FLAG_APPLIED);
3028 for (at = 0; at < NROFATTACKS; at++) 2923 for (at = 0; at < NROFATTACKS; at++)
3029 if (will_kill_again & (1 << at)) 2924 if (will_kill_again & (1 << at))
3030 force->resist[at] = 100; 2925 force->resist[at] = 100;
3031 2926
… …
3040void 2935void
3041loot_object (object *op) 2936loot_object (object *op)
3042{ /* Grab and destroy some treasure */ 2937{ /* Grab and destroy some treasure */
3043 object *tmp, *tmp2, *next; 2938 object *tmp, *tmp2, *next;
3044 2939
3045 if (op->container) 2940 op->close_container (); /* close open sack first */
3046 esrv_apply_container (op, op->container); /* close open sack first */
3047 2941
3048 for (tmp = op->inv; tmp; tmp = next) 2942 for (tmp = op->inv; tmp; tmp = next)
3049 { 2943 {
3050 next = tmp->below; 2944 next = tmp->below;
3051 2945
3052 if (tmp->invisible) 2946 if (tmp->invisible)
3053 continue; 2947 continue;
3054 2948
3055 tmp->remove (); 2949 tmp->remove ();
3056 tmp->x = op->x, tmp->y = op->y; 2950 tmp->x = op->x, tmp->y = op->y;
2951
3057 if (tmp->type == CONTAINER) 2952 if (tmp->type == CONTAINER)
3058 { /* empty container to ground */ 2953 loot_object (tmp); /* empty container to ground */
3059 loot_object (tmp); 2954
3060 }
3061 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3))) 2955 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(rndm (3))))
3062 { 2956 {
3063 if (tmp->nrof > 1) 2957 if (tmp->nrof > 1)
3064 { 2958 {
3065 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1)); 2959 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3066 tmp2->destroy (); 2960 tmp2->destroy ();
… …
3077/* 2971/*
3078 * fix_weight(): Check recursively the weight of all players, and fix 2972 * fix_weight(): Check recursively the weight of all players, and fix
3079 * what needs to be fixed. Refresh windows and fix speed if anything 2973 * what needs to be fixed. Refresh windows and fix speed if anything
3080 * was changed. 2974 * was changed.
3081 */ 2975 */
3082
3083void 2976void
3084fix_weight (void) 2977fix_weight (void)
3085{ 2978{
3086 for_all_players (pl) 2979 for_all_players (pl)
3087 { 2980 {
… …
3147 if (op->type == PLAYER) 3040 if (op->type == PLAYER)
3148 { 3041 {
3149 op->contr->tmp_invis = 0; 3042 op->contr->tmp_invis = 0;
3150 op->contr->invis_race = 0; 3043 op->contr->invis_race = 0;
3151 } 3044 }
3045
3152 update_object (op, UP_OBJ_FACE); 3046 update_object (op, UP_OBJ_CHANGE);
3153} 3047}
3154 3048
3155int 3049int
3156is_true_undead (object *op) 3050is_true_undead (object *op)
3157{ 3051{
3158 object *tmp = NULL;
3159
3160 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3052 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3161 return 1; 3053 return 1;
3162 3054
3163 return 0; 3055 return 0;
3164} 3056}
… …
3209/* For Hidden creatures - a chance of becoming 'unhidden' 3101/* For Hidden creatures - a chance of becoming 'unhidden'
3210 * every time they move - as we subtract off 'invisibility' 3102 * every time they move - as we subtract off 'invisibility'
3211 * AND, for players, if they move into a ridiculously unhideable 3103 * AND, for players, if they move into a ridiculously unhideable
3212 * spot (surrounded by clear terrain in broad daylight). -b.t. 3104 * spot (surrounded by clear terrain in broad daylight). -b.t.
3213 */ 3105 */
3214
3215void 3106void
3216do_hidden_move (object *op) 3107do_hidden_move (object *op)
3217{ 3108{
3218 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3109 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3219 object *skop; 3110 object *skop;
… …
3452 char buf[MAX_BUF]; /* tmp. string buffer */ 3343 char buf[MAX_BUF]; /* tmp. string buffer */
3453 int i = 0, j = 0; 3344 int i = 0, j = 0;
3454 3345
3455 /* get the appropriate treasurelist */ 3346 /* get the appropriate treasurelist */
3456 if (atnr == ATNR_FIRE) 3347 if (atnr == ATNR_FIRE)
3457 trlist = find_treasurelist ("dragon_ability_fire"); 3348 trlist = treasurelist::find ("dragon_ability_fire");
3458 else if (atnr == ATNR_COLD) 3349 else if (atnr == ATNR_COLD)
3459 trlist = find_treasurelist ("dragon_ability_cold"); 3350 trlist = treasurelist::find ("dragon_ability_cold");
3460 else if (atnr == ATNR_ELECTRICITY) 3351 else if (atnr == ATNR_ELECTRICITY)
3461 trlist = find_treasurelist ("dragon_ability_elec"); 3352 trlist = treasurelist::find ("dragon_ability_elec");
3462 else if (atnr == ATNR_POISON) 3353 else if (atnr == ATNR_POISON)
3463 trlist = find_treasurelist ("dragon_ability_poison"); 3354 trlist = treasurelist::find ("dragon_ability_poison");
3464 3355
3465 if (trlist == NULL || who->type != PLAYER) 3356 if (trlist == NULL || who->type != PLAYER)
3466 return; 3357 return;
3467 3358
3468 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3359 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
… …
3600 * not readied. 3491 * not readied.
3601 */ 3492 */
3602void 3493void
3603player_unready_range_ob (player *pl, object *ob) 3494player_unready_range_ob (player *pl, object *ob)
3604{ 3495{
3605 rangetype i; 3496 if (pl->ob->current_weapon == ob)
3497 pl->ob->current_weapon = 0;
3606 3498
3607 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3499 if (pl->combat_ob == ob)
3608 { 3500 pl->combat_ob = 0;
3501
3609 if (pl->ranges[i] == ob) 3502 if (pl->ranged_ob == ob)
3610 { 3503 pl->ranged_ob = 0;
3611 pl->ranges[i] = NULL;
3612 if (pl->shoottype == i)
3613 {
3614 pl->shoottype = range_none;
3615 }
3616 }
3617 }
3618} 3504}
3505
3506sint8
3507player::visibility_at (maptile *map, int x, int y) const
3508{
3509 if (!ns)
3510 return 0;
3511
3512 int dx, dy;
3513 if (!adjacent_map (map, ns->current_map, &dx, &dy))
3514 return 0;
3515
3516 x += dx - ns->current_x + ns->mapx / 2;
3517 y += dy - ns->current_y + ns->mapy / 2;
3518
3519 if (!IN_RANGE_EXC (x, 0, ns->mapx) || !IN_RANGE_EXC (y, 0, ns->mapy))
3520 return 0;
3521
3522 return 100 - blocked_los [x][y];
3523}

Diff Legend

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