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

Diff Legend

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