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.135 by root, Sun May 13 15:13:57 2007 UTC vs.
Revision 1.158 by root, Mon Aug 13 15:46:45 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software: you can redistribute it and/or modify
9 * 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
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
12 * 12 *
13 * 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,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * 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
19 * along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 * 20 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <crossfire@schmorp.de>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <sounds.h> 26#include <sounds.h>
147 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, 146 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
148 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news); 147 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
149 close_and_delete (fp, comp); 148 close_and_delete (fp, comp);
150} 149}
151 150
152float
153player::weapon_speed () const
154{
155 return ob->speed / weapon_sp * .5f;//TODO, the .5 is arbitrary
156}
157
158/* This loads the first map an puts the player on it. */ 151/* This loads the first map an puts the player on it. */
159static void 152static void
160set_first_map (object *op) 153set_first_map (object *op)
161{ 154{
162 op->contr->maplevel = first_map_path; 155 op->contr->maplevel = first_map_path;
163 op->x = -1; 156 op->x = -1;
164 op->y = -1; 157 op->y = -1;
165}
166
167void
168player::enter_map ()
169{
170 object *tmp = object::create ();
171
172 EXIT_PATH (tmp) = maplevel;
173 EXIT_X (tmp) = ob->x;
174 EXIT_Y (tmp) = ob->y;
175 ob->enter_exit (tmp);
176
177 tmp->destroy ();
178} 158}
179 159
180void 160void
181player::activate () 161player::activate ()
182{ 162{
187 ob->remove (); 167 ob->remove ();
188 ob->map = 0; 168 ob->map = 0;
189 ob->activate_recursive (); 169 ob->activate_recursive ();
190 CLEAR_FLAG (ob, FLAG_FRIENDLY); 170 CLEAR_FLAG (ob, FLAG_FRIENDLY);
191 add_friendly_object (ob); 171 add_friendly_object (ob);
192 enter_map ();
193} 172}
194 173
195void 174void
196player::deactivate () 175player::deactivate ()
197{ 176{
227 ob->close_container (); //TODO: client-specific 206 ob->close_container (); //TODO: client-specific
228 207
229 ns->update_look = 0; 208 ns->update_look = 0;
230 ns->look_position = 0; 209 ns->look_position = 0;
231 210
232 clear_los (ob); 211 clear_los (this);
233 212
234 ns->reset_stats (); 213 ns->reset_stats ();
235 214
236 /* make sure he's a player -- needed because of class change. */ 215 /* make sure he's a player -- needed because of class change. */
237 ob->type = PLAYER; // we are paranoid 216 ob->type = PLAYER; // we are paranoid
238 ob->race = ob->arch->clone.race; 217 ob->race = ob->arch->race;
239 218
240 ob->carrying = sum_weight (ob); 219 ob->carrying = sum_weight (ob);
241 link_player_skills (ob); 220 link_player_skills (ob);
242 221
243 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER); 222 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
244 223
245 assign (title, ob->arch->clone.name); 224 assign (title, ob->arch->object::name);
246 225
247 /* if it's a dragon player, set the correct title here */ 226 /* if it's a dragon player, set the correct title here */
248 if (is_dragon_pl (ob)) 227 if (is_dragon_pl (ob))
249 { 228 {
250 object *tmp, *abil = 0, *skin = 0; 229 object *tmp, *abil = 0, *skin = 0;
251 230
252 shstr_cmp dragon_ability_force ("dragon_ability_force");
253 shstr_cmp dragon_skin_force ("dragon_skin_force");
254
255 for (tmp = ob->inv; tmp; tmp = tmp->below) 231 for (tmp = ob->inv; tmp; tmp = tmp->below)
256 if (tmp->type == FORCE) 232 if (tmp->type == FORCE)
257 if (tmp->arch->name == dragon_ability_force) 233 if (tmp->arch->archname == shstr_dragon_ability_force)
258 abil = tmp; 234 abil = tmp;
259 else if (tmp->arch->name == dragon_skin_force) 235 else if (tmp->arch->archname == shstr_dragon_skin_force)
260 skin = tmp; 236 skin = tmp;
261 237
262 set_dragon_name (ob, abil, skin); 238 set_dragon_name (ob, abil, skin);
263 } 239 }
264 240
265 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!"); 241 new_draw_info (NDI_UNIQUE, 0, ob, "Welcome Back!");
266 242
267 esrv_new_player (this, ob->weight + ob->carrying); 243 esrv_new_player (this, ob->weight + ob->carrying);
244
245 ob->flag [FLAG_READY_WEAPON] = false;
246 ob->flag [FLAG_READY_SKILL] = false;
247 ob->flag [FLAG_READY_BOW] = false;
268 248
269 for (object *op = ob->inv; op; op = op->below) 249 for (object *op = ob->inv; op; op = op->below)
270 if (op->flag [FLAG_APPLIED]) 250 if (op->flag [FLAG_APPLIED])
271 switch (op->type) 251 switch (op->type)
272 { 252 {
253 case SKILL:
254 ob->flag [FLAG_APPLIED] = false;
255 break;
256
273 case WAND: 257 case WAND:
274 case ROD: 258 case ROD:
275 case HORN: 259 case HORN:
276 case BOW: 260 case BOW:
277 case SKILL: 261 ranged_ob = op;
278 case SKILL_TOOL: 262 break;
263
279 case WEAPON: 264 case WEAPON:
280 apply_special (ob, op, AP_UNAPPLY); 265 combat_ob = op;
281 apply_special (ob, op, AP_APPLY);
282 break; 266 break;
283 } 267 }
284 268
269 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
285 ob->update_stats (); 270 ob->update_stats ();
271
286 ns->floorbox_update (); 272 ns->floorbox_update ();
287
288 esrv_send_inventory (ob, ob); 273 esrv_send_inventory (ob, ob);
289 esrv_add_spells (this, 0); 274 esrv_add_spells (this, 0);
290 275
291 activate (); 276 activate ();
292 277
312 ns->pl = 0; 297 ns->pl = 0;
313 ns = 0; 298 ns = 0;
314 } 299 }
315 300
316 if (ob) 301 if (ob)
302 {
317 ob->close_container (); //TODO: client-specific 303 ob->close_container (); //TODO: client-specific
304 ob->drop_unpaid_items ();
305 }
306
307 observe = ob;
318 308
319 deactivate (); 309 deactivate ();
320} 310}
321 311
322// the need for this function can be explained 312// the need for this function can be explained
323// by load_object not returning the object 313// by load_object not returning the object
324void 314void
325player::set_object (object *op) 315player::set_object (object *op)
326{ 316{
327 ob = op; 317 ob = observe = op;
328 ob->contr = this; /* this aren't yet in archetype */ 318 ob->contr = this; /* this aren't yet in archetype */
329 319
330 ob->speed_left = 0.5f;
331 ob->speed = 1.0f; 320 ob->speed = 1.0f;
321 ob->speed_left = 0.5f;
322
332 ob->direction = 5; /* So player faces south */ 323 ob->direction = 5; /* So player faces south */
324}
325
326void
327player::set_observe (object *op)
328{
329 observe = op ? op : ob;
330 do_los = 1;
333} 331}
334 332
335player::player () 333player::player ()
336{ 334{
337 /* There are some elements we want initialised to non zero value - 335 /* There are some elements we want initialised to non zero value -
348 petmode = pet_normal; 346 petmode = pet_normal;
349 listening = 10; 347 listening = 10;
350 usekeys = containers; 348 usekeys = containers;
351 peaceful = 1; /* default peaceful */ 349 peaceful = 1; /* default peaceful */
352 do_los = 1; 350 do_los = 1;
351
352 weapon_sp = 1.0f;
353 weapon_sp_left = 0.5f;
353} 354}
354 355
355void 356void
356player::do_destroy () 357player::do_destroy ()
357{ 358{
362 if (ob) 363 if (ob)
363 { 364 {
364 ob->destroy_inv (false); 365 ob->destroy_inv (false);
365 ob->destroy (); 366 ob->destroy ();
366 } 367 }
368
369 ob = observe = 0;
367} 370}
368 371
369player::~player () 372player::~player ()
370{ 373{
371 /* Clear item stack */ 374 /* Clear item stack */
398 * Note: there MUST be at least one player archetype! 401 * Note: there MUST be at least one player archetype!
399 */ 402 */
400archetype * 403archetype *
401get_player_archetype (archetype *at) 404get_player_archetype (archetype *at)
402{ 405{
403 archetype *start = at; 406 archvec::iterator i = at ? archetypes.find (at) : archetypes.begin ();
404 407
405 for (;;) 408 for (;;)
406 { 409 {
407 if (at == NULL || at->next == NULL) 410 if (++i == archetypes.end ())
408 at = first_archetype; 411 i = archetypes.begin ();
409 else 412 else if (*i == at)
410 at = at->next; 413 cleanup ("not a single player archetype found");
411 414
412 if (at->clone.type == PLAYER) 415 if ((*i)->type == PLAYER)
413 return at; 416 return *i;
414
415 if (at == start)
416 {
417 LOG (llevError, "No Player archetypes\n");
418 exit (-1);
419 }
420 } 417 }
421} 418}
422 419
423object * 420object *
424get_nearest_player (object *mon) 421get_nearest_player (object *mon)
914 if (*first_map_ext_path) 911 if (*first_map_ext_path)
915 { 912 {
916 object *tmp; 913 object *tmp;
917 char mapname[MAX_BUF]; 914 char mapname[MAX_BUF];
918 915
919 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->name); 916 snprintf (mapname, MAX_BUF - 1, "%s/%s", &first_map_ext_path, &ob->arch->archname);
920 tmp = object::create (); 917 tmp = object::create ();
921 EXIT_PATH (tmp) = mapname; 918 EXIT_PATH (tmp) = mapname;
922 EXIT_X (tmp) = ob->x; 919 EXIT_X (tmp) = ob->x;
923 EXIT_Y (tmp) = ob->y; 920 EXIT_Y (tmp) = ob->y;
924 ob->enter_exit (tmp); /* we don't really care if it succeeded; 921 ob->enter_exit (tmp); /* we don't really care if it succeeded;
943 int x = ob->x, y = ob->y; 940 int x = ob->x, y = ob->y;
944 941
945 ob->remove_statbonus (); 942 ob->remove_statbonus ();
946 ob->remove (); 943 ob->remove ();
947 ob->arch = get_player_archetype (ob->arch); 944 ob->arch = get_player_archetype (ob->arch);
948 ob->arch->clone.copy_to (ob); 945 ob->arch->copy_to (ob);
949 ob->instantiate (); 946 ob->instantiate ();
950 ob->stats = ob->contr->orig_stats; 947 ob->stats = ob->contr->orig_stats;
951 ob->name = ob->name_pl = name; 948 ob->name = ob->name_pl = name;
952 ob->x = x; 949 ob->x = x;
953 ob->y = y; 950 ob->y = y;
954 SET_ANIMATION (ob, 2); /* So player faces south */ 951 SET_ANIMATION (ob, 2); /* So player faces south */
955 insert_ob_in_map (ob, ob->map, ob, 0); 952 insert_ob_in_map (ob, ob->map, ob, 0);
956 assign (ob->contr->title, ob->arch->clone.name); 953 assign (ob->contr->title, ob->arch->object::name);
957 ob->add_statbonus (); 954 ob->add_statbonus ();
958 } 955 }
959 while (!allowed_class (ob)); 956 while (!allowed_class (ob));
960 957
961 update_object (ob, UP_OBJ_FACE); 958 update_object (ob, UP_OBJ_FACE);
1106 if (tmp->name != NULL) 1103 if (tmp->name != NULL)
1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1104 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1108 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1105 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1109 else 1106 else
1110 sprintf (putstring, "item name: %s item type: %d weight/value: %d", 1107 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1111 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1108 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1112 1109
1113 new_draw_info (NDI_UNIQUE, 0, op, putstring); 1110 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1114 } 1111 }
1115 1112
1116 /* philosophy: 1113 /* philosophy:
1191 pick_up (op, tmp); 1188 pick_up (op, tmp);
1192 continue; 1189 continue;
1193 } 1190 }
1194 1191
1195 if (op->contr->mode & PU_READABLES) 1192 if (op->contr->mode & PU_READABLES)
1196 if (tmp->type == BOOK || tmp->type == SCROLL) 1193 if (tmp->type == BOOK || tmp->type == SCROLL || tmp->type == INSCRIBABLE)
1197 { 1194 {
1198 pick_up (op, tmp); 1195 pick_up (op, tmp);
1199 continue; 1196 continue;
1200 } 1197 }
1201 1198
1309 /* careful: chairs and tables are weapons! */ 1306 /* careful: chairs and tables are weapons! */
1310 if (op->contr->mode & PU_ALLWEAPON) 1307 if (op->contr->mode & PU_ALLWEAPON)
1311 { 1308 {
1312 if (tmp->type == WEAPON && tmp->name != NULL) 1309 if (tmp->type == WEAPON && tmp->name != NULL)
1313 { 1310 {
1314 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL && 1311 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->archname, "table") == NULL &&
1315 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL) 1312 strstr (tmp->name, "chair") && strstr (tmp->arch->archname, "chair") == NULL)
1316 { 1313 {
1317 pick_up (op, tmp); 1314 pick_up (op, tmp);
1318 continue; 1315 continue;
1319 } 1316 }
1320 } 1317 }
1321 1318
1322 if (tmp->type == WEAPON && tmp->name == NULL) 1319 if (tmp->type == WEAPON && tmp->name == NULL)
1323 { 1320 {
1324 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL) 1321 if (strstr (tmp->arch->archname, "table") == NULL && strstr (tmp->arch->archname, "chair") == NULL)
1325 { 1322 {
1326 pick_up (op, tmp); 1323 pick_up (op, tmp);
1327 continue; 1324 continue;
1328 } 1325 }
1329 } 1326 }
1354 if (tmp->name != NULL) 1351 if (tmp->name != NULL)
1355 { 1352 {
1356 fprintf (stderr, "%s", tmp->name); 1353 fprintf (stderr, "%s", tmp->name);
1357 } 1354 }
1358 else 1355 else
1359 fprintf (stderr, "%s", tmp->arch->name); 1356 fprintf (stderr, "%s", tmp->arch->archname);
1360 fprintf (stderr, ",%d] = ", tmp->type); 1357 fprintf (stderr, ",%d] = ", tmp->type);
1361 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1358 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1362#endif 1359#endif
1363 continue; 1360 continue;
1364 } 1361 }
1434 else 1431 else
1435 { 1432 {
1436 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++) 1433 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1437 { 1434 {
1438 attacktype = 1 << attacknum; 1435 attacktype = 1 << attacknum;
1439 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1436 if ((arrow->attacktype & attacktype) && (target->arch->resist[attacknum]) < 0)
1440 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby) 1437 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100) > betterby)
1441 { 1438 {
1442 tmp = arrow; 1439 tmp = arrow;
1443 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100; 1440 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->resist[attacknum]) / 100;
1444 } 1441 }
1445 } 1442 }
1446 if ((2 + arrow->magic + arrow->stats.dam) > betterby) 1443 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1447 { 1444 {
1448 tmp = arrow; 1445 tmp = arrow;
1550 { 1547 {
1551 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1548 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1552 return 0; 1549 return 0;
1553 } 1550 }
1554 1551
1555 if (player *pl = op->contr) 1552 if (op->contr)
1556 { 1553 bow = op->current_weapon;
1557 bow = pl->ranged_ob;
1558 if (!op->change_weapon (bow))
1559 return 0;
1560 }
1561 else 1554 else
1562 { 1555 {
1563 for (bow = op->inv; bow; bow = bow->below) 1556 for (bow = op->inv; bow; bow = bow->below)
1564 /* Don't check for applied - monsters don't apply bows - in that way, they 1557 /* Don't check for applied - monsters don't apply bows - in that way, they
1565 * don't need to switch back and forth between bows and weapons. 1558 * don't need to switch back and forth between bows and weapons.
1636 arrow->stats.grace = arrow->attacktype; 1629 arrow->stats.grace = arrow->attacktype;
1637 1630
1638 if (arrow->slaying) 1631 if (arrow->slaying)
1639 arrow->spellarg = strdup (arrow->slaying); 1632 arrow->spellarg = strdup (arrow->slaying);
1640 1633
1634#if 0
1641 if (player *pl = op->contr) 1635 if (player *pl = op->contr)
1642 { 1636 {
1643 if (!pl->has_hit)
1644 {
1645 pl->has_hit = 1;
1646 pl->ob->speed_left += pl->weapon_speed () - pl->ob->speed;
1647 }
1648#if 0
1649 float speed = pl->weapon_sp; 1637 float speed = pl->weapon_sp;
1650 1638
1651 /* penalize ROF for bestarrow */ 1639 /* penalize ROF for bestarrow */
1652 if (pl->bowtype == bow_bestarrow) 1640 if (pl->bowtype == bow_bestarrow)
1653 speed *= .9f; 1641 speed *= .9f;
1654 else 1642 else
1655 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f; 1643 speed *= 1.f + dex_bonus[op->stats.Dex] * .2f;
1656 1644
1657 op->speed_left += speed - op->speed; 1645 op->speed_left += speed - op->speed;
1646 }
1658#endif 1647#endif
1659 }
1660 1648
1661 SET_ANIMATION (arrow, arrow->direction); 1649 SET_ANIMATION (arrow, arrow->direction);
1662 1650
1663 /* update the speed */ 1651 /* update the speed */
1664 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 1652 arrow->speed = ((bow->flag [FLAG_NO_STRENGTH] ? 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.f
1665 + bow->stats.dam / 7.0; 1653 + bow->stats.dam / 7.f;
1666 1654
1667 arrow->set_speed (max (arrow->speed, 2.0)); 1655 arrow->set_speed (max (arrow->speed, 2.f));
1668 arrow->speed_left = 0; 1656 arrow->speed_left = 0;
1669 1657
1670 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc; 1658 int wc = op->stats.wc + wc_mod - arrow->magic - arrow->stats.wc;
1671 1659
1672 if (op->type == PLAYER) 1660 if (op->type == PLAYER)
1695 1683
1696 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC); 1684 arrow->stats.wc = clamp (wc, MIN_WC, MAX_WC);
1697 arrow->move_type = MOVE_FLY_LOW; 1685 arrow->move_type = MOVE_FLY_LOW;
1698 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1686 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1699 1687
1700 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW); 1688 op->play_sound (sound_find ("fire_arrow"));
1701 m->insert (arrow, sx, sy, op); 1689 m->insert (arrow, sx, sy, op);
1702 1690
1703 if (!arrow->destroyed ()) 1691 if (!arrow->destroyed ())
1704 move_arrow (arrow); 1692 move_arrow (arrow);
1705 1693
1783 1771
1784 if (item->type == WAND) 1772 if (item->type == WAND)
1785 { 1773 {
1786 if (item->stats.food <= 0) 1774 if (item->stats.food <= 0)
1787 { 1775 {
1788 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1776 op->contr->play_sound (sound_find ("wand_poof"));
1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0)); 1777 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1790 1778
1791 return; 1779 return;
1792 } 1780 }
1793 } 1781 }
1794 else if (item->type == ROD || item->type == HORN) 1782 else if (item->type == ROD || item->type == HORN)
1795 { 1783 {
1796 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace)) 1784 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
1797 { 1785 {
1798 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0); 1786 op->contr->play_sound (sound_find ("wand_poof"));
1799 1787
1800 if (item->type == ROD) 1788 if (item->type == ROD)
1801 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1789 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1802 else 1790 else
1803 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0)); 1791 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1816 object *tmp; 1804 object *tmp;
1817 1805
1818 if (item->arch) 1806 if (item->arch)
1819 { 1807 {
1820 CLEAR_FLAG (item, FLAG_ANIMATE); 1808 CLEAR_FLAG (item, FLAG_ANIMATE);
1821 item->face = item->arch->clone.face; 1809 item->face = item->arch->face;
1822 item->set_speed (0); 1810 item->set_speed (0);
1823 } 1811 }
1824 1812
1825 if ((tmp = item->in_player ())) 1813 if ((tmp = item->in_player ()))
1826 esrv_update_item (UPD_ANIM, tmp, item); 1814 esrv_update_item (UPD_ANIM, tmp, item);
1831 } 1819 }
1832} 1820}
1833 1821
1834/* Received a fire command for the player - go and do it. 1822/* Received a fire command for the player - go and do it.
1835 */ 1823 */
1836void 1824bool
1837fire (object *op, int dir) 1825fire (object *op, int dir)
1838{ 1826{
1839 int spellcost = 0; 1827 int spellcost = 0;
1840 1828
1841 /* check for loss of invisiblity/hide */ 1829 /* check for loss of invisiblity/hide */
1845 player *pl = op->contr; 1833 player *pl = op->contr;
1846 1834
1847 if (pl->golem) 1835 if (pl->golem)
1848 { 1836 {
1849 control_golem (op->contr->golem, dir); 1837 control_golem (op->contr->golem, dir);
1850 return; 1838 return false;
1851 } 1839 }
1852 1840
1853 object *ob = pl->ranged_ob; 1841 object *ob = pl->ranged_ob;
1854 1842
1855 if (!ob) 1843 if (!ob)
1856 return; 1844 return false;
1845
1846 if (!op->change_weapon (ob))
1847 return false;
1848
1849 if (op->speed_left > 0.f)
1850 --op->speed_left;
1851 else
1852 return false;
1857 1853
1858 switch (ob->type) 1854 switch (ob->type)
1859 { 1855 {
1860 case BOW: 1856 case BOW:
1861 player_fire_bow (op, dir); 1857 player_fire_bow (op, dir);
1868 case BUILDER: 1864 case BUILDER:
1869 apply_map_builder (op, dir); 1865 apply_map_builder (op, dir);
1870 break; 1866 break;
1871 1867
1872 case SKILL: 1868 case SKILL:
1873 case SKILL_TOOL:
1874 do_skill (op, op, ob, dir, 0); 1869 do_skill (op, op, ob, dir, 0);
1875 break; 1870 break;
1876 1871
1877 default: 1872 default:
1878 fire_misc_object (op, dir); 1873 fire_misc_object (op, dir);
1879 break; 1874 break;
1880 } 1875 }
1876
1877 return true;
1881} 1878}
1882 1879
1883/* find_key 1880/* find_key
1884 * We try to find a key for the door as passed. If we find a key 1881 * We try to find a key for the door as passed. If we find a key
1885 * and successfully use it, we return the key, otherwise NULL 1882 * and successfully use it, we return the key, otherwise NULL
1972 * 0 otherwise 1969 * 0 otherwise
1973 */ 1970 */
1974static int 1971static int
1975player_attack_door (object *op, object *door) 1972player_attack_door (object *op, object *door)
1976{ 1973{
1977 /* If its a door, try to find a use a key. If we do destroy the door, 1974 /* If its a door, try to find a key. If we do destroy the door,
1978 * might as well return immediately as there is nothing more to do - 1975 * might as well return immediately as there is nothing more to do -
1979 * otherwise, we fall through to the rest of the code. 1976 * otherwise, we fall through to the rest of the code.
1980 */ 1977 */
1981 object *key = find_key (op, op, door); 1978 object *key = find_key (op, op, door);
1982 1979
1983 /* IF we found a key, do some extra work */ 1980 /* If we found a key, do some extra work */
1984 if (key) 1981 if (key)
1985 { 1982 {
1986 object *container = key->env; 1983 object *container = key->env;
1987
1988 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989 1984
1990 if (action_makes_visible (op)) 1985 if (action_makes_visible (op))
1991 make_visible (op); 1986 make_visible (op);
1992 1987
1993 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP)) 1988 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2023 * It should keep the code cleaner. 2018 * It should keep the code cleaner.
2024 * When this is called, the players direction has been updated 2019 * When this is called, the players direction has been updated
2025 * (taking into account confusion.) The player is also actually 2020 * (taking into account confusion.) The player is also actually
2026 * going to try and move (not fire weapons). 2021 * going to try and move (not fire weapons).
2027 */ 2022 */
2028void 2023bool
2029move_player_attack (object *op, int dir) 2024move_player_attack (object *op, int dir)
2030{ 2025{
2031 object *tmp, *mon;
2032 int on_battleground; 2026 int on_battleground;
2033 maptile *m;
2034 2027
2035 sint16 nx = freearr_x[dir] + op->x; 2028 sint16 nx = freearr_x[dir] + op->x;
2036 sint16 ny = freearr_y[dir] + op->y; 2029 sint16 ny = freearr_y[dir] + op->y;
2037 2030
2038 on_battleground = op_on_battleground (op, 0, 0); 2031 on_battleground = op_on_battleground (op, 0, 0);
2032
2033 if (out_of_map (op->map, nx, ny))
2034 return false;
2035
2036 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
2037 {
2038 --op->speed_left;
2039 return true;
2040 }
2039 2041
2040 /* If braced, or can't move to the square, and it is not out of the 2042 /* If braced, or can't move to the square, and it is not out of the
2041 * map, attack it. Note order of if statement is important - don't 2043 * map, attack it. Note order of if statement is important - don't
2042 * want to be calling move_ob if braced, because move_ob will move the 2044 * want to be calling move_ob if braced, because move_ob will move the
2043 * player. This is a pretty nasty hack, because if we could 2045 * player. This is a pretty nasty hack, because if we could
2044 * move to some space, it then means that if we are braced, we should 2046 * move to some space, it then means that if we are braced, we should
2045 * do nothing at all. As it is, if we are braced, we go through 2047 * do nothing at all. As it is, if we are braced, we go through
2046 * quite a bit of processing. However, it probably is less than what 2048 * quite a bit of processing. However, it probably is less than what
2047 * move_ob uses. 2049 * move_ob uses.
2048 */ 2050 */
2049 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2050 {
2051 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2052 {
2053 m = op->map->xy_find (nx, ny); 2051 maptile *m = op->map->xy_find (nx, ny);
2054 if (!m)
2055 return; /* Don't think this should happen */
2056 }
2057 else
2058 m = op->map;
2059 2052
2060 if (!(tmp = m->at (nx, ny).bot))
2061 return;
2062
2063 mon = 0;
2064 /* Go through all the objects, and find ones of interest. Only stop if 2053 /* Go through all the objects, and find ones of interest. Only stop if
2065 * we find a monster - that is something we know we want to attack. 2054 * we find a monster - that is something we know we want to attack.
2066 * if its a door or barrel (can roll) see if there may be monsters 2055 * if its a door or barrel (can roll) see if there may be monsters
2067 * on the space 2056 * on the space
2068 */ 2057 */
2069 while (tmp) 2058 object *mon;
2070 { 2059 for (mon = m->at (nx, ny).bot; mon; mon = mon->above)
2071 if (tmp == op) 2060 {
2072 { 2061 if ((mon->flag [FLAG_ALIVE]
2073 tmp = tmp->above; 2062 || mon->type == LOCKED_DOOR
2074 continue; 2063 || mon->flag [FLAG_CAN_ROLL])
2075 }
2076
2077 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2078 {
2079 mon = tmp; 2064 && mon != op)
2080 break; 2065 break;
2081 } 2066 }
2082 2067
2083 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2084 mon = tmp;
2085
2086 tmp = tmp->above;
2087 }
2088
2089 if (!mon) /* This happens anytime the player tries to move */ 2068 if (!mon) /* This happens anytime the player tries to move */
2090 return; /* into a wall */ 2069 return false; /* into a wall */
2091 2070
2092 if (mon->head)
2093 mon = mon->head; 2071 mon = mon->head_ ();
2094 2072
2095 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR)) 2073 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2074 if (op->contr->weapon_sp_left > 0.f)
2096 if (player_attack_door (op, mon)) 2075 if (player_attack_door (op, mon))
2076 {
2077 --op->contr->weapon_sp_left;
2097 return; 2078 return true;
2079 }
2098 2080
2099 /* The following deals with possibly attacking peaceful 2081 /* The following deals with possibly attacking peaceful
2100 * or frienddly creatures. Basically, all players are considered 2082 * or friendly creatures. Basically, all players are considered
2101 * unaggressive. If the moving player has peaceful set, then the 2083 * unaggressive. If the moving player has peaceful set, then the
2102 * object should be pushed instead of attacked. It is assumed that 2084 * object should be pushed instead of attacked. It is assumed that
2103 * if you are braced, you will not attack friends accidently, 2085 * if you are braced, you will not attack friends accidently,
2104 * and thus will not push them. 2086 * and thus will not push them.
2105 */ 2087 */
2106 2088
2107 /* If the creature is a pet, push it even if the player is not 2089 /* If the creature is a pet, push it even if the player is not
2108 * peaceful. Our assumption is the creature is a pet if the 2090 * peaceful. Our assumption is the creature is a pet if the
2109 * player owns it and it is either friendly or unagressive. 2091 * player owns it and it is either friendly or unagressive.
2110 */ 2092 */
2111 if ((op->type == PLAYER) 2093 if (op->type == PLAYER
2112#if COZY_SERVER
2113 &&
2114 ((mon->owner && mon->owner->contr 2094 && ((mon->owner && mon->owner->contr
2115 && same_party (mon->owner->contr->party, op->contr->party)) || mon->owner == op) 2095 && same_party (mon->owner->contr->party, op->contr->party))
2116#else
2117 && mon->owner == op 2096 || mon->owner == op)
2118#endif
2119 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))) 2097 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2120 { 2098 {
2121 /* If we're braced, we don't want to switch places with it */ 2099 /* If we're braced, we don't want to switch places with it */
2122 if (op->contr->braced) 2100 if (op->contr->braced)
2123 return; 2101 return false;
2124 2102
2125 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2103 if (op->speed_left > 0.f)
2104 {
2105 --op->speed_left;
2106
2107 op->play_sound (sound_find ("push_player"));
2126 push_ob (mon, dir, op); 2108 push_ob (mon, dir, op);
2109
2127 if (op->contr->tmp_invis || op->hide) 2110 if (op->contr->tmp_invis || op->hide)
2128 make_visible (op); 2111 make_visible (op);
2129 2112
2130 return; 2113 return true;
2131 } 2114 }
2115 else
2116 return false;
2117 }
2132 2118
2133 /* in certain circumstances, you shouldn't attack friendly 2119 /* in certain circumstances, you shouldn't attack friendly
2134 * creatures. Note that if you are braced, you can't push 2120 * creatures. Note that if you are braced, you can't push
2135 * someone, but put it inside this loop so that you won't 2121 * someone, but put it inside this loop so that you won't
2136 * attack them either. 2122 * attack them either.
2137 */ 2123 */
2138 if ((mon->type == PLAYER || mon->enemy != op) && 2124 if ((mon->type == PLAYER || mon->enemy != op)
2139 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && ( 2125 && (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY))
2140#ifdef PROHIBIT_PLAYERKILL
2141 (op->contr->peaceful 2126 && ((op->contr->peaceful
2142 || (mon->type == PLAYER 2127 || (mon->type == PLAYER && mon->contr->peaceful))
2143 && mon->contr->
2144 peaceful)) &&
2145#else
2146 op->contr->peaceful &&
2147#endif
2148 !on_battleground)) 2128 && !on_battleground))
2129 {
2130 if (op->speed_left > 0.f)
2149 { 2131 {
2132 --op->speed_left;
2133
2150 if (!op->contr->braced) 2134 if (!op->contr->braced)
2151 { 2135 {
2152 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER); 2136 op->play_sound (sound_find ("push_player"));
2153 push_ob (mon, dir, op); 2137 push_ob (mon, dir, op);
2154 } 2138 }
2155 else 2139 else
2156 new_draw_info (0, 0, op, "You withhold your attack"); 2140 new_draw_info (0, 0, op, "You withhold your attack");
2157 2141
2158 if (op->contr->tmp_invis || op->hide) 2142 if (op->contr->tmp_invis || op->hide)
2159 make_visible (op); 2143 make_visible (op);
2160 }
2161 2144
2145 return true;
2146 }
2147 }
2162 /* If the object is a boulder or other rollable object, then 2148 /* If the object is a boulder or other rollable object, then
2163 * roll it if not braced. You can't roll it if you are braced. 2149 * roll it if not braced. You can't roll it if you are braced.
2164 */ 2150 */
2165 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced)) 2151 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2152 {
2153 if (op->speed_left > 0.f)
2166 { 2154 {
2155 --op->speed_left;
2156
2167 recursive_roll (mon, dir, op); 2157 recursive_roll (mon, dir, op);
2168 if (action_makes_visible (op)) 2158 if (action_makes_visible (op))
2169 make_visible (op); 2159 make_visible (op);
2170 }
2171 2160
2161 return true;
2162 }
2163 }
2172 /* Any generic living creature. Including things like doors. 2164 /* Any generic living creature. Including things like doors.
2173 * Way it works is like this: First, it must have some hit points 2165 * Way it works is like this: First, it must have some hit points
2174 * and be living. Then, it must be one of the following: 2166 * and be living. Then, it must be one of the following:
2175 * 1) Not a player, 2) A player, but of a different party. Note 2167 * 1) Not a player, 2) A player, but of a different party. Note
2176 * that party_number -1 is no party, so attacks can still happen. 2168 * that party_number -1 is no party, so attacks can still happen.
2177 */ 2169 */
2178 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) && 2170 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2179 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party))) 2171 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2180 { 2172 {
2181 if (!op->contr->has_hit) 2173 if (op->contr->weapon_sp_left > 0.f && !op->flag [FLAG_WIZPASS])
2182 { 2174 {
2183 op->contr->has_hit = 1; 2175 --op->contr->weapon_sp_left;
2184 op->speed_left += op->contr->weapon_speed () - op->speed;
2185 }
2186 2176
2187 skill_attack (mon, op, 0, 0, 0); 2177 skill_attack (mon, op, 0, 0, 0);
2188
2189 /* If attacking another player, that player gets automatic
2190 * hitback, and doesn't loose luck either.
2191 * Disable hitback on the battleground or if the target is
2192 * the wiz.
2193 */
2194 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2195 {
2196 short luck = mon->stats.luck;
2197
2198 mon->contr->has_hit = 1;
2199 skill_attack (op, mon, 0, 0, 0);
2200 mon->stats.luck = luck;
2201 }
2202 2178
2203 if (action_makes_visible (op)) 2179 if (action_makes_visible (op))
2204 make_visible (op); 2180 make_visible (op);
2205 }
2206 } /* if player should attack something */
2207}
2208 2181
2209int 2182 return true;
2183 }
2184 }
2185
2186 return false;
2187}
2188
2189bool
2210move_player (object *op, int dir) 2190move_player (object *op, int dir)
2211{ 2191{
2212 int pick; 2192 int pick;
2213 2193
2214 if (!op->map || op->map->in_memory != MAP_IN_MEMORY) 2194 if (!op->map || op->map->in_memory != MAP_IN_MEMORY)
2228 op->facing = dir; 2208 op->facing = dir;
2229 2209
2230 if (op->hide) 2210 if (op->hide)
2231 do_hidden_move (op); 2211 do_hidden_move (op);
2232 2212
2213 bool retval;
2214
2233 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2215 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2234 /*nop */ ; 2216 retval = RESULT_INT (0);
2235 else if (op->contr->fire_on) 2217 else if (op->contr->fire_on)
2236 fire (op, dir); 2218 retval = fire (op, dir);
2237 else 2219 else
2238 { 2220 {
2239 move_player_attack (op, dir); 2221 retval = move_player_attack (op, dir);
2240 pick = check_pick (op); 2222 pick = check_pick (op);
2241 } 2223 }
2242 2224
2243 /* Add special check for newcs players and fire on - this way, the 2225 /* Add special check for newcs players and fire on - this way, the
2244 * server can handle repeat firing. 2226 * server can handle repeat firing.
2251 /* Update how the player looks. Use the facing, so direction may 2233 /* Update how the player looks. Use the facing, so direction may
2252 * get reset to zero. This allows for full animation capabilities 2234 * get reset to zero. This allows for full animation capabilities
2253 * for players. 2235 * for players.
2254 */ 2236 */
2255 animate_object (op, op->facing); 2237 animate_object (op, op->facing);
2256 return 0; 2238
2239 return retval;
2257} 2240}
2258 2241
2259/* This is similar to handle_player, below, but is only used by the 2242/* This is similar to handle_player, below, but is only used by the
2260 * new client/server stuff. 2243 * new client/server stuff.
2261 * This is sort of special, in that the new client/server actually uses 2244 * This is sort of special, in that the new client/server actually uses
2262 * the new speed values for commands. 2245 * the new speed values for commands.
2263 * 2246 *
2264 * Returns true if there are more actions we can do. 2247 * Returns true if there are more actions we can do. Should not do
2248 * many actions in a row, as that would be too unfair to other
2249 * players.
2265 */ 2250 */
2266int 2251bool
2267handle_newcs_player (object *op) 2252handle_newcs_player (object *op)
2268{ 2253{
2269 if (QUERY_FLAG (op, FLAG_SCARED)) 2254 if (QUERY_FLAG (op, FLAG_SCARED))
2270 { 2255 {
2271 flee_player (op); 2256 if (op->speed_left > 0.f)
2272
2273 /* If player is still scared, that is his action for this tick */
2274 if (op->flag [FLAG_SCARED])
2275 { 2257 {
2276 --op->speed_left; 2258 --op->speed_left;
2259 flee_player (op);
2260
2277 return 0; 2261 return true;
2278 } 2262 }
2263 else
2264 return false;
2279 } 2265 }
2280 2266
2281 /* call this here - we also will call this in do_ericserver, but 2267 /* call this here - we also will call this in do_ericserver, but
2282 * the players time has been increased when doericserver has been 2268 * the players time has been increased when doericserver has been
2283 * called, so we recheck it here. 2269 * called, so we recheck it here.
2284 */ 2270 */
2285 if (op->contr->ns->handle_command ()) 2271 if (op->contr->ns->handle_command ())
2286 return 1; 2272 return true;
2287 2273
2288 if (op->speed_left > 0.f)
2289 {
2290 if (op->direction && (op->contr->run_on || op->contr->fire_on)) 2274 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2291 {
2292 /* All move commands take 1 tick, at least for now */
2293 --op->speed_left;
2294
2295 /* Instead of all the stuff below, let move_player take care
2296 * of it. Also, some of the skill stuff is only put in
2297 * there, as well as the confusion stuff.
2298 */
2299 move_player (op, op->direction); 2275 return move_player (op, op->direction);
2300 2276
2301 return op->speed_left > 0.f;
2302 }
2303 }
2304
2305 return 0; 2277 return false;
2306} 2278}
2307 2279
2308int 2280int
2309save_life (object *op) 2281save_life (object *op)
2310{ 2282{
2312 return 0; 2284 return 0;
2313 2285
2314 for (object *tmp = op->inv; tmp; tmp = tmp->below) 2286 for (object *tmp = op->inv; tmp; tmp = tmp->below)
2315 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE)) 2287 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2316 { 2288 {
2317 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE); 2289 op->play_sound (sound_find ("ob_evaporate"));
2318 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp)); 2290 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2319 2291
2320 if (op->contr) 2292 if (op->contr)
2321 esrv_del_item (op->contr, tmp->count); 2293 esrv_del_item (op->contr, tmp->count);
2322 2294
2342/* This goes throws the inventory and removes unpaid objects, and puts them 2314/* This goes throws the inventory and removes unpaid objects, and puts them
2343 * back in the map (location and map determined by values of env). This 2315 * back in the map (location and map determined by values of env). This
2344 * function will descend into containers. op is the object to start the search 2316 * function will descend into containers. op is the object to start the search
2345 * from. 2317 * from.
2346 */ 2318 */
2347void 2319static void
2348remove_unpaid_objects (object *op, object *env) 2320drop_unpaid_items (object *op, object *env)
2349{ 2321{
2350 while (op) 2322 while (op)
2351 { 2323 {
2352 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */ 2324 object *next = op->below; /* Make sure we have a good value, in case we remove object 'op' */
2353 2325
2357 esrv_del_item (env->contr, op->count); 2329 esrv_del_item (env->contr, op->count);
2358 2330
2359 op->insert_at (env); 2331 op->insert_at (env);
2360 } 2332 }
2361 else if (op->inv) 2333 else if (op->inv)
2362 remove_unpaid_objects (op->inv, env); 2334 drop_unpaid_items (op->inv, env);
2363 2335
2364 op = next; 2336 op = next;
2365 } 2337 }
2338}
2339
2340void
2341object::drop_unpaid_items ()
2342{
2343 if (!flag [FLAG_REMOVED])
2344 ::drop_unpaid_items (inv, this);
2366} 2345}
2367 2346
2368/* 2347/*
2369 * Returns pointer a static string containing gravestone text 2348 * Returns pointer a static string containing gravestone text
2370 * Moved from apply.c to player.c - player.c is what 2349 * Moved from apply.c to player.c - player.c is what
2576 } 2555 }
2577 2556
2578 /* Digestion */ 2557 /* Digestion */
2579 if (--op->last_eat < 0) 2558 if (--op->last_eat < 0)
2580 { 2559 {
2581#ifdef COZY_SERVER 2560 int bonus = max (0, op->contr->digestion),
2582 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion; 2561 penalty = max (0, -op->contr->digestion);
2583 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2584#else
2585 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2586#endif
2587 2562
2588 if (op->contr->gen_hp > 0)
2589 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1); 2563 op->last_eat = 25 * (1 + bonus) / (max (0, op->contr->gen_hp) + penalty + 1);
2590 else
2591 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2592 2564
2593 /* dms do not consume food */ 2565 /* dms do not consume food */
2594 if (!QUERY_FLAG (op, FLAG_WIZ)) 2566 if (!QUERY_FLAG (op, FLAG_WIZ))
2595 op->stats.food--; 2567 op->stats.food--;
2596 } 2568 }
2657 object *tmp; 2629 object *tmp;
2658 2630
2659 if (save_life (op)) 2631 if (save_life (op))
2660 return; 2632 return;
2661 2633
2662
2663 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2634 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2664 * in cities ONLY!!! It is very important that this doesn't get abused. 2635 * in cities ONLY!!! It is very important that this doesn't get abused.
2665 * Look at op_on_battleground() for more info --AndreasV 2636 * Look at op_on_battleground() for more info --AndreasV
2666 */ 2637 */
2667 if (op_on_battleground (op, &x, &y)) 2638 if (op_on_battleground (op, &x, &y))
2719 strcpy (op->contr->killer, "starvation"); 2690 strcpy (op->contr->killer, "starvation");
2720 } 2691 }
2721 else 2692 else
2722 sprintf (buf, "%s died.", &op->name); 2693 sprintf (buf, "%s died.", &op->name);
2723 2694
2724 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0); 2695 op->contr->play_sound (sound_find ("player_dies"));
2725 2696
2726 /* save the map location for corpse, gravestone */ 2697 /* save the map location for corpse, gravestone */
2727 x = op->x; 2698 x = op->x;
2728 y = op->y; 2699 y = op->y;
2729 map = op->map; 2700 map = op->map;
2906 2877
2907 /* 2878 /*
2908 * Check to see if the player has any unpaid items. If so, remove them 2879 * Check to see if the player has any unpaid items. If so, remove them
2909 * and put them back in the map. 2880 * and put them back in the map.
2910 */ 2881 */
2911 remove_unpaid_objects (op->inv, op); 2882 op->drop_unpaid_items ();
2912 2883
2913 /****************************************/ 2884 /****************************************/
2914 /* */ 2885 /* */
2915 /* Move player to his current respawn- */ 2886 /* Move player to his current respawn- */
2916 /* position (usually last savebed) */ 2887 /* position (usually last savebed) */
3068} 3039}
3069 3040
3070int 3041int
3071is_true_undead (object *op) 3042is_true_undead (object *op)
3072{ 3043{
3073 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3044 if (QUERY_FLAG (op->arch, FLAG_UNDEAD))
3074 return 1; 3045 return 1;
3075 3046
3076 return 0; 3047 return 0;
3077} 3048}
3078 3049
3122/* For Hidden creatures - a chance of becoming 'unhidden' 3093/* For Hidden creatures - a chance of becoming 'unhidden'
3123 * every time they move - as we subtract off 'invisibility' 3094 * every time they move - as we subtract off 'invisibility'
3124 * AND, for players, if they move into a ridiculously unhideable 3095 * AND, for players, if they move into a ridiculously unhideable
3125 * spot (surrounded by clear terrain in broad daylight). -b.t. 3096 * spot (surrounded by clear terrain in broad daylight). -b.t.
3126 */ 3097 */
3127
3128void 3098void
3129do_hidden_move (object *op) 3099do_hidden_move (object *op)
3130{ 3100{
3131 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW); 3101 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3132 object *skop; 3102 object *skop;
3249 * a blocked los square. 3219 * a blocked los square.
3250 * we use the archetype to figure out offsets. 3220 * we use the archetype to figure out offsets.
3251 */ 3221 */
3252 while (op) 3222 while (op)
3253 { 3223 {
3254 dx = rv.distance_x + op->arch->clone.x; 3224 dx = rv.distance_x + op->arch->x;
3255 dy = rv.distance_y + op->arch->clone.y; 3225 dy = rv.distance_y + op->arch->y;
3256 3226
3257 /* only the viewable area the player sees is updated by LOS 3227 /* only the viewable area the player sees is updated by LOS
3258 * code, so we need to restrict ourselves to that range of values 3228 * code, so we need to restrict ourselves to that range of values
3259 * for any meaningful values. 3229 * for any meaningful values.
3260 */ 3230 */
3385 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3355 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3386 return; 3356 return;
3387 } 3357 }
3388 3358
3389 /* everything seems okay - now bring on the gift: */ 3359 /* everything seems okay - now bring on the gift: */
3390 item = &(tr->item->clone); 3360 item = tr->item;
3391 3361
3392 if (item->type == SPELL) 3362 if (item->type == SPELL)
3393 { 3363 {
3394 if (check_spell_known (who, item->name)) 3364 if (check_spell_known (who, item->name))
3395 return; 3365 return;
3454 { 3424 {
3455 /* forces in the treasurelist can alter the player's stats */ 3425 /* forces in the treasurelist can alter the player's stats */
3456 object *skin; 3426 object *skin;
3457 3427
3458 /* first get the dragon skin force */ 3428 /* first get the dragon skin force */
3459 shstr_cmp dragon_skin_force ("dragon_skin_force");
3460 for (skin = who->inv; skin && !(skin->arch->name == dragon_skin_force); skin = skin->below) 3429 for (skin = who->inv; skin && !(skin->arch->archname == shstr_dragon_skin_force); skin = skin->below)
3461 ; 3430 ;
3462 3431
3463 if (!skin) 3432 if (!skin)
3464 return; 3433 return;
3465 3434

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines