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.62 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.97 by root, Mon Jan 8 22:32:11 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 <pwd.h>
26#include <sproto.h> 27#include <sproto.h>
27#include <sounds.h> 28#include <sounds.h>
… …
31#include <skills.h> 32#include <skills.h>
32 33
33#include <algorithm> 34#include <algorithm>
34#include <functional> 35#include <functional>
35 36
36player * 37playervec 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 38
46void 39void
47display_motd (const object *op) 40display_motd (const object *op)
48{ 41{
49 char buf[MAX_BUF]; 42 char buf[MAX_BUF];
… …
132 125
133 if (*buf == '%') 126 if (*buf == '%')
134 { /* send one news */ 127 { /* send one news */
135 if (size > 0) 128 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 */ 129 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 */
130
137 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
138 strip_endline (subject); 132 strip_endline (subject);
139 size = 0; 133 size = 0;
140 news[0] = '\0'; 134 news[0] = '\0';
141 } 135 }
… …
158 152
159/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
160static void 154static void
161set_first_map (object *op) 155set_first_map (object *op)
162{ 156{
163 strcpy (op->contr->maplevel, first_map_path); 157 op->contr->maplevel = first_map_path;
164 op->x = -1; 158 op->x = -1;
165 op->y = -1; 159 op->y = -1;
160}
161
162void
163player::enter_map ()
164{
165 object *tmp = object::create ();
166
167 EXIT_PATH (tmp) = maplevel;
168 EXIT_X (tmp) = ob->x;
169 EXIT_Y (tmp) = ob->y;
166 enter_exit (op, 0); 170 ob->enter_exit (tmp);
171
172 tmp->destroy ();
173}
174
175void
176player::activate ()
177{
178 if (active)
179 return;
180
181 players.insert (this);
182 ob->remove ();
183 ob->map = 0;
184 ob->activate_recursive ();
185 CLEAR_FLAG (ob, FLAG_FRIENDLY);
186 add_friendly_object (ob);
187 enter_map ();
188}
189
190void
191player::deactivate ()
192{
193 if (!active)
194 return;
195
196 terminate_all_pets (ob);
197 remove_friendly_object (ob);
198 ob->deactivate_recursive ();
199 ob->remove ();
200 ob->map = 0;
201
202 // for weird reasons, this is often "ob", keeping a circular reference
203 ranges [range_skill] = 0;
204
205 players.erase (this);
167} 206}
168 207
169// connect the player with a specific client 208// connect the player with a specific client
170// also changed, rationalises, and fixes some incorrect settings 209// also changed, rationalises, and fixes some incorrect settings
171void 210void
172player::connect (client *ns) 211player::connect (client *ns)
173{ 212{
174 this->ns = ns; 213 this->ns = ns;
175 ns->pl = this; 214 ns->pl = this;
176 215
177 next = first_player; 216 run_on = 0;
178 first_player = this; 217 fire_on = 0;
218 ob->container = 0; //TODO: client-specific
179 219
180 ns->update_look = 0; 220 ns->update_look = 0;
181 ns->look_position = 0; 221 ns->look_position = 0;
182 222
183 clear_los (ob); 223 clear_los (ob);
224
225 ns->reset_stats ();
184 226
185 /* make sure he's a player -- needed because of class change. */ 227 /* make sure he's a player -- needed because of class change. */
186 ob->type = PLAYER; // we are paranoid 228 ob->type = PLAYER; // we are paranoid
187 ob->race = ob->arch->clone.race; 229 ob->race = ob->arch->clone.race;
188 230
… …
191 233
192 ob->carrying = sum_weight (ob); 234 ob->carrying = sum_weight (ob);
193 link_player_skills (ob); 235 link_player_skills (ob);
194 236
195 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 237 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
196 update_ob_speed (ob);
197 238
198 assign (title, ob->arch->clone.name); 239 assign (title, ob->arch->clone.name);
199 240
200 /* can_use_shield is a new flag. However, the can_use.. seems to largely come 241 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
201 * from the class, and not race. I don't see any way to get the class information 242 * from the class, and not race. I don't see any way to get the class information
… …
223 skin = tmp; 264 skin = tmp;
224 265
225 set_dragon_name (ob, abil, skin); 266 set_dragon_name (ob, abil, skin);
226 } 267 }
227 268
228 CLEAR_FLAG (ob, FLAG_FRIENDLY);
229 add_friendly_object (ob);
230
231 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
232
233 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 269 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
234 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
235 270
236 esrv_new_player (this, ob->weight + ob->carrying); 271 esrv_new_player (this, ob->weight + ob->carrying);
237 272
238 ob->update_stats (); 273 ob->update_stats ();
239 ns->floorbox_update (); 274 ns->floorbox_update ();
240 275
241 esrv_send_inventory (ob, ob); 276 esrv_send_inventory (ob, ob);
242 esrv_add_spells (this, 0); 277 esrv_add_spells (this, 0);
243 278
244 enter_exit (ob, 0); 279 activate ();
245 280
246 send_rules (ob); 281 send_rules (ob);
247 send_news (ob); 282 send_news (ob);
248 display_motd (ob); 283 display_motd (ob);
284
285 INVOKE_PLAYER (CONNECT, this);
249 INVOKE_PLAYER (LOGIN, this); 286 INVOKE_PLAYER (LOGIN, this);
250} 287}
251 288
252void 289void
253player::disconnect () 290player::disconnect ()
254{ 291{
255 if (!ns) 292 if (ns)
256 return; 293 {
294 if (active)
295 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
257 296
258 //TODO: don't be so harsh and destroy :) 297 INVOKE_PLAYER (DISCONNECT, this);
259 destroy ();
260 298
299 ns->reset_stats ();
261 ns->pl = 0; 300 ns->pl = 0;
262 ns = 0; 301 this->ns = 0;
302 }
303
304 ob->container = 0; //TODO: client-specific
305 deactivate ();
263} 306}
264 307
265// the need for this function can be explained 308// the need for this function can be explained
266// by load_object not returning the object 309// by load_object not returning the object
267void 310void
… …
274 ob->speed = 1.0; 317 ob->speed = 1.0;
275 ob->direction = 5; /* So player faces south */ 318 ob->direction = 5; /* So player faces south */
276 ob->stats.wc = 2; 319 ob->stats.wc = 2;
277 ob->run_away = 25; /* Then we panick... */ 320 ob->run_away = 25; /* Then we panick... */
278 321
279 set_first_map (ob);
280
281 ob->roll_stats (); 322 ob->roll_stats ();
282} 323}
283 324
284player::player () 325player::player ()
285{ 326{
286 /* There are some elements we want initialized to non zero value - 327 /* There are some elements we want initialised to non zero value -
287 * we deal with that below this point. 328 * we deal with that below this point.
288 */ 329 */
289 outputs_sync = 16; /* Every 2 seconds */ 330 outputs_sync = 16; /* Every 2 seconds */
290 outputs_count = 8; /* Keeps present behaviour */ 331 outputs_count = 8; /* Keeps present behaviour */
291 unapply = unapply_nochoice; 332 unapply = unapply_nochoice;
292 333
293 assign (savebed_map, first_map_path); /* Init. respawn position */ 334 savebed_map = first_map_path; /* Init. respawn position */
294 335
295 gen_sp_armour = 10; 336 gen_sp_armour = 10;
296 last_speed = -1;
297 shoottype = range_none; 337 shoottype = range_none;
298 bowtype = bow_normal; 338 bowtype = bow_normal;
299 petmode = pet_normal; 339 petmode = pet_normal;
300 listening = 10; 340 listening = 10;
301 usekeys = containers; 341 usekeys = containers;
302 last_weapon_sp = -1;
303 peaceful = 1; /* default peaceful */ 342 peaceful = 1; /* default peaceful */
304 do_los = 1; 343 do_los = 1;
305
306 /* we need to clear these to -1 and not zero - otherwise,
307 * if a player quits and starts a new character, we wont
308 * send new values to the client, as things like exp start
309 * at zero.
310 */
311 for (int i = 0; i < NUM_SKILLS; i++)
312 last_skill_exp[i] = -1;
313
314 for (int i = 0; i < NROFATTACKS; i++)
315 last_resist[i] = -1;
316
317 last_stats.exp = -1;
318 last_weight = (uint32) - 1;
319} 344}
320 345
321void 346void
322player::do_destroy () 347player::do_destroy ()
323{ 348{
349 disconnect ();
350
324 attachable::do_destroy (); 351 attachable::do_destroy ();
325 352
326 disconnect ();
327
328 terminate_all_pets (ob);
329
330 if (first_player != this)
331 {
332 player *prev = first_player;
333
334 while (prev && prev->next && prev->next != this)
335 prev = prev->next;
336
337 if (prev->next != this)
338 {
339 LOG (llevError, "Free_player: Can't find previous player.\n");
340 abort ();
341 }
342
343 prev->next = next;
344 }
345 else
346 first_player = next;
347
348 if (ob) 353 if (ob)
354 {
349 ob->destroy (true); 355 ob->destroy_inv (false);
350
351 if (ns)
352 {
353 ns->send_packet ("goodbye");
354 ns->flush ();
355 ns->pl = 0;
356 ns->destroy (); 356 ob->destroy ();
357 } 357 }
358
359 attachable::do_destroy ();
360} 358}
361 359
362player::~player () 360player::~player ()
363{ 361{
364 /* Clear item stack */ 362 /* Clear item stack */
… …
373player::create () 371player::create ()
374{ 372{
375 player *pl = new player; 373 player *pl = new player;
376 374
377 pl->set_object (arch_to_object (get_player_archetype (0))); 375 pl->set_object (arch_to_object (get_player_archetype (0)));
376 set_first_map (pl->ob);
378 377
379 return pl; 378 return pl;
380} 379}
381 380
382/* 381/*
… …
413 object *op = NULL; 412 object *op = NULL;
414 objectlink *ol; 413 objectlink *ol;
415 unsigned lastdist; 414 unsigned lastdist;
416 rv_vector rv; 415 rv_vector rv;
417 416
418 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 417 for (ol = first_friendly_object, lastdist = 1000; ol; ol = ol->next)
419 { 418 {
420 /* We should not find free objects on this friendly list, but it 419 /* We should not find free objects on this friendly list, but it
421 * does periodically happen. Given that, lets deal with it. 420 * does periodically happen. Given that, lets deal with it.
422 * While unlikely, it is possible the next object on the friendly 421 * While unlikely, it is possible the next object on the friendly
423 * list is also free, so encapsulate this in a while loop. 422 * list is also free, so encapsulate this in a while loop.
… …
427 object *tmp = ol->ob; 426 object *tmp = ol->ob;
428 427
429 /* Can't do much more other than log the fact, because the object 428 /* Can't do much more other than log the fact, because the object
430 * itself will have been cleared. 429 * itself will have been cleared.
431 */ 430 */
432 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n"); 431 LOG (llevDebug, "get_nearest_player: Found free/non friendly object '%s' on friendly list\n",
432 tmp->debug_desc ());
433 ol = ol->next; 433 ol = ol->next;
434 remove_friendly_object (tmp); 434 remove_friendly_object (tmp);
435 if (!ol) 435 if (!ol)
436 return op; 436 return op;
437 } 437 }
… …
848 848
849 contr->orig_stats = stats; 849 contr->orig_stats = stats;
850 } 850 }
851} 851}
852 852
853static void
854start_info (object *op)
855{
856 char buf[MAX_BUF];
857
858 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
859 new_draw_info (NDI_UNIQUE, 0, op, buf);
860 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
861 //new_draw_info (NDI_UNIQUE, 0, op, " ");
862}
863
853/* This function takes the key that is passed, and does the 864/* This function takes the key that is passed, and does the
854 * appropriate action with it (change race, or other things). 865 * appropriate action with it (change race, or other things).
855 * The function name is for historical reasons - now we have 866 * The function name is for historical reasons - now we have
856 * separate race and class; this actually changes the RACE, 867 * separate race and class; this actually changes the RACE,
857 * not the class. 868 * not the class.
… …
884 * to save here. 895 * to save here.
885 */ 896 */
886 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name); 897 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
887 make_path_to_file (buf); 898 make_path_to_file (buf);
888 899
889#ifdef AUTOSAVE
890 op->contr->last_save_tick = pticks;
891#endif
892 start_info (op); 900 start_info (op);
893 CLEAR_FLAG (op, FLAG_WIZ); 901 CLEAR_FLAG (op, FLAG_WIZ);
894 give_initial_items (op, op->randomitems); 902 give_initial_items (op, op->randomitems);
895 link_player_skills (op); 903 link_player_skills (op);
896 esrv_send_inventory (op, op); 904 esrv_send_inventory (op, op);
… …
902 if (*first_map_ext_path) 910 if (*first_map_ext_path)
903 { 911 {
904 object *tmp; 912 object *tmp;
905 char mapname[MAX_BUF]; 913 char mapname[MAX_BUF];
906 914
907 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 915 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
908 tmp = object::create (); 916 tmp = object::create ();
909 EXIT_PATH (tmp) = mapname; 917 EXIT_PATH (tmp) = mapname;
910 EXIT_X (tmp) = op->x; 918 EXIT_X (tmp) = op->x;
911 EXIT_Y (tmp) = op->y; 919 EXIT_Y (tmp) = op->y;
912 enter_exit (op, tmp); /* we don't really care if it succeeded; 920 op->enter_exit (tmp); /* we don't really care if it succeeded;
913 * if the map isn't there, then stay on the 921 * if the map isn't there, then stay on the
914 * default initial map */ 922 * default initial map */
915 tmp->destroy (); 923 tmp->destroy ();
916 } 924 }
917 else 925 else
… …
956 if (op->msg) 964 if (op->msg)
957 new_draw_info (NDI_BLUE, 0, op, op->msg); 965 new_draw_info (NDI_BLUE, 0, op, op->msg);
958 966
959 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 967 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
960 return 0; 968 return 0;
961}
962
963int
964key_confirm_quit (object *op, char key)
965{
966 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
967 {
968 op->contr->ns->state = ST_PLAYING;
969 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
970 return 1;
971 }
972
973 INVOKE_PLAYER (LOGOUT, op->contr);
974 INVOKE_PLAYER (QUIT, op->contr);
975
976 terminate_all_pets (op);
977 leave_map (op);
978 op->direction = 0;
979 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
980
981 strcpy (op->contr->killer, "quit");
982 check_score (op);
983 op->contr->party = 0;
984 op->contr->own_title[0] = '\0';
985
986 object_ptr ob = op;
987
988 delete ob->contr;
989
990 /* We need to hunt for any per player unique maps in memory and
991 * get rid of them. The trailing slash in the path is intentional,
992 * so that players named 'Ab' won't match against players 'Abe' pathname
993 */
994 char buf[MAX_BUF];
995 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
996
997 for (maptile *next, *mp = first_map; mp; mp = next)
998 {
999 next = mp->next;
1000
1001 if (!strncmp (mp->path, buf, strlen (buf)))
1002 delete_map (mp);
1003 }
1004
1005 delete_character (ob->name, 1);
1006
1007 return 1;
1008} 969}
1009 970
1010void 971void
1011flee_player (object *op) 972flee_player (object *op)
1012{ 973{
… …
1666 return 0; 1627 return 0;
1667 } 1628 }
1668 1629
1669 arrow->set_owner (op); 1630 arrow->set_owner (op);
1670 arrow->skill = bow->skill; 1631 arrow->skill = bow->skill;
1671
1672 arrow->direction = dir; 1632 arrow->direction = dir;
1673 arrow->x = sx;
1674 arrow->y = sy;
1675 1633
1676 if (op->type == PLAYER) 1634 if (op->type == PLAYER)
1677 { 1635 {
1678 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1636 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1679 op->update_stats (); 1637 op->update_stats ();
… …
1694 1652
1695 /* update the speed */ 1653 /* update the speed */
1696 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1654 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1697 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1655 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1698 1656
1699 if (arrow->speed < 1.0) 1657 arrow->set_speed (max (arrow->speed, 1.0));
1700 arrow->speed = 1.0;
1701 update_ob_speed (arrow);
1702 arrow->speed_left = 0; 1658 arrow->speed_left = 0;
1703 1659
1704 if (op->type == PLAYER) 1660 if (op->type == PLAYER)
1705 { 1661 {
1706 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1662 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1719 arrow->attacktype |= bow->attacktype; 1675 arrow->attacktype |= bow->attacktype;
1720 1676
1721 if (bow->slaying) 1677 if (bow->slaying)
1722 arrow->slaying = bow->slaying; 1678 arrow->slaying = bow->slaying;
1723 1679
1724 arrow->map = m;
1725 arrow->move_type = MOVE_FLY_LOW; 1680 arrow->move_type = MOVE_FLY_LOW;
1726 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1681 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1727 1682
1728 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1683 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1729 insert_ob_in_map (arrow, m, op, 0); 1684 m->insert (arrow, sx, sy, op);
1730 1685
1731 if (!arrow->destroyed ()) 1686 if (!arrow->destroyed ())
1732 move_arrow (arrow); 1687 move_arrow (arrow);
1733 1688
1734 if (op->type == PLAYER) 1689 if (op->type == PLAYER)
… …
1760 } 1715 }
1761 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1716 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1762 { 1717 {
1763 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1718 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1764 wcmod = -1; 1719 wcmod = -1;
1720
1765 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1721 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1766 } 1722 }
1767 else if (op->contr->bowtype == bow_threewide) 1723 else if (op->contr->bowtype == bow_threewide)
1768 { 1724 {
1769 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1725 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1839 1795
1840 if (item->arch) 1796 if (item->arch)
1841 { 1797 {
1842 CLEAR_FLAG (item, FLAG_ANIMATE); 1798 CLEAR_FLAG (item, FLAG_ANIMATE);
1843 item->face = item->arch->clone.face; 1799 item->face = item->arch->clone.face;
1844 item->speed = 0; 1800 item->set_speed (0);
1845 update_ob_speed (item);
1846 } 1801 }
1802
1847 if ((tmp = item->in_player ())) 1803 if ((tmp = item->in_player ()))
1848 esrv_update_item (UPD_ANIM, tmp, item); 1804 esrv_update_item (UPD_ANIM, tmp, item);
1849 } 1805 }
1850 } 1806 }
1851 else if (item->type == ROD || item->type == HORN) 1807 else if (item->type == ROD || item->type == HORN)
1852 {
1853 drain_rod_charge (item); 1808 drain_rod_charge (item);
1854 }
1855 } 1809 }
1856} 1810}
1857 1811
1858/* Received a fire command for the player - go and do it. 1812/* Received a fire command for the player - go and do it.
1859 */ 1813 */
… …
1898 { 1852 {
1899 if (op->type == PLAYER) 1853 if (op->type == PLAYER)
1900 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use."); 1854 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
1901 return; 1855 return;
1902 } 1856 }
1857
1903 (void) do_skill (op, op, op->chosen_skill, dir, NULL); 1858 do_skill (op, op, op->chosen_skill, dir, NULL);
1904 return; 1859 return;
1905 case range_builder: 1860 case range_builder:
1906 apply_map_builder (op, dir); 1861 apply_map_builder (op, dir);
1907 return; 1862 return;
1908 default: 1863 default:
… …
2075 */ 2030 */
2076 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2031 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2077 { 2032 {
2078 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2033 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2079 { 2034 {
2080 m = get_map_from_coord (op->map, &nx, &ny); 2035 m = op->map->xy_find (nx, ny);
2081 if (!m) 2036 if (!m)
2082 return; /* Don't think this should happen */ 2037 return; /* Don't think this should happen */
2083 } 2038 }
2084 else 2039 else
2085 m = op->map; 2040 m = op->map;
2086 2041
2087 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL) 2042 if (!(tmp = m->at (nx, ny).bot))
2088 {
2089 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2090 return; 2043 return;
2091 }
2092 2044
2093 mon = 0; 2045 mon = 0;
2094 /* Go through all the objects, and find ones of interest. Only stop if 2046 /* Go through all the objects, and find ones of interest. Only stop if
2095 * we find a monster - that is something we know we want to attack. 2047 * we find a monster - that is something we know we want to attack.
2096 * if its a door or barrel (can roll) see if there may be monsters 2048 * if its a door or barrel (can roll) see if there may be monsters
… …
2149 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2101 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2150 { 2102 {
2151 /* If we're braced, we don't want to switch places with it */ 2103 /* If we're braced, we don't want to switch places with it */
2152 if (op->contr->braced) 2104 if (op->contr->braced)
2153 return; 2105 return;
2106
2154 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2107 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2155 (void) push_ob (mon, dir, op); 2108 (void) push_ob (mon, dir, op);
2156 if (op->contr->tmp_invis || op->hide) 2109 if (op->contr->tmp_invis || op->hide)
2157 make_visible (op); 2110 make_visible (op);
2111
2158 return; 2112 return;
2159 } 2113 }
2160 2114
2161 /* in certain circumstances, you shouldn't attack friendly 2115 /* in certain circumstances, you shouldn't attack friendly
2162 * creatures. Note that if you are braced, you can't push 2116 * creatures. Note that if you are braced, you can't push
… …
2176 !on_battleground)) 2130 !on_battleground))
2177 { 2131 {
2178 if (!op->contr->braced) 2132 if (!op->contr->braced)
2179 { 2133 {
2180 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2134 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2181 (void) push_ob (mon, dir, op); 2135 push_ob (mon, dir, op);
2182 } 2136 }
2183 else 2137 else
2184 new_draw_info (0, 0, op, "You withhold your attack"); 2138 new_draw_info (0, 0, op, "You withhold your attack");
2185 2139
2186 if (op->contr->tmp_invis || op->hide) 2140 if (op->contr->tmp_invis || op->hide)
… …
2201 * Way it works is like this: First, it must have some hit points 2155 * Way it works is like this: First, it must have some hit points
2202 * and be living. Then, it must be one of the following: 2156 * and be living. Then, it must be one of the following:
2203 * 1) Not a player, 2) A player, but of a different party. Note 2157 * 1) Not a player, 2) A player, but of a different party. Note
2204 * that party_number -1 is no party, so attacks can still happen. 2158 * that party_number -1 is no party, so attacks can still happen.
2205 */ 2159 */
2206
2207 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2160 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2208 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2161 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2209 { 2162 {
2210 2163
2211 /* If the player hasn't hit something this tick, and does 2164 /* If the player hasn't hit something this tick, and does
… …
2245int 2198int
2246move_player (object *op, int dir) 2199move_player (object *op, int dir)
2247{ 2200{
2248 int pick; 2201 int pick;
2249 2202
2250 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2203 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2251 return 0; 2204 return 0;
2252 2205
2253 /* Sanity check: make sure dir is valid */ 2206 /* Sanity check: make sure dir is valid */
2254 if ((dir < 0) || (dir >= 9)) 2207 if ((dir < 0) || (dir >= 9))
2255 { 2208 {
2256 LOG (llevError, "move_player: invalid direction %d\n", dir); 2209 LOG (llevError, "move_player: invalid direction %d\n", dir);
2257 return 0; 2210 return 0;
2258 } 2211 }
2259 2212
2260 /* peterm: added following line */ 2213 /* peterm: added following line */
2261 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2214 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2262 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2215 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2263 2216
2264 op->facing = dir; 2217 op->facing = dir;
2265 2218
… …
2343 2296
2344 /* call this here - we also will call this in do_ericserver, but 2297 /* call this here - we also will call this in do_ericserver, but
2345 * the players time has been increased when doericserver has been 2298 * the players time has been increased when doericserver has been
2346 * called, so we recheck it here. 2299 * called, so we recheck it here.
2347 */ 2300 */
2348 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2301 if (op->contr->ns->handle_command ())
2349 for (int rep = 8; --rep && op->contr->ns->handle_command (); ) 2302 return 1;
2350 ;
2351 2303
2352 if (op->speed_left < 0) 2304 if (op->speed_left > 0)
2353 return 0; 2305 {
2354
2355 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2306 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2356 { 2307 {
2357 /* All move commands take 1 tick, at least for now */ 2308 /* All move commands take 1 tick, at least for now */
2358 op->speed_left--; 2309 op->speed_left--;
2359 2310
2360 /* Instead of all the stuff below, let move_player take care 2311 /* Instead of all the stuff below, let move_player take care
2361 * of it. Also, some of the skill stuff is only put in 2312 * of it. Also, some of the skill stuff is only put in
2362 * there, as well as the confusion stuff. 2313 * there, as well as the confusion stuff.
2363 */ 2314 */
2364 move_player (op, op->direction); 2315 move_player (op, op->direction);
2365 if (op->speed_left > 0) 2316
2366 return 1; 2317 return op->speed_left > 0;
2367 else 2318 }
2368 return 0;
2369 } 2319 }
2370 2320
2371 return 0; 2321 return 0;
2372} 2322}
2373 2323
… …
2415{ 2365{
2416 object *next; 2366 object *next;
2417 2367
2418 while (op) 2368 while (op)
2419 { 2369 {
2420 next = op->below; /* Make sure we have a good value, in case 2370 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2421 * we remove object 'op' 2371
2422 */
2423 if (QUERY_FLAG (op, FLAG_UNPAID)) 2372 if (QUERY_FLAG (op, FLAG_UNPAID))
2424 { 2373 {
2425 op->remove ();
2426 op->x = env->x;
2427 op->y = env->y;
2428 if (env->type == PLAYER) 2374 if (env->type == PLAYER)
2429 esrv_del_item (env->contr, op->count); 2375 esrv_del_item (env->contr, op->count);
2430 insert_ob_in_map (op, env->map, NULL, 0); 2376
2377 op->insert_at (env);
2431 } 2378 }
2432 else if (op->inv) 2379 else if (op->inv)
2433 remove_unpaid_objects (op->inv, env); 2380 remove_unpaid_objects (op->inv, env);
2434 2381
2435 op = next; 2382 op = next;
… …
2728 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2675 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2729 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2676 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2730 2677
2731 /* restore player */ 2678 /* restore player */
2732 at = archetype::find ("poisoning"); 2679 at = archetype::find ("poisoning");
2733 tmp = present_arch_in_ob (at, op); 2680 if (object *tmp = present_arch_in_ob (at, op))
2734 if (tmp)
2735 { 2681 {
2736 tmp->destroy (); 2682 tmp->destroy ();
2737 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2683 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2738 } 2684 }
2739 2685
2740 at = archetype::find ("confusion"); 2686 at = archetype::find ("confusion");
2741 tmp = present_arch_in_ob (at, op); 2687 if (object *tmp = present_arch_in_ob (at, op))
2742 if (tmp)
2743 { 2688 {
2744 tmp->destroy (); 2689 tmp->destroy ();
2745 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2690 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2746 } 2691 }
2747 2692
… …
2749 op->stats.hp = op->stats.maxhp; 2694 op->stats.hp = op->stats.maxhp;
2750 if (op->stats.food <= 0) 2695 if (op->stats.food <= 0)
2751 op->stats.food = 999; 2696 op->stats.food = 999;
2752 2697
2753 /* create a bodypart-trophy to make the winner happy */ 2698 /* create a bodypart-trophy to make the winner happy */
2754 tmp = arch_to_object (archetype::find ("finger")); 2699 if (object *tmp = arch_to_object (archetype::find ("finger")))
2755 if (tmp != NULL)
2756 { 2700 {
2757 sprintf (buf, "%s's finger", &op->name); 2701 sprintf (buf, "%s's finger", &op->name);
2758 tmp->name = buf; 2702 tmp->name = buf;
2759 sprintf (buf, " This finger has been cut off %s\n" 2703 sprintf (buf, " This finger has been cut off %s\n"
2760 " the %s, when he was defeated at\n level %d by %s.\n", 2704 " the %s, when he was defeated at\n level %d by %s.\n",
2761 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2705 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2762 tmp->msg = buf; 2706 tmp->msg = buf;
2763 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2707 tmp->value = 0, tmp->material = 0, tmp->type = 0;
2764 tmp->materialname = NULL; 2708 tmp->materialname = NULL;
2765 tmp->x = op->x, tmp->y = op->y; 2709 tmp->insert_at (op, tmp);
2766 insert_ob_in_map (tmp, op->map, op, 0);
2767 } 2710 }
2768 2711
2769 /* teleport defeated player to new destination */ 2712 /* teleport defeated player to new destination */
2770 transfer_ob (op, x, y, 0, NULL); 2713 transfer_ob (op, x, y, 0, NULL);
2771 op->contr->braced = 0; 2714 op->contr->braced = 0;
… …
2776 2719
2777 command_kill_pets (op, 0); 2720 command_kill_pets (op, 0);
2778 2721
2779 if (op->stats.food < 0) 2722 if (op->stats.food < 0)
2780 { 2723 {
2781 if (op->contr->explore)
2782 {
2783 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2784 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2785 op->stats.food = 999;
2786 return;
2787 }
2788 sprintf (buf, "%s starved to death.", &op->name); 2724 sprintf (buf, "%s starved to death.", &op->name);
2789 strcpy (op->contr->killer, "starvation"); 2725 strcpy (op->contr->killer, "starvation");
2790 } 2726 }
2791 else 2727 else
2792 {
2793 if (op->contr->explore)
2794 {
2795 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2796 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2797 op->stats.hp = op->stats.maxhp;
2798 return;
2799 }
2800 sprintf (buf, "%s died.", &op->name); 2728 sprintf (buf, "%s died.", &op->name);
2801 } 2729
2802 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2730 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2803 2731
2804 /* save the map location for corpse, gravestone */ 2732 /* save the map location for corpse, gravestone */
2805 x = op->x; 2733 x = op->x;
2806 y = op->y; 2734 y = op->y;
2807 map = op->map; 2735 map = op->map;
2808
2809 2736
2810 /* NOT_PERMADEATH code. This basically brings the character back to 2737 /* NOT_PERMADEATH code. This basically brings the character back to
2811 * life if they are dead - it takes some exp and a random stat. 2738 * life if they are dead - it takes some exp and a random stat.
2812 * See the config.h file for a little more in depth detail about this. 2739 * See the config.h file for a little more in depth detail about this.
2813 */ 2740 */
… …
2830 num_stats_lose = 1; 2757 num_stats_lose = 1;
2831 else 2758 else
2832 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2759 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2833 } 2760 }
2834 else 2761 else
2835 {
2836 num_stats_lose = 1; 2762 num_stats_lose = 1;
2837 } 2763
2838 lost_a_stat = 0; 2764 lost_a_stat = 0;
2839 2765
2840 for (z = 0; z < num_stats_lose; z++) 2766 for (z = 0; z < num_stats_lose; z++)
2841 { 2767 {
2842 i = RANDOM () % NUM_STATS; 2768 i = RANDOM () % NUM_STATS;
… …
3000 /* */ 2926 /* */
3001 /****************************************/ 2927 /****************************************/
3002 2928
3003 enter_player_savebed (op); 2929 enter_player_savebed (op);
3004 2930
3005 /* Save the player before inserting the force to reduce
3006 * chance of abuse.
3007 */
3008 op->contr->braced = 0; 2931 op->contr->braced = 0;
3009 op->contr->save ();
3010 2932
3011 /* it is possible that the player has blown something up 2933 /* it is possible that the player has blown something up
3012 * at his savebed location, and that can have long lasting 2934 * at his savebed location, and that can have long lasting
3013 * spell effects. So first see if there is a spell effect 2935 * spell effects. So first see if there is a spell effect
3014 * on the space that might harm the player. 2936 * on the space that might harm the player.
… …
3226 3148
3227 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3149 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3228 3150
3229 /* its *extremely* hard to run and sneak/hide at the same time! */ 3151 /* its *extremely* hard to run and sneak/hide at the same time! */
3230 if (op->type == PLAYER && op->contr->run_on) 3152 if (op->type == PLAYER && op->contr->run_on)
3231 {
3232 if (!skop || num >= skop->level) 3153 if (!skop || num >= skop->level)
3233 { 3154 {
3234 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3155 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3235 make_visible (op); 3156 make_visible (op);
3236 return; 3157 return;
3237 } 3158 }
3238 else 3159 else
3239 num += 20; 3160 num += 20;
3240 } 3161
3241 num += op->map->difficulty; 3162 num += op->map->difficulty;
3242 hide = hideability (op); /* modify by terrain hidden level */ 3163 hide = hideability (op); /* modify by terrain hidden level */
3243 num -= hide; 3164 num -= hide;
3165
3244 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3166 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3245 { 3167 {
3246 make_visible (op); 3168 make_visible (op);
3247 if (op->type == PLAYER) 3169 if (op->type == PLAYER)
3248 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3170 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3249 } 3171 }
3250 else if (op->type == PLAYER && skop) 3172 else if (op->type == PLAYER && skop)
3251 {
3252 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3173 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3253 }
3254} 3174}
3255 3175
3256/* determine if who is standing near a hostile creature. */ 3176/* determine if who is standing near a hostile creature. */
3257 3177
3258int 3178int
… …
3325 if (pl->type != PLAYER) 3245 if (pl->type != PLAYER)
3326 { 3246 {
3327 LOG (llevError, "player_can_view() called for non-player object\n"); 3247 LOG (llevError, "player_can_view() called for non-player object\n");
3328 return -1; 3248 return -1;
3329 } 3249 }
3250
3330 if (!pl || !op) 3251 if (!pl || !op)
3331 return 0; 3252 return 0;
3332 3253
3333 if (op->head)
3334 {
3335 op = op->head; 3254 op = op->head_ ();
3336 } 3255
3337 get_rangevector (pl, op, &rv, 0x1); 3256 get_rangevector (pl, op, &rv, 0x1);
3338 3257
3339 /* starting with the 'head' part, lets loop 3258 /* starting with the 'head' part, lets loop
3340 * through the object and find if it has any 3259 * through the object and find if it has any
3341 * part that is in the los array but isnt on 3260 * part that is in the los array but isnt on
… …
3471 if (trlist == NULL || who->type != PLAYER) 3390 if (trlist == NULL || who->type != PLAYER)
3472 return; 3391 return;
3473 3392
3474 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3393 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3475 3394
3476 if (tr == NULL || tr->item == NULL) 3395 if (!tr || !tr->item)
3477 { 3396 {
3478 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3397 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3479 return; 3398 return;
3480 } 3399 }
3481 3400
… …
3606 * not readied. 3525 * not readied.
3607 */ 3526 */
3608void 3527void
3609player_unready_range_ob (player *pl, object *ob) 3528player_unready_range_ob (player *pl, object *ob)
3610{ 3529{
3611 rangetype i;
3612
3613 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1)) 3530 for (rangetype i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3614 {
3615 if (pl->ranges[i] == ob) 3531 if (pl->ranges[i] == ob)
3616 { 3532 {
3617 pl->ranges[i] = NULL; 3533 pl->ranges[i] = 0;
3618 if (pl->shoottype == i) 3534 if (pl->shoottype == i)
3619 {
3620 pl->shoottype = range_none; 3535 pl->shoottype = range_none;
3621 }
3622 } 3536 }
3623 }
3624} 3537}

Diff Legend

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