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.60 by root, Sat Dec 23 09:41:55 2006 UTC vs.
Revision 1.91 by root, Sun Jan 7 23:10:43 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 player *pl;
40
41 for (pl = first_player; pl; pl = pl->next)
42 if (pl->ob && !strcmp (query_name (pl->ob), plname))
43 return pl;
44
45 return 0;
46}
47 38
48void 39void
49display_motd (const object *op) 40display_motd (const object *op)
50{ 41{
51 char buf[MAX_BUF]; 42 char buf[MAX_BUF];
… …
134 125
135 if (*buf == '%') 126 if (*buf == '%')
136 { /* send one news */ 127 { /* send one news */
137 if (size > 0) 128 if (size > 0)
138 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
139 strcpy (subject, buf + 1); 131 strcpy (subject, buf + 1);
140 strip_endline (subject); 132 strip_endline (subject);
141 size = 0; 133 size = 0;
142 news[0] = '\0'; 134 news[0] = '\0';
143 } 135 }
… …
160 152
161/* This loads the first map an puts the player on it. */ 153/* This loads the first map an puts the player on it. */
162static void 154static void
163set_first_map (object *op) 155set_first_map (object *op)
164{ 156{
165 strcpy (op->contr->maplevel, first_map_path); 157 op->contr->maplevel = first_map_path;
166 op->x = -1; 158 op->x = -1;
167 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;
168 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 enter_map ();
186}
187
188void
189player::deactivate ()
190{
191 if (!active)
192 return;
193
194 terminate_all_pets (ob);
195 ob->deactivate_recursive ();
196 ob->remove ();
197 ob->map = 0;
198
199 players.erase (this);
169} 200}
170 201
171// connect the player with a specific client 202// connect the player with a specific client
172// also changed, rationalises, and fixes some incorrect settings 203// also changed, rationalises, and fixes some incorrect settings
173void 204void
174player::connect (client *ns) 205player::connect (client *ns)
175{ 206{
176 this->ns = ns; 207 this->ns = ns;
177 ns->pl = this; 208 ns->pl = this;
178 209
179 next = first_player;
180 first_player = this;
181
182 ns->update_look = 0; 210 ns->update_look = 0;
183 ns->look_position = 0; 211 ns->look_position = 0;
184 212
185 clear_los (ob); 213 clear_los (ob);
186 214
… …
193 221
194 ob->carrying = sum_weight (ob); 222 ob->carrying = sum_weight (ob);
195 link_player_skills (ob); 223 link_player_skills (ob);
196 224
197 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 225 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
198 update_ob_speed (ob);
199 226
200 assign (title, ob->arch->clone.name); 227 assign (title, ob->arch->clone.name);
201 228
202 /* can_use_shield is a new flag. However, the can_use.. seems to largely come 229 /* can_use_shield is a new flag. However, the can_use.. seems to largely come
203 * from the class, and not race. I don't see any way to get the class information 230 * from the class, and not race. I don't see any way to get the class information
… …
228 } 255 }
229 256
230 CLEAR_FLAG (ob, FLAG_FRIENDLY); 257 CLEAR_FLAG (ob, FLAG_FRIENDLY);
231 add_friendly_object (ob); 258 add_friendly_object (ob);
232 259
233 LOG (llevInfo, "LOGIN: Player named %s from ip %s\n", &ob->name, ns->host);
234
235 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 260 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
236 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_DK_ORANGE, 5, NULL, "%s has entered the game.", &ob->name);
237 261
238 esrv_new_player (this, ob->weight + ob->carrying); 262 esrv_new_player (this, ob->weight + ob->carrying);
239 263
240 ob->update_stats (); 264 ob->update_stats ();
241 ns->floorbox_update (); 265 ns->floorbox_update ();
242 266
243 esrv_send_inventory (ob, ob); 267 esrv_send_inventory (ob, ob);
244 esrv_add_spells (this, 0); 268 esrv_add_spells (this, 0);
245 269
246 enter_exit (ob, 0); 270 activate ();
247 271
248 send_rules (ob); 272 send_rules (ob);
249 send_news (ob); 273 send_news (ob);
250 display_motd (ob); 274 display_motd (ob);
275
276 INVOKE_PLAYER (CONNECT, this);
251 INVOKE_PLAYER (LOGIN, this); 277 INVOKE_PLAYER (LOGIN, this);
278}
279
280void
281player::disconnect ()
282{
283 if (ns)
284 {
285 if (active)
286 INVOKE_PLAYER (LOGOUT, this, ARG_INT (0));
287
288 INVOKE_PLAYER (DISCONNECT, this);
289
290 ns->pl = 0;
291 this->ns = 0;
292 }
293
294 deactivate ();
252} 295}
253 296
254// the need for this function can be explained 297// the need for this function can be explained
255// by load_object not returning the object 298// by load_object not returning the object
256void 299void
… …
263 ob->speed = 1.0; 306 ob->speed = 1.0;
264 ob->direction = 5; /* So player faces south */ 307 ob->direction = 5; /* So player faces south */
265 ob->stats.wc = 2; 308 ob->stats.wc = 2;
266 ob->run_away = 25; /* Then we panick... */ 309 ob->run_away = 25; /* Then we panick... */
267 310
268 set_first_map (ob);
269
270 ob->roll_stats (); 311 ob->roll_stats ();
271} 312}
272 313
273player::player () 314player::player ()
274{ 315{
275 /* There are some elements we want initialized to non zero value - 316 /* There are some elements we want initialised to non zero value -
276 * we deal with that below this point. 317 * we deal with that below this point.
277 */ 318 */
278 outputs_sync = 16; /* Every 2 seconds */ 319 outputs_sync = 16; /* Every 2 seconds */
279 outputs_count = 8; /* Keeps present behaviour */ 320 outputs_count = 8; /* Keeps present behaviour */
280 unapply = unapply_nochoice; 321 unapply = unapply_nochoice;
281 322
282 assign (savebed_map, first_map_path); /* Init. respawn position */ 323 savebed_map = first_map_path; /* Init. respawn position */
283 324
284 gen_sp_armour = 10; 325 gen_sp_armour = 10;
285 last_speed = -1; 326 last_speed = -1;
286 shoottype = range_none; 327 shoottype = range_none;
287 bowtype = bow_normal; 328 bowtype = bow_normal;
… …
305 346
306 last_stats.exp = -1; 347 last_stats.exp = -1;
307 last_weight = (uint32) - 1; 348 last_weight = (uint32) - 1;
308} 349}
309 350
351void
352player::do_destroy ()
353{
354 disconnect ();
355
356 attachable::do_destroy ();
357
358 if (ob)
359 {
360 ob->destroy_inv (false);
361 ob->destroy ();
362 }
363}
364
310player::~player () 365player::~player ()
311{ 366{
312 terminate_all_pets (ob);
313
314 if (first_player != this)
315 {
316 player *prev = first_player;
317
318 while (prev && prev->next && prev->next != this)
319 prev = prev->next;
320
321 if (prev->next != this)
322 {
323 LOG (llevError, "Free_player: Can't find previous player.\n");
324 abort ();
325 }
326
327 prev->next = next;
328 }
329 else
330 first_player = next;
331
332 if (ob)
333 {
334 ob->contr = 0;
335 ob->destroy (1);
336 }
337
338 if (ns)
339 {
340 ns->send_packet ("goodbye");
341 ns->flush ();
342 ns->pl = 0;
343 ns->destroy ();
344 }
345
346 /* Clear item stack */ 367 /* Clear item stack */
347 free (stack_items); 368 free (stack_items);
348} 369}
349 370
350/* Tries to add player on the connection passed in ns. 371/* Tries to add player on the connection passed in ns.
… …
355player::create () 376player::create ()
356{ 377{
357 player *pl = new player; 378 player *pl = new player;
358 379
359 pl->set_object (arch_to_object (get_player_archetype (0))); 380 pl->set_object (arch_to_object (get_player_archetype (0)));
381 set_first_map (pl->ob);
360 382
361 return pl; 383 return pl;
362} 384}
363 385
364/* 386/*
… …
391 413
392object * 414object *
393get_nearest_player (object *mon) 415get_nearest_player (object *mon)
394{ 416{
395 object *op = NULL; 417 object *op = NULL;
396 player *pl = NULL;
397 objectlink *ol; 418 objectlink *ol;
398 unsigned lastdist; 419 unsigned lastdist;
399 rv_vector rv; 420 rv_vector rv;
400 421
401 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next) 422 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
… …
433 { 454 {
434 op = ol->ob; 455 op = ol->ob;
435 lastdist = rv.distance; 456 lastdist = rv.distance;
436 } 457 }
437 } 458 }
438 for (pl = first_player; pl != NULL; pl = pl->next) 459
439 { 460 for_all_players (pl)
440 if (can_detect_enemy (mon, pl->ob, &rv)) 461 if (can_detect_enemy (mon, pl->ob, &rv))
441 {
442
443 if (lastdist > rv.distance) 462 if (lastdist > rv.distance)
444 { 463 {
445 op = pl->ob; 464 op = pl->ob;
446 lastdist = rv.distance; 465 lastdist = rv.distance;
447 } 466 }
448 } 467
449 }
450#if 0 468#if 0
451 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)"); 469 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
452#endif 470#endif
453 return op; 471 return op;
454} 472}
… …
834 852
835 contr->orig_stats = stats; 853 contr->orig_stats = stats;
836 } 854 }
837} 855}
838 856
857static void
858start_info (object *op)
859{
860 char buf[MAX_BUF];
861
862 sprintf (buf, "Welcome to Crossfire v%s!", VERSION);
863 new_draw_info (NDI_UNIQUE, 0, op, buf);
864 //new_draw_info (NDI_UNIQUE, 0, op, "Press `?' for help");
865 //new_draw_info (NDI_UNIQUE, 0, op, " ");
866}
867
839/* This function takes the key that is passed, and does the 868/* This function takes the key that is passed, and does the
840 * appropriate action with it (change race, or other things). 869 * appropriate action with it (change race, or other things).
841 * The function name is for historical reasons - now we have 870 * The function name is for historical reasons - now we have
842 * separate race and class; this actually changes the RACE, 871 * separate race and class; this actually changes the RACE,
843 * not the class. 872 * not the class.
… …
888 if (*first_map_ext_path) 917 if (*first_map_ext_path)
889 { 918 {
890 object *tmp; 919 object *tmp;
891 char mapname[MAX_BUF]; 920 char mapname[MAX_BUF];
892 921
893 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name); 922 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &op->arch->name);
894 tmp = object::create (); 923 tmp = object::create ();
895 EXIT_PATH (tmp) = mapname; 924 EXIT_PATH (tmp) = mapname;
896 EXIT_X (tmp) = op->x; 925 EXIT_X (tmp) = op->x;
897 EXIT_Y (tmp) = op->y; 926 EXIT_Y (tmp) = op->y;
898 enter_exit (op, tmp); /* we don't really care if it succeeded; 927 op->enter_exit (tmp); /* we don't really care if it succeeded;
899 * if the map isn't there, then stay on the 928 * if the map isn't there, then stay on the
900 * default initial map */ 929 * default initial map */
901 tmp->destroy (); 930 tmp->destroy ();
902 } 931 }
903 else 932 else
… …
942 if (op->msg) 971 if (op->msg)
943 new_draw_info (NDI_BLUE, 0, op, op->msg); 972 new_draw_info (NDI_BLUE, 0, op, op->msg);
944 973
945 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n"); 974 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
946 return 0; 975 return 0;
947}
948
949int
950key_confirm_quit (object *op, char key)
951{
952 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
953 {
954 op->contr->ns->state = ST_PLAYING;
955 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
956 return 1;
957 }
958
959 INVOKE_PLAYER (LOGOUT, op->contr);
960 INVOKE_PLAYER (QUIT, op->contr);
961
962 terminate_all_pets (op);
963 leave_map (op);
964 op->direction = 0;
965 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
966
967 strcpy (op->contr->killer, "quit");
968 check_score (op);
969 op->contr->party = 0;
970 op->contr->own_title[0] = '\0';
971
972 object_ptr ob = op;
973
974 delete ob->contr;
975
976 /* We need to hunt for any per player unique maps in memory and
977 * get rid of them. The trailing slash in the path is intentional,
978 * so that players named 'Ab' won't match against players 'Abe' pathname
979 */
980 char buf[MAX_BUF];
981 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
982
983 for (maptile *next, *mp = first_map; mp; mp = next)
984 {
985 next = mp->next;
986
987 if (!strncmp (mp->path, buf, strlen (buf)))
988 delete_map (mp);
989 }
990
991 delete_character (ob->name, 1);
992
993 return 1;
994} 976}
995 977
996void 978void
997flee_player (object *op) 979flee_player (object *op)
998{ 980{
… …
1652 return 0; 1634 return 0;
1653 } 1635 }
1654 1636
1655 arrow->set_owner (op); 1637 arrow->set_owner (op);
1656 arrow->skill = bow->skill; 1638 arrow->skill = bow->skill;
1657
1658 arrow->direction = dir; 1639 arrow->direction = dir;
1659 arrow->x = sx;
1660 arrow->y = sy;
1661 1640
1662 if (op->type == PLAYER) 1641 if (op->type == PLAYER)
1663 { 1642 {
1664 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed; 1643 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1665 op->update_stats (); 1644 op->update_stats ();
… …
1680 1659
1681 /* update the speed */ 1660 /* update the speed */
1682 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 1661 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1683 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0; 1662 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1684 1663
1685 if (arrow->speed < 1.0) 1664 arrow->set_speed (max (arrow->speed, 1.0));
1686 arrow->speed = 1.0;
1687 update_ob_speed (arrow);
1688 arrow->speed_left = 0; 1665 arrow->speed_left = 0;
1689 1666
1690 if (op->type == PLAYER) 1667 if (op->type == PLAYER)
1691 { 1668 {
1692 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1669 arrow->stats.wc = 20 - bow->magic - arrow->magic -
… …
1705 arrow->attacktype |= bow->attacktype; 1682 arrow->attacktype |= bow->attacktype;
1706 1683
1707 if (bow->slaying) 1684 if (bow->slaying)
1708 arrow->slaying = bow->slaying; 1685 arrow->slaying = bow->slaying;
1709 1686
1710 arrow->map = m;
1711 arrow->move_type = MOVE_FLY_LOW; 1687 arrow->move_type = MOVE_FLY_LOW;
1712 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1688 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1713 1689
1714 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1690 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1715 insert_ob_in_map (arrow, m, op, 0); 1691 m->insert (arrow, sx, sy, op);
1716 1692
1717 if (!arrow->destroyed ()) 1693 if (!arrow->destroyed ())
1718 move_arrow (arrow); 1694 move_arrow (arrow);
1719 1695
1720 if (op->type == PLAYER) 1696 if (op->type == PLAYER)
… …
1746 } 1722 }
1747 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) 1723 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
1748 { 1724 {
1749 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1)) 1725 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1750 wcmod = -1; 1726 wcmod = -1;
1727
1751 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y); 1728 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1752 } 1729 }
1753 else if (op->contr->bowtype == bow_threewide) 1730 else if (op->contr->bowtype == bow_threewide)
1754 { 1731 {
1755 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y); 1732 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
… …
1825 1802
1826 if (item->arch) 1803 if (item->arch)
1827 { 1804 {
1828 CLEAR_FLAG (item, FLAG_ANIMATE); 1805 CLEAR_FLAG (item, FLAG_ANIMATE);
1829 item->face = item->arch->clone.face; 1806 item->face = item->arch->clone.face;
1830 item->speed = 0; 1807 item->set_speed (0);
1831 update_ob_speed (item);
1832 } 1808 }
1809
1833 if ((tmp = item->in_player ())) 1810 if ((tmp = item->in_player ()))
1834 esrv_update_item (UPD_ANIM, tmp, item); 1811 esrv_update_item (UPD_ANIM, tmp, item);
1835 } 1812 }
1836 } 1813 }
1837 else if (item->type == ROD || item->type == HORN) 1814 else if (item->type == ROD || item->type == HORN)
1838 {
1839 drain_rod_charge (item); 1815 drain_rod_charge (item);
1840 }
1841 } 1816 }
1842} 1817}
1843 1818
1844/* Received a fire command for the player - go and do it. 1819/* Received a fire command for the player - go and do it.
1845 */ 1820 */
… …
2061 */ 2036 */
2062 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny)) 2037 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2063 { 2038 {
2064 if (OUT_OF_REAL_MAP (op->map, nx, ny)) 2039 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2065 { 2040 {
2066 m = get_map_from_coord (op->map, &nx, &ny); 2041 m = op->map->xy_find (nx, ny);
2067 if (!m) 2042 if (!m)
2068 return; /* Don't think this should happen */ 2043 return; /* Don't think this should happen */
2069 } 2044 }
2070 else 2045 else
2071 m = op->map; 2046 m = op->map;
2072 2047
2073 if ((tmp = GET_MAP_OB (m, nx, ny)) == NULL) 2048 if (!(tmp = m->at (nx, ny).bot))
2074 {
2075 /* LOG(llevError,"player_move_attack: GET_MAP_OB returns NULL, but player can not move there.\n"); */
2076 return; 2049 return;
2077 }
2078 2050
2079 mon = 0; 2051 mon = 0;
2080 /* Go through all the objects, and find ones of interest. Only stop if 2052 /* Go through all the objects, and find ones of interest. Only stop if
2081 * we find a monster - that is something we know we want to attack. 2053 * we find a monster - that is something we know we want to attack.
2082 * if its a door or barrel (can roll) see if there may be monsters 2054 * if its a door or barrel (can roll) see if there may be monsters
… …
2135 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2107 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2136 { 2108 {
2137 /* If we're braced, we don't want to switch places with it */ 2109 /* If we're braced, we don't want to switch places with it */
2138 if (op->contr->braced) 2110 if (op->contr->braced)
2139 return; 2111 return;
2112
2140 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2113 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2141 (void) push_ob (mon, dir, op); 2114 (void) push_ob (mon, dir, op);
2142 if (op->contr->tmp_invis || op->hide) 2115 if (op->contr->tmp_invis || op->hide)
2143 make_visible (op); 2116 make_visible (op);
2117
2144 return; 2118 return;
2145 } 2119 }
2146 2120
2147 /* in certain circumstances, you shouldn't attack friendly 2121 /* in certain circumstances, you shouldn't attack friendly
2148 * creatures. Note that if you are braced, you can't push 2122 * creatures. Note that if you are braced, you can't push
… …
2162 !on_battleground)) 2136 !on_battleground))
2163 { 2137 {
2164 if (!op->contr->braced) 2138 if (!op->contr->braced)
2165 { 2139 {
2166 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2140 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2167 (void) push_ob (mon, dir, op); 2141 push_ob (mon, dir, op);
2168 } 2142 }
2169 else 2143 else
2170 new_draw_info (0, 0, op, "You withhold your attack"); 2144 new_draw_info (0, 0, op, "You withhold your attack");
2171 2145
2172 if (op->contr->tmp_invis || op->hide) 2146 if (op->contr->tmp_invis || op->hide)
… …
2187 * Way it works is like this: First, it must have some hit points 2161 * Way it works is like this: First, it must have some hit points
2188 * and be living. Then, it must be one of the following: 2162 * and be living. Then, it must be one of the following:
2189 * 1) Not a player, 2) A player, but of a different party. Note 2163 * 1) Not a player, 2) A player, but of a different party. Note
2190 * that party_number -1 is no party, so attacks can still happen. 2164 * that party_number -1 is no party, so attacks can still happen.
2191 */ 2165 */
2192
2193 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2166 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2194 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2167 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2195 { 2168 {
2196 2169
2197 /* If the player hasn't hit something this tick, and does 2170 /* If the player hasn't hit something this tick, and does
… …
2231int 2204int
2232move_player (object *op, int dir) 2205move_player (object *op, int dir)
2233{ 2206{
2234 int pick; 2207 int pick;
2235 2208
2236 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY) 2209 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2237 return 0; 2210 return 0;
2238 2211
2239 /* Sanity check: make sure dir is valid */ 2212 /* Sanity check: make sure dir is valid */
2240 if ((dir < 0) || (dir >= 9)) 2213 if ((dir < 0) || (dir >= 9))
2241 { 2214 {
2242 LOG (llevError, "move_player: invalid direction %d\n", dir); 2215 LOG (llevError, "move_player: invalid direction %d\n", dir);
2243 return 0; 2216 return 0;
2244 } 2217 }
2245 2218
2246 /* peterm: added following line */ 2219 /* peterm: added following line */
2247 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir) 2220 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2248 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2); 2221 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2249 2222
2250 op->facing = dir; 2223 op->facing = dir;
2251 2224
… …
2329 2302
2330 /* call this here - we also will call this in do_ericserver, but 2303 /* call this here - we also will call this in do_ericserver, but
2331 * the players time has been increased when doericserver has been 2304 * the players time has been increased when doericserver has been
2332 * called, so we recheck it here. 2305 * called, so we recheck it here.
2333 */ 2306 */
2334 //TODO: better than handling 8 commands, use some more intelligent rate-limiting 2307 if (op->contr->ns->handle_command ())
2335 for (int rep = 8; --rep && op->contr->ns->handle_command (); ) 2308 return 1;
2336 ;
2337 2309
2338 if (op->speed_left < 0) 2310 if (op->speed_left > 0)
2339 return 0; 2311 {
2340
2341 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2312 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2342 { 2313 {
2343 /* All move commands take 1 tick, at least for now */ 2314 /* All move commands take 1 tick, at least for now */
2344 op->speed_left--; 2315 op->speed_left--;
2345 2316
2346 /* Instead of all the stuff below, let move_player take care 2317 /* Instead of all the stuff below, let move_player take care
2347 * of it. Also, some of the skill stuff is only put in 2318 * of it. Also, some of the skill stuff is only put in
2348 * there, as well as the confusion stuff. 2319 * there, as well as the confusion stuff.
2349 */ 2320 */
2350 move_player (op, op->direction); 2321 move_player (op, op->direction);
2351 if (op->speed_left > 0) 2322
2352 return 1; 2323 return op->speed_left > 0;
2353 else 2324 }
2354 return 0;
2355 } 2325 }
2356 2326
2357 return 0; 2327 return 0;
2358} 2328}
2359 2329
… …
2401{ 2371{
2402 object *next; 2372 object *next;
2403 2373
2404 while (op) 2374 while (op)
2405 { 2375 {
2406 next = op->below; /* Make sure we have a good value, in case 2376 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2407 * we remove object 'op' 2377
2408 */
2409 if (QUERY_FLAG (op, FLAG_UNPAID)) 2378 if (QUERY_FLAG (op, FLAG_UNPAID))
2410 { 2379 {
2411 op->remove ();
2412 op->x = env->x;
2413 op->y = env->y;
2414 if (env->type == PLAYER) 2380 if (env->type == PLAYER)
2415 esrv_del_item (env->contr, op->count); 2381 esrv_del_item (env->contr, op->count);
2416 insert_ob_in_map (op, env->map, NULL, 0); 2382
2383 op->insert_at (env);
2417 } 2384 }
2418 else if (op->inv) 2385 else if (op->inv)
2419 remove_unpaid_objects (op->inv, env); 2386 remove_unpaid_objects (op->inv, env);
2420 2387
2421 op = next; 2388 op = next;
… …
2714 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!"); 2681 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2715 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life..."); 2682 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2716 2683
2717 /* restore player */ 2684 /* restore player */
2718 at = archetype::find ("poisoning"); 2685 at = archetype::find ("poisoning");
2719 tmp = present_arch_in_ob (at, op); 2686 if (object *tmp = present_arch_in_ob (at, op))
2720 if (tmp)
2721 { 2687 {
2722 tmp->destroy (); 2688 tmp->destroy ();
2723 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed"); 2689 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2724 } 2690 }
2725 2691
2726 at = archetype::find ("confusion"); 2692 at = archetype::find ("confusion");
2727 tmp = present_arch_in_ob (at, op); 2693 if (object *tmp = present_arch_in_ob (at, op))
2728 if (tmp)
2729 { 2694 {
2730 tmp->destroy (); 2695 tmp->destroy ();
2731 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer"); 2696 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2732 } 2697 }
2733 2698
… …
2735 op->stats.hp = op->stats.maxhp; 2700 op->stats.hp = op->stats.maxhp;
2736 if (op->stats.food <= 0) 2701 if (op->stats.food <= 0)
2737 op->stats.food = 999; 2702 op->stats.food = 999;
2738 2703
2739 /* create a bodypart-trophy to make the winner happy */ 2704 /* create a bodypart-trophy to make the winner happy */
2740 tmp = arch_to_object (archetype::find ("finger")); 2705 if (object *tmp = arch_to_object (archetype::find ("finger")))
2741 if (tmp != NULL)
2742 { 2706 {
2743 sprintf (buf, "%s's finger", &op->name); 2707 sprintf (buf, "%s's finger", &op->name);
2744 tmp->name = buf; 2708 tmp->name = buf;
2745 sprintf (buf, " This finger has been cut off %s\n" 2709 sprintf (buf, " This finger has been cut off %s\n"
2746 " the %s, when he was defeated at\n level %d by %s.\n", 2710 " the %s, when he was defeated at\n level %d by %s.\n",
2747 &op->name, op->contr->title, (int) (op->level), op->contr->killer); 2711 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2748 tmp->msg = buf; 2712 tmp->msg = buf;
2749 tmp->value = 0, tmp->material = 0, tmp->type = 0; 2713 tmp->value = 0, tmp->material = 0, tmp->type = 0;
2750 tmp->materialname = NULL; 2714 tmp->materialname = NULL;
2751 tmp->x = op->x, tmp->y = op->y; 2715 tmp->insert_at (op, tmp);
2752 insert_ob_in_map (tmp, op->map, op, 0);
2753 } 2716 }
2754 2717
2755 /* teleport defeated player to new destination */ 2718 /* teleport defeated player to new destination */
2756 transfer_ob (op, x, y, 0, NULL); 2719 transfer_ob (op, x, y, 0, NULL);
2757 op->contr->braced = 0; 2720 op->contr->braced = 0;
… …
2762 2725
2763 command_kill_pets (op, 0); 2726 command_kill_pets (op, 0);
2764 2727
2765 if (op->stats.food < 0) 2728 if (op->stats.food < 0)
2766 { 2729 {
2767 if (op->contr->explore)
2768 {
2769 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2770 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2771 op->stats.food = 999;
2772 return;
2773 }
2774 sprintf (buf, "%s starved to death.", &op->name); 2730 sprintf (buf, "%s starved to death.", &op->name);
2775 strcpy (op->contr->killer, "starvation"); 2731 strcpy (op->contr->killer, "starvation");
2776 } 2732 }
2777 else 2733 else
2778 {
2779 if (op->contr->explore)
2780 {
2781 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2782 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2783 op->stats.hp = op->stats.maxhp;
2784 return;
2785 }
2786 sprintf (buf, "%s died.", &op->name); 2734 sprintf (buf, "%s died.", &op->name);
2787 } 2735
2788 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2736 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2789 2737
2790 /* save the map location for corpse, gravestone */ 2738 /* save the map location for corpse, gravestone */
2791 x = op->x; 2739 x = op->x;
2792 y = op->y; 2740 y = op->y;
2793 map = op->map; 2741 map = op->map;
2794
2795 2742
2796 /* NOT_PERMADEATH code. This basically brings the character back to 2743 /* NOT_PERMADEATH code. This basically brings the character back to
2797 * life if they are dead - it takes some exp and a random stat. 2744 * life if they are dead - it takes some exp and a random stat.
2798 * See the config.h file for a little more in depth detail about this. 2745 * See the config.h file for a little more in depth detail about this.
2799 */ 2746 */
… …
2816 num_stats_lose = 1; 2763 num_stats_lose = 1;
2817 else 2764 else
2818 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO; 2765 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2819 } 2766 }
2820 else 2767 else
2821 {
2822 num_stats_lose = 1; 2768 num_stats_lose = 1;
2823 } 2769
2824 lost_a_stat = 0; 2770 lost_a_stat = 0;
2825 2771
2826 for (z = 0; z < num_stats_lose; z++) 2772 for (z = 0; z < num_stats_lose; z++)
2827 { 2773 {
2828 i = RANDOM () % NUM_STATS; 2774 i = RANDOM () % NUM_STATS;
… …
2986 /* */ 2932 /* */
2987 /****************************************/ 2933 /****************************************/
2988 2934
2989 enter_player_savebed (op); 2935 enter_player_savebed (op);
2990 2936
2991 /* Save the player before inserting the force to reduce
2992 * chance of abuse.
2993 */
2994 op->contr->braced = 0; 2937 op->contr->braced = 0;
2995 op->contr->save ();
2996 2938
2997 /* it is possible that the player has blown something up 2939 /* it is possible that the player has blown something up
2998 * at his savebed location, and that can have long lasting 2940 * at his savebed location, and that can have long lasting
2999 * spell effects. So first see if there is a spell effect 2941 * spell effects. So first see if there is a spell effect
3000 * on the space that might harm the player. 2942 * on the space that might harm the player.
… …
3070 */ 3012 */
3071 3013
3072void 3014void
3073fix_weight (void) 3015fix_weight (void)
3074{ 3016{
3075 for (player *pl = first_player; pl; pl = pl->next) 3017 for_all_players (pl)
3076 { 3018 {
3077 int old = pl->ob->carrying, sum = sum_weight (pl->ob); 3019 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3078 3020
3079 if (old == sum) 3021 if (old == sum)
3080 continue; 3022 continue;
… …
3084} 3026}
3085 3027
3086void 3028void
3087fix_luck (void) 3029fix_luck (void)
3088{ 3030{
3089 for (player *pl = first_player; pl; pl = pl->next) 3031 for_all_players (pl)
3090 if (!pl->ob->contr->ns->state) 3032 if (!pl->ob->contr->ns->state)
3091 pl->ob->change_luck (0); 3033 pl->ob->change_luck (0);
3092} 3034}
3093 3035
3094/* cast_dust() - handles op throwing objects of type 'DUST'. 3036/* cast_dust() - handles op throwing objects of type 'DUST'.
… …
3212 3154
3213 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING); 3155 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3214 3156
3215 /* its *extremely* hard to run and sneak/hide at the same time! */ 3157 /* its *extremely* hard to run and sneak/hide at the same time! */
3216 if (op->type == PLAYER && op->contr->run_on) 3158 if (op->type == PLAYER && op->contr->run_on)
3217 {
3218 if (!skop || num >= skop->level) 3159 if (!skop || num >= skop->level)
3219 { 3160 {
3220 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!"); 3161 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3221 make_visible (op); 3162 make_visible (op);
3222 return; 3163 return;
3223 } 3164 }
3224 else 3165 else
3225 num += 20; 3166 num += 20;
3226 } 3167
3227 num += op->map->difficulty; 3168 num += op->map->difficulty;
3228 hide = hideability (op); /* modify by terrain hidden level */ 3169 hide = hideability (op); /* modify by terrain hidden level */
3229 num -= hide; 3170 num -= hide;
3171
3230 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0)) 3172 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3231 { 3173 {
3232 make_visible (op); 3174 make_visible (op);
3233 if (op->type == PLAYER) 3175 if (op->type == PLAYER)
3234 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!"); 3176 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3235 } 3177 }
3236 else if (op->type == PLAYER && skop) 3178 else if (op->type == PLAYER && skop)
3237 {
3238 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0); 3179 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3239 }
3240} 3180}
3241 3181
3242/* determine if who is standing near a hostile creature. */ 3182/* determine if who is standing near a hostile creature. */
3243 3183
3244int 3184int
… …
3311 if (pl->type != PLAYER) 3251 if (pl->type != PLAYER)
3312 { 3252 {
3313 LOG (llevError, "player_can_view() called for non-player object\n"); 3253 LOG (llevError, "player_can_view() called for non-player object\n");
3314 return -1; 3254 return -1;
3315 } 3255 }
3256
3316 if (!pl || !op) 3257 if (!pl || !op)
3317 return 0; 3258 return 0;
3318 3259
3319 if (op->head)
3320 {
3321 op = op->head; 3260 op = op->head_ ();
3322 } 3261
3323 get_rangevector (pl, op, &rv, 0x1); 3262 get_rangevector (pl, op, &rv, 0x1);
3324 3263
3325 /* starting with the 'head' part, lets loop 3264 /* starting with the 'head' part, lets loop
3326 * through the object and find if it has any 3265 * through the object and find if it has any
3327 * part that is in the los array but isnt on 3266 * part that is in the los array but isnt on
… …
3457 if (trlist == NULL || who->type != PLAYER) 3396 if (trlist == NULL || who->type != PLAYER)
3458 return; 3397 return;
3459 3398
3460 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++); 3399 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3461 3400
3462 if (tr == NULL || tr->item == NULL) 3401 if (!tr || !tr->item)
3463 { 3402 {
3464 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3403 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3465 return; 3404 return;
3466 } 3405 }
3467 3406

Diff Legend

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