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.230 by root, Sat Jun 27 08:25:36 2009 UTC vs.
Revision 1.263 by root, Sat Apr 3 22:30:21 2010 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * 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 Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
24
25//+GPL
23 26
24#include <global.h> 27#include <global.h>
25#include <sproto.h> 28#include <sproto.h>
26#include <sounds.h> 29#include <sounds.h>
27#include <living.h> 30#include <living.h>
32#include <algorithm> 35#include <algorithm>
33#include <functional> 36#include <functional>
34 37
35playervec players; 38playervec players;
36 39
37void
38display_motd (const object *op)
39{
40 char buf[MAX_BUF];
41 char motd[HUGE_BUF];
42 FILE *fp;
43 int comp;
44 int size;
45
46 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
47 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
48 return;
49
50 motd[0] = '\0';
51 size = 0;
52
53 while (fgets (buf, MAX_BUF, fp))
54 {
55 if (*buf == '#')
56 continue;
57
58 strncat (motd + size, buf, HUGE_BUF - size);
59 size += strlen (buf);
60 }
61
62 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
63 close_and_delete (fp, comp);
64}
65
66void
67send_rules (const object *op)
68{
69 char buf[MAX_BUF];
70 char rules[HUGE_BUF];
71 FILE *fp;
72 int comp;
73 int size;
74
75 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
76 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
77 return;
78
79 rules[0] = '\0';
80 size = 0;
81
82 while (fgets (buf, MAX_BUF, fp))
83 {
84 if (*buf == '#')
85 continue;
86
87 if (size + strlen (buf) >= HUGE_BUF)
88 {
89 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
90 break;
91 }
92
93 strncat (rules + size, buf, HUGE_BUF - size);
94 size += strlen (buf);
95 }
96
97 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
98 close_and_delete (fp, comp);
99}
100
101void
102send_news (const object *op)
103{
104 char buf[MAX_BUF];
105 char news[HUGE_BUF];
106 char subject[MAX_BUF];
107 FILE *fp;
108 int comp;
109 int size;
110
111 sprintf (buf, "%s/%s", settings.confdir, settings.news);
112 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
113 return;
114
115 news[0] = '\0';
116 subject[0] = '\0';
117 size = 0;
118
119 while (fgets (buf, MAX_BUF, fp))
120 {
121 if (*buf == '#')
122 continue;
123
124 if (*buf == '%')
125 { /* send one news */
126 if (size > 0)
127 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
128 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
129 "INFORMATION: %s\n%s", (char *)"%s\n%s",
130 subject, news); /*send previously read news */
131
132 strcpy (subject, buf + 1);
133 strip_endline (subject);
134 size = 0;
135 news[0] = '\0';
136 }
137 else
138 {
139 if (size + strlen (buf) >= HUGE_BUF)
140 {
141 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
142 break;
143 }
144 strncat (news + size, buf, HUGE_BUF - size);
145 size += strlen (buf);
146 }
147 }
148
149 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
150 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
151 close_and_delete (fp, comp);
152}
153
154/* This loads the first map an puts the player on it. */ 40/* This loads the first map an puts the player on it. */
155static void 41static void
156set_first_map (object *op) 42set_first_map (object *op)
157{ 43{
158 op->contr->maplevel = first_map_path; 44 op->contr->maplevel = first_map_path;
221 ob->race = ob->arch->race; 107 ob->race = ob->arch->race;
222 108
223 ob->update_weight (); 109 ob->update_weight ();
224 link_skills (); 110 link_skills ();
225 111
226 CLEAR_FLAG (ob, FLAG_NO_FIX_PLAYER);
227
228 assign (title, ob->arch->object::name); 112 assign (title, ob->arch->object::name);
229 113
230 /* if it's a dragon player, set the correct title here */ 114 /* if it's a dragon player, set the correct title here */
231 if (is_dragon_pl (ob)) 115 if (ob->is_dragon ())
232 { 116 {
233 object *tmp, *abil = 0, *skin = 0; 117 object *tmp, *abil = 0, *skin = 0;
234 118
235 for (tmp = ob->inv; tmp; tmp = tmp->below) 119 for (tmp = ob->inv; tmp; tmp = tmp->below)
236 if (tmp->type == FORCE) 120 if (tmp->type == FORCE)
250 134
251 ns->floorbox_update (); 135 ns->floorbox_update ();
252 esrv_send_inventory (ob, ob); 136 esrv_send_inventory (ob, ob);
253 esrv_add_spells (this, 0); 137 esrv_add_spells (this, 0);
254 138
139 ob->flag [FLAG_READY_WEAPON] = false;
140 ob->flag [FLAG_READY_SKILL] = false;
141 ob->flag [FLAG_READY_RANGE] = false;
142 ob->flag [FLAG_READY_BOW] = false;
143
144 for (object *op = ob->inv; op; op = op->below)
145 if (op->flag [FLAG_APPLIED])
146 switch (op->type)
147 {
148 case SKILL:
149 op->flag [FLAG_APPLIED] = false;
150 break;
151
152 case SPELL:
153 case WAND:
154 case ROD:
155 case HORN:
156 case BOW:
157 case RANGED:
158 ranged_ob = op;
159 op->flag [FLAG_APPLIED] = false;
160 break;
161
162 case WEAPON:
163 combat_ob = op;
164 op->flag [FLAG_APPLIED] = false;
165 break;
166 }
167
168 ob->update_stats (); // we unapplied stuff above
169
170 ob->current_weapon = 0;
171 if (object *item = combat_ob ? combat_ob : ranged_ob)
172 ob->apply (item);
173
255 activate (); 174 activate ();
256
257 send_rules (ob);
258 send_news (ob);
259 display_motd (ob);
260 175
261 INVOKE_PLAYER (CONNECT, this); 176 INVOKE_PLAYER (CONNECT, this);
262 INVOKE_PLAYER (LOGIN, this); 177 INVOKE_PLAYER (LOGIN, this);
263} 178}
264 179
281 ns->reset_stats (); 196 ns->reset_stats ();
282 ns->pl = 0; 197 ns->pl = 0;
283 ns = 0; 198 ns = 0;
284 } 199 }
285 200
286 observe = ob; 201 // this is important for the player scheduler to get the correct refcount
202 // when ns = 0
203 observe = viewpoint = ob;
287 204
288 deactivate (); 205 deactivate ();
289} 206}
207
208//-GPL
290 209
291// the need for this function can be explained 210// the need for this function can be explained
292// by load_object not returning the object 211// by load_object not returning the object
293void 212void
294player::set_object (object *op) 213player::set_object (object *op)
295{ 214{
296 ob = observe = op; 215 ob = observe = viewpoint = op;
297 ob->contr = this; /* this aren't yet in archetype */ 216 ob->contr = this; /* this aren't yet in archetype */
298 217
299 ob->speed = 1.0f; 218 ob->speed = 1.0f;
300 ob->speed_left = 0.5f; 219 ob->speed_left = 0.5f;
301 220
302 ob->direction = 5; /* So player faces south */ 221 ob->direction = 5; /* So player faces south */
303
304 ob->flag [FLAG_READY_WEAPON] = false;
305 ob->flag [FLAG_READY_SKILL] = false;
306 ob->flag [FLAG_READY_BOW] = false;
307
308 for (object *op = ob->inv; op; op = op->below)
309 if (op->flag [FLAG_APPLIED])
310 switch (op->type)
311 {
312 case SKILL:
313 ob->flag [FLAG_APPLIED] = false;
314 break;
315
316 case WAND:
317 case ROD:
318 case HORN:
319 case BOW:
320 ranged_ob = op;
321 break;
322
323 case WEAPON:
324 combat_ob = op;
325 break;
326 }
327
328 ob->change_weapon (combat_ob ? combat_ob : ranged_ob);
329 ob->deactivate (); // change_weapon activates, fix this better
330} 222}
331 223
332void 224void
333player::set_observe (object *op) 225player::set_observe (object *op)
334{ 226{
335 observe = op ? op : ob; 227 observe = viewpoint = op ? op : ob;
336 do_los = 1; 228 do_los = 1;
337} 229}
230
231void
232player::set_viewpoint (object *op)
233{
234 viewpoint = op ? op : (object *)observe;
235 do_los = 1;
236}
237
238//+GPL
338 239
339player::player () 240player::player ()
340{ 241{
341 /* There are some elements we want initialised to non zero value - 242 /* There are some elements we want initialised to non zero value -
342 * we deal with that below this point. 243 * we deal with that below this point.
369 { 270 {
370 ob->destroy_inv (false); 271 ob->destroy_inv (false);
371 ob->destroy (); 272 ob->destroy ();
372 } 273 }
373 274
374 ob = observe = 0; 275 ob = observe = viewpoint = 0;
375} 276}
376 277
377player::~player () 278player::~player ()
378{ 279{
379 /* Clear item stack */ 280 /* Clear item stack */
380 free (stack_items); 281 free (stack_items);
282}
283
284/*
285 * get_player_archetype() return next player archetype from archetype
286 * list. Not very efficient routine, but used only creating new players.
287 * Note: there MUST be at least one player archetype!
288 */
289static archetype *
290get_player_archetype (archetype *at)
291{
292 // archetypes could have been reloaded
293 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
294
295 if (!nat)
296 return at;
297
298 archvec::iterator i = archetypes.find (nat);
299
300 for (;;)
301 {
302 if (++i == archetypes.end ())
303 i = archetypes.begin ();
304 else if (*i == at)
305 cleanup ("not a single player archetype found");
306
307 if ((*i)->type == PLAYER)
308 return *i;
309 }
381} 310}
382 311
383/* Tries to add player on the connection passed in ns. 312/* Tries to add player on the connection passed in ns.
384 * All we can really get in this is some settings like host and display 313 * All we can really get in this is some settings like host and display
385 * mode. 314 * mode.
387player * 316player *
388player::create () 317player::create ()
389{ 318{
390 player *pl = new player; 319 player *pl = new player;
391 320
392 pl->set_object (arch_to_object (get_player_archetype (0))); 321 pl->set_object (get_player_archetype (0)->instance ());
393 322
394 pl->ob->roll_stats (); 323 pl->ob->roll_stats ();
395 pl->ob->stats.wc = 2; 324 pl->ob->stats.wc = 2;
396 pl->ob->run_away = 25; /* Then we panick... */ 325 pl->ob->run_away = 25; /* Then we panick... */
397 326
398 set_first_map (pl->ob); 327 set_first_map (pl->ob);
399 328
400 return pl; 329 return pl;
401}
402
403/*
404 * get_player_archetype() return next player archetype from archetype
405 * list. Not very efficient routine, but used only creating new players.
406 * Note: there MUST be at least one player archetype!
407 */
408archetype *
409get_player_archetype (archetype *at)
410{
411 // archetypes could have been reloaded
412 archetype *nat = at ? archetype::find (at->archname) : archetypes [0];
413
414 if (!nat)
415 return at;
416
417 archvec::iterator i = archetypes.find (nat);
418
419 for (;;)
420 {
421 if (++i == archetypes.end ())
422 i = archetypes.begin ();
423 else if (*i == at)
424 cleanup ("not a single player archetype found");
425
426 if ((*i)->type == PLAYER)
427 return *i;
428 }
429} 330}
430 331
431object * 332object *
432get_nearest_player (object *mon) 333get_nearest_player (object *mon)
433{ 334{
742 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 643 send_query (op->contr->ns, CS_QUERY_HIDEINPUT, "What is the password?\n:");
743} 644}
744 645
745/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 646/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
746static int 647static int
747roll_stat (void) 648roll_stat ()
748{ 649{
749 int a[4], i, j, k; 650 int a[4], i, j, k;
750 651
751 for (i = 0; i < 4; i++) 652 for (i = 0; i < 4; i++)
752 a[i] = (int) rndm (6) + 1; 653 a[i] = (int) rndm (6) + 1;
849player::chargen_race_done () 750player::chargen_race_done ()
850{ 751{
851 /* this must before then initial items are given */ 752 /* this must before then initial items are given */
852 esrv_new_player (ob->contr); 753 esrv_new_player (ob->contr);
853 754
854 treasurelist *tl = treasurelist::find ("starting_wealth"); 755 treasurelist *tl = treasurelist::find (shstr_starting_wealth);
855 if (tl) 756 if (tl)
856 create_treasure (tl, ob, 0, 0, 0); 757 create_treasure (tl, ob, 0, 0, 0);
857 758
858 INVOKE_PLAYER (BIRTH, ob->contr); 759 INVOKE_PLAYER (BIRTH, ob->contr);
859 INVOKE_PLAYER (LOGIN, ob->contr); 760 INVOKE_PLAYER (LOGIN, ob->contr);
912 ob->stats.hp = ob->stats.maxhp; 813 ob->stats.hp = ob->stats.maxhp;
913 ob->stats.sp = ob->stats.maxsp; 814 ob->stats.sp = ob->stats.maxsp;
914 ob->stats.grace = 0; 815 ob->stats.grace = 0;
915} 816}
916 817
917void 818static void
918flee_player (object *op) 819flee_player (object *op)
919{ 820{
920 int dir, diff; 821 int dir, diff;
921 rv_vector rv; 822 rv_vector rv;
922 823
946 dir = absdir (4 + rv.direction); 847 dir = absdir (4 + rv.direction);
947 for (diff = 0; diff < 3; diff++) 848 for (diff = 0; diff < 3; diff++)
948 { 849 {
949 int m = 1 - rndm (2) * 2; 850 int m = 1 - rndm (2) * 2;
950 851
951 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op))) 852 if (op->move (absdir (dir + diff * m)) || (diff == 0 && op->move (absdir (dir - diff * m))))
952 return; 853 return;
953 } 854 }
954 855
955 /* Cornered, get rid of scared */ 856 /* Cornered, get rid of scared */
956 CLEAR_FLAG (op, FLAG_SCARED); 857 CLEAR_FLAG (op, FLAG_SCARED);
966{ 867{
967 object *tmp, *next; 868 object *tmp, *next;
968 int stop = 0; 869 int stop = 0;
969 int wvratio; 870 int wvratio;
970 871
971 /* if you're flying, you cna't pick up anything */ 872 /* if you're flying, you can't pick up anything */
972 if (op->move_type & MOVE_FLYING) 873 if (op->move_type & MOVE_FLYING)
973 return 1; 874 return 1;
974 875
975 next = op->below; 876 next = op->below;
976 877
977 int cnt = MAX_ITEM_PER_DROP; 878 int cnt = MAX_ITEM_PER_ACTION;
978#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0) 879#define CHK_PICK_PICKUP do { pick_up (op, tmp); cnt--; } while (0)
979 880
980 /* loop while there are items on the floor that are not marked as 881 /* loop while there are items on the floor that are not marked as
981 * destroyed */ 882 * destroyed */
982 while (next && !next->destroyed ()) 883 while (next && !next->destroyed ())
1008 if (op->contr->mode & PU_DEBUG) 909 if (op->contr->mode & PU_DEBUG)
1009 { 910 {
1010 /* some debugging code to figure out item information */ 911 /* some debugging code to figure out item information */
1011 const char *str = tmp->name 912 const char *str = tmp->name
1012 ? format ("item name: %s item type: %d weight/value: %d", 913 ? format ("item name: %s item type: %d weight/value: %d",
1013 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))) 914 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))))
1014 : format ("item name: %s item type: %d weight/value: %d", 915 : format ("item name: %s item type: %d weight/value: %d",
1015 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 916 &tmp->arch->archname, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1016 917
1017 new_draw_info (NDI_UNIQUE, 0, op, str); 918 new_draw_info (NDI_UNIQUE, 0, op, str);
1018 } 919 }
1019 920
1020 if (op->contr->mode & PU_INHIBIT) 921 if (op->contr->mode & PU_INHIBIT)
1107 continue; 1008 continue;
1108 } 1009 }
1109 1010
1110 /* wands/staves/rods/horns */ 1011 /* wands/staves/rods/horns */
1111 if (op->contr->mode & PU_MAGIC_DEVICE) 1012 if (op->contr->mode & PU_MAGIC_DEVICE)
1112 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1013 if (tmp->type == WAND
1014 || tmp->type == ROD
1015 || tmp->type == HORN
1016 || tmp->type == POWER_CRYSTAL)
1113 { 1017 {
1114 CHK_PICK_PICKUP; 1018 CHK_PICK_PICKUP;
1115 continue; 1019 continue;
1116 } 1020 }
1117 1021
1118 /* pick up all magical items */ 1022 /* pick up all magical items */
1119 if (op->contr->mode & PU_MAGICAL) 1023 if (op->contr->mode & PU_MAGICAL)
1120 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)) 1024 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL)
1025 && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1121 { 1026 {
1122 CHK_PICK_PICKUP; 1027 CHK_PICK_PICKUP;
1123 continue; 1028 continue;
1124 } 1029 }
1125 1030
1132 } 1037 }
1133 } 1038 }
1134 1039
1135 /* rings & amulets - talismans seems to be typed AMULET */ 1040 /* rings & amulets - talismans seems to be typed AMULET */
1136 if (op->contr->mode & PU_JEWELS) 1041 if (op->contr->mode & PU_JEWELS)
1137 if (tmp->type == RING || tmp->type == AMULET) 1042 if (tmp->type == RING
1043 || tmp->type == AMULET
1044 || tmp->type == GIRDLE
1045 || tmp->type == SKILL_TOOL)
1138 { 1046 {
1139 CHK_PICK_PICKUP; 1047 CHK_PICK_PICKUP;
1140 continue; 1048 continue;
1141 } 1049 }
1142 1050
1191 CHK_PICK_PICKUP; 1099 CHK_PICK_PICKUP;
1192 continue; 1100 continue;
1193 } 1101 }
1194 1102
1195 if (op->contr->mode & PU_GLOVES) 1103 if (op->contr->mode & PU_GLOVES)
1196 if (tmp->type == GLOVES) 1104 if (tmp->type == GLOVES || tmp->type == BRACERS)
1197 { 1105 {
1198 CHK_PICK_PICKUP; 1106 CHK_PICK_PICKUP;
1199 continue; 1107 continue;
1200 } 1108 }
1201 1109
1251 fprintf (stderr, "%s", tmp->name); 1159 fprintf (stderr, "%s", tmp->name);
1252 } 1160 }
1253 else 1161 else
1254 fprintf (stderr, "%s", tmp->arch->archname); 1162 fprintf (stderr, "%s", tmp->arch->archname);
1255 fprintf (stderr, ",%d] = ", tmp->type); 1163 fprintf (stderr, ",%d] = ", tmp->type);
1256 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1)))); 1164 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * max (tmp->nrof, 1))));
1257#endif 1165#endif
1258 CHK_PICK_PICKUP; 1166 CHK_PICK_PICKUP;
1259 continue; 1167 continue;
1260 } 1168 }
1261 } /* the new pickup model */ 1169 } /* the new pickup model */
1262 } 1170 }
1263 1171
1264 return !stop; 1172 return !stop;
1265} 1173}
1266 1174
1175/* routine for both players and monsters. We call this when
1176 * there is a possibility for our action distrubing our hiding
1177 * place or invisiblity spell. Artefact invisiblity causes
1178 * "noise" instead. If we arent invisible to begin with, we
1179 * return 0.
1180 */
1181static int
1182action_makes_visible (object *op)
1183{
1184 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
1185 {
1186 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
1187 {
1188 // artefact invisibility is permanent, but we still make noise
1189 // this is important for game-balance.
1190 if (op->contr)
1191 op->make_noise ();
1192
1193 return 0;
1194 }
1195
1196 if (op->contr && op->contr->tmp_invis == 0)
1197 return 0;
1198
1199 /* If monsters, they should become visible */
1200 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
1201 {
1202 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
1203 return 1;
1204 }
1205 }
1206
1207 return 0;
1208}
1209
1267/* 1210/*
1268 * Find an arrow in the inventory and after that 1211 * Find an arrow in the inventory and after that
1269 * in the right type container (quiver). Pointer to the 1212 * in the right type container (quiver). Pointer to the
1270 * found object is returned. 1213 * found object is returned.
1271 */ 1214 */
1272object * 1215static object *
1273find_arrow (object *op, const char *type) 1216find_arrow (object *op, const char *type)
1274{ 1217{
1275 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1218 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1276 if (tmp->type == ARROW && !strcmp (&tmp->race, type)) 1219 if (tmp->type == ARROW && !strcmp (&tmp->race, type))
1277 return splay (tmp); 1220 return splay (tmp);
1291 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1234 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1292 * against the target. A full test is not performed, simply a basic test 1235 * against the target. A full test is not performed, simply a basic test
1293 * of resistances. The archer is making a quick guess at what he sees down 1236 * of resistances. The archer is making a quick guess at what he sees down
1294 * the hall. Failing that it does it's best to pick the highest plus arrow. 1237 * the hall. Failing that it does it's best to pick the highest plus arrow.
1295 */ 1238 */
1296object * 1239static object *
1297find_better_arrow (object *op, object *target, shstr_cmp type, int *better) 1240find_better_arrow (object *op, object *target, shstr_cmp type, int *better)
1298{ 1241{
1299 object *tmp = NULL, *arrow, *ntmp; 1242 object *tmp = NULL, *arrow, *ntmp;
1300 int attacknum, attacktype, betterby = 0, i; 1243 int attacknum, attacktype, betterby = 0, i;
1301 1244
1370 * find_better_arrow to find a decent arrow to use. 1313 * find_better_arrow to find a decent arrow to use.
1371 * op = the shooter 1314 * op = the shooter
1372 * type = bow->race 1315 * type = bow->race
1373 * dir = fire direction 1316 * dir = fire direction
1374 */ 1317 */
1375object * 1318static object *
1376pick_arrow_target (object *op, shstr_cmp type, int dir) 1319pick_arrow_target (object *op, shstr_cmp type, int dir)
1377{ 1320{
1378 object *tmp = NULL; 1321 object *tmp = NULL;
1379 maptile *m; 1322 maptile *m;
1380 int i, mflags, found, number; 1323 int i, mflags, found, number;
1467 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name); 1410 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1468 return 0; 1411 return 0;
1469 } 1412 }
1470 1413
1471 // optimisation: move object to top so we will find it quickly again 1414 // optimisation: move object to top so we will find it quickly again
1472 if (bow->below) 1415 splay (bow);
1473 {
1474 bow->remove ();
1475 op->insert (bow);
1476 }
1477 } 1416 }
1478 1417
1479 if (!bow->race || !bow->skill) 1418 if (!bow->race || !bow->skill)
1480 { 1419 {
1481 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name); 1420 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1599 * but monsters can't. Putting that code here 1538 * but monsters can't. Putting that code here
1600 * makes the fire_bow code much cleaner. 1539 * makes the fire_bow code much cleaner.
1601 * this function should only be called if 'op' is a player, 1540 * this function should only be called if 'op' is a player,
1602 * hence the function name. 1541 * hence the function name.
1603 */ 1542 */
1604int 1543static int
1605player_fire_bow (object *op, int dir) 1544player_fire_bow (object *op, int dir)
1606{ 1545{
1607 int ret; 1546 int ret;
1608 1547
1609 if (op->contr->bowtype == bow_bestarrow) 1548 if (op->contr->bowtype == bow_bestarrow)
1637} 1576}
1638 1577
1639/* Fires a misc (wand/rod/horn) object in 'dir'. 1578/* Fires a misc (wand/rod/horn) object in 'dir'.
1640 * Broken apart from 'fire' to keep it more readable. 1579 * Broken apart from 'fire' to keep it more readable.
1641 */ 1580 */
1642void 1581static void
1643fire_misc_object (object *op, int dir) 1582fire_misc_object (object *op, int dir)
1644{ 1583{
1645 object *item = op->contr->ranged_ob; 1584 object *item = op->contr->ranged_ob;
1646 1585
1647 if (!item) 1586 if (!item)
1654 { 1593 {
1655 LOG (llevError, "Object %s lacks a spell\n", &item->name); 1594 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1656 return; 1595 return;
1657 } 1596 }
1658 1597
1659 if (!op->change_weapon (item)) 1598 if (!op->apply (item))
1660 return; 1599 return;
1661 1600
1662 if (item->type == WAND) 1601 if (item->type == WAND)
1663 { 1602 {
1664 if (item->stats.food <= 0) 1603 if (item->stats.food <= 0)
1669 return; 1608 return;
1670 } 1609 }
1671 } 1610 }
1672 else if (item->type == ROD || item->type == HORN) 1611 else if (item->type == ROD || item->type == HORN)
1673 { 1612 {
1674 sint16 spell_sp = MAX (item->inv->stats.sp, item->inv->stats.grace); 1613 sint16 spell_sp = max (item->inv->stats.sp, item->inv->stats.grace);
1675 1614
1676 // using the maximum of the rods charge allows at least one spell cast 1615 // using the maximum of the rods charge allows at least one spell cast
1677 // for a rod or horn, this fixes some broken rods. 1616 // for a rod or horn, this fixes some broken rods.
1678 if (item->stats.hp < MIN (spell_sp, item->stats.maxhp)) 1617 if (item->stats.hp < min (spell_sp, item->stats.maxhp))
1679 { 1618 {
1680 op->contr->play_sound (sound_find ("wand_poof")); 1619 op->contr->play_sound (sound_find ("wand_poof"));
1681 1620
1682 if (item->type == ROD) 1621 if (item->type == ROD)
1683 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0)); 1622 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1715} 1654}
1716 1655
1717/* Received a fire command for the player - go and do it. 1656/* Received a fire command for the player - go and do it.
1718 */ 1657 */
1719bool 1658bool
1720fire (object *op, int dir) 1659fire (object *who, int dir)
1721{ 1660{
1722 int spellcost = 0; 1661 int spellcost = 0;
1723 1662
1724 player *pl = op->contr; 1663 player *pl = who->contr;
1725 1664
1726 if (pl->golem) 1665 if (pl->golem)
1727 { 1666 {
1728 control_golem (op->contr->golem, dir); 1667 control_golem (who->contr->golem, dir);
1729 return false; 1668 return false;
1730 } 1669 }
1731 1670
1732 object *ob = pl->ranged_ob; 1671 object *ob = pl->ranged_ob;
1733 1672
1734 if (!ob) 1673 if (!ob)
1735 return false; 1674 return false;
1736 1675
1737 if (op->speed_left > 0.f) 1676 if (who->speed_left > 0.f)
1738 --op->speed_left; 1677 --who->speed_left;
1739 else 1678 else
1740 return false; 1679 return false;
1741 1680
1742 if (!op->change_weapon (ob)) 1681 if (!who->apply (ob))
1743 return false; 1682 return false;
1744 1683
1745 /* check for loss of invisiblity/hide */ 1684 /* check for loss of invisiblity/hide */
1746 if (action_makes_visible (op)) 1685 if (action_makes_visible (who))
1747 make_visible (op); 1686 make_visible (who);
1748 1687
1749 switch (ob->type) 1688 switch (ob->type)
1750 { 1689 {
1751 case BOW: 1690 case BOW:
1752 player_fire_bow (op, dir); 1691 player_fire_bow (who, dir);
1753 break; 1692 break;
1754 1693
1755 case SPELL: 1694 case SPELL:
1756 spellcost = cast_spell (op, op, dir, ob, *pl->spellparam ? pl->spellparam : 0); 1695 spellcost = cast_spell (who, who, dir, ob, *pl->spellparam ? pl->spellparam : 0);
1757 break; 1696 break;
1758 1697
1759 case BUILDER: 1698 case BUILDER:
1760 apply_map_builder (op, dir); 1699 apply_map_builder (who, dir);
1761 break; 1700 break;
1762 1701
1763 case SKILL: 1702 case SKILL:
1764 do_skill (op, op, ob, dir, 0); 1703 do_skill (who, who, ob, dir, 0);
1765 break; 1704 break;
1766 1705
1706 case RANGED:
1707 do_skill (who, ob, who->chosen_skill, dir, 0);
1708 break;
1709
1767 default: 1710 default:
1768 fire_misc_object (op, dir); 1711 fire_misc_object (who, dir);
1769 break; 1712 break;
1770 } 1713 }
1771 1714
1772 return true; 1715 return true;
1773} 1716}
1774 1717
1775/* find_key 1718static object *
1776 * We try to find a key for the door as passed. If we find a key
1777 * and successfully use it, we return the key, otherwise NULL
1778 * This function merges both normal and locked door, since the logic
1779 * for both is the same - just the specific key is different.
1780 * pl is the player,
1781 * inv is the objects inventory to searched
1782 * door is the door we are trying to match against.
1783 * This function can be called recursively to search containers.
1784 */
1785object *
1786find_key (object *pl, object *container, object *door) 1719find_key_ (object *pl, object *container, object *door)
1787{ 1720{
1788 object *tmp, *key; 1721 object *tmp, *key;
1789 1722
1790 /* Should not happen, but sanity checking is never bad */ 1723 /* Should not happen, but sanity checking is never bad */
1791 if (!container->inv) 1724 if (!container->inv)
1794 /* First, lets try to find a key in the top level inventory */ 1727 /* First, lets try to find a key in the top level inventory */
1795 for (tmp = container->inv; tmp; tmp = tmp->below) 1728 for (tmp = container->inv; tmp; tmp = tmp->below)
1796 { 1729 {
1797 if (door->type == DOOR && tmp->type == KEY) 1730 if (door->type == DOOR && tmp->type == KEY)
1798 break; 1731 break;
1732
1799 /* For sanity, we should really check door type, but other stuff 1733 /* For sanity, we should really check door type, but other stuff
1800 * (like containers) can be locked with special keys 1734 * (like containers) can be locked with special keys
1801 */ 1735 */
1802 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying) 1736 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1803 break; 1737 break;
1809 * a key, return 1743 * a key, return
1810 */ 1744 */
1811 if (!tmp) 1745 if (!tmp)
1812 { 1746 {
1813 for (tmp = container->inv; tmp; tmp = tmp->below) 1747 for (tmp = container->inv; tmp; tmp = tmp->below)
1814 {
1815 /* No reason to search empty containers */ 1748 /* No reason to search empty containers */
1816 if (tmp->type == CONTAINER && tmp->inv) 1749 if (tmp->type == CONTAINER && tmp->inv)
1817 {
1818 if ((key = find_key (pl, tmp, door))) 1750 if ((key = find_key_ (pl, tmp, door)))
1819 return key; 1751 return key;
1820 }
1821 }
1822 1752
1823 if (!tmp) 1753 if (!tmp)
1824 return NULL; 1754 return 0;
1825 } 1755 }
1826 1756
1827 /* We get down here if we have found a key. Now if its in a container, 1757 /* We get down here if we have found a key. Now if its in a container,
1828 * see if we actually want to use it 1758 * see if we actually want to use it
1829 */ 1759 */
1830 if (pl != container) 1760 if (pl != container)
1831 { 1761 {
1832 /* Only let players use keys in containers */ 1762 /* Only let players use keys in containers */
1833 if (!pl->contr) 1763 if (!pl->contr)
1834 return NULL; 1764 return 0;
1765
1835 /* cases where this fails: 1766 /* cases where this fails:
1836 * If we only search the player inventory, return now since we 1767 * If we only search the player inventory, return now since we
1837 * are not in the players inventory. 1768 * are not in the players inventory.
1838 * If the container is not active, return now since only active 1769 * If the container is not active, return now since only active
1839 * containers can be used. 1770 * containers can be used.
1843 * inv must have been an container and must have been active. 1774 * inv must have been an container and must have been active.
1844 * 1775 *
1845 * Change the color so that the message doesn't disappear with 1776 * Change the color so that the message doesn't disappear with
1846 * all the others. 1777 * all the others.
1847 */ 1778 */
1848 if (pl->contr->usekeys == key_inventory || 1779 if (pl->contr->usekeys == key_inventory
1849 !QUERY_FLAG (container, FLAG_APPLIED) || 1780 || !QUERY_FLAG (container, FLAG_APPLIED)
1850 (pl->contr->usekeys == keyrings && container->race != shstr_keys)) 1781 || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
1851 { 1782 {
1852 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl, 1783 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1853 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container)); 1784 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1854 return NULL; 1785 return NULL;
1855 } 1786 }
1856 } 1787 }
1857 1788
1858 return tmp; 1789 return tmp;
1790}
1791
1792/* find_key
1793 * We try to find a key for the door as passed. If we find a key
1794 * and successfully use it, we return the key, otherwise NULL
1795 * This function merges both normal and locked door, since the logic
1796 * for both is the same - just the specific key is different.
1797 * pl is the player,
1798 * inv is the objects inventory to searched
1799 * door is the door we are trying to match against.
1800 * This function can be called recursively to search containers.
1801 */
1802object *
1803find_key (object *pl, object *container, object *door)
1804{
1805 if (door->slaying && is_match_expr (door->slaying))
1806 {
1807 // for match expressions, we try to find the key by applying the match
1808 // to the op itself, which is supposed to find the "key", instead
1809 // of searching through containers ourselves.
1810
1811 return match_one (door->slaying, container, door, pl, pl);
1812 }
1813 else
1814 return find_key_ (pl, container, door);
1859} 1815}
1860 1816
1861/* moved door processing out of move_player_attack. 1817/* moved door processing out of move_player_attack.
1862 * returns 1 if player has opened the door with a key 1818 * returns 1 if player has opened the door with a key
1863 * such that the caller should not do anything more, 1819 * such that the caller should not do anything more,
1913 * going to try and move (not fire weapons). 1869 * going to try and move (not fire weapons).
1914 */ 1870 */
1915bool 1871bool
1916move_player_attack (object *op, int dir) 1872move_player_attack (object *op, int dir)
1917{ 1873{
1918 int on_battleground; 1874 if (!op->contr->braced && op->speed_left > 0.f && op->move (dir))
1875 {
1876 --op->speed_left;
1877 return true;
1878 }
1919 1879
1920 sint16 nx = freearr_x[dir] + op->x; 1880 sint16 nx = freearr_x[dir] + op->x;
1921 sint16 ny = freearr_y[dir] + op->y; 1881 sint16 ny = freearr_y[dir] + op->y;
1922 1882
1923 on_battleground = op_on_battleground (op, 0, 0);
1924
1925 if (out_of_map (op->map, nx, ny)) 1883 if (out_of_map (op->map, nx, ny))
1926 return false; 1884 return false;
1927
1928 if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
1929 {
1930 --op->speed_left;
1931 return true;
1932 }
1933 1885
1934 /* If braced, or can't move to the square, and it is not out of the 1886 /* If braced, or can't move to the square, and it is not out of the
1935 * map, attack it. Note order of if statement is important - don't 1887 * map, attack it. Note order of if statement is important - don't
1936 * want to be calling move_ob if braced, because move_ob will move the 1888 * want to be calling move_ob if braced, because move_ob will move the
1937 * player. This is a pretty nasty hack, because if we could 1889 * player. This is a pretty nasty hack, because if we could
2006 } 1958 }
2007 else 1959 else
2008 return false; 1960 return false;
2009 } 1961 }
2010 1962
1963 bool on_battleground = op_on_battleground (op, 0, 0);
1964
2011 /* in certain circumstances, you shouldn't attack friendly 1965 /* in certain circumstances, you shouldn't attack friendly
2012 * creatures. Note that if you are braced, you can't push 1966 * creatures. Note that if you are braced, you can't push
2013 * someone, but put it inside this loop so that you won't 1967 * someone, but put it inside this loop so that you won't
2014 * attack them either. 1968 * attack them either.
2015 */ 1969 */
2079} 2033}
2080 2034
2081bool 2035bool
2082move_player (object *op, int dir) 2036move_player (object *op, int dir)
2083{ 2037{
2084 int pick;
2085
2086 if (!op->map || op->map->in_memory != MAP_ACTIVE) 2038 if (!op->map || op->map->in_memory != MAP_ACTIVE)
2087 return 0; 2039 return 0;
2088 2040
2089 /* Sanity check: make sure dir is valid */ 2041 /* Sanity check: make sure dir is valid */
2090 if ((dir < 0) || (dir >= 9)) 2042 if (dir < 0 || dir >= 9)
2091 { 2043 {
2092 LOG (llevError, "move_player: invalid direction %d\n", dir); 2044 LOG (llevError, "move_player: invalid direction %d\n", dir);
2093 return 0; 2045 return 0;
2094 } 2046 }
2095 2047
2101 2053
2102 if (op->flag [FLAG_HIDDEN]) 2054 if (op->flag [FLAG_HIDDEN])
2103 do_hidden_move (op); 2055 do_hidden_move (op);
2104 2056
2105 bool retval; 2057 bool retval;
2058 int pick = 0;
2106 2059
2107 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir))) 2060 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2108 retval = RESULT_INT (0); 2061 retval = RESULT_INT (0);
2109 else if (op->contr->fire_on) 2062 else if (op->contr->fire_on)
2110 retval = fire (op, dir); 2063 retval = fire (op, dir);
2167 return move_player (op, op->direction); 2120 return move_player (op, op->direction);
2168 2121
2169 return false; 2122 return false;
2170} 2123}
2171 2124
2172int 2125static int
2173save_life (object *op) 2126save_life (object *op)
2174{ 2127{
2175 if (!QUERY_FLAG (op, FLAG_LIFESAVE)) 2128 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2176 return 0; 2129 return 0;
2177 2130
2186 2139
2187 if (op->stats.hp < 0) 2140 if (op->stats.hp < 0)
2188 op->stats.hp = op->stats.maxhp; 2141 op->stats.hp = op->stats.maxhp;
2189 2142
2190 if (op->stats.food < 0) 2143 if (op->stats.food < 0)
2191 op->stats.food = 999; 2144 op->stats.food = MAX_FOOD;
2192 2145
2193 op->update_stats (); 2146 op->update_stats ();
2194 return 1; 2147 return 1;
2195 } 2148 }
2196 2149
2224void 2177void
2225object::drop_unpaid_items () 2178object::drop_unpaid_items ()
2226{ 2179{
2227 if (!flag [FLAG_REMOVED]) 2180 if (!flag [FLAG_REMOVED])
2228 ::drop_unpaid_items (inv, this); 2181 ::drop_unpaid_items (inv, this);
2229}
2230
2231/*
2232 * Returns pointer a static string containing gravestone text
2233 * Moved from apply.c to player.c - player.c is what
2234 * actually uses this function. player.c may not be quite the
2235 * best, a misc file for object actions is probably better,
2236 * but there isn't one in the server directory.
2237 */
2238const char *
2239gravestone_text (object *op)
2240{
2241 static dynbuf_text buf;
2242
2243 buf << "---- R.I.P. ----\n\n"
2244 << op->name;
2245
2246 if (op->type == PLAYER)
2247 buf << " the " << op->contr->title;
2248
2249 buf << "\n\n";
2250
2251 buf << "who was level ";
2252 buf << (sint32)op->level << "\n\n" // OO breakdown
2253 << " when " << (op->contr ? "killed" : "died") << "\n\n";
2254
2255 if (op->type == PLAYER)
2256 buf << "by " << op->contr->killer_name () << ".\n\n";
2257
2258 {
2259 static char buf2[128];
2260 time_t now = time (NULL);
2261 strftime (buf2, 128, "%b %d %Y\n\n", localtime (&now));
2262 buf << buf2;
2263 }
2264
2265 return buf;
2266} 2182}
2267 2183
2268void 2184void
2269do_some_living (object *op) 2185do_some_living (object *op)
2270{ 2186{
2462 2378
2463 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON) 2379 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2464 { 2380 {
2465 op->statusmsg ("You blindly grab for a bite of food. " 2381 op->statusmsg ("You blindly grab for a bite of food. "
2466 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2382 "H<To prevent you from starving, you ate some random item from your backpack.>");
2467 manual_apply (op, tmp, 0); 2383 op->apply (tmp);
2468 2384
2469 if (op->stats.food >= 0 || op->stats.hp < 0) 2385 if (op->stats.food >= 0 || op->stats.hp < 0)
2470 break; 2386 break;
2471 } 2387 }
2472 else if (tmp->type == FLESH) 2388 else if (tmp->type == FLESH)
2478 */ 2394 */
2479 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh) 2395 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2480 { 2396 {
2481 op->statusmsg ("You blindly grab for a bite of food. " 2397 op->statusmsg ("You blindly grab for a bite of food. "
2482 "H<To prevent you from starving, you ate some random item from your backpack.>"); 2398 "H<To prevent you from starving, you ate some random item from your backpack.>");
2483 manual_apply (op, flesh, 0); 2399 op->apply (flesh);
2484 } 2400 }
2485 2401
2486 // If player is still starving, alert him! 2402 // If player is still starving, alert him!
2487 if (op->stats.food < 0) 2403 if (op->stats.food < 0)
2488 op->failmsg ("You are starving! " 2404 op->failmsg ("You are starving! "
2525 return; 2441 return;
2526 2442
2527 dynbuf_text deathtab; 2443 dynbuf_text deathtab;
2528 2444
2529 /* restore player */ 2445 /* restore player */
2530 at = archetype::find ("poisoning"); 2446 at = archetype::find (shstr_poisoning);
2531 if (object *tmp = present_arch_in_ob (at, op)) 2447 if (object *tmp = present_arch_in_ob (at, op))
2532 { 2448 {
2533 tmp->destroy (); 2449 tmp->destroy ();
2534 deathtab << "Your body feels cleansed...\r"; 2450 deathtab << "Your body feels cleansed...\r";
2535 } 2451 }
2536 2452
2537 at = archetype::find ("confusion"); 2453 at = archetype::find (shstr_confusion);
2538 if (object *tmp = present_arch_in_ob (at, op)) 2454 if (object *tmp = present_arch_in_ob (at, op))
2539 { 2455 {
2540 tmp->destroy (); 2456 tmp->destroy ();
2541 deathtab << "Your mind feels clearer...\r"; 2457 deathtab << "Your mind feels clearer...\r";
2542 } 2458 }
2544 cure_disease (op, 0, 0); /* remove any disease */ 2460 cure_disease (op, 0, 0); /* remove any disease */
2545 2461
2546 max_it (op->stats.hp , op->stats.maxhp); 2462 max_it (op->stats.hp , op->stats.maxhp);
2547 max_it (op->stats.sp , op->stats.maxsp); 2463 max_it (op->stats.sp , op->stats.maxsp);
2548 max_it (op->stats.grace, op->stats.maxgrace); 2464 max_it (op->stats.grace, op->stats.maxgrace);
2549
2550 if (op->stats.food <= 0) 2465 max_it (op->stats.food , 200);
2551 op->stats.food = 999;
2552 2466
2553 // remove all spell effects that are active 2467 // remove all spell effects that are active
2554 // to avoid long-term effects such as word-of-recall 2468 // to avoid long-term effects such as word-of-recall
2555 for (object *item = op->inv; item; ) 2469 for (object *item = op->inv; item; )
2556 { 2470 {
2569 if (op_on_battleground (op, &x, &y)) 2483 if (op_on_battleground (op, &x, &y))
2570 { 2484 {
2571 deathtab << "You almost died in combat, but local medics have saved your life...\r"; 2485 deathtab << "You almost died in combat, but local medics have saved your life...\r";
2572 2486
2573 /* create a bodypart-trophy to make the winner happy */ 2487 /* create a bodypart-trophy to make the winner happy */
2574 if (object *tmp = arch_to_object (archetype::find ("finger"))) 2488 object *tmp = archetype::find (shstr_finger)->instance ();
2575 { 2489
2576 tmp->name = format ("%s's finger" , &op->name); 2490 tmp->name = format ("%s's finger" , &op->name);
2577 tmp->name_pl = format ("%s's fingers", &op->name); 2491 tmp->name_pl = format ("%s's fingers", &op->name);
2578 tmp->msg = format ( 2492 tmp->msg = format (
2579 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n", 2493 "This finger has been cut off of %s the %s, when he was defeated at level %d by %s.\n",
2580 &op->name, op->contr->title, 2494 &op->name, op->contr->title,
2581 (int)op->level, 2495 (int)op->level,
2582 op->contr->killer_name () 2496 op->contr->killer_name ()
2583 ); 2497 );
2584 tmp->value = 0, tmp->type = 0; 2498 tmp->value = 0, tmp->type = 0;
2585 tmp->materialname = "organics"; 2499 tmp->material = name_to_material (shstr_organic);
2586 tmp->insert_at (op, tmp); 2500 tmp->insert_at (op, tmp);
2587 }
2588 2501
2589 /* teleport defeated player to new destination */ 2502 /* teleport defeated player to new destination */
2590 transfer_ob (op, x, y, 0, NULL); 2503 transfer_ob (op, x, y, 0, NULL);
2591 op->contr->braced = 0; 2504 op->contr->braced = 0;
2592 2505
2654 lost_a_stat = 1; 2567 lost_a_stat = 1;
2655 } 2568 }
2656 else 2569 else
2657 { 2570 {
2658 /* deplete a stat */ 2571 /* deplete a stat */
2659 archetype *deparch = archetype::find ("depletion"); 2572 archetype *deparch = archetype::find (shstr_depletion);
2660 object *dep; 2573 object *dep;
2661 2574
2662 dep = present_arch_in_ob (deparch, op); 2575 dep = present_arch_in_ob (deparch, op);
2663 if (!dep) 2576 if (!dep)
2664 { 2577 {
2665 dep = arch_to_object (deparch); 2578 dep = deparch->instance ();
2666 insert_ob_in_ob (dep, op); 2579 insert_ob_in_ob (dep, op);
2667 } 2580 }
2668 lose_this_stat = 1; 2581 lose_this_stat = 1;
2669 if (settings.balanced_stat_loss) 2582 if (settings.balanced_stat_loss)
2670 { 2583 {
2736#endif 2649#endif
2737 2650
2738 /* Put a gravestone up where the character 'almost' died. List the 2651 /* Put a gravestone up where the character 'almost' died. List the
2739 * exp loss on the stone. 2652 * exp loss on the stone.
2740 */ 2653 */
2741 tmp = arch_to_object (archetype::find ("gravestone")); 2654 tmp = archetype::find (shstr_gravestone)->instance ();
2742 tmp->name = format ("%s's gravestone", &op->name); 2655 tmp->name = format ("%s's gravestone", &op->name);
2743 tmp->name_pl = format ("%s's gravestones", &op->name); 2656 tmp->name_pl = format ("%s's gravestones", &op->name);
2744 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n", 2657 tmp->msg = format ("T<RIP>\n\nHere rests the hero %s the %s,\rwho was killed\rby %s.\n",
2745 &op->name, op->contr->title, op->contr->killer_name ()); 2658 &op->name, op->contr->title, op->contr->killer_name ());
2746 tmp->x = op->x, tmp->y = op->y; 2659 tmp->x = op->x, tmp->y = op->y;
2801 } 2714 }
2802 2715
2803 op->contr->infobox (MSG_CHANNEL ("death"), deathtab); 2716 op->contr->infobox (MSG_CHANNEL ("death"), deathtab);
2804} 2717}
2805 2718
2806void 2719static void
2807loot_object (object *op) 2720loot_object (object *op)
2808{ /* Grab and destroy some treasure */ 2721{ /* Grab and destroy some treasure */
2809 object *tmp, *tmp2, *next; 2722 object *tmp, *tmp2, *next;
2810 2723
2811 op->close_container (); /* close open sack first */ 2724 op->close_container (); /* close open sack first */
2842 * fix_weight(): Check recursively the weight of all players, and fix 2755 * fix_weight(): Check recursively the weight of all players, and fix
2843 * what needs to be fixed. Refresh windows and fix speed if anything 2756 * what needs to be fixed. Refresh windows and fix speed if anything
2844 * was changed. 2757 * was changed.
2845 */ 2758 */
2846void 2759void
2847fix_weight (void) 2760fix_weight ()
2848{ 2761{
2849 for_all_players (pl) 2762 for_all_players (pl)
2850 { 2763 {
2851 sint32 old = pl->ob->carrying; 2764 sint32 old = pl->ob->carrying;
2852 2765
2859 } 2772 }
2860 } 2773 }
2861} 2774}
2862 2775
2863void 2776void
2864fix_luck (void) 2777fix_luck ()
2865{ 2778{
2866 for_all_players (pl) 2779 for_all_players (pl)
2867 if (!pl->ob->contr->ns->state) 2780 if (!pl->ob->contr->ns->state)
2868 pl->ob->change_luck (0); 2781 pl->ob->change_luck (0);
2869} 2782}
3113 } 3026 }
3114 3027
3115 return 0; 3028 return 0;
3116} 3029}
3117 3030
3118/* routine for both players and monsters. We call this when
3119 * there is a possibility for our action distrubing our hiding
3120 * place or invisiblity spell. Artefact invisiblity causes
3121 * "noise" instead. If we arent invisible to begin with, we
3122 * return 0.
3123 */
3124int
3125action_makes_visible (object *op)
3126{
3127 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3128 {
3129 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3130 {
3131 // artefact invisibility is permanent, but we still make noise
3132 // this is important for game-balance.
3133 if (op->contr)
3134 op->make_noise ();
3135
3136 return 0;
3137 }
3138
3139 if (op->contr && op->contr->tmp_invis == 0)
3140 return 0;
3141
3142 /* If monsters, they should become visible */
3143 if (op->flag [FLAG_HIDDEN] || !op->contr || (op->contr && op->contr->tmp_invis))
3144 {
3145 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->flag [FLAG_HIDDEN] ? "unhidden" : "visible");
3146 return 1;
3147 }
3148 }
3149
3150 return 0;
3151}
3152
3153/* op_on_battleground - checks if the given object op (usually 3031/* op_on_battleground - checks if the given object op (usually
3154 * a player) is standing on a valid battleground-tile, 3032 * a player) is standing on a valid battleground-tile,
3155 * function returns TRUE/FALSE. If true x, y returns the battleground 3033 * function returns TRUE/FALSE. If true x, y returns the battleground
3156 * -exit-coord. (and if x, y not NULL) 3034 * -exit-coord. (and if x, y not NULL)
3157 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set 3035 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
3176 && tmp->name == shstr_battleground 3054 && tmp->name == shstr_battleground
3177 && EXIT_X (tmp) && EXIT_Y (tmp)) 3055 && EXIT_X (tmp) && EXIT_Y (tmp))
3178 { 3056 {
3179 /* before we assign the exit, check if this is a teambattle */ 3057 /* before we assign the exit, check if this is a teambattle */
3180 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp)) 3058 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3181 {
3182 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below) 3059 for (object *invtmp = op->inv; invtmp; invtmp = invtmp->below)
3060 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3183 { 3061 {
3184 if (invtmp->type == FORCE && invtmp->slaying && tmp->slaying == invtmp->slaying)
3185 {
3186 if (x && y) 3062 if (x && y)
3187 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp); 3063 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3188 3064
3189 return 1; 3065 return 1;
3190 }
3191 } 3066 }
3192 }
3193 3067
3194 if (x && y) 3068 if (x && y)
3195 *x = EXIT_X (tmp), *y = EXIT_Y (tmp); 3069 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3196 3070
3197 return 1; 3071 return 1;
3354 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg); 3228 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3355 } 3229 }
3356 else 3230 else
3357 { 3231 {
3358 /* generate misc. treasure */ 3232 /* generate misc. treasure */
3359 tmp = arch_to_object (tr->item); 3233 tmp = tr->item->instance ();
3360 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp)); 3234 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3361 who->insert (tmp); 3235 who->insert (tmp);
3362 } 3236 }
3363} 3237}
3364 3238
3365/** 3239//-GPL
3366 * Unready an object for a player. This function does nothing if the object was
3367 * not readied.
3368 */
3369void
3370player_unready_range_ob (player *pl, object *ob)
3371{
3372 if (pl->ob->current_weapon == ob)
3373 pl->ob->current_weapon = 0;
3374
3375 if (pl->combat_ob == ob)
3376 pl->combat_ob = 0;
3377
3378 if (pl->ranged_ob == ob)
3379 pl->ranged_ob = 0;
3380}
3381 3240
3382sint8 3241sint8
3383player::darkness_at (maptile *map, int x, int y) const 3242player::darkness_at (maptile *map, int x, int y) const
3384{ 3243{
3385 if (!ns) 3244 if (!ns)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines