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.6 by root, Sat Aug 26 23:36:34 2006 UTC vs.
Revision 1.27 by root, Wed Sep 27 00:36:09 2006 UTC

1/*
2 * static char *rcsid_player_c =
3 * "$Id: player.C,v 1.6 2006/08/26 23:36:34 root Exp $";
4 */
5
6/* 1/*
7 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
8 3
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen 5 Copyright (C) 1992 Frank Tore Johansen
… …
21 16
22 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software 18 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25 20
26 The author can be reached via e-mail to crossfire-devel@real-time.com 21 The author can be reached via e-mail to <crossfire@schmorp.de>
27*/ 22*/
28 23
29#include <global.h> 24#include <global.h>
30#ifndef WIN32 /* ---win32 remove headers */ 25#ifndef WIN32 /* ---win32 remove headers */
31#include <pwd.h> 26# include <pwd.h>
32#endif 27#endif
33#ifndef __CEXTRACT__ 28#ifndef __CEXTRACT__
34#include <sproto.h> 29# include <sproto.h>
35#endif 30#endif
36#include <sounds.h> 31#include <sounds.h>
37#include <living.h> 32#include <living.h>
38#include <object.h> 33#include <object.h>
39#include <spells.h> 34#include <spells.h>
… …
42 37
43#ifdef COZY_SERVER 38#ifdef COZY_SERVER
44extern int same_party (partylist *a, partylist *b); 39extern int same_party (partylist *a, partylist *b);
45#endif 40#endif
46 41
42player *
47player *find_player(const char *plname) 43find_player (const char *plname)
48{ 44{
49 player *pl; 45 player *pl;
46
50 for(pl=first_player;pl!=NULL;pl=pl->next) 47 for (pl = first_player; pl != NULL; pl = pl->next)
51 { 48 {
52 if(pl->ob != NULL && !strcmp(query_name(pl->ob),plname)) 49 if (pl->ob != NULL && !strcmp (query_name (pl->ob), plname))
53 return pl; 50 return pl;
54 }; 51 };
55 return NULL; 52 return NULL;
56} 53}
57 54
55player *
58player* find_player_partial_name( const char* plname ) 56find_player_partial_name (const char *plname)
59 { 57{
60 player* pl; 58 player *pl;
61 player* found = NULL; 59 player *found = NULL;
62 size_t namelen = strlen( plname ); 60 size_t namelen = strlen (plname);
61
63 for ( pl = first_player; pl != NULL; pl = pl->next ) 62 for (pl = first_player; pl != NULL; pl = pl->next)
64 { 63 {
65 if ( strlen( pl->ob->name ) < namelen ) 64 if ((size_t) strlen (pl->ob->name) < namelen)
66 continue; 65 continue;
67 66
68 if ( !strcmp( pl->ob->name, plname) ) 67 if (!strcmp (pl->ob->name, plname))
69 return pl; 68 return pl;
70 69
71 if ( !strncasecmp( pl->ob->name, plname, namelen ) ) 70 if (!strncasecmp (pl->ob->name, plname, namelen))
72 { 71 {
73 if ( found ) 72 if (found)
74 return NULL; 73 return NULL;
75 74
76 found = pl; 75 found = pl;
76 }
77 }
78 return found;
79}
80
81void
82display_motd (const object *op)
83{
84 char buf[MAX_BUF];
85 char motd[HUGE_BUF];
86 FILE *fp;
87 int comp;
88 int size;
89
90 sprintf (buf, "%s/%s", settings.confdir, settings.motd);
91 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
92 {
93 return;
94 }
95 motd[0] = '\0';
96 size = 0;
97 while (fgets (buf, MAX_BUF, fp) != NULL)
98 {
99 if (*buf == '#')
100 continue;
101 strncat (motd + size, buf, HUGE_BUF - size);
102 size += strlen (buf);
103 }
104 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
105 close_and_delete (fp, comp);
106}
107
108void
109send_rules (const object *op)
110{
111 char buf[MAX_BUF];
112 char rules[HUGE_BUF];
113 FILE *fp;
114 int comp;
115 int size;
116
117 sprintf (buf, "%s/%s", settings.confdir, settings.rules);
118 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
119 {
120 return;
121 }
122 rules[0] = '\0';
123 size = 0;
124 while (fgets (buf, MAX_BUF, fp) != NULL)
125 {
126 if (*buf == '#')
127 continue;
128 if (size + strlen (buf) >= HUGE_BUF)
129 {
130 LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
131 break;
132 }
133 strncat (rules + size, buf, HUGE_BUF - size);
134 size += strlen (buf);
135 }
136 draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
137 close_and_delete (fp, comp);
138}
139
140void
141send_news (const object *op)
142{
143 char buf[MAX_BUF];
144 char news[HUGE_BUF];
145 char subject[MAX_BUF];
146 FILE *fp;
147 int comp;
148 int size;
149
150 sprintf (buf, "%s/%s", settings.confdir, settings.news);
151 if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
152 return;
153 news[0] = '\0';
154 subject[0] = '\0';
155 size = 0;
156 while (fgets (buf, MAX_BUF, fp) != NULL)
157 {
158 if (*buf == '#')
159 continue;
160 if (*buf == '%')
161 { /* send one news */
162 if (size > 0)
163 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s", "%s\n%s", subject, news); /*send previously read news */
164 strcpy (subject, buf + 1);
165 strip_endline (subject);
166 size = 0;
167 news[0] = '\0';
168 }
169 else
170 {
171 if (size + strlen (buf) >= HUGE_BUF)
172 {
173 LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
174 break;
77 } 175 }
78 }
79 return found;
80 }
81
82void display_motd(const object *op) {
83 char buf[MAX_BUF];
84 char motd[HUGE_BUF];
85 FILE *fp;
86 int comp;
87 int size;
88
89 sprintf(buf, "%s/%s", settings.confdir, settings.motd);
90 if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL) {
91 return;
92 }
93 motd[0]='\0';
94 size=0;
95 while (fgets(buf, MAX_BUF, fp) != NULL) {
96 if( *buf == '#')
97 continue;
98 strncat(motd+size,buf,HUGE_BUF-size);
99 size+=strlen(buf);
100 }
101 draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
102 close_and_delete(fp, comp);
103}
104
105void send_rules(const object *op) {
106 char buf[MAX_BUF];
107 char rules[HUGE_BUF];
108 FILE *fp;
109 int comp;
110 int size;
111
112 sprintf(buf, "%s/%s", settings.confdir, settings.rules);
113 if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL) {
114 return;
115 }
116 rules[0]='\0';
117 size=0;
118 while (fgets(buf, MAX_BUF, fp) != NULL) {
119 if( *buf == '#')
120 continue;
121 if (size + strlen(buf)>=HUGE_BUF)
122 {
123 LOG(llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
124 break;
125 }
126 strncat(rules+size,buf,HUGE_BUF-size);
127 size+=strlen(buf);
128 }
129 draw_ext_info(NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
130 close_and_delete(fp, comp);
131}
132
133void send_news(const object *op) {
134 char buf[MAX_BUF];
135 char news[HUGE_BUF];
136 char subject[MAX_BUF];
137 FILE *fp;
138 int comp;
139 int size;
140
141 sprintf(buf, "%s/%s", settings.confdir, settings.news);
142 if ((fp=open_and_uncompress(buf, 0, &comp)) == NULL)
143 return;
144 news[0]='\0';
145 subject[0]='\0';
146 size=0;
147 while (fgets(buf, MAX_BUF, fp) != NULL) {
148 if( *buf == '#')
149 continue;
150 if ( *buf =='%'){ /* send one news */
151 if (size>0)
152 draw_ext_info_format(NDI_UNIQUE | NDI_GREEN, 0, op,
153 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
154 "INFORMATION: %s\n%s",
155 "%s\n%s",
156 subject, news); /*send previously read news*/
157 strcpy(subject,buf+1);
158 strip_endline(subject);
159 size=0;
160 news[0]='\0';
161 }
162 else{
163 if (size + strlen(buf)>=HUGE_BUF)
164 {
165 LOG(llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
166 break;
167 }
168 strncat(news+size,buf,HUGE_BUF-size); 176 strncat (news + size, buf, HUGE_BUF - size);
169 size+=strlen(buf); 177 size += strlen (buf);
170 } 178 }
171 }
172 179 }
180
173 draw_ext_info_format(NDI_UNIQUE | NDI_GREEN, 0, op, 181 draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
174 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, 182 MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", "%s\n%s", subject, news);
175 "INFORMATION: %s\n%s\n",
176 "%s\n%s",
177 subject, news);
178 close_and_delete(fp, comp); 183 close_and_delete (fp, comp);
179} 184}
180 185
186int
181int playername_ok(const char *cp) { 187playername_ok (const char *cp)
188{
182 /* Don't allow - or _ as first character in the name */ 189 /* Don't allow - or _ as first character in the name */
183 if (*cp == '-' || *cp == '_') return 0; 190 if (*cp == '-' || *cp == '_')
184
185 for(;*cp!='\0';cp++)
186 if(!((*cp>='a'&&*cp<='z')||(*cp>='A'&&*cp<='Z'))&&*cp!='-'&&*cp!='_')
187 return 0; 191 return 0;
192
193 for (; *cp != '\0'; cp++)
194 if (!((*cp >= 'a' && *cp <= 'z') || (*cp >= 'A' && *cp <= 'Z')) && *cp != '-' && *cp != '_')
195 return 0;
188 return 1; 196 return 1;
189} 197}
190 198
191/* This no longer sets the player map. Also, it now updates 199/* This no longer sets the player map. Also, it now updates
192 * all the pointers so the caller doesn't need to do that. 200 * all the pointers so the caller doesn't need to do that.
193 * Caller is responsible for setting the correct map. 201 * Caller is responsible for setting the correct map.
… …
197 * Hopefully this will be less bugfree and simpler. 205 * Hopefully this will be less bugfree and simpler.
198 * Returns the player structure. If 'p' is null, 206 * Returns the player structure. If 'p' is null,
199 * we create a new one. Otherwise, we recycle 207 * we create a new one. Otherwise, we recycle
200 * the one that is passed. 208 * the one that is passed.
201 */ 209 */
202static player* get_player(player *p) { 210static player *
211get_player (player *p)
212{
203 object *op=arch_to_object(get_player_archetype(NULL)); 213 object *op = arch_to_object (get_player_archetype (NULL));
204 int i; 214 int i;
205 215
206 if (!p) { 216 if (!p)
207 player *tmp; 217 {
218 p = new player;
208 219
209 p = (player *) malloc(sizeof(player));
210 if(p==NULL)
211 fatal(OUT_OF_MEMORY);
212
213 /* This adds the player in the linked list. There is extra 220 /* This adds the player in the linked list. There is extra
214 * complexity here because we want to add the new player at the 221 * complexity here because we want to add the new player at the
215 * end of the list - there is in fact no compelling reason that 222 * end of the list - there is in fact no compelling reason that
216 * that needs to be done except for things like output of 223 * that needs to be done except for things like output of
217 * 'who'. 224 * 'who'.
218 */ 225 */
219 tmp=first_player; 226 player *tmp = first_player;
227
220 while(tmp!=NULL&&tmp->next!=NULL) 228 while (tmp != NULL && tmp->next != NULL)
221 tmp=tmp->next; 229 tmp = tmp->next;
222 if(tmp!=NULL) 230 if (tmp != NULL)
223 tmp->next=p; 231 tmp->next = p;
224 else 232 else
225 first_player=p; 233 first_player = p;
226 234
227 p->next = NULL; 235 p->next = NULL;
228 } 236 }
229 237
230 /* Clears basically the entire player structure except 238 /* Clears basically the entire player structure except
231 * for next and socket. 239 * for next and socket.
232 */ 240 */
233 memset (static_cast<player_memset *>(p), 0, sizeof (player_memset)); 241 p->clear ();
234 242
235 /* There are some elements we want initialized to non zero value - 243 /* There are some elements we want initialized to non zero value -
236 * we deal with that below this point. 244 * we deal with that below this point.
237 */ 245 */
238 p->party=NULL; 246 p->party = NULL;
239 p->outputs_sync=16; /* Every 2 seconds */ 247 p->outputs_sync = 16; /* Every 2 seconds */
240 p->outputs_count=1; /* Keeps present behaviour */ 248 p->outputs_count = 8; /* Keeps present behaviour */
241 p->unapply = unapply_nochoice; 249 p->unapply = unapply_nochoice;
242 p->Swap_First = -1; 250 p->Swap_First = -1;
243 251
244#ifdef AUTOSAVE 252#ifdef AUTOSAVE
245 p->last_save_tick = 9999999; 253 p->last_save_tick = 9999999;
246#endif 254#endif
247 255
248 strcpy(p->savebed_map, first_map_path); /* Init. respawn position */ 256 strcpy (p->savebed_map, first_map_path); /* Init. respawn position */
249 257
250 op->contr=p; /* this aren't yet in archetype */ 258 op->contr = p; /* this aren't yet in archetype */
251 p->ob = op; 259 p->ob = op;
252 op->speed_left=0.5; 260 op->speed_left = 0.5;
253 op->speed=1.0; 261 op->speed = 1.0;
254 op->direction=5; /* So player faces south */ 262 op->direction = 5; /* So player faces south */
255 op->stats.wc=2; 263 op->stats.wc = 2;
256 op->run_away = 25; /* Then we panick... */ 264 op->run_away = 25; /* Then we panick... */
257 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */ 265 p->socket.monitor_spells = 0; /* Needed because esrv_update_spells( ) gets called by roll_stats */
258 266
259 roll_stats(op); 267 roll_stats (op);
260 p->state=ST_ROLL_STAT; 268 p->state = ST_ROLL_STAT;
261 clear_los(op); 269 clear_los (op);
262 270
263 p->gen_sp_armour=10; 271 p->gen_sp_armour = 10;
264 p->last_speed= -1; 272 p->last_speed = -1;
265 p->shoottype=range_none; 273 p->shoottype = range_none;
266 p->bowtype=bow_normal; 274 p->bowtype = bow_normal;
267 p->petmode=pet_normal; 275 p->petmode = pet_normal;
268 p->listening=10; 276 p->listening = 10;
269 p->usekeys=containers; 277 p->usekeys = containers;
270 p->last_weapon_sp= -1; 278 p->last_weapon_sp = -1;
271 p->peaceful=1; /* default peaceful */ 279 p->peaceful = 1; /* default peaceful */
272 p->do_los=1; 280 p->do_los = 1;
273 p->explore=0; 281 p->explore = 0;
274 p->no_shout=0; /* default can shout */ 282 p->no_shout = 0; /* default can shout */
275 283
276 strncpy(p->title, op->arch->clone.name, sizeof(p->title)-1); 284 assign (p->title, op->arch->clone.name);
277 p->title[sizeof(p->title)-1] = '\0';
278 op->race = add_string (op->arch->clone.race); 285 op->race = op->arch->clone.race;
279 286
280 CLEAR_FLAG(op,FLAG_READY_SKILL); 287 CLEAR_FLAG (op, FLAG_READY_SKILL);
281 288
282 /* we need to clear these to -1 and not zero - otherwise, 289 /* we need to clear these to -1 and not zero - otherwise,
283 * if a player quits and starts a new character, we wont 290 * if a player quits and starts a new character, we wont
284 * send new values to the client, as things like exp start 291 * send new values to the client, as things like exp start
285 * at zero. 292 * at zero.
286 */ 293 */
287 for (i=0; i < NUM_SKILLS; i++) { 294 for (i = 0; i < NUM_SKILLS; i++)
295 {
288 p->last_skill_exp[i] = -1; 296 p->last_skill_exp[i] = -1;
289 p->last_skill_ob[i] = NULL; 297 p->last_skill_ob[i] = NULL;
290 } 298 }
291 for (i=0; i < NROFATTACKS; i++) { 299 for (i = 0; i < NROFATTACKS; i++)
300 {
292 p->last_resist[i] = -1; 301 p->last_resist[i] = -1;
293 } 302 }
294 p->last_stats.exp = -1; 303 p->last_stats.exp = -1;
295 p->last_weight = (uint32)-1; 304 p->last_weight = (uint32) - 1;
296 305
297 p->socket.update_look=0; 306 p->socket.update_look = 0;
298 p->socket.look_position=0; 307 p->socket.look_position = 0;
299 return p; 308 return p;
300} 309}
301
302 310
303/* This loads the first map an puts the player on it. */ 311/* This loads the first map an puts the player on it. */
312static void
304static void set_first_map(object *op) 313set_first_map (object *op)
305{ 314{
306 strcpy(op->contr->maplevel, first_map_path); 315 strcpy (op->contr->maplevel, first_map_path);
307 op->x = -1; 316 op->x = -1;
308 op->y = -1; 317 op->y = -1;
309 enter_exit(op, NULL); 318 enter_exit (op, NULL);
310} 319}
311 320
312/* Tries to add player on the connection passwd in ns. 321/* Tries to add player on the connection passwd in ns.
313 * All we can really get in this is some settings like host and display 322 * All we can really get in this is some settings like host and display
314 * mode. 323 * mode.
315 */ 324 */
316 325
326int
317int add_player(NewSocket *ns) { 327add_player (NewSocket * ns)
328{
318 player *p; 329 player *p;
319 330
320 p=get_player(NULL); 331 p = get_player (NULL);
321 p->socket = *ns; 332 p->socket = *ns;
322 p->socket.faces_sent = (uint8*) malloc(p->socket.faces_sent_len*sizeof(*p->socket.faces_sent)); 333 p->socket.faces_sent = (uint8 *) malloc (p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
334
323 if(p->socket.faces_sent == NULL) 335 if (p->socket.faces_sent == NULL)
324 fatal(OUT_OF_MEMORY); 336 fatal (OUT_OF_MEMORY);
337
325 memcpy(p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len*sizeof(*p->socket.faces_sent)); 338 memcpy (p->socket.faces_sent, ns->faces_sent, p->socket.faces_sent_len * sizeof (*p->socket.faces_sent));
326 /* Needed because the socket we just copied over needs to be cleared. 339 /* Needed because the socket we just copied over needs to be cleared.
327 * Note that this can result in a client reset if there is partial data 340 * Note that this can result in a client reset if there is partial data
328 * on the uncoming socket. 341 * on the uncoming socket.
329 */ 342 */
330 p->socket.inbuf.len = 0; 343 p->socket.inbuf.len = 0;
331 set_first_map(p->ob); 344 set_first_map (p->ob);
332 345
333 CLEAR_FLAG(p->ob, FLAG_FRIENDLY); 346 CLEAR_FLAG (p->ob, FLAG_FRIENDLY);
334 add_friendly_object(p->ob); 347 add_friendly_object (p->ob);
335 send_rules(p->ob); 348 send_rules (p->ob);
336 send_news(p->ob); 349 send_news (p->ob);
337 display_motd(p->ob); 350 display_motd (p->ob);
338 get_name(p->ob); 351 get_name (p->ob);
352
339 return 0; 353 return 0;
340} 354}
341 355
342/* 356/*
343 * get_player_archetype() return next player archetype from archetype 357 * get_player_archetype() return next player archetype from archetype
344 * list. Not very efficient routine, but used only creating new players. 358 * list. Not very efficient routine, but used only creating new players.
345 * Note: there MUST be at least one player archetype! 359 * Note: there MUST be at least one player archetype!
346 */ 360 */
361archetype *
347archetype *get_player_archetype(archetype* at) 362get_player_archetype (archetype *at)
348{ 363{
349 archetype *start = at; 364 archetype *start = at;
365
350 for (;;) { 366 for (;;)
367 {
351 if (at==NULL || at->next==NULL) 368 if (at == NULL || at->next == NULL)
352 at=first_archetype; 369 at = first_archetype;
353 else 370 else
354 at=at->next; 371 at = at->next;
355 if(at->clone.type==PLAYER) 372 if (at->clone.type == PLAYER)
356 return at; 373 return at;
357 if (at == start) { 374 if (at == start)
375 {
358 LOG (llevError, "No Player archetypes\n"); 376 LOG (llevError, "No Player archetypes\n");
359 exit (-1); 377 exit (-1);
360 } 378 }
361 } 379 }
362} 380}
363 381
364 382
383object *
365object *get_nearest_player(object *mon) { 384get_nearest_player (object *mon)
385{
366 object *op = NULL; 386 object *op = NULL;
367 player *pl = NULL; 387 player *pl = NULL;
368 objectlink *ol; 388 objectlink *ol;
369 unsigned lastdist; 389 unsigned lastdist;
370 rv_vector rv; 390 rv_vector rv;
371 391
372 for(ol=first_friendly_object,lastdist=1000;ol!=NULL;ol=ol->next) { 392 for (ol = first_friendly_object, lastdist = 1000; ol != NULL; ol = ol->next)
393 {
373 /* We should not find free objects on this friendly list, but it 394 /* We should not find free objects on this friendly list, but it
374 * does periodically happen. Given that, lets deal with it. 395 * does periodically happen. Given that, lets deal with it.
375 * While unlikely, it is possible the next object on the friendly 396 * While unlikely, it is possible the next object on the friendly
376 * list is also free, so encapsulate this in a while loop. 397 * list is also free, so encapsulate this in a while loop.
377 */ 398 */
378 while (QUERY_FLAG(ol->ob, FLAG_FREED) || !QUERY_FLAG(ol->ob, FLAG_FRIENDLY)) { 399 while (QUERY_FLAG (ol->ob, FLAG_FREED) || !QUERY_FLAG (ol->ob, FLAG_FRIENDLY))
400 {
379 object *tmp=ol->ob; 401 object *tmp = ol->ob;
380 402
381 /* Can't do much more other than log the fact, because the object 403 /* Can't do much more other than log the fact, because the object
382 * itself will have been cleared. 404 * itself will have been cleared.
383 */ 405 */
384 LOG(llevDebug,"get_nearest_player: Found free/non friendly object on friendly list\n"); 406 LOG (llevDebug, "get_nearest_player: Found free/non friendly object on friendly list\n");
385 ol = ol->next; 407 ol = ol->next;
386 remove_friendly_object(tmp); 408 remove_friendly_object (tmp);
387 if (!ol) return op; 409 if (!ol)
388 } 410 return op;
411 }
389 412
390 /* Remove special check for player from this. First, it looks to cause 413 /* Remove special check for player from this. First, it looks to cause
391 * some crashes (ol->ob->contr not set properly?), but secondly, a more 414 * some crashes (ol->ob->contr not set properly?), but secondly, a more
392 * complicated method of state checking would be needed in any case - 415 * complicated method of state checking would be needed in any case -
393 * as it was, a clever player could type quit, and the function would 416 * as it was, a clever player could type quit, and the function would
394 * skip them over while waiting for confirmation. Remove 417 * skip them over while waiting for confirmation. Remove
395 * on_same_map check, as can_detect_enemy also does this 418 * on_same_map check, as can_detect_enemy also does this
396 */ 419 */
397 if (!can_detect_enemy(mon,ol->ob,&rv)) 420 if (!can_detect_enemy (mon, ol->ob, &rv))
398 continue; 421 continue;
399 422
400 if(lastdist>rv.distance) { 423 if (lastdist > rv.distance)
424 {
401 op=ol->ob; 425 op = ol->ob;
402 lastdist=rv.distance; 426 lastdist = rv.distance;
403 } 427 }
404 } 428 }
405 for (pl=first_player; pl != NULL; pl=pl->next) { 429 for (pl = first_player; pl != NULL; pl = pl->next)
430 {
406 if (can_detect_enemy(mon, pl->ob,&rv)) { 431 if (can_detect_enemy (mon, pl->ob, &rv))
432 {
407 433
408 if(lastdist>rv.distance) { 434 if (lastdist > rv.distance)
409 op=pl->ob; 435 {
410 lastdist=rv.distance; 436 op = pl->ob;
411 } 437 lastdist = rv.distance;
412 } 438 }
439 }
413 } 440 }
414#if 0 441#if 0
415 LOG(llevDebug,"get_nearest_player() finds player: %s\n",op?op->name:"(null)"); 442 LOG (llevDebug, "get_nearest_player() finds player: %s\n", op ? &op->name : "(null)");
416#endif 443#endif
417 return op; 444 return op;
418} 445}
419 446
420/* I believe this can safely go to 2, 3 is questionable, 4 will likely 447/* I believe this can safely go to 2, 3 is questionable, 4 will likely
421 * result in a monster paths backtracking. It basically determines how large a 448 * result in a monster paths backtracking. It basically determines how large a
422 * detour a monster will take from the direction path when looking 449 * detour a monster will take from the direction path when looking
… …
459 * monster can in fact move one space in that direction. 486 * monster can in fact move one space in that direction.
460 * 3) I'm not sure how good this code will be for moving multipart monsters, 487 * 3) I'm not sure how good this code will be for moving multipart monsters,
461 * since only simple checks to blocked are being called, which could mean the monster 488 * since only simple checks to blocked are being called, which could mean the monster
462 * is blocking itself. 489 * is blocking itself.
463 */ 490 */
491int
464int path_to_player(object *mon, object *pl, unsigned mindiff) { 492path_to_player (object *mon, object *pl, unsigned mindiff)
493{
465 rv_vector rv; 494 rv_vector rv;
466 sint16 x,y; 495 sint16 x, y;
467 int lastx,lasty,dir,i,diff, firstdir=0,lastdir, max=MAX_SPACES, mflags, blocked; 496 int lastx, lasty, dir, i, diff, firstdir = 0, lastdir, max = MAX_SPACES, mflags, blocked;
468 mapstruct *m ,*lastmap; 497 maptile *m, *lastmap;
469 498
470 get_rangevector(mon, pl, &rv, 0); 499 get_rangevector (mon, pl, &rv, 0);
471 500
472 if (rv.distance<mindiff) return 0; 501 if (rv.distance < mindiff)
473
474 x=mon->x;
475 y=mon->y;
476 m=mon->map;
477 dir = rv.direction;
478 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
479 diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);
480 /* If we can't solve it within the search distance, return now. */
481 if (diff>max) return 0;
482 while (diff >1 && max>0) {
483 lastx = x;
484 lasty = y;
485 lastmap = m;
486 x = lastx + freearr_x[dir];
487 y = lasty + freearr_y[dir];
488
489 mflags = get_map_flags(m, &m, x, y, &x, &y);
490 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK(m, x, y);
491
492 /* Space is blocked - try changing direction a little */
493 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK(mon, blocked) || (mflags&P_BLOCKSVIEW))
494 && (m == mon->map && blocked_link(mon, m, x, y)))) {
495 /* recalculate direction from last good location. Possible
496 * we were not traversing ideal location before.
497 */
498 get_rangevector_from_mapcoord(lastmap, lastx, lasty, pl, &rv, 0);
499 if (rv.direction != dir) {
500 /* OK - says direction should be different - lets reset the
501 * the values so it will try again.
502 */
503 x = lastx;
504 y = lasty;
505 m = lastmap;
506 dir = firstdir = rv.direction;
507 } else {
508 /* direct path is blocked - try taking a side step to
509 * either the left or right.
510 * Note increase the values in the loop below to be
511 * more than -1/1 respectively will mean the monster takes
512 * bigger detour. Have to be careful about these values getting
513 * too big (3 or maybe 4 or higher) as the monster may just try
514 * stepping back and forth
515 */
516 for (i=-DETOUR_AMOUNT; i<=DETOUR_AMOUNT; i++) {
517 if (i==0) continue; /* already did this, so skip it */
518 /* Use lastdir here - otherwise,
519 * since the direction that the creature should move in
520 * may change, you could get infinite loops.
521 * ie, player is northwest, but monster can only
522 * move west, so it does that. It goes some distance,
523 * gets blocked, finds that it should move north,
524 * can't do that, but now finds it can move east, and
525 * gets back to its original point. lastdir contains
526 * the last direction the creature has successfully
527 * moved.
528 */
529
530 x = lastx + freearr_x[absdir(lastdir+i)];
531 y = lasty + freearr_y[absdir(lastdir+i)];
532 m = lastmap;
533 mflags = get_map_flags(m, &m, x, y, &x, &y);
534 if (mflags & P_OUT_OF_MAP) continue;
535 blocked = GET_MAP_MOVE_BLOCK(m, x, y);
536 if (OB_TYPE_MOVE_BLOCK(mon, blocked)) continue;
537 if (mflags & P_BLOCKSVIEW) continue;
538
539 if (m == mon->map && blocked_link(mon, m, x, y)) break;
540 }
541 /* go through entire loop without finding a valid
542 * sidestep to take - thus, no valid path.
543 */
544 if (i==(DETOUR_AMOUNT+1))
545 return 0;
546 diff--;
547 lastdir=dir;
548 max--;
549 if (!firstdir) firstdir = dir+i;
550 } /* else check alternate directions */
551 } /* if blocked */
552 else {
553 /* we moved towards creature, so diff is less */
554 diff--;
555 max--;
556 lastdir=dir;
557 if (!firstdir) firstdir = dir;
558 }
559 if (diff<=1) {
560 /* Recalculate diff (distance) because we may not have actually
561 * headed toward player for entire distance.
562 */
563 get_rangevector_from_mapcoord(m, x, y, pl, &rv, 0);
564 diff = FABS(rv.distance_x)>FABS(rv.distance_y)?FABS(rv.distance_x):FABS(rv.distance_y);
565 }
566 if (diff>max) return 0;
567 }
568 /* If we reached the max, didn't find a direction in time */
569 if (!max) return 0;
570
571 return firstdir;
572}
573
574void give_initial_items(object *pl,treasurelist *items) {
575 object *op,*next=NULL;
576
577 if(pl->randomitems!=NULL)
578 create_treasure(items,pl,GT_STARTEQUIP | GT_ONLY_GOOD,1,0);
579
580 for (op=pl->inv; op; op=next) {
581 next = op->below;
582
583 /* Forces get applied per default, unless they have the
584 * flag "neutral" set. Sorry but I can't think of a better way
585 */
586 if(op->type==FORCE && !QUERY_FLAG(op, FLAG_NEUTRAL))
587 SET_FLAG(op,FLAG_APPLIED);
588
589 /* we never give weapons/armour if these cannot be used
590 * by this player due to race restrictions
591 */
592 if (pl->type == PLAYER) {
593 if ((!QUERY_FLAG(pl, FLAG_USE_ARMOUR) &&
594 (op->type == ARMOUR || op->type == BOOTS ||
595 op->type == CLOAK || op->type == HELMET ||
596 op->type == SHIELD || op->type == GLOVES ||
597 op->type == BRACERS || op->type == GIRDLE)) ||
598 (!QUERY_FLAG(pl, FLAG_USE_WEAPON) && op->type == WEAPON)) {
599 remove_ob (op);
600 free_object (op);
601 continue;
602 }
603 }
604
605 /* This really needs to be better - we should really give
606 * a substitute spellbook. The problem is that we don't really
607 * have a good idea what to replace it with (need something like
608 * a first level treasurelist for each skill.)
609 * remove duplicate skills also
610 */
611 if(op->type==SPELLBOOK || op->type == SKILL) {
612 object *tmp;
613
614 for (tmp=op->below; tmp; tmp=tmp->below)
615 if (tmp->type == op->type && tmp->name == op->name) break;
616
617 if (tmp) {
618 remove_ob(op);
619 free_object(op);
620 LOG(llevError,"give_initial_items: Removing duplicate object %s\n",
621 tmp->name);
622 continue;
623 }
624 if (op->nrof > 1) op->nrof = 1;
625 }
626
627 if (op->type == SPELLBOOK && op->inv) {
628 CLEAR_FLAG(op->inv, FLAG_STARTEQUIP);
629 }
630
631 /* Give starting characters identified, uncursed, and undamned
632 * items. Just don't identify gold or silver, or it won't be
633 * merged properly.
634 */
635 if (need_identify(op)) {
636 SET_FLAG(op, FLAG_IDENTIFIED);
637 CLEAR_FLAG(op, FLAG_CURSED);
638 CLEAR_FLAG(op, FLAG_DAMNED);
639 }
640 if(op->type==SPELL) {
641 remove_ob(op);
642 free_object(op);
643 continue;
644 }
645 else if(op->type==SKILL) {
646 SET_FLAG(op, FLAG_CAN_USE_SKILL);
647 op->stats.exp = 0;
648 op->level = 1;
649 }
650 /* lock all 'normal items by default */
651 else SET_FLAG(op, FLAG_INV_LOCKED);
652 } /* for loop of objects in player inv */
653
654 /* Need to set up the skill pointers */
655 link_player_skills(pl);
656}
657
658void get_name(object *op) {
659 op->contr->write_buf[0]='\0';
660 op->contr->state=ST_GET_NAME;
661 send_query(&op->contr->socket,0,"What is your name?\n:");
662}
663
664void get_password(object *op) {
665 op->contr->write_buf[0]='\0';
666 op->contr->state=ST_GET_PASSWORD;
667 send_query(&op->contr->socket,CS_QUERY_HIDEINPUT, "What is your password?\n:");
668}
669
670void play_again(object *op)
671{
672 op->contr->state=ST_PLAY_AGAIN;
673 op->chosen_skill = NULL;
674 send_query(&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
675 /* a bit of a hack, but there are various places early in th
676 * player creation process that a user can quit (eg, roll
677 * stats) that isn't removing the player. Taking a quick
678 * look, there are many places that call play_again without
679 * removing the player - it probably makes more sense
680 * to leave it to play_again to remove the object in all
681 * cases.
682 */
683 if (!QUERY_FLAG(op, FLAG_REMOVED))
684 remove_ob(op);
685 /* Need to set this to null - otherwise, it could point to garbage,
686 * and draw() doesn't check to see if the player is removed, only if
687 * the map is null or not swapped out.
688 */
689 op->map = NULL;
690}
691
692
693int receive_play_again(object *op, char key)
694{
695 if(key=='q'||key=='Q') {
696 remove_friendly_object(op);
697 leave(op->contr,0); /* ericserver will draw the message */
698 return 2;
699 }
700 else if(key=='a'||key=='A') {
701 player *pl = op->contr;
702 const char *name = op->name;
703
704 add_refcount(name);
705 remove_friendly_object(op);
706 free_object(op);
707 pl = get_player(pl);
708 op = pl->ob;
709 add_friendly_object(op);
710 op->contr->password[0]='~';
711 FREE_AND_CLEAR_STR(op->name);
712 FREE_AND_CLEAR_STR(op->name_pl);
713
714 /* Lets put a space in here */
715 new_draw_info(NDI_UNIQUE, 0, op, "\n");
716 get_name(op);
717 op->name = name; /* Alrady added a refcount above */
718 op->name_pl = add_string(name);
719 set_first_map(op);
720 } else {
721 /* user pressed something else so just ask again... */
722 play_again(op);
723 }
724 return 0; 502 return 0;
725}
726 503
727void confirm_password(object *op) { 504 x = mon->x;
505 y = mon->y;
506 m = mon->map;
507 dir = rv.direction;
508 lastdir = firstdir = rv.direction; /* perhaps we stand next to pl, init firstdir too */
509 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);
510 /* If we can't solve it within the search distance, return now. */
511 if (diff > max)
512 return 0;
513 while (diff > 1 && max > 0)
514 {
515 lastx = x;
516 lasty = y;
517 lastmap = m;
518 x = lastx + freearr_x[dir];
519 y = lasty + freearr_y[dir];
728 520
521 mflags = get_map_flags (m, &m, x, y, &x, &y);
522 blocked = (mflags & P_OUT_OF_MAP) ? MOVE_ALL : GET_MAP_MOVE_BLOCK (m, x, y);
523
524 /* Space is blocked - try changing direction a little */
525 if ((mflags & P_OUT_OF_MAP) || ((OB_TYPE_MOVE_BLOCK (mon, blocked) || (mflags & P_BLOCKSVIEW))
526 && (m == mon->map && blocked_link (mon, m, x, y))))
527 {
528 /* recalculate direction from last good location. Possible
529 * we were not traversing ideal location before.
530 */
531 get_rangevector_from_mapcoord (lastmap, lastx, lasty, pl, &rv, 0);
532 if (rv.direction != dir)
533 {
534 /* OK - says direction should be different - lets reset the
535 * the values so it will try again.
536 */
537 x = lastx;
538 y = lasty;
539 m = lastmap;
540 dir = firstdir = rv.direction;
541 }
542 else
543 {
544 /* direct path is blocked - try taking a side step to
545 * either the left or right.
546 * Note increase the values in the loop below to be
547 * more than -1/1 respectively will mean the monster takes
548 * bigger detour. Have to be careful about these values getting
549 * too big (3 or maybe 4 or higher) as the monster may just try
550 * stepping back and forth
551 */
552 for (i = -DETOUR_AMOUNT; i <= DETOUR_AMOUNT; i++)
553 {
554 if (i == 0)
555 continue; /* already did this, so skip it */
556 /* Use lastdir here - otherwise,
557 * since the direction that the creature should move in
558 * may change, you could get infinite loops.
559 * ie, player is northwest, but monster can only
560 * move west, so it does that. It goes some distance,
561 * gets blocked, finds that it should move north,
562 * can't do that, but now finds it can move east, and
563 * gets back to its original point. lastdir contains
564 * the last direction the creature has successfully
565 * moved.
566 */
567
568 x = lastx + freearr_x[absdir (lastdir + i)];
569 y = lasty + freearr_y[absdir (lastdir + i)];
570 m = lastmap;
571 mflags = get_map_flags (m, &m, x, y, &x, &y);
572 if (mflags & P_OUT_OF_MAP)
573 continue;
574 blocked = GET_MAP_MOVE_BLOCK (m, x, y);
575 if (OB_TYPE_MOVE_BLOCK (mon, blocked))
576 continue;
577 if (mflags & P_BLOCKSVIEW)
578 continue;
579
580 if (m == mon->map && blocked_link (mon, m, x, y))
581 break;
582 }
583 /* go through entire loop without finding a valid
584 * sidestep to take - thus, no valid path.
585 */
586 if (i == (DETOUR_AMOUNT + 1))
587 return 0;
588 diff--;
589 lastdir = dir;
590 max--;
591 if (!firstdir)
592 firstdir = dir + i;
593 } /* else check alternate directions */
594 } /* if blocked */
595 else
596 {
597 /* we moved towards creature, so diff is less */
598 diff--;
599 max--;
600 lastdir = dir;
601 if (!firstdir)
602 firstdir = dir;
603 }
604 if (diff <= 1)
605 {
606 /* Recalculate diff (distance) because we may not have actually
607 * headed toward player for entire distance.
608 */
609 get_rangevector_from_mapcoord (m, x, y, pl, &rv, 0);
610 diff = FABS (rv.distance_x) > FABS (rv.distance_y) ? FABS (rv.distance_x) : FABS (rv.distance_y);
611 }
612 if (diff > max)
613 return 0;
614 }
615 /* If we reached the max, didn't find a direction in time */
616 if (!max)
617 return 0;
618
619 return firstdir;
620}
621
622void
623give_initial_items (object *pl, treasurelist * items)
624{
625 object *op, *next = NULL;
626
627 if (pl->randomitems != NULL)
628 create_treasure (items, pl, GT_STARTEQUIP | GT_ONLY_GOOD, 1, 0);
629
630 for (op = pl->inv; op; op = next)
631 {
632 next = op->below;
633
634 /* Forces get applied per default, unless they have the
635 * flag "neutral" set. Sorry but I can't think of a better way
636 */
637 if (op->type == FORCE && !QUERY_FLAG (op, FLAG_NEUTRAL))
638 SET_FLAG (op, FLAG_APPLIED);
639
640 /* we never give weapons/armour if these cannot be used
641 * by this player due to race restrictions
642 */
643 if (pl->type == PLAYER)
644 {
645 if ((!QUERY_FLAG (pl, FLAG_USE_ARMOUR) &&
646 (op->type == ARMOUR || op->type == BOOTS ||
647 op->type == CLOAK || op->type == HELMET ||
648 op->type == SHIELD || op->type == GLOVES ||
649 op->type == BRACERS || op->type == GIRDLE)) || (!QUERY_FLAG (pl, FLAG_USE_WEAPON) && op->type == WEAPON))
650 {
651 remove_ob (op);
652 free_object (op);
653 continue;
654 }
655 }
656
657 /* This really needs to be better - we should really give
658 * a substitute spellbook. The problem is that we don't really
659 * have a good idea what to replace it with (need something like
660 * a first level treasurelist for each skill.)
661 * remove duplicate skills also
662 */
663 if (op->type == SPELLBOOK || op->type == SKILL)
664 {
665 object *tmp;
666
667 for (tmp = op->below; tmp; tmp = tmp->below)
668 if (tmp->type == op->type && tmp->name == op->name)
669 break;
670
671 if (tmp)
672 {
673 remove_ob (op);
674 free_object (op);
675 LOG (llevError, "give_initial_items: Removing duplicate object %s\n", &tmp->name);
676 continue;
677 }
678 if (op->nrof > 1)
679 op->nrof = 1;
680 }
681
682 if (op->type == SPELLBOOK && op->inv)
683 {
684 CLEAR_FLAG (op->inv, FLAG_STARTEQUIP);
685 }
686
687 /* Give starting characters identified, uncursed, and undamned
688 * items. Just don't identify gold or silver, or it won't be
689 * merged properly.
690 */
691 if (need_identify (op))
692 {
693 SET_FLAG (op, FLAG_IDENTIFIED);
694 CLEAR_FLAG (op, FLAG_CURSED);
695 CLEAR_FLAG (op, FLAG_DAMNED);
696 }
697 if (op->type == SPELL)
698 {
699 remove_ob (op);
700 free_object (op);
701 continue;
702 }
703 else if (op->type == SKILL)
704 {
705 SET_FLAG (op, FLAG_CAN_USE_SKILL);
706 op->stats.exp = 0;
707 op->level = 1;
708 }
709 /* lock all 'normal items by default */
710 else
711 SET_FLAG (op, FLAG_INV_LOCKED);
712 } /* for loop of objects in player inv */
713
714 /* Need to set up the skill pointers */
715 link_player_skills (pl);
716}
717
718void
719get_name (object *op)
720{
729 op->contr->write_buf[0]='\0'; 721 op->contr->write_buf[0] = '\0';
722 op->contr->state = ST_GET_NAME;
723 send_query (&op->contr->socket, 0, "What is your name?\n:");
724}
725
726void
727get_password (object *op)
728{
729 op->contr->write_buf[0] = '\0';
730 op->contr->state = ST_GET_PASSWORD;
731 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is your password?\n:");
732}
733
734void
735play_again (object *op)
736{
737 op->contr->state = ST_PLAY_AGAIN;
738 op->chosen_skill = NULL;
739 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Do you want to play again (a/q)?");
740 /* a bit of a hack, but there are various places early in th
741 * player creation process that a user can quit (eg, roll
742 * stats) that isn't removing the player. Taking a quick
743 * look, there are many places that call play_again without
744 * removing the player - it probably makes more sense
745 * to leave it to play_again to remove the object in all
746 * cases.
747 */
748 if (!QUERY_FLAG (op, FLAG_REMOVED))
749 remove_ob (op);
750 /* Need to set this to null - otherwise, it could point to garbage,
751 * and draw() doesn't check to see if the player is removed, only if
752 * the map is null or not swapped out.
753 */
754 op->map = NULL;
755}
756
757int
758receive_play_again (object *op, char key)
759{
760 if (key == 'q' || key == 'Q')
761 {
762 remove_friendly_object (op);
763 leave (op->contr, 0); /* ericserver will draw the message */
764 return 2;
765 }
766 else if (key == 'a' || key == 'A')
767 {
768 player *pl = op->contr;
769 shstr name = op->name;
770
771 op->contr = 0;
772 op->type = 0;
773 op->destroy (1);
774 pl = get_player (pl);
775 op = pl->ob;
776 add_friendly_object (op);
777 op->contr->password[0] = '~';
778 op->name = op->name_pl = 0;
779 /* Lets put a space in here */
780 new_draw_info (NDI_UNIQUE, 0, op, "\n");
781 get_name (op);
782 op->name = op->name_pl = name;
783 set_first_map (op);
784 }
785 else
786 /* user pressed something else so just ask again... */
787 play_again (op);
788
789 return 0;
790}
791
792void
793confirm_password (object *op)
794{
795
796 op->contr->write_buf[0] = '\0';
730 op->contr->state=ST_CONFIRM_PASSWORD; 797 op->contr->state = ST_CONFIRM_PASSWORD;
731 send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:"); 798 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "Please type your password again.\n:");
732} 799}
733 800
801void
734void get_party_password(object *op, partylist *party) { 802get_party_password (object *op, partylist *party)
803{
735 if (party == NULL) { 804 if (party == NULL)
805 {
736 LOG(llevError, "get_party_password(): tried to make player %s join a NULL party", op->name); 806 LOG (llevError, "get_party_password(): tried to make player %s join a NULL party", &op->name);
737 return; 807 return;
738 } 808 }
739 op->contr->write_buf[0]='\0'; 809 op->contr->write_buf[0] = '\0';
740 op->contr->state=ST_GET_PARTY_PASSWORD; 810 op->contr->state = ST_GET_PARTY_PASSWORD;
741 op->contr->party_to_join = party; 811 op->contr->party_to_join = party;
742 send_query(&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:"); 812 send_query (&op->contr->socket, CS_QUERY_HIDEINPUT, "What is the password?\n:");
743} 813}
744 814
745 815
746/* This rolls four 1-6 rolls and sums the best 3 of the 4. */ 816/* This rolls four 1-6 rolls and sums the best 3 of the 4. */
817int
747int roll_stat(void) { 818roll_stat (void)
819{
748 int a[4],i,j,k; 820 int a[4], i, j, k;
749 821
750 for(i=0;i<4;i++) 822 for (i = 0; i < 4; i++)
751 a[i]=(int)RANDOM()%6+1; 823 a[i] = (int) RANDOM () % 6 + 1;
752 824
753 for(i=0,j=0,k=7;i<4;i++) 825 for (i = 0, j = 0, k = 7; i < 4; i++)
754 if(a[i]<k) 826 if (a[i] < k)
755 k=a[i],j=i; 827 k = a[i], j = i;
756 828
757 for(i=0,k=0;i<4;i++) { 829 for (i = 0, k = 0; i < 4; i++)
758 if(i!=j)
759 k+=a[i];
760 } 830 {
831 if (i != j)
832 k += a[i];
833 }
761 return k; 834 return k;
762} 835}
763 836
837void
764void roll_stats(object *op) { 838roll_stats (object *op)
839{
765 int sum=0; 840 int sum = 0;
766 int i = 0, j = 0; 841 int i = 0, j = 0;
767 int statsort[7]; 842 int statsort[7];
768 843
844 do
769 do { 845 {
770 op->stats.Str=roll_stat(); 846 op->stats.Str = roll_stat ();
771 op->stats.Dex=roll_stat(); 847 op->stats.Dex = roll_stat ();
772 op->stats.Int=roll_stat(); 848 op->stats.Int = roll_stat ();
773 op->stats.Con=roll_stat(); 849 op->stats.Con = roll_stat ();
774 op->stats.Wis=roll_stat(); 850 op->stats.Wis = roll_stat ();
775 op->stats.Pow=roll_stat(); 851 op->stats.Pow = roll_stat ();
776 op->stats.Cha=roll_stat(); 852 op->stats.Cha = roll_stat ();
777 sum=op->stats.Str+op->stats.Dex+op->stats.Int+ 853 sum = op->stats.Str + op->stats.Dex + op->stats.Int + op->stats.Con + op->stats.Wis + op->stats.Pow + op->stats.Cha;
778 op->stats.Con+op->stats.Wis+op->stats.Pow+ 854 }
779 op->stats.Cha;
780 } while(sum<82||sum>116); 855 while (sum < 82 || sum > 116);
781 856
782 /* Sort the stats so that rerolling is easier... */ 857 /* Sort the stats so that rerolling is easier... */
783 statsort[0] = op->stats.Str; 858 statsort[0] = op->stats.Str;
784 statsort[1] = op->stats.Dex; 859 statsort[1] = op->stats.Dex;
785 statsort[2] = op->stats.Int; 860 statsort[2] = op->stats.Int;
786 statsort[3] = op->stats.Con; 861 statsort[3] = op->stats.Con;
787 statsort[4] = op->stats.Wis; 862 statsort[4] = op->stats.Wis;
788 statsort[5] = op->stats.Pow; 863 statsort[5] = op->stats.Pow;
789 statsort[6] = op->stats.Cha; 864 statsort[6] = op->stats.Cha;
790 865
791 /* a quick and dirty bubblesort? */ 866 /* a quick and dirty bubblesort? */
867 do
792 do { 868 {
793 if (statsort[i] < statsort[i + 1]) { 869 if (statsort[i] < statsort[i + 1])
870 {
794 j = statsort[i]; 871 j = statsort[i];
795 statsort[i] = statsort[i + 1]; 872 statsort[i] = statsort[i + 1];
796 statsort[i + 1] = j; 873 statsort[i + 1] = j;
797 i = 0; 874 i = 0;
798 } else { 875 }
799 i++; 876 else
800 } 877 {
878 i++;
879 }
880 }
801 } while (i < 6); 881 while (i < 6);
802 882
803 op->stats.Str = statsort[0]; 883 op->stats.Str = statsort[0];
804 op->stats.Dex = statsort[1]; 884 op->stats.Dex = statsort[1];
805 op->stats.Con = statsort[2]; 885 op->stats.Con = statsort[2];
806 op->stats.Int = statsort[3]; 886 op->stats.Int = statsort[3];
807 op->stats.Wis = statsort[4]; 887 op->stats.Wis = statsort[4];
808 op->stats.Pow = statsort[5]; 888 op->stats.Pow = statsort[5];
809 op->stats.Cha = statsort[6]; 889 op->stats.Cha = statsort[6];
810 890
811 891
812 op->contr->orig_stats.Str=op->stats.Str; 892 op->contr->orig_stats.Str = op->stats.Str;
813 op->contr->orig_stats.Dex=op->stats.Dex; 893 op->contr->orig_stats.Dex = op->stats.Dex;
814 op->contr->orig_stats.Int=op->stats.Int; 894 op->contr->orig_stats.Int = op->stats.Int;
815 op->contr->orig_stats.Con=op->stats.Con; 895 op->contr->orig_stats.Con = op->stats.Con;
816 op->contr->orig_stats.Wis=op->stats.Wis; 896 op->contr->orig_stats.Wis = op->stats.Wis;
817 op->contr->orig_stats.Pow=op->stats.Pow; 897 op->contr->orig_stats.Pow = op->stats.Pow;
818 op->contr->orig_stats.Cha=op->stats.Cha; 898 op->contr->orig_stats.Cha = op->stats.Cha;
819 899
820 op->level=1; 900 op->level = 1;
821 op->stats.exp=0; 901 op->stats.exp = 0;
822 op->stats.ac=0; 902 op->stats.ac = 0;
823 903
824 op->contr->levhp[1] = 9; 904 op->contr->levhp[1] = 9;
825 op->contr->levsp[1] = 6; 905 op->contr->levsp[1] = 6;
826 op->contr->levgrace[1] = 3; 906 op->contr->levgrace[1] = 3;
827 907
828 fix_player(op); 908 fix_player (op);
829 op->stats.hp = op->stats.maxhp; 909 op->stats.hp = op->stats.maxhp;
830 op->stats.sp = op->stats.maxsp; 910 op->stats.sp = op->stats.maxsp;
831 op->stats.grace = op->stats.maxgrace; 911 op->stats.grace = op->stats.maxgrace;
832 op->contr->orig_stats=op->stats; 912 op->contr->orig_stats = op->stats;
833} 913}
834 914
915void
835void Roll_Again(object *op) 916Roll_Again (object *op)
836{ 917{
837 esrv_new_player(op->contr, 0); 918 esrv_new_player (op->contr, 0);
919 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
838 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? "); 920 "[y] to roll new stats [n] to use stats\n[1-7] [1-7] to swap stats.\nRoll again (y/n/1-7)? ");
839} 921}
840 922
923void
841void Swap_Stat(object *op,int Swap_Second) 924Swap_Stat (object *op, int Swap_Second)
842{ 925{
843 signed char tmp; 926 signed char tmp;
844 char buf[MAX_BUF]; 927 char buf[MAX_BUF];
845 928
846 if ( op->contr->Swap_First == -1 ) { 929 if (op->contr->Swap_First == -1)
930 {
847 new_draw_info(NDI_UNIQUE, 0,op,"How the hell did you get here?!?!!!"); 931 new_draw_info (NDI_UNIQUE, 0, op, "How the hell did you get here?!?!!!");
848 new_draw_info(NDI_UNIQUE, 0,op,"Error in Swap_Stat code,"); 932 new_draw_info (NDI_UNIQUE, 0, op, "Error in Swap_Stat code,");
849 new_draw_info(NDI_UNIQUE, 0,op,"mail korg@rdt.monash.edu.au"); 933 new_draw_info (NDI_UNIQUE, 0, op, "mail korg@rdt.monash.edu.au");
850 return; 934 return;
851 } 935 }
852 936
853 tmp = get_attr_value(&op->contr->orig_stats, op->contr->Swap_First); 937 tmp = get_attr_value (&op->contr->orig_stats, op->contr->Swap_First);
854 938
855 set_attr_value(&op->contr->orig_stats, op->contr->Swap_First, 939 set_attr_value (&op->contr->orig_stats, op->contr->Swap_First, get_attr_value (&op->contr->orig_stats, Swap_Second));
856 get_attr_value(&op->contr->orig_stats, Swap_Second));
857 940
858 set_attr_value(&op->contr->orig_stats, Swap_Second, tmp); 941 set_attr_value (&op->contr->orig_stats, Swap_Second, tmp);
859 942
860 sprintf(buf,"%s done\n", short_stat_name[Swap_Second]); 943 sprintf (buf, "%s done\n", short_stat_name[Swap_Second]);
861 new_draw_info(NDI_UNIQUE, 0,op, buf); 944 new_draw_info (NDI_UNIQUE, 0, op, buf);
862 op->stats.Str = op->contr->orig_stats.Str; 945 op->stats.Str = op->contr->orig_stats.Str;
863 op->stats.Dex = op->contr->orig_stats.Dex; 946 op->stats.Dex = op->contr->orig_stats.Dex;
864 op->stats.Con = op->contr->orig_stats.Con; 947 op->stats.Con = op->contr->orig_stats.Con;
865 op->stats.Int = op->contr->orig_stats.Int; 948 op->stats.Int = op->contr->orig_stats.Int;
866 op->stats.Wis = op->contr->orig_stats.Wis; 949 op->stats.Wis = op->contr->orig_stats.Wis;
867 op->stats.Pow = op->contr->orig_stats.Pow; 950 op->stats.Pow = op->contr->orig_stats.Pow;
868 op->stats.Cha = op->contr->orig_stats.Cha; 951 op->stats.Cha = op->contr->orig_stats.Cha;
869 op->stats.ac=0; 952 op->stats.ac = 0;
870 953
871 op->level=1; 954 op->level = 1;
872 op->stats.exp=0; 955 op->stats.exp = 0;
873 op->stats.ac=0; 956 op->stats.ac = 0;
874 957
875 op->contr->levhp[1] = 9; 958 op->contr->levhp[1] = 9;
876 op->contr->levsp[1] = 6; 959 op->contr->levsp[1] = 6;
877 op->contr->levgrace[1] = 3; 960 op->contr->levgrace[1] = 3;
878 961
879 fix_player(op); 962 fix_player (op);
880 op->stats.hp = op->stats.maxhp; 963 op->stats.hp = op->stats.maxhp;
881 op->stats.sp = op->stats.maxsp; 964 op->stats.sp = op->stats.maxsp;
882 op->stats.grace = op->stats.maxgrace; 965 op->stats.grace = op->stats.maxgrace;
883 op->contr->orig_stats=op->stats; 966 op->contr->orig_stats = op->stats;
884 op->contr->Swap_First=-1; 967 op->contr->Swap_First = -1;
885} 968}
886 969
887 970
888/* This code has been greatly reduced, because with set_attr_value 971/* This code has been greatly reduced, because with set_attr_value
889 * and get_attr_value, the stats can be accessed just numeric 972 * and get_attr_value, the stats can be accessed just numeric
890 * ids. stat_trans is a table that translate the number entered 973 * ids. stat_trans is a table that translate the number entered
891 * into the actual stat. It is needed because the order the stats 974 * into the actual stat. It is needed because the order the stats
892 * are displayed in the stat window is not the same as how 975 * are displayed in the stat window is not the same as how
893 * the number's access that stat. The table does that translation. 976 * the number's access that stat. The table does that translation.
894 */ 977 */
978int
895int key_roll_stat(object *op, char key) 979key_roll_stat (object *op, char key)
896{ 980{
897 int keynum = key -'0'; 981 int keynum = key - '0';
898 char buf[MAX_BUF]; 982 char buf[MAX_BUF];
899 static sint8 stat_trans[] = {-1, STR, DEX, CON, INT, WIS, POW, CHA}; 983 static sint8 stat_trans[] = { -1, STR, DEX, CON, INT, WIS, POW, CHA };
900 984
901 if (keynum>0 && keynum<=7) { 985 if (keynum > 0 && keynum <= 7)
986 {
902 if (op->contr->Swap_First==-1) { 987 if (op->contr->Swap_First == -1)
988 {
903 op->contr->Swap_First=stat_trans[keynum]; 989 op->contr->Swap_First = stat_trans[keynum];
904 sprintf(buf,"%s ->", short_stat_name[stat_trans[keynum]]); 990 sprintf (buf, "%s ->", short_stat_name[stat_trans[keynum]]);
905 new_draw_info(NDI_UNIQUE, 0,op,buf); 991 new_draw_info (NDI_UNIQUE, 0, op, buf);
906 } 992 }
907 else 993 else
908 Swap_Stat(op,stat_trans[keynum]); 994 Swap_Stat (op, stat_trans[keynum]);
909 995
910 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,""); 996 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
911 return 1; 997 return 1;
912 }
913 switch (key) {
914 case 'n':
915 case 'N': {
916 SET_FLAG(op, FLAG_WIZ);
917 if(op->map==NULL) {
918 LOG(llevError,"Map == NULL in state 2\n");
919 break;
920 } 998 }
999 switch (key)
1000 {
1001 case 'n':
1002 case 'N':
1003 {
1004 SET_FLAG (op, FLAG_WIZ);
1005 if (op->map == NULL)
1006 {
1007 LOG (llevError, "Map == NULL in state 2\n");
1008 break;
1009 }
921 1010
922#if 0 1011#if 0
923 /* So that enter_exit will put us at startx/starty */ 1012 /* So that enter_exit will put us at startx/starty */
924 op->x= -1; 1013 op->x = -1;
925 1014
926 enter_exit(op,NULL); 1015 enter_exit (op, NULL);
927#endif 1016#endif
928 SET_ANIMATION(op, 2); /* So player faces south */ 1017 SET_ANIMATION (op, 2); /* So player faces south */
929 /* Enter exit adds a player otherwise */ 1018 /* Enter exit adds a player otherwise */
930 add_statbonus(op); 1019 add_statbonus (op);
931 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n"); 1020 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR,
1021 "Now choose a character.\nPress any key to change outlook.\nPress `d' when you're pleased.\n");
932 op->contr->state = ST_CHANGE_CLASS; 1022 op->contr->state = ST_CHANGE_CLASS;
933 if (op->msg) 1023 if (op->msg)
934 new_draw_info(NDI_BLUE, 0, op, op->msg); 1024 new_draw_info (NDI_BLUE, 0, op, op->msg);
935 return 0; 1025 return 0;
936 } 1026 }
937 case 'y': 1027 case 'y':
938 case 'Y': 1028 case 'Y':
939 roll_stats(op); 1029 roll_stats (op);
940 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,""); 1030 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "");
941 return 1; 1031 return 1;
942 1032
943 case 'q': 1033 case 'q':
944 case 'Q': 1034 case 'Q':
945 play_again(op); 1035 play_again (op);
946 return 1; 1036 return 1;
947 1037
948 default: 1038 default:
949 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Yes, No, Quit or 1-6. Roll again?"); 1039 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Yes, No, Quit or 1-6. Roll again?");
950 return 0; 1040 return 0;
951 } 1041 }
952 return 0; 1042 return 0;
953} 1043}
954 1044
955/* This function takes the key that is passed, and does the 1045/* This function takes the key that is passed, and does the
956 * appropriate action with it (change race, or other things). 1046 * appropriate action with it (change race, or other things).
957 * The function name is for historical reasons - now we have 1047 * The function name is for historical reasons - now we have
958 * separate race and class; this actually changes the RACE, 1048 * separate race and class; this actually changes the RACE,
959 * not the class. 1049 * not the class.
960 */ 1050 */
961 1051
1052int
962int key_change_class(object *op, char key) 1053key_change_class (object *op, char key)
963{ 1054{
964 int tmp_loop; 1055 int tmp_loop;
965 1056
966 if(key=='q'||key=='Q') { 1057 if (key == 'q' || key == 'Q')
1058 {
967 remove_ob(op); 1059 remove_ob (op);
968 play_again(op); 1060 play_again (op);
969 return 0; 1061 return 0;
970 } 1062 }
971 if(key=='d'||key=='D') { 1063 if (key == 'd' || key == 'D')
1064 {
972 char buf[MAX_BUF]; 1065 char buf[MAX_BUF];
973 1066
974 /* this must before then initial items are given */ 1067 /* this must before then initial items are given */
975 esrv_new_player(op->contr, op->weight+op->carrying); 1068 esrv_new_player (op->contr, op->weight + op->carrying);
976 create_treasure(find_treasurelist("starting_wealth"),op, 0, 0, 0); 1069 create_treasure (find_treasurelist ("starting_wealth"), op, 0, 0, 0);
977 1070
978 INVOKE_PLAYER (BIRTH, op->contr); 1071 INVOKE_PLAYER (BIRTH, op->contr);
979 INVOKE_PLAYER (LOGIN, op->contr); 1072 INVOKE_PLAYER (LOGIN, op->contr);
980 1073
981 op->contr->state=ST_PLAYING; 1074 op->contr->state = ST_PLAYING;
982 1075
983 if (op->msg) { 1076 if (op->msg)
984 free_string(op->msg);
985 op->msg=NULL; 1077 op->msg = NULL;
986 }
987 1078
988 /* We create this now because some of the unique maps will need it 1079 /* We create this now because some of the unique maps will need it
989 * to save here. 1080 * to save here.
990 */ 1081 */
991 sprintf(buf,"%s/%s/%s",settings.localdir,settings.playerdir,op->name); 1082 sprintf (buf, "%s/%s/%s", settings.localdir, settings.playerdir, &op->name);
992 make_path_to_file(buf); 1083 make_path_to_file (buf);
993 1084
994#ifdef AUTOSAVE 1085#ifdef AUTOSAVE
995 op->contr->last_save_tick = pticks; 1086 op->contr->last_save_tick = pticks;
996#endif 1087#endif
997 start_info(op); 1088 start_info (op);
998 CLEAR_FLAG(op, FLAG_WIZ); 1089 CLEAR_FLAG (op, FLAG_WIZ);
999 give_initial_items(op,op->randomitems); 1090 give_initial_items (op, op->randomitems);
1000 link_player_skills(op); 1091 link_player_skills (op);
1001 esrv_send_inventory(op, op); 1092 esrv_send_inventory (op, op);
1002 fix_player(op); 1093 fix_player (op);
1003 1094
1004 /* This moves the player to a different start map, if there 1095 /* This moves the player to a different start map, if there
1005 * is one for this race 1096 * is one for this race
1006 */ 1097 */
1007 if(*first_map_ext_path) { 1098 if (*first_map_ext_path)
1099 {
1008 object *tmp; 1100 object *tmp;
1009 mapstruct *oldmap = op->map;
1010 char mapname[MAX_BUF]; 1101 char mapname[MAX_BUF];
1011 snprintf(mapname, MAX_BUF-1, "%s/%s", 1102
1012 first_map_ext_path, op->arch->name); 1103 snprintf (mapname, MAX_BUF - 1, "%s/%s", first_map_ext_path, &op->arch->name);
1013 tmp=get_object(); 1104 tmp = get_object ();
1014 EXIT_PATH(tmp) = add_string(mapname); 1105 EXIT_PATH (tmp) = mapname;
1015 EXIT_X(tmp) = op->x; 1106 EXIT_X (tmp) = op->x;
1016 EXIT_Y(tmp) = op->y; 1107 EXIT_Y (tmp) = op->y;
1017 enter_exit(op,tmp); /* we don't really care if it succeeded; 1108 enter_exit (op, tmp); /* we don't really care if it succeeded;
1018 * if the map isn't there, then stay on the 1109 * if the map isn't there, then stay on the
1019 * default initial map */ 1110 * default initial map */
1020 free_object(tmp); 1111 free_object (tmp);
1112 }
1021 } else { 1113 else
1114 {
1022 LOG(llevDebug,"first_map_ext_path not set\n"); 1115 LOG (llevDebug, "first_map_ext_path not set\n");
1023 } 1116 }
1024 return 0; 1117 return 0;
1025 } 1118 }
1026 1119
1027 /* Following actually changes the race - this is the default command 1120 /* Following actually changes the race - this is the default command
1028 * if we don't match with one of the options above. 1121 * if we don't match with one of the options above.
1029 */ 1122 */
1030 1123
1031 tmp_loop = 0; 1124 tmp_loop = 0;
1032 while(!tmp_loop) { 1125 while (!tmp_loop)
1033 const char *name = add_string (op->name); 1126 {
1127 shstr name = op->name;
1034 int x = op->x, y = op->y; 1128 int x = op->x, y = op->y;
1129
1035 remove_statbonus(op); 1130 remove_statbonus (op);
1036 remove_ob (op); 1131 remove_ob (op);
1037 op->arch = get_player_archetype(op->arch); 1132 op->arch = get_player_archetype (op->arch);
1038 copy_object (&op->arch->clone, op); 1133 copy_object (&op->arch->clone, op);
1039 op->instantiate (); 1134 op->instantiate ();
1040 op->stats = op->contr->orig_stats; 1135 op->stats = op->contr->orig_stats;
1041 free_string (op->name); 1136 op->name = op->name_pl = name;
1042 op->name = name; 1137 op->x = x;
1043 free_string(op->name_pl); 1138 op->y = y;
1044 op->name_pl = add_string(name);
1045 op->x = x;
1046 op->y = y;
1047 SET_ANIMATION(op, 2); /* So player faces south */ 1139 SET_ANIMATION (op, 2); /* So player faces south */
1048 insert_ob_in_map (op, op->map, op,0); 1140 insert_ob_in_map (op, op->map, op, 0);
1049 strncpy(op->contr->title, op->arch->clone.name, sizeof(op->contr->title)-1); 1141 assign (op->contr->title, op->arch->clone.name);
1050 op->contr->title[sizeof(op->contr->title)-1] = '\0';
1051 add_statbonus(op); 1142 add_statbonus (op);
1052 tmp_loop=allowed_class(op); 1143 tmp_loop = allowed_class (op);
1053
1054 if (!strncmp (op->msg, "Edit me", 7)) tmp_loop = 0; // pippijn fucked it up //D//TODO
1055 } 1144 }
1145
1056 update_object(op,UP_OBJ_FACE); 1146 update_object (op, UP_OBJ_FACE);
1057 esrv_update_item(UPD_FACE,op,op); 1147 esrv_update_item (UPD_FACE, op, op);
1058 fix_player(op); 1148 fix_player (op);
1059 op->stats.hp=op->stats.maxhp; 1149 op->stats.hp = op->stats.maxhp;
1060 op->stats.sp=op->stats.maxsp; 1150 op->stats.sp = op->stats.maxsp;
1061 op->stats.grace=0; 1151 op->stats.grace = 0;
1152
1062 if (op->msg) 1153 if (op->msg)
1063 new_draw_info(NDI_BLUE, 0, op, op->msg); 1154 new_draw_info (NDI_BLUE, 0, op, op->msg);
1155
1064 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,"Press any key for the next race.\nPress `d' to play this race.\n"); 1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Press any key for the next race.\nPress `d' to play this race.\n");
1065 return 0; 1157 return 0;
1066} 1158}
1067 1159
1160int
1068int key_confirm_quit(object *op, char key) 1161key_confirm_quit (object *op, char key)
1069{ 1162{
1070 char buf[MAX_BUF]; 1163 char buf[MAX_BUF];
1071 1164
1072 if(key!='y'&&key!='Y'&&key!='q'&&key!='Q') { 1165 if (key != 'y' && key != 'Y' && key != 'q' && key != 'Q')
1166 {
1073 op->contr->state=ST_PLAYING; 1167 op->contr->state = ST_PLAYING;
1074 new_draw_info(NDI_UNIQUE, 0,op,"OK, continuing to play."); 1168 new_draw_info (NDI_UNIQUE, 0, op, "OK, continuing to play.");
1075 return 1; 1169 return 1;
1076 } 1170 }
1077 1171
1078 INVOKE_PLAYER (LOGOUT, op->contr); 1172 INVOKE_PLAYER (LOGOUT, op->contr);
1079 INVOKE_PLAYER (QUIT , op->contr); 1173 INVOKE_PLAYER (QUIT, op->contr);
1080 1174
1081 terminate_all_pets(op); 1175 terminate_all_pets (op);
1082 leave_map(op); 1176 leave_map (op);
1083 op->direction=0; 1177 op->direction = 0;
1084 new_draw_info_format(NDI_UNIQUE | NDI_ALL, 5, NULL, 1178 new_draw_info_format (NDI_UNIQUE | NDI_ALL, 5, NULL, "%s quits the game.", &op->name);
1085 "%s quits the game.",op->name);
1086 1179
1087 strcpy(op->contr->killer,"quit"); 1180 strcpy (op->contr->killer, "quit");
1088 check_score(op); 1181 check_score (op);
1089 op->contr->party=NULL; 1182 op->contr->party = NULL;
1090 if (settings.set_title == TRUE) 1183 if (settings.set_title == TRUE)
1091 op->contr->own_title[0]='\0'; 1184 op->contr->own_title[0] = '\0';
1092 1185
1093 if(!QUERY_FLAG(op,FLAG_WAS_WIZ)) { 1186 if (!QUERY_FLAG (op, FLAG_WAS_WIZ))
1094 mapstruct *mp, *next; 1187 {
1188 maptile *mp, *next;
1095 1189
1096 /* We need to hunt for any per player unique maps in memory and 1190 /* We need to hunt for any per player unique maps in memory and
1097 * get rid of them. The trailing slash in the path is intentional, 1191 * get rid of them. The trailing slash in the path is intentional,
1098 * so that players named 'Ab' won't match against players 'Abe' pathname 1192 * so that players named 'Ab' won't match against players 'Abe' pathname
1099 */ 1193 */
1100 sprintf(buf,"%s/%s/%s/", settings.localdir, settings.playerdir, op->name); 1194 sprintf (buf, "%s/%s/%s/", settings.localdir, settings.playerdir, &op->name);
1101 for (mp=first_map; mp!=NULL; mp=next) { 1195 for (mp = first_map; mp != NULL; mp = next)
1196 {
1102 next = mp->next; 1197 next = mp->next;
1103 if (!strncmp(mp->path, buf, strlen(buf))) 1198 if (!strncmp (mp->path, buf, strlen (buf)))
1104 delete_map(mp); 1199 delete_map (mp);
1105 } 1200 }
1106 1201
1107 delete_character(op->name, 1); 1202 delete_character (op->name, 1);
1108 } 1203 }
1204
1109 play_again(op); 1205 play_again (op);
1110 return 1; 1206 return 1;
1111} 1207}
1112 1208
1209void
1113void flee_player(object *op) { 1210flee_player (object *op)
1211{
1114 int dir,diff; 1212 int dir, diff;
1115 rv_vector rv; 1213 rv_vector rv;
1116 1214
1117 if(op->stats.hp < 0) { 1215 if (op->stats.hp < 0)
1216 {
1118 LOG(llevDebug, "Fleeing player is dead.\n"); 1217 LOG (llevDebug, "Fleeing player is dead.\n");
1119 CLEAR_FLAG(op, FLAG_SCARED); 1218 CLEAR_FLAG (op, FLAG_SCARED);
1120 return; 1219 return;
1121 } 1220 }
1122 1221
1123 if(op->enemy==NULL) { 1222 if (op->enemy == NULL)
1223 {
1124 LOG(llevDebug,"Fleeing player had no enemy.\n"); 1224 LOG (llevDebug, "Fleeing player had no enemy.\n");
1125 CLEAR_FLAG(op, FLAG_SCARED); 1225 CLEAR_FLAG (op, FLAG_SCARED);
1126 return; 1226 return;
1127 } 1227 }
1128 1228
1129 /* Seen some crashes here. Since we don't store an 1229 /* Seen some crashes here. Since we don't store an
1130 * op->enemy_count, it is possible that something destroys the 1230 * op->enemy_count, it is possible that something destroys the
1131 * actual enemy, and the object is recycled. 1231 * actual enemy, and the object is recycled.
1132 */ 1232 */
1133 if (op->enemy->map == NULL) { 1233 if (op->enemy->map == NULL)
1234 {
1134 CLEAR_FLAG(op, FLAG_SCARED); 1235 CLEAR_FLAG (op, FLAG_SCARED);
1135 op->enemy=NULL; 1236 op->enemy = NULL;
1136 return; 1237 return;
1137 } 1238 }
1138 1239
1139 if(!(random_roll(0, 4, op, PREFER_LOW)) && did_make_save(op, op->level, 0)) { 1240 if (!(random_roll (0, 4, op, PREFER_LOW)) && did_make_save (op, op->level, 0))
1241 {
1140 op->enemy=NULL; 1242 op->enemy = NULL;
1141 CLEAR_FLAG(op, FLAG_SCARED); 1243 CLEAR_FLAG (op, FLAG_SCARED);
1142 return; 1244 return;
1143 } 1245 }
1144 get_rangevector(op, op->enemy, &rv, 0); 1246 get_rangevector (op, op->enemy, &rv, 0);
1145 1247
1146 dir=absdir(4+rv.direction); 1248 dir = absdir (4 + rv.direction);
1147 for(diff=0;diff<3;diff++) { 1249 for (diff = 0; diff < 3; diff++)
1148 int m=1-(RANDOM()&2);
1149 if(move_ob(op,absdir(dir+diff*m),op)||
1150 (diff==0 && move_ob(op,absdir(dir-diff*m),op))) {
1151 return;
1152 }
1153 } 1250 {
1251 int m = 1 - (RANDOM () & 2);
1252
1253 if (move_ob (op, absdir (dir + diff * m), op) || (diff == 0 && move_ob (op, absdir (dir - diff * m), op)))
1254 {
1255 return;
1256 }
1257 }
1154 /* Cornered, get rid of scared */ 1258 /* Cornered, get rid of scared */
1155 CLEAR_FLAG(op, FLAG_SCARED); 1259 CLEAR_FLAG (op, FLAG_SCARED);
1156 op->enemy=NULL; 1260 op->enemy = NULL;
1157} 1261}
1158 1262
1159 1263
1160/* check_pick sees if there is stuff to be picked up/picks up stuff. 1264/* check_pick sees if there is stuff to be picked up/picks up stuff.
1161 * IT returns 1 if the player should keep on moving, 0 if he should 1265 * IT returns 1 if the player should keep on moving, 0 if he should
1162 * stop. 1266 * stop.
1163 */ 1267 */
1268int
1164int check_pick(object *op) { 1269check_pick (object *op)
1270{
1165 object *tmp, *next; 1271 object *tmp, *next;
1166 tag_t next_tag=0, op_tag;
1167 int stop = 0; 1272 int stop = 0;
1168 int j, k, wvratio; 1273 int j, k, wvratio;
1169 char putstring[128], tmpstr[16]; 1274 char putstring[128], tmpstr[16];
1170 1275
1171
1172 /* if you're flying, you cna't pick up anything */ 1276 /* if you're flying, you cna't pick up anything */
1173 if (op->move_type & MOVE_FLYING) 1277 if (op->move_type & MOVE_FLYING)
1174 return 1; 1278 return 1;
1175 1279
1176 op_tag = op->count;
1177
1178 next = op->below; 1280 next = op->below;
1179 if (next)
1180 next_tag = next->count;
1181 1281
1182 /* loop while there are items on the floor that are not marked as 1282 /* loop while there are items on the floor that are not marked as
1183 * destroyed */ 1283 * destroyed */
1184 while (next && ! was_destroyed (next, next_tag)) 1284 while (next && !next->destroyed ())
1185 { 1285 {
1186 tmp = next; 1286 tmp = next;
1187 next = tmp->below; 1287 next = tmp->below;
1188 if (next)
1189 next_tag = next->count;
1190 1288
1191 if (was_destroyed (op, op_tag)) 1289 if (op->destroyed ())
1192 return 0; 1290 return 0;
1193 1291
1194 if ( ! can_pick (op, tmp)) 1292 if (!can_pick (op, tmp))
1195 continue; 1293 continue;
1196 1294
1197 if (op->contr->search_str[0]!='\0' && settings.search_items == TRUE) 1295 if (op->contr->search_str[0] != '\0' && settings.search_items == TRUE)
1198 { 1296 {
1199 if (item_matched_string (op, tmp, op->contr->search_str)) 1297 if (item_matched_string (op, tmp, op->contr->search_str))
1200 pick_up (op, tmp); 1298 pick_up (op, tmp);
1201 continue; 1299 continue;
1202 } 1300 }
1203 1301
1204 /* high not bit set? We're using the old autopickup model */ 1302 /* high not bit set? We're using the old autopickup model */
1205 if(!(op->contr->mode & PU_NEWMODE)) { 1303 if (!(op->contr->mode & PU_NEWMODE))
1304 {
1206 switch (op->contr->mode) { 1305 switch (op->contr->mode)
1207 case 0: return 1; /* don't pick up */ 1306 {
1208 case 1: pick_up (op, tmp); 1307 case 0:
1209 return 1; 1308 return 1; /* don't pick up */
1210 case 2: pick_up (op, tmp); 1309 case 1:
1211 return 0; 1310 pick_up (op, tmp);
1212 case 3: return 0; /* stop before pickup */ 1311 return 1;
1213 case 4: pick_up (op, tmp); 1312 case 2:
1214 break; 1313 pick_up (op, tmp);
1215 case 5: pick_up (op, tmp); 1314 return 0;
1216 stop = 1; 1315 case 3:
1217 break; 1316 return 0; /* stop before pickup */
1218 case 6: 1317 case 4:
1219 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && 1318 pick_up (op, tmp);
1220 ! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED)) 1319 break;
1221 pick_up(op, tmp); 1320 case 5:
1222 break; 1321 pick_up (op, tmp);
1322 stop = 1;
1323 break;
1324 case 6:
1325 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1326 pick_up (op, tmp);
1327 break;
1223 1328
1224 case 7: 1329 case 7:
1225 if (tmp->type == MONEY || tmp->type == GEM) 1330 if (tmp->type == MONEY || tmp->type == GEM)
1226 pick_up(op, tmp); 1331 pick_up (op, tmp);
1227 break; 1332 break;
1228 1333
1229 default: 1334 default:
1230 /* use value density */ 1335 /* use value density */
1231 if ( ! QUERY_FLAG (tmp, FLAG_UNPAID) 1336 if (!QUERY_FLAG (tmp, FLAG_UNPAID)
1232 && (query_cost (tmp, op, F_TRUE) * 100 1337 && (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= op->contr->mode)
1233 / (tmp->weight * MAX (tmp->nrof, 1))) 1338 pick_up (op, tmp);
1234 >= op->contr->mode) 1339 }
1235 pick_up(op,tmp); 1340 }
1236 } 1341 else
1237 } 1342 { /* old model */
1238 else { /* old model */
1239 /* NEW pickup handling */ 1343 /* NEW pickup handling */
1240 if(op->contr->mode & PU_DEBUG) 1344 if (op->contr->mode & PU_DEBUG)
1241 { 1345 {
1242 /* some debugging code to figure out item information */ 1346 /* some debugging code to figure out item information */
1243 if(tmp->name!=NULL) 1347 if (tmp->name != NULL)
1244 sprintf(putstring,"item name: %s item type: %d weight/value: %d", 1348 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1245 tmp->name, tmp->type, 1349 &tmp->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1246 (int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1)))); 1350 else
1247 else
1248 sprintf(putstring,"item name: %s item type: %d weight/value: %d", 1351 sprintf (putstring, "item name: %s item type: %d weight/value: %d",
1249 tmp->arch->name, tmp->type, 1352 &tmp->arch->name, tmp->type, (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1250 (int)(query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1))));
1251 new_draw_info(NDI_UNIQUE, 0,op,putstring); 1353 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1252 1354
1253 sprintf(putstring,"...flags: "); 1355 sprintf (putstring, "...flags: ");
1254 for(k=0;k<4;k++) 1356 for (k = 0; k < 4; k++)
1255 { 1357 {
1256 for(j=0;j<32;j++) 1358 for (j = 0; j < 32; j++)
1257 { 1359 {
1258 if((tmp->flags[k]>>j)&0x01) 1360 if ((tmp->flags[k] >> j) & 0x01)
1259 { 1361 {
1260 sprintf(tmpstr,"%d ",k*32+j); 1362 sprintf (tmpstr, "%d ", k * 32 + j);
1261 strcat(putstring, tmpstr); 1363 strcat (putstring, tmpstr);
1262 } 1364 }
1263 } 1365 }
1264 } 1366 }
1265 new_draw_info(NDI_UNIQUE, 0,op,putstring); 1367 new_draw_info (NDI_UNIQUE, 0, op, putstring);
1266 1368
1267#if 0 1369#if 0
1268 /* print the flags too */ 1370 /* print the flags too */
1269 for(k=0;k<4;k++) 1371 for (k = 0; k < 4; k++)
1270 { 1372 {
1271 fprintf(stderr,"%d [%d] ", k, k*32+31); 1373 fprintf (stderr, "%d [%d] ", k, k * 32 + 31);
1272 for(j=0;j<32;j++) 1374 for (j = 0; j < 32; j++)
1273 { 1375 {
1274 fprintf(stderr,"%d",tmp->flags[k]>>(31-j)&0x01); 1376 fprintf (stderr, "%d", tmp->flags[k] >> (31 - j) & 0x01);
1275 if(!((j+1)%4))fprintf(stderr," "); 1377 if (!((j + 1) % 4))
1276 } 1378 fprintf (stderr, " ");
1379 }
1277 fprintf(stderr," [%d]\n", k*32); 1380 fprintf (stderr, " [%d]\n", k * 32);
1278 } 1381 }
1279#endif 1382#endif
1280 } 1383 }
1281 /* philosophy: 1384 /* philosophy:
1282 * It's easy to grab an item type from a pile, as long as it's 1385 * It's easy to grab an item type from a pile, as long as it's
1283 * generic. This takes no game-time. For more detailed pickups 1386 * generic. This takes no game-time. For more detailed pickups
1284 * and selections, select-items shoul dbe used. This is a 1387 * and selections, select-items shoul dbe used. This is a
1285 * grab-as-you-run type mode that's really useful for arrows for 1388 * grab-as-you-run type mode that's really useful for arrows for
1286 * example. 1389 * example.
1287 * The drawback: right now it has no frontend, so you need to 1390 * The drawback: right now it has no frontend, so you need to
1288 * stick the bits you want into a calculator in hex mode and then 1391 * stick the bits you want into a calculator in hex mode and then
1289 * convert to decimal and then 'pickup <#> 1392 * convert to decimal and then 'pickup <#>
1290 */ 1393 */
1291 1394
1292 /* the first two modes are exclusive: if NOTHING we return, if 1395 /* the first two modes are exclusive: if NOTHING we return, if
1293 * STOP then we stop. All the rest are applied sequentially, 1396 * STOP then we stop. All the rest are applied sequentially,
1294 * meaning if any test passes, the item gets picked up. */ 1397 * meaning if any test passes, the item gets picked up. */
1295 1398
1296 /* if mode is set to pick nothing up, return */ 1399 /* if mode is set to pick nothing up, return */
1297 1400
1298 if(op->contr->mode & PU_NOTHING) return 1; 1401 if (op->contr->mode & PU_NOTHING)
1402 return 1;
1299 1403
1300 /* if mode is set to stop when encountering objects, return */ 1404 /* if mode is set to stop when encountering objects, return */
1301 /* take STOP before INHIBIT since it doesn't actually pick 1405 /* take STOP before INHIBIT since it doesn't actually pick
1302 * anything up */ 1406 * anything up */
1303 1407
1304 if(op->contr->mode & PU_STOP) return 0; 1408 if (op->contr->mode & PU_STOP)
1409 return 0;
1305 1410
1306 /* useful for going into stores and not losing your settings... */ 1411 /* useful for going into stores and not losing your settings... */
1307 /* and for battles wher you don't want to get loaded down while 1412 /* and for battles wher you don't want to get loaded down while
1308 * fighting */ 1413 * fighting */
1309 if(op->contr->mode & PU_INHIBIT) return 1; 1414 if (op->contr->mode & PU_INHIBIT)
1415 return 1;
1310 1416
1311 /* prevent us from turning into auto-thieves :) */ 1417 /* prevent us from turning into auto-thieves :) */
1312 if (QUERY_FLAG (tmp, FLAG_UNPAID)) continue; 1418 if (QUERY_FLAG (tmp, FLAG_UNPAID))
1419 continue;
1313 1420
1314 /* ignore known cursed objects */ 1421 /* ignore known cursed objects */
1315 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED) continue; 1422 if (QUERY_FLAG (tmp, FLAG_KNOWN_CURSED) && op->contr->mode & PU_NOT_CURSED)
1423 continue;
1316 1424
1317 /* all food and drink if desired */ 1425 /* all food and drink if desired */
1318 /* question: don't pick up known-poisonous stuff? */ 1426 /* question: don't pick up known-poisonous stuff? */
1319 if(op->contr->mode & PU_FOOD) 1427 if (op->contr->mode & PU_FOOD)
1320 if (tmp->type == FOOD) 1428 if (tmp->type == FOOD)
1321 { pick_up(op, tmp); if(0)fprintf(stderr,"FOOD\n"); continue; } 1429 {
1430 pick_up (op, tmp);
1431 if (0)
1432 fprintf (stderr, "FOOD\n");
1433 continue;
1434 }
1322 if(op->contr->mode & PU_DRINK) 1435 if (op->contr->mode & PU_DRINK)
1323 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG(tmp, FLAG_KNOWN_CURSED))) 1436 if (tmp->type == DRINK || (tmp->type == POISON && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED)))
1324 { pick_up(op, tmp); if(0)fprintf(stderr,"DRINK\n"); continue; } 1437 {
1438 pick_up (op, tmp);
1439 if (0)
1440 fprintf (stderr, "DRINK\n");
1441 continue;
1442 }
1325 1443
1326 if(op->contr->mode & PU_POTION) 1444 if (op->contr->mode & PU_POTION)
1327 if (tmp->type == POTION) 1445 if (tmp->type == POTION)
1328 { pick_up(op, tmp); if(0)fprintf(stderr,"POTION\n"); continue; } 1446 {
1447 pick_up (op, tmp);
1448 if (0)
1449 fprintf (stderr, "POTION\n");
1450 continue;
1451 }
1329 1452
1330 /* spellbooks, skillscrolls and normal books/scrolls */ 1453 /* spellbooks, skillscrolls and normal books/scrolls */
1331 if(op->contr->mode & PU_SPELLBOOK) 1454 if (op->contr->mode & PU_SPELLBOOK)
1332 if (tmp->type == SPELLBOOK) 1455 if (tmp->type == SPELLBOOK)
1333 { pick_up(op, tmp); if(0)fprintf(stderr,"SPELLBOOK\n"); continue; } 1456 {
1457 pick_up (op, tmp);
1458 if (0)
1459 fprintf (stderr, "SPELLBOOK\n");
1460 continue;
1461 }
1334 if(op->contr->mode & PU_SKILLSCROLL) 1462 if (op->contr->mode & PU_SKILLSCROLL)
1335 if (tmp->type == SKILLSCROLL) 1463 if (tmp->type == SKILLSCROLL)
1336 { pick_up(op, tmp); if(0)fprintf(stderr,"SKILLSCROLL\n"); continue; } 1464 {
1465 pick_up (op, tmp);
1466 if (0)
1467 fprintf (stderr, "SKILLSCROLL\n");
1468 continue;
1469 }
1337 if(op->contr->mode & PU_READABLES) 1470 if (op->contr->mode & PU_READABLES)
1338 if (tmp->type == BOOK || tmp->type == SCROLL) 1471 if (tmp->type == BOOK || tmp->type == SCROLL)
1339 { pick_up(op, tmp); if(0)fprintf(stderr,"READABLES\n"); continue; } 1472 {
1473 pick_up (op, tmp);
1474 if (0)
1475 fprintf (stderr, "READABLES\n");
1476 continue;
1477 }
1340 1478
1341 /* wands/staves/rods/horns */ 1479 /* wands/staves/rods/horns */
1342 if (op->contr->mode & PU_MAGIC_DEVICE) 1480 if (op->contr->mode & PU_MAGIC_DEVICE)
1343 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN) 1481 if (tmp->type == WAND || tmp->type == ROD || tmp->type == HORN)
1344 { pick_up(op, tmp); if(0)fprintf(stderr,"MAGIC_DEVICE\n"); continue; } 1482 {
1483 pick_up (op, tmp);
1484 if (0)
1485 fprintf (stderr, "MAGIC_DEVICE\n");
1486 continue;
1487 }
1345 1488
1346 /* pick up all magical items */ 1489 /* pick up all magical items */
1347 if(op->contr->mode & PU_MAGICAL) 1490 if (op->contr->mode & PU_MAGICAL)
1348 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && ! QUERY_FLAG(tmp, FLAG_KNOWN_CURSED)) 1491 if (QUERY_FLAG (tmp, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (tmp, FLAG_KNOWN_CURSED))
1349 { pick_up(op, tmp); if(0)fprintf(stderr,"MAGICAL\n"); continue; } 1492 {
1493 pick_up (op, tmp);
1494 if (0)
1495 fprintf (stderr, "MAGICAL\n");
1496 continue;
1497 }
1350 1498
1351 if(op->contr->mode & PU_VALUABLES) 1499 if (op->contr->mode & PU_VALUABLES)
1352 { 1500 {
1353 if (tmp->type == MONEY || tmp->type == GEM) 1501 if (tmp->type == MONEY || tmp->type == GEM)
1354 { pick_up(op, tmp); if(0)fprintf(stderr,"MONEY/GEM\n"); continue; } 1502 {
1355 } 1503 pick_up (op, tmp);
1504 if (0)
1505 fprintf (stderr, "MONEY/GEM\n");
1506 continue;
1507 }
1508 }
1356 1509
1357 /* rings & amulets - talismans seems to be typed AMULET */ 1510 /* rings & amulets - talismans seems to be typed AMULET */
1358 if(op->contr->mode & PU_JEWELS) 1511 if (op->contr->mode & PU_JEWELS)
1359 if (tmp->type == RING || tmp->type == AMULET) 1512 if (tmp->type == RING || tmp->type == AMULET)
1360 { pick_up(op, tmp); if(0)fprintf(stderr,"JEWELS\n"); continue; } 1513 {
1514 pick_up (op, tmp);
1515 if (0)
1516 fprintf (stderr, "JEWELS\n");
1517 continue;
1518 }
1361 1519
1362 /* bows and arrows. Bows are good for selling! */ 1520 /* bows and arrows. Bows are good for selling! */
1363 if(op->contr->mode & PU_BOW) 1521 if (op->contr->mode & PU_BOW)
1364 if (tmp->type == BOW) 1522 if (tmp->type == BOW)
1365 { pick_up(op, tmp); if(0)fprintf(stderr,"BOW\n"); continue; } 1523 {
1524 pick_up (op, tmp);
1525 if (0)
1526 fprintf (stderr, "BOW\n");
1527 continue;
1528 }
1366 if(op->contr->mode & PU_ARROW) 1529 if (op->contr->mode & PU_ARROW)
1367 if (tmp->type == ARROW) 1530 if (tmp->type == ARROW)
1368 { pick_up(op, tmp); if(0)fprintf(stderr,"ARROW\n"); continue; } 1531 {
1532 pick_up (op, tmp);
1533 if (0)
1534 fprintf (stderr, "ARROW\n");
1535 continue;
1536 }
1369 1537
1370 /* all kinds of armor etc. */ 1538 /* all kinds of armor etc. */
1371 if(op->contr->mode & PU_ARMOUR) 1539 if (op->contr->mode & PU_ARMOUR)
1372 if (tmp->type == ARMOUR) 1540 if (tmp->type == ARMOUR)
1373 { pick_up(op, tmp); if(0)fprintf(stderr,"ARMOUR\n"); continue; } 1541 {
1542 pick_up (op, tmp);
1543 if (0)
1544 fprintf (stderr, "ARMOUR\n");
1545 continue;
1546 }
1374 if(op->contr->mode & PU_HELMET) 1547 if (op->contr->mode & PU_HELMET)
1375 if (tmp->type == HELMET) 1548 if (tmp->type == HELMET)
1376 { pick_up(op, tmp); if(0)fprintf(stderr,"HELMET\n"); continue; } 1549 {
1550 pick_up (op, tmp);
1551 if (0)
1552 fprintf (stderr, "HELMET\n");
1553 continue;
1554 }
1377 if(op->contr->mode & PU_SHIELD) 1555 if (op->contr->mode & PU_SHIELD)
1378 if (tmp->type == SHIELD) 1556 if (tmp->type == SHIELD)
1379 { pick_up(op, tmp); if(0)fprintf(stderr,"SHIELD\n"); continue; } 1557 {
1558 pick_up (op, tmp);
1559 if (0)
1560 fprintf (stderr, "SHIELD\n");
1561 continue;
1562 }
1380 if(op->contr->mode & PU_BOOTS) 1563 if (op->contr->mode & PU_BOOTS)
1381 if (tmp->type == BOOTS) 1564 if (tmp->type == BOOTS)
1382 { pick_up(op, tmp); if(0)fprintf(stderr,"BOOTS\n"); continue; } 1565 {
1566 pick_up (op, tmp);
1567 if (0)
1568 fprintf (stderr, "BOOTS\n");
1569 continue;
1570 }
1383 if(op->contr->mode & PU_GLOVES) 1571 if (op->contr->mode & PU_GLOVES)
1384 if (tmp->type == GLOVES) 1572 if (tmp->type == GLOVES)
1385 { pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; } 1573 {
1574 pick_up (op, tmp);
1575 if (0)
1576 fprintf (stderr, "GLOVES\n");
1577 continue;
1578 }
1386 if(op->contr->mode & PU_CLOAK) 1579 if (op->contr->mode & PU_CLOAK)
1387 if (tmp->type == CLOAK) 1580 if (tmp->type == CLOAK)
1388 { pick_up(op, tmp); if(0)fprintf(stderr,"GLOVES\n"); continue; } 1581 {
1582 pick_up (op, tmp);
1583 if (0)
1584 fprintf (stderr, "GLOVES\n");
1585 continue;
1586 }
1389 1587
1390 /* hoping to catch throwing daggers here */ 1588 /* hoping to catch throwing daggers here */
1391 if(op->contr->mode & PU_MISSILEWEAPON) 1589 if (op->contr->mode & PU_MISSILEWEAPON)
1392 if(tmp->type == WEAPON && QUERY_FLAG(tmp, FLAG_IS_THROWN)) 1590 if (tmp->type == WEAPON && QUERY_FLAG (tmp, FLAG_IS_THROWN))
1393 { pick_up(op, tmp); if(0)fprintf(stderr,"MISSILEWEAPON\n"); continue; } 1591 {
1592 pick_up (op, tmp);
1593 if (0)
1594 fprintf (stderr, "MISSILEWEAPON\n");
1595 continue;
1596 }
1394 1597
1395 /* careful: chairs and tables are weapons! */ 1598 /* careful: chairs and tables are weapons! */
1396 if(op->contr->mode & PU_ALLWEAPON) 1599 if (op->contr->mode & PU_ALLWEAPON)
1397 { 1600 {
1398 if(tmp->type == WEAPON && tmp->name!=NULL) 1601 if (tmp->type == WEAPON && tmp->name != NULL)
1399 { 1602 {
1400 if(strstr(tmp->name,"table")==NULL && strstr(tmp->arch->name,"table")==NULL && 1603 if (strstr (tmp->name, "table") == NULL && strstr (tmp->arch->name, "table") == NULL &&
1401 strstr(tmp->name,"chair") && strstr(tmp->arch->name,"chair")==NULL) 1604 strstr (tmp->name, "chair") && strstr (tmp->arch->name, "chair") == NULL)
1402 { pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; } 1605 {
1403 } 1606 pick_up (op, tmp);
1607 if (0)
1608 fprintf (stderr, "WEAPON\n");
1609 continue;
1610 }
1611 }
1404 if(tmp->type == WEAPON && tmp->name==NULL) 1612 if (tmp->type == WEAPON && tmp->name == NULL)
1405 { 1613 {
1406 if(strstr(tmp->arch->name,"table")==NULL && 1614 if (strstr (tmp->arch->name, "table") == NULL && strstr (tmp->arch->name, "chair") == NULL)
1407 strstr(tmp->arch->name,"chair")==NULL) 1615 {
1408 { pick_up(op, tmp); if(0)fprintf(stderr,"WEAPON\n"); continue; } 1616 pick_up (op, tmp);
1409 } 1617 if (0)
1410 } 1618 fprintf (stderr, "WEAPON\n");
1619 continue;
1620 }
1621 }
1622 }
1411 1623
1412 /* misc stuff that's useful */ 1624 /* misc stuff that's useful */
1413 if(op->contr->mode & PU_KEY) 1625 if (op->contr->mode & PU_KEY)
1414 if (tmp->type == KEY || tmp->type == SPECIAL_KEY) 1626 if (tmp->type == KEY || tmp->type == SPECIAL_KEY)
1415 { pick_up(op, tmp); if(0)fprintf(stderr,"KEY\n"); continue; } 1627 {
1628 pick_up (op, tmp);
1629 if (0)
1630 fprintf (stderr, "KEY\n");
1631 continue;
1632 }
1416 1633
1417 /* any of the last 4 bits set means we use the ratio for value 1634 /* any of the last 4 bits set means we use the ratio for value
1418 * pickups */ 1635 * pickups */
1419 if(op->contr->mode & PU_RATIO) 1636 if (op->contr->mode & PU_RATIO)
1420 { 1637 {
1421 /* use value density to decide what else to grab */ 1638 /* use value density to decide what else to grab */
1422 /* >=7 was >= op->contr->mode */ 1639 /* >=7 was >= op->contr->mode */
1423 /* >=7 is the old standard setting. Now we take the last 4 bits 1640 /* >=7 is the old standard setting. Now we take the last 4 bits
1424 * and multiply them by 5, giving 0..15*5== 5..75 */ 1641 * and multiply them by 5, giving 0..15*5== 5..75 */
1425 wvratio=(op->contr->mode & PU_RATIO) * 5; 1642 wvratio = (op->contr->mode & PU_RATIO) * 5;
1426 if ((query_cost(tmp, op, F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof, 1))) >= wvratio) 1643 if ((query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))) >= (unsigned int) wvratio)
1427 { 1644 {
1428 pick_up(op, tmp); 1645 pick_up (op, tmp);
1429#if 0 1646#if 0
1430 fprintf(stderr,"HIGH WEIGHT/VALUE ["); 1647 fprintf (stderr, "HIGH WEIGHT/VALUE [");
1431 if(tmp->name!=NULL) { 1648 if (tmp->name != NULL)
1649 {
1432 fprintf(stderr,"%s", tmp->name); 1650 fprintf (stderr, "%s", tmp->name);
1433 } 1651 }
1434 else fprintf(stderr,"%s",tmp->arch->name); 1652 else
1653 fprintf (stderr, "%s", tmp->arch->name);
1435 fprintf(stderr,",%d] = ", tmp->type); 1654 fprintf (stderr, ",%d] = ", tmp->type);
1436 fprintf(stderr,"%d\n",(int)(query_cost(tmp,op,F_TRUE)*100 / (tmp->weight * MAX(tmp->nrof,1)))); 1655 fprintf (stderr, "%d\n", (int) (query_cost (tmp, op, F_TRUE) * 100 / (tmp->weight * MAX (tmp->nrof, 1))));
1437#endif 1656#endif
1438 continue; 1657 continue;
1439 } 1658 }
1659 }
1660 } /* the new pickup model */
1440 } 1661 }
1441 } /* the new pickup model */
1442 }
1443 return ! stop; 1662 return !stop;
1444} 1663}
1445 1664
1446/* 1665/*
1447 * Find an arrow in the inventory and after that 1666 * Find an arrow in the inventory and after that
1448 * in the right type container (quiver). Pointer to the 1667 * in the right type container (quiver). Pointer to the
1449 * found object is returned. 1668 * found object is returned.
1450 */ 1669 */
1670object *
1451object *find_arrow(object *op, const char *type) 1671find_arrow (object *op, const char *type)
1452{ 1672{
1453 object *tmp = NULL; 1673 object *tmp = NULL;
1454 1674
1455 for(op=op->inv; op; op=op->below) 1675 for (op = op->inv; op; op = op->below)
1456 if(!tmp && op->type==CONTAINER && op->race==type && 1676 if (!tmp && op->type == CONTAINER && op->race == type && QUERY_FLAG (op, FLAG_APPLIED))
1457 QUERY_FLAG(op,FLAG_APPLIED))
1458 tmp = find_arrow (op, type); 1677 tmp = find_arrow (op, type);
1459 else if (op->type==ARROW && op->race==type) 1678 else if (op->type == ARROW && op->race == type)
1460 return op; 1679 return op;
1461 return tmp; 1680 return tmp;
1462} 1681}
1463 1682
1464/* 1683/*
1465 * Similar to find_arrow, but looks for (roughly) the best arrow to use 1684 * Similar to find_arrow, but looks for (roughly) the best arrow to use
1466 * against the target. A full test is not performed, simply a basic test 1685 * against the target. A full test is not performed, simply a basic test
1467 * of resistances. The archer is making a quick guess at what he sees down 1686 * of resistances. The archer is making a quick guess at what he sees down
1468 * the hall. Failing that it does it's best to pick the highest plus arrow. 1687 * the hall. Failing that it does it's best to pick the highest plus arrow.
1469 */ 1688 */
1470 1689
1690object *
1471object *find_better_arrow(object *op, object *target, const char *type, int *better) 1691find_better_arrow (object *op, object *target, const char *type, int *better)
1472{ 1692{
1473 object *tmp = NULL, *arrow, *ntmp; 1693 object *tmp = NULL, *arrow, *ntmp;
1474 int attacknum, attacktype, betterby=0, i; 1694 int attacknum, attacktype, betterby = 0, i;
1475 1695
1476 if (!type) 1696 if (!type)
1477 return NULL; 1697 return NULL;
1478 1698
1479 for (arrow=op->inv; arrow; arrow=arrow->below) { 1699 for (arrow = op->inv; arrow; arrow = arrow->below)
1480 if (arrow->type==CONTAINER && arrow->race==type && 1700 {
1481 QUERY_FLAG(arrow, FLAG_APPLIED)) { 1701 if (arrow->type == CONTAINER && arrow->race == type && QUERY_FLAG (arrow, FLAG_APPLIED))
1482 i = 0; 1702 {
1703 i = 0;
1483 ntmp = find_better_arrow(arrow, target, type, &i); 1704 ntmp = find_better_arrow (arrow, target, type, &i);
1484 if (i > betterby) { 1705 if (i > betterby)
1485 tmp = ntmp; 1706 {
1486 betterby = i; 1707 tmp = ntmp;
1487 } 1708 betterby = i;
1709 }
1710 }
1488 } else if (arrow->type==ARROW && arrow->race==type) { 1711 else if (arrow->type == ARROW && arrow->race == type)
1712 {
1489 /* allways prefer assasination/slaying */ 1713 /* allways prefer assasination/slaying */
1490 if (target->race != NULL && arrow->slaying != NULL && 1714 if (target->race != NULL && arrow->slaying != NULL && strstr (arrow->slaying, target->race))
1491 strstr(arrow->slaying, target->race)) { 1715 {
1492 if (arrow->attacktype & AT_DEATH) { 1716 if (arrow->attacktype & AT_DEATH)
1493 *better = 100; 1717 {
1494 return arrow; 1718 *better = 100;
1495 } else { 1719 return arrow;
1496 tmp = arrow; 1720 }
1721 else
1722 {
1723 tmp = arrow;
1497 betterby = (arrow->magic + arrow->stats.dam) * 2; 1724 betterby = (arrow->magic + arrow->stats.dam) * 2;
1498 } 1725 }
1499 } else { 1726 }
1727 else
1728 {
1500 for (attacknum=0; attacknum < NROFATTACKS; attacknum++) { 1729 for (attacknum = 0; attacknum < NROFATTACKS; attacknum++)
1730 {
1501 attacktype = 1<<attacknum; 1731 attacktype = 1 << attacknum;
1502 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0) 1732 if ((arrow->attacktype & attacktype) && (target->arch->clone.resist[attacknum]) < 0)
1503 if (((arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100) > betterby) { 1733 if (((arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100) > betterby)
1504 tmp = arrow; 1734 {
1735 tmp = arrow;
1505 betterby = (arrow->magic + arrow->stats.dam)*(100-target->arch->clone.resist[attacknum])/100; 1736 betterby = (arrow->magic + arrow->stats.dam) * (100 - target->arch->clone.resist[attacknum]) / 100;
1506 } 1737 }
1507 } 1738 }
1508 if ((2 + arrow->magic + arrow->stats.dam) > betterby) { 1739 if ((2 + arrow->magic + arrow->stats.dam) > betterby)
1509 tmp = arrow; 1740 {
1741 tmp = arrow;
1510 betterby = 2 + arrow->magic + arrow->stats.dam; 1742 betterby = 2 + arrow->magic + arrow->stats.dam;
1511 } 1743 }
1512 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby) { 1744 if (arrow->title && (1 + arrow->magic + arrow->stats.dam) > betterby)
1513 tmp = arrow; 1745 {
1746 tmp = arrow;
1514 betterby = 1 + arrow->magic + arrow->stats.dam; 1747 betterby = 1 + arrow->magic + arrow->stats.dam;
1515 } 1748 }
1749 }
1750 }
1516 } 1751 }
1517 }
1518 }
1519 if (tmp == NULL && arrow == NULL) 1752 if (tmp == NULL && arrow == NULL)
1520 return find_arrow(op, type); 1753 return find_arrow (op, type);
1521 1754
1522 *better = betterby; 1755 *better = betterby;
1523 return tmp; 1756 return tmp;
1524} 1757}
1525 1758
1526/* looks in a given direction, finds the first valid target, and calls 1759/* looks in a given direction, finds the first valid target, and calls
1527 * find_better_arrow to find a decent arrow to use. 1760 * find_better_arrow to find a decent arrow to use.
1528 * op = the shooter 1761 * op = the shooter
1529 * type = bow->race 1762 * type = bow->race
1530 * dir = fire direction 1763 * dir = fire direction
1531 */ 1764 */
1532 1765
1766object *
1533object *pick_arrow_target(object *op, const char *type, int dir) 1767pick_arrow_target (object *op, const char *type, int dir)
1534{ 1768{
1535 object *tmp = NULL; 1769 object *tmp = NULL;
1536 mapstruct *m; 1770 maptile *m;
1537 int i, mflags, found, number; 1771 int i, mflags, found, number;
1538 sint16 x, y; 1772 sint16 x, y;
1539 1773
1540 if (op->map == NULL) 1774 if (op->map == NULL)
1541 return find_arrow(op, type); 1775 return find_arrow (op, type);
1542 1776
1543 /* do a dex check */ 1777 /* do a dex check */
1544 number = (die_roll(2, 40, op, PREFER_LOW)-2)/2; 1778 number = (die_roll (2, 40, op, PREFER_LOW) - 2) / 2;
1545 if (number > (op->stats.Dex + (op->chosen_skill?op->chosen_skill->level:op->level))) 1779 if (number > (op->stats.Dex + (op->chosen_skill ? op->chosen_skill->level : op->level)))
1546 return find_arrow(op, type); 1780 return find_arrow (op, type);
1547 1781
1548 m = op->map; 1782 m = op->map;
1549 x = op->x; 1783 x = op->x;
1550 y = op->y; 1784 y = op->y;
1551 1785
1552 /* find the first target */ 1786 /* find the first target */
1553 for (i=0, found=0; i<20; i++) { 1787 for (i = 0, found = 0; i < 20; i++)
1788 {
1554 x += freearr_x[dir]; 1789 x += freearr_x[dir];
1555 y += freearr_y[dir]; 1790 y += freearr_y[dir];
1556 mflags = get_map_flags(m, &m, x, y, &x, &y); 1791 mflags = get_map_flags (m, &m, x, y, &x, &y);
1557 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW) { 1792 if (mflags & P_OUT_OF_MAP || mflags & P_BLOCKSVIEW)
1793 {
1558 tmp = NULL; 1794 tmp = NULL;
1559 break; 1795 break;
1796 }
1560 } else if (GET_MAP_MOVE_BLOCK(m, x, y) == MOVE_FLY_LOW) { 1797 else if (GET_MAP_MOVE_BLOCK (m, x, y) == MOVE_FLY_LOW)
1798 {
1561 /* This block presumes arrows and the like are MOVE_FLY_SLOW - 1799 /* This block presumes arrows and the like are MOVE_FLY_SLOW -
1562 * perhaps a bad assumption. 1800 * perhaps a bad assumption.
1563 */ 1801 */
1564 tmp = NULL; 1802 tmp = NULL;
1565 break; 1803 break;
1566 } 1804 }
1567 if (mflags & P_IS_ALIVE) { 1805 if (mflags & P_IS_ALIVE)
1806 {
1568 for (tmp = GET_MAP_OB(m, x, y); tmp; tmp=tmp->above) 1807 for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
1569 if (QUERY_FLAG(tmp, FLAG_ALIVE)) { 1808 if (QUERY_FLAG (tmp, FLAG_ALIVE))
1570 found++; 1809 {
1571 break; 1810 found++;
1572 } 1811 break;
1812 }
1573 if (found) 1813 if (found)
1574 break; 1814 break;
1575 } 1815 }
1576 } 1816 }
1577 if (tmp == NULL) 1817 if (tmp == NULL)
1578 return find_arrow(op, type); 1818 return find_arrow (op, type);
1579 1819
1580 if (tmp->head) 1820 if (tmp->head)
1581 tmp = tmp->head; 1821 tmp = tmp->head;
1582 1822
1583 return find_better_arrow(op, tmp, type, &i); 1823 return find_better_arrow (op, tmp, type, &i);
1584} 1824}
1585 1825
1586/* 1826/*
1587 * Creature fires a bow - op can be monster or player. Returns 1827 * Creature fires a bow - op can be monster or player. Returns
1588 * 1 if bow was actually fired, 0 otherwise. 1828 * 1 if bow was actually fired, 0 otherwise.
… …
1591 * dir is the direction of fire. 1831 * dir is the direction of fire.
1592 * wc_mod is any special modifier to give (used in special player fire modes) 1832 * wc_mod is any special modifier to give (used in special player fire modes)
1593 * sx, sy are coordinates to fire arrow from - also used in some of the special 1833 * sx, sy are coordinates to fire arrow from - also used in some of the special
1594 * player fire modes. 1834 * player fire modes.
1595 */ 1835 */
1836int
1596int fire_bow(object *op, object *part, object *arrow, int dir, int wc_mod, 1837fire_bow (object *op, object *part, object *arrow, int dir, int wc_mod, sint16 sx, sint16 sy)
1597 sint16 sx, sint16 sy)
1598{ 1838{
1599 object *left, *bow; 1839 object *left, *bow;
1600 tag_t left_tag, tag;
1601 int bowspeed, mflags; 1840 int bowspeed, mflags;
1602 mapstruct *m; 1841 maptile *m;
1603 1842
1604 if (!dir) { 1843 if (!dir)
1844 {
1605 new_draw_info(NDI_UNIQUE, 0, op, "You can't shoot yourself!"); 1845 new_draw_info (NDI_UNIQUE, 0, op, "You can't shoot yourself!");
1606 return 0; 1846 return 0;
1607 } 1847 }
1608 if (op->type == PLAYER) 1848 if (op->type == PLAYER)
1609 bow=op->contr->ranges[range_bow]; 1849 bow = op->contr->ranges[range_bow];
1610 else { 1850 else
1851 {
1611 for(bow=op->inv; bow; bow=bow->below) 1852 for (bow = op->inv; bow; bow = bow->below)
1612 /* Don't check for applied - monsters don't apply bows - in that way, they 1853 /* Don't check for applied - monsters don't apply bows - in that way, they
1613 * don't need to switch back and forth between bows and weapons. 1854 * don't need to switch back and forth between bows and weapons.
1614 */ 1855 */
1615 if(bow->type==BOW) 1856 if (bow->type == BOW)
1616 break; 1857 break;
1617 1858
1618 if (!bow) { 1859 if (!bow)
1860 {
1619 LOG (llevError, "Range: bow without activated bow (%s).\n", op->name); 1861 LOG (llevError, "Range: bow without activated bow (%s).\n", &op->name);
1620 return 0; 1862 return 0;
1621 } 1863 }
1622 } 1864 }
1623 if( !bow->race || !bow->skill) { 1865 if (!bow->race || !bow->skill)
1866 {
1624 new_draw_info_format(NDI_UNIQUE, 0, op, "Your %s is broken.", bow->name); 1867 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s is broken.", &bow->name);
1625 return 0; 1868 return 0;
1626 } 1869 }
1627 1870
1628 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex]; 1871 bowspeed = bow->stats.sp + dex_bonus[op->stats.Dex];
1629 1872
1630 /* penalize ROF for bestarrow */ 1873 /* penalize ROF for bestarrow */
1631 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow) 1874 if (op->type == PLAYER && op->contr->bowtype == bow_bestarrow)
1632 bowspeed -= dex_bonus[op->stats.Dex] + 5; 1875 bowspeed -= dex_bonus[op->stats.Dex] + 5;
1633 if (bowspeed < 1) 1876 if (bowspeed < 1)
1634 bowspeed = 1; 1877 bowspeed = 1;
1635 1878
1636 if (arrow == NULL) { 1879 if (arrow == NULL)
1880 {
1637 if ((arrow=find_arrow(op, bow->race)) == NULL) { 1881 if ((arrow = find_arrow (op, bow->race)) == NULL)
1882 {
1638 if (op->type == PLAYER) 1883 if (op->type == PLAYER)
1639 new_draw_info_format(NDI_UNIQUE, 0, op, 1884 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1640 "You have no %s left.", bow->race);
1641 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */ 1885 /* FLAG_READY_BOW will get reset if the monsters picks up some arrows */
1642 else 1886 else
1643 CLEAR_FLAG(op, FLAG_READY_BOW); 1887 CLEAR_FLAG (op, FLAG_READY_BOW);
1644 return 0; 1888 return 0;
1645 } 1889 }
1646 } 1890 }
1647 mflags = get_map_flags(op->map, &m, sx, sy, &sx, &sy); 1891 mflags = get_map_flags (op->map, &m, sx, sy, &sx, &sy);
1648 if (mflags & P_OUT_OF_MAP) { 1892 if (mflags & P_OUT_OF_MAP)
1649 return 0;
1650 } 1893 {
1894 return 0;
1895 }
1651 if (GET_MAP_MOVE_BLOCK(m, sx, sy) == MOVE_FLY_LOW) { 1896 if (GET_MAP_MOVE_BLOCK (m, sx, sy) == MOVE_FLY_LOW)
1897 {
1652 new_draw_info(NDI_UNIQUE, 0,op,"Something is in the way."); 1898 new_draw_info (NDI_UNIQUE, 0, op, "Something is in the way.");
1653 return 0; 1899 return 0;
1654 } 1900 }
1655 1901
1656 /* this should not happen, but sometimes does */ 1902 /* this should not happen, but sometimes does */
1657 if (arrow->nrof==0) { 1903 if (arrow->nrof == 0)
1904 {
1658 remove_ob(arrow); 1905 remove_ob (arrow);
1659 free_object(arrow); 1906 free_object (arrow);
1660 return 0; 1907 return 0;
1661 } 1908 }
1662 1909
1663 left = arrow; /* these are arrows left to the player */ 1910 left = arrow; /* these are arrows left to the player */
1664 left_tag = left->count;
1665 arrow = get_split_ob(arrow, 1); 1911 arrow = get_split_ob (arrow, 1);
1666 if (arrow == NULL) { 1912 if (arrow == NULL)
1913 {
1667 new_draw_info_format(NDI_UNIQUE, 0, op, "You have no %s left.", 1914 new_draw_info_format (NDI_UNIQUE, 0, op, "You have no %s left.", &bow->race);
1668 bow->race); 1915 return 0;
1669 return 0;
1670 } 1916 }
1671 set_owner(arrow, op); 1917 set_owner (arrow, op);
1672 if (arrow->skill) free_string(arrow->skill);
1673 arrow->skill = add_refcount(bow->skill); 1918 arrow->skill = bow->skill;
1674 1919
1675 arrow->direction=dir; 1920 arrow->direction = dir;
1676 arrow->x = sx; 1921 arrow->x = sx;
1677 arrow->y = sy; 1922 arrow->y = sy;
1678 1923
1679 if (op->type == PLAYER) { 1924 if (op->type == PLAYER)
1925 {
1680 op->speed_left = 0.01 - (float)FABS(op->speed) * 100 / bowspeed; 1926 op->speed_left = 0.01 - (float) FABS (op->speed) * 100 / bowspeed;
1681 fix_player(op); 1927 fix_player (op);
1682 } 1928 }
1683 1929
1684 SET_ANIMATION(arrow, arrow->direction); 1930 SET_ANIMATION (arrow, arrow->direction);
1685 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */ 1931 arrow->stats.sp = arrow->stats.wc; /* save original wc and dam */
1686 arrow->stats.hp = arrow->stats.dam; 1932 arrow->stats.hp = arrow->stats.dam;
1687 arrow->stats.grace = arrow->attacktype; 1933 arrow->stats.grace = arrow->attacktype;
1688 if (arrow->slaying != NULL) 1934 if (arrow->slaying != NULL)
1689 arrow->spellarg = strdup_local(arrow->slaying); 1935 arrow->spellarg = strdup_local (arrow->slaying);
1690 1936
1691 /* Note that this was different for monsters - they got their level 1937 /* Note that this was different for monsters - they got their level
1692 * added to the damage. I think the strength bonus is more proper. 1938 * added to the damage. I think the strength bonus is more proper.
1693 */ 1939 */
1694
1695 arrow->stats.dam += (QUERY_FLAG(bow, FLAG_NO_STRENGTH) ?
1696 0 : dam_bonus[op->stats.Str]) +
1697 bow->stats.dam + bow->magic + arrow->magic;
1698 1940
1941 arrow->stats.dam += (QUERY_FLAG (bow, FLAG_NO_STRENGTH) ? 0 : dam_bonus[op->stats.Str]) + bow->stats.dam + bow->magic + arrow->magic;
1942
1699 /* update the speed */ 1943 /* update the speed */
1700 arrow->speed = (float)((QUERY_FLAG(bow, FLAG_NO_STRENGTH) ? 1944 arrow->speed = (float) ((QUERY_FLAG (bow, FLAG_NO_STRENGTH) ?
1701 0 : dam_bonus[op->stats.Str]) + 1945 0 : dam_bonus[op->stats.Str]) + bow->magic + arrow->magic) / 5.0 + (float) bow->stats.dam / 7.0;
1702 bow->magic + arrow->magic) / 5.0 +
1703 (float)bow->stats.dam / 7.0;
1704 1946
1705 if (arrow->speed < 1.0) 1947 if (arrow->speed < 1.0)
1706 arrow->speed = 1.0; 1948 arrow->speed = 1.0;
1707 update_ob_speed(arrow); 1949 update_ob_speed (arrow);
1708 arrow->speed_left = 0; 1950 arrow->speed_left = 0;
1709 1951
1710 if (op->type == PLAYER) { 1952 if (op->type == PLAYER)
1953 {
1711 arrow->stats.wc = 20 - bow->magic - arrow->magic - 1954 arrow->stats.wc = 20 - bow->magic - arrow->magic -
1712 (op->chosen_skill?op->chosen_skill->level:op->level) - 1955 (op->chosen_skill ? op->chosen_skill->level : op->level) -
1713 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - 1956 dex_bonus[op->stats.Dex] - thaco_bonus[op->stats.Str] - arrow->stats.wc - bow->stats.wc + wc_mod;
1714 arrow->stats.wc - bow->stats.wc + wc_mod;
1715 1957
1716 arrow->level = op->chosen_skill?op->chosen_skill->level:op->level; 1958 arrow->level = op->chosen_skill ? op->chosen_skill->level : op->level;
1717 } else { 1959 }
1960 else
1961 {
1718 arrow->stats.wc= op->stats.wc - bow->magic - arrow->magic - 1962 arrow->stats.wc = op->stats.wc - bow->magic - arrow->magic - arrow->stats.wc + wc_mod;
1719 arrow->stats.wc + wc_mod;
1720
1721 arrow->level = op->level; 1963 arrow->level = op->level;
1722 } 1964 }
1965
1723 if (arrow->attacktype == AT_PHYSICAL) 1966 if (arrow->attacktype == AT_PHYSICAL)
1724 arrow->attacktype |= bow->attacktype; 1967 arrow->attacktype |= bow->attacktype;
1968
1725 if (bow->slaying != NULL) 1969 if (bow->slaying != NULL)
1726 arrow->slaying = add_string(bow->slaying); 1970 arrow->slaying = bow->slaying;
1727 1971
1728 arrow->map = m; 1972 arrow->map = m;
1729 arrow->move_type = MOVE_FLY_LOW; 1973 arrow->move_type = MOVE_FLY_LOW;
1730 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK; 1974 arrow->move_on = MOVE_FLY_LOW | MOVE_WALK;
1731 1975
1732 play_sound_map(op->map, op->x, op->y, SOUND_FIRE_ARROW); 1976 play_sound_map (op->map, op->x, op->y, SOUND_FIRE_ARROW);
1733 tag = arrow->count;
1734 insert_ob_in_map(arrow, m, op, 0); 1977 insert_ob_in_map (arrow, m, op, 0);
1735 1978
1736 if (!was_destroyed(arrow, tag)) 1979 if (!arrow->destroyed ())
1737 move_arrow(arrow); 1980 move_arrow (arrow);
1738 1981
1739 if (op->type == PLAYER) { 1982 if (op->type == PLAYER)
1740 if (was_destroyed (left, left_tag)) 1983 {
1984 if (left->destroyed ())
1741 esrv_del_item(op->contr, left_tag); 1985 esrv_del_item (op->contr, left->count);
1742 else 1986 else
1743 esrv_send_item(op, left); 1987 esrv_send_item (op, left);
1744 } 1988 }
1989
1745 return 1; 1990 return 1;
1746} 1991}
1747 1992
1748/* Special fire code for players - this takes into 1993/* Special fire code for players - this takes into
1749 * account the special fire modes players can have 1994 * account the special fire modes players can have
1750 * but monsters can't. Putting that code here 1995 * but monsters can't. Putting that code here
1751 * makes the fire_bow code much cleaner. 1996 * makes the fire_bow code much cleaner.
1752 * this function should only be called if 'op' is a player, 1997 * this function should only be called if 'op' is a player,
1753 * hence the function name. 1998 * hence the function name.
1754 */ 1999 */
2000int
1755int player_fire_bow(object *op, int dir) 2001player_fire_bow (object *op, int dir)
1756{ 2002{
1757 int ret=0, wcmod=0; 2003 int ret = 0, wcmod = 0;
1758 2004
1759 if (op->contr->bowtype == bow_bestarrow) { 2005 if (op->contr->bowtype == bow_bestarrow)
1760 ret = fire_bow(op, op, 2006 {
1761 pick_arrow_target(op, op->contr->ranges[range_bow]->race, dir), 2007 ret = fire_bow (op, op, pick_arrow_target (op, op->contr->ranges[range_bow]->race, dir), dir, 0, op->x, op->y);
1762 dir, 0, op->x, op->y); 2008 }
1763 } else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw) { 2009 else if (op->contr->bowtype >= bow_n && op->contr->bowtype <= bow_nw)
2010 {
1764 if (!similar_direction(dir, op->contr->bowtype - bow_n + 1)) 2011 if (!similar_direction (dir, op->contr->bowtype - bow_n + 1))
1765 wcmod =-1; 2012 wcmod = -1;
1766 ret = fire_bow(op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, 2013 ret = fire_bow (op, op, NULL, op->contr->bowtype - bow_n + 1, wcmod, op->x, op->y);
1767 op->x, op->y); 2014 }
1768 } else if (op->contr->bowtype == bow_threewide) { 2015 else if (op->contr->bowtype == bow_threewide)
2016 {
1769 ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y); 2017 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1770 ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir+2)], op->y + freearr_y[absdir(dir+2)]); 2018 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir + 2)], op->y + freearr_y[absdir (dir + 2)]);
1771 ret |= fire_bow(op, op, NULL, dir, -5, op->x + freearr_x[absdir(dir-2)], op->y + freearr_y[absdir(dir-2)]); 2019 ret |= fire_bow (op, op, NULL, dir, -5, op->x + freearr_x[absdir (dir - 2)], op->y + freearr_y[absdir (dir - 2)]);
2020 }
1772 } else if (op->contr->bowtype == bow_spreadshot) { 2021 else if (op->contr->bowtype == bow_spreadshot)
2022 {
1773 ret |= fire_bow(op, op, NULL, dir, 0, op->x, op->y); 2023 ret |= fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1774 ret |= fire_bow(op, op, NULL, absdir(dir-1), -5, op->x, op->y); 2024 ret |= fire_bow (op, op, NULL, absdir (dir - 1), -5, op->x, op->y);
1775 ret |= fire_bow(op, op, NULL, absdir(dir+1), -5, op->x, op->y); 2025 ret |= fire_bow (op, op, NULL, absdir (dir + 1), -5, op->x, op->y);
1776 2026
1777 } else { 2027 }
2028 else
2029 {
1778 /* Simple case */ 2030 /* Simple case */
1779 ret = fire_bow(op, op, NULL, dir, 0, op->x, op->y); 2031 ret = fire_bow (op, op, NULL, dir, 0, op->x, op->y);
1780 } 2032 }
1781 return ret; 2033 return ret;
1782} 2034}
1783 2035
1784 2036
1785/* Fires a misc (wand/rod/horn) object in 'dir'. 2037/* Fires a misc (wand/rod/horn) object in 'dir'.
1786 * Broken apart from 'fire' to keep it more readable. 2038 * Broken apart from 'fire' to keep it more readable.
1787 */ 2039 */
2040void
1788void fire_misc_object(object *op, int dir) 2041fire_misc_object (object *op, int dir)
1789{ 2042{
1790 object *item; 2043 object *item;
1791 2044
1792 if (!op->contr->ranges[range_misc]) { 2045 if (!op->contr->ranges[range_misc])
2046 {
1793 new_draw_info(NDI_UNIQUE, 0,op,"You have range item readied."); 2047 new_draw_info (NDI_UNIQUE, 0, op, "You have range item readied.");
1794 return; 2048 return;
1795 } 2049 }
1796 2050
1797 item = op->contr->ranges[range_misc]; 2051 item = op->contr->ranges[range_misc];
1798 if (!item->inv) { 2052 if (!item->inv)
2053 {
1799 LOG(llevError,"Object %s lacks a spell\n", item->name); 2054 LOG (llevError, "Object %s lacks a spell\n", &item->name);
1800 return; 2055 return;
1801 } 2056 }
1802 if (item->type == WAND) { 2057 if (item->type == WAND)
2058 {
1803 if(item->stats.food<=0) { 2059 if (item->stats.food <= 0)
2060 {
1804 play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0); 2061 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1805 new_draw_info_format(NDI_UNIQUE, 0,op,"The %s goes poof.", query_base_name(item, 0)); 2062 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s goes poof.", query_base_name (item, 0));
1806 return; 2063 return;
1807 } 2064 }
2065 }
1808 } else if (item->type == ROD || item->type==HORN) { 2066 else if (item->type == ROD || item->type == HORN)
2067 {
1809 if(item->stats.hp<MAX(item->inv->stats.sp, item->inv->stats.grace)) { 2068 if (item->stats.hp < MAX (item->inv->stats.sp, item->inv->stats.grace))
2069 {
1810 play_sound_player_only(op->contr, SOUND_WAND_POOF,0,0); 2070 play_sound_player_only (op->contr, SOUND_WAND_POOF, 0, 0);
1811 if (item->type== ROD) 2071 if (item->type == ROD)
1812 new_draw_info_format(NDI_UNIQUE, 0,op, 2072 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s whines for a while, but nothing happens.", query_base_name (item, 0));
1813 "The %s whines for a while, but nothing happens.", query_base_name(item,0)); 2073 else
1814 else 2074 new_draw_info_format (NDI_UNIQUE, 0, op, "The %s needs more time to charge.", query_base_name (item, 0));
1815 new_draw_info_format(NDI_UNIQUE, 0,op,
1816 "The %s needs more time to charge.", query_base_name(item,0));
1817 return; 2075 return;
1818 } 2076 }
1819 } 2077 }
1820 2078
1821 if(cast_spell(op,item,dir,item->inv,NULL)) { 2079 if (cast_spell (op, item, dir, item->inv, NULL))
2080 {
1822 SET_FLAG(op, FLAG_BEEN_APPLIED); /* You now know something about it */ 2081 SET_FLAG (op, FLAG_BEEN_APPLIED); /* You now know something about it */
1823 if (item->type == WAND) { 2082 if (item->type == WAND)
2083 {
1824 if (!(--item->stats.food)) { 2084 if (!(--item->stats.food))
1825 object *tmp; 2085 {
1826 if (item->arch) { 2086 object *tmp;
2087
2088 if (item->arch)
2089 {
1827 CLEAR_FLAG(item, FLAG_ANIMATE); 2090 CLEAR_FLAG (item, FLAG_ANIMATE);
1828 item->face = item->arch->clone.face; 2091 item->face = item->arch->clone.face;
1829 item->speed = 0; 2092 item->speed = 0;
1830 update_ob_speed(item); 2093 update_ob_speed (item);
1831 } 2094 }
1832 if ((tmp=is_player_inv(item))) 2095 if ((tmp = is_player_inv (item)))
1833 esrv_update_item(UPD_ANIM, tmp, item); 2096 esrv_update_item (UPD_ANIM, tmp, item);
1834 } 2097 }
1835 } 2098 }
1836 else if (item->type == ROD || item->type==HORN) { 2099 else if (item->type == ROD || item->type == HORN)
2100 {
1837 drain_rod_charge(item); 2101 drain_rod_charge (item);
1838 } 2102 }
1839 } 2103 }
1840} 2104}
1841 2105
1842/* Received a fire command for the player - go and do it. 2106/* Received a fire command for the player - go and do it.
1843 */ 2107 */
2108void
1844void fire(object *op,int dir) { 2109fire (object *op, int dir)
2110{
1845 int spellcost=0; 2111 int spellcost = 0;
1846 2112
1847 /* check for loss of invisiblity/hide */ 2113 /* check for loss of invisiblity/hide */
1848 if (action_makes_visible(op)) make_visible(op); 2114 if (action_makes_visible (op))
2115 make_visible (op);
1849 2116
1850 switch(op->contr->shoottype) { 2117 switch (op->contr->shoottype)
2118 {
1851 case range_none: 2119 case range_none:
1852 return;
1853
1854 case range_bow:
1855 player_fire_bow(op, dir);
1856 return;
1857
1858 case range_magic: /* Casting spells */
1859 spellcost=(cast_spell(op,op,dir,op->contr->ranges[range_magic],op->contr->spellparam[0]?op->contr->spellparam:NULL));
1860 return;
1861
1862 case range_misc:
1863 fire_misc_object(op, dir);
1864 return;
1865
1866 case range_golem: /* Control summoned monsters from scrolls */
1867 if(op->contr->ranges[range_golem]==NULL ||
1868 op->contr->golem_count != op->contr->ranges[range_golem]->count) {
1869 op->contr->ranges[range_golem] = NULL;
1870 op->contr->shoottype=range_none;
1871 op->contr->golem_count = 0;
1872 }
1873 else
1874 control_golem(op->contr->ranges[range_golem], dir);
1875 return;
1876
1877 case range_skill:
1878 if(!op->chosen_skill) {
1879 if(op->type==PLAYER)
1880 new_draw_info(NDI_UNIQUE, 0,op,"You have no applicable skill to use.");
1881 return;
1882 }
1883 (void) do_skill(op,op,op->chosen_skill,dir,NULL);
1884 return;
1885 case range_builder:
1886 apply_map_builder( op, dir );
1887 return; 2120 return;
1888 default: 2121
2122 case range_bow:
2123 player_fire_bow (op, dir);
2124 return;
2125
2126 case range_magic: /* Casting spells */
2127 spellcost = (cast_spell (op, op, dir, op->contr->ranges[range_magic], op->contr->spellparam[0] ? op->contr->spellparam : 0));
2128 return;
2129
2130 case range_misc:
2131 fire_misc_object (op, dir);
2132 return;
2133
2134 case range_golem: /* Control summoned monsters from scrolls */
2135 if (op->contr->ranges[range_golem] == NULL || op->contr->golem_count != op->contr->ranges[range_golem]->count)
2136 {
2137 op->contr->ranges[range_golem] = NULL;
2138 op->contr->shoottype = range_none;
2139 op->contr->golem_count = 0;
2140 }
2141 else
2142 control_golem (op->contr->ranges[range_golem], dir);
2143 return;
2144
2145 case range_skill:
2146 if (!op->chosen_skill)
2147 {
2148 if (op->type == PLAYER)
2149 new_draw_info (NDI_UNIQUE, 0, op, "You have no applicable skill to use.");
2150 return;
2151 }
2152 (void) do_skill (op, op, op->chosen_skill, dir, NULL);
2153 return;
2154 case range_builder:
2155 apply_map_builder (op, dir);
2156 return;
2157 default:
1889 new_draw_info(NDI_UNIQUE, 0,op,"Illegal shoot type."); 2158 new_draw_info (NDI_UNIQUE, 0, op, "Illegal shoot type.");
1890 return; 2159 return;
1891 } 2160 }
1892} 2161}
1893 2162
1894 2163
1895 2164
… …
1902 * inv is the objects inventory to searched 2171 * inv is the objects inventory to searched
1903 * door is the door we are trying to match against. 2172 * door is the door we are trying to match against.
1904 * This function can be called recursively to search containers. 2173 * This function can be called recursively to search containers.
1905 */ 2174 */
1906 2175
2176object *
1907object * find_key(object *pl, object *container, object *door) 2177find_key (object *pl, object *container, object *door)
1908{ 2178{
1909 object *tmp,*key; 2179 object *tmp, *key;
1910 2180
1911 /* Should not happen, but sanity checking is never bad */ 2181 /* Should not happen, but sanity checking is never bad */
1912 if (container->inv == NULL) return NULL; 2182 if (container->inv == NULL)
2183 return NULL;
1913 2184
1914 /* First, lets try to find a key in the top level inventory */ 2185 /* First, lets try to find a key in the top level inventory */
1915 for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) { 2186 for (tmp = container->inv; tmp != NULL; tmp = tmp->below)
2187 {
1916 if (door->type==DOOR && tmp->type==KEY) break; 2188 if (door->type == DOOR && tmp->type == KEY)
2189 break;
1917 /* For sanity, we should really check door type, but other stuff 2190 /* For sanity, we should really check door type, but other stuff
1918 * (like containers) can be locked with special keys 2191 * (like containers) can be locked with special keys
1919 */ 2192 */
1920 if (tmp->slaying && tmp->type==SPECIAL_KEY && 2193 if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
1921 tmp->slaying==door->slaying) break; 2194 break;
1922 } 2195 }
1923 /* No key found - lets search inventories now */ 2196 /* No key found - lets search inventories now */
1924 /* If we find and use a key in an inventory, return at that time. 2197 /* If we find and use a key in an inventory, return at that time.
1925 * otherwise, if we search all the inventories and still don't find 2198 * otherwise, if we search all the inventories and still don't find
1926 * a key, return 2199 * a key, return
1927 */ 2200 */
1928 if (!tmp) { 2201 if (!tmp)
2202 {
1929 for (tmp=container->inv; tmp!=NULL; tmp=tmp->below) { 2203 for (tmp = container->inv; tmp != NULL; tmp = tmp->below)
2204 {
1930 /* No reason to search empty containers */ 2205 /* No reason to search empty containers */
1931 if (tmp->type==CONTAINER && tmp->inv) { 2206 if (tmp->type == CONTAINER && tmp->inv)
1932 if ((key=find_key(pl, tmp, door))!=NULL) return key; 2207 {
2208 if ((key = find_key (pl, tmp, door)) != NULL)
2209 return key;
2210 }
2211 }
2212 if (!tmp)
2213 return NULL;
1933 } 2214 }
1934 }
1935 if (!tmp) return NULL;
1936 }
1937 /* We get down here if we have found a key. Now if its in a container, 2215 /* We get down here if we have found a key. Now if its in a container,
1938 * see if we actually want to use it 2216 * see if we actually want to use it
1939 */ 2217 */
1940 if (pl!=container) { 2218 if (pl != container)
2219 {
1941 /* Only let players use keys in containers */ 2220 /* Only let players use keys in containers */
1942 if (!pl->contr) return NULL; 2221 if (!pl->contr)
2222 return NULL;
1943 /* cases where this fails: 2223 /* cases where this fails:
1944 * If we only search the player inventory, return now since we 2224 * If we only search the player inventory, return now since we
1945 * are not in the players inventory. 2225 * are not in the players inventory.
1946 * If the container is not active, return now since only active 2226 * If the container is not active, return now since only active
1947 * containers can be used. 2227 * containers can be used.
1948 * If we only search keyrings and the container does not have 2228 * If we only search keyrings and the container does not have
1949 * a race/isn't a keyring. 2229 * a race/isn't a keyring.
1950 * No checking for all containers - to fall through past here, 2230 * No checking for all containers - to fall through past here,
1951 * inv must have been an container and must have been active. 2231 * inv must have been an container and must have been active.
1952 * 2232 *
1953 * Change the color so that the message doesn't disappear with 2233 * Change the color so that the message doesn't disappear with
1954 * all the others. 2234 * all the others.
1955 */ 2235 */
1956 if (pl->contr->usekeys == key_inventory || 2236 if (pl->contr->usekeys == key_inventory ||
1957 !QUERY_FLAG(container, FLAG_APPLIED) || 2237 !QUERY_FLAG (container, FLAG_APPLIED) ||
1958 (pl->contr->usekeys == keyrings && 2238 (pl->contr->usekeys == keyrings && (!container->race || strcmp (container->race, "keys"))))
1959 (!container->race || strcmp(container->race, "keys"))) 2239 {
1960 ) {
1961 new_draw_info_format(NDI_UNIQUE|NDI_BROWN, 0, pl, 2240 new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
1962 "The %s in your %s vibrates as you approach the door", 2241 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
1963 query_name(tmp), query_name(container));
1964 return NULL; 2242 return NULL;
1965 } 2243 }
1966 } 2244 }
1967 return tmp; 2245 return tmp;
1968} 2246}
1969 2247
1970/* moved door processing out of move_player_attack. 2248/* moved door processing out of move_player_attack.
1971 * returns 1 if player has opened the door with a key 2249 * returns 1 if player has opened the door with a key
1972 * such that the caller should not do anything more, 2250 * such that the caller should not do anything more,
1973 * 0 otherwise 2251 * 0 otherwise
1974 */ 2252 */
2253static int
1975static int player_attack_door(object *op, object *door) 2254player_attack_door (object *op, object *door)
1976{ 2255{
1977 2256
1978 /* If its a door, try to find a use a key. If we do destroy the door, 2257 /* If its a door, try to find a use a key. If we do destroy the door,
1979 * might as well return immediately as there is nothing more to do - 2258 * might as well return immediately as there is nothing more to do -
1980 * otherwise, we fall through to the rest of the code. 2259 * otherwise, we fall through to the rest of the code.
1981 */ 2260 */
1982 object *key=find_key(op, op, door); 2261 object *key = find_key (op, op, door);
1983 2262
1984 /* IF we found a key, do some extra work */ 2263 /* IF we found a key, do some extra work */
1985 if (key) { 2264 if (key)
2265 {
1986 object *container=key->env; 2266 object *container = key->env;
1987 2267
1988 play_sound_map(op->map, op->x, op->y, SOUND_OPEN_DOOR); 2268 play_sound_map (op->map, op->x, op->y, SOUND_OPEN_DOOR);
1989 if(action_makes_visible(op)) make_visible(op); 2269 if (action_makes_visible (op))
2270 make_visible (op);
1990 if(door->inv &&(door->inv->type ==RUNE || door->inv->type ==TRAP)) spring_trap(door->inv,op); 2271 if (door->inv && (door->inv->type == RUNE || door->inv->type == TRAP))
2272 spring_trap (door->inv, op);
1991 if (door->type == DOOR) { 2273 if (door->type == DOOR)
2274 {
1992 hit_player(door,9998,op,AT_PHYSICAL,1); /* Break through the door */ 2275 hit_player (door, 9998, op, AT_PHYSICAL, 1); /* Break through the door */
1993 } 2276 }
1994 else if(door->type==LOCKED_DOOR) { 2277 else if (door->type == LOCKED_DOOR)
1995 new_draw_info_format(NDI_UNIQUE, NDI_BROWN, op, 2278 {
1996 "You open the door with the %s", query_short_name(key)); 2279 new_draw_info_format (NDI_UNIQUE, NDI_BROWN, op, "You open the door with the %s", query_short_name (key));
1997 remove_door2(door); /* remove door without violence ;-) */ 2280 remove_door2 (door); /* remove door without violence ;-) */
1998 } 2281 }
1999 /* Do this after we print the message */ 2282 /* Do this after we print the message */
2000 decrease_ob(key); /* Use up one of the keys */ 2283 decrease_ob (key); /* Use up one of the keys */
2001 /* Need to update the weight the container the key was in */ 2284 /* Need to update the weight the container the key was in */
2002 if (container != op) 2285 if (container != op)
2003 esrv_update_item(UPD_WEIGHT, op, container); 2286 esrv_update_item (UPD_WEIGHT, op, container);
2004 return 1; /* Nothing more to do below */ 2287 return 1; /* Nothing more to do below */
2288 }
2005 } else if (door->type==LOCKED_DOOR) { 2289 else if (door->type == LOCKED_DOOR)
2290 {
2006 /* Might as well return now - no other way to open this */ 2291 /* Might as well return now - no other way to open this */
2007 new_draw_info(NDI_UNIQUE | NDI_NAVY, 0, op, door->msg); 2292 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, door->msg);
2008 return 1; 2293 return 1;
2009 } 2294 }
2010 return 0; 2295 return 0;
2011} 2296}
2012 2297
2013/* This function is just part of a breakup from move_player. 2298/* This function is just part of a breakup from move_player.
2014 * It should keep the code cleaner. 2299 * It should keep the code cleaner.
2015 * When this is called, the players direction has been updated 2300 * When this is called, the players direction has been updated
2016 * (taking into account confusion.) The player is also actually 2301 * (taking into account confusion.) The player is also actually
2017 * going to try and move (not fire weapons). 2302 * going to try and move (not fire weapons).
2018 */ 2303 */
2019 2304
2305void
2020void move_player_attack(object *op, int dir) 2306move_player_attack (object *op, int dir)
2021{ 2307{
2022 object *tmp, *mon, *tpl; 2308 object *tmp, *mon;
2023 sint16 nx, ny; 2309 sint16 nx, ny;
2024 int on_battleground; 2310 int on_battleground;
2025 mapstruct *m; 2311 maptile *m;
2026 2312
2027 if (op->contr->transport) tpl = op->contr->transport;
2028 else tpl = op;
2029 nx=freearr_x[dir]+tpl->x; 2313 nx = freearr_x[dir] + op->x;
2030 ny=freearr_y[dir]+tpl->y; 2314 ny = freearr_y[dir] + op->y;
2031 2315
2032 on_battleground = op_on_battleground(tpl, NULL, NULL); 2316 on_battleground = op_on_battleground (op, NULL, NULL);
2033 2317
2034 /* If braced, or can't move to the square, and it is not out of the 2318 /* If braced, or can't move to the square, and it is not out of the
2035 * map, attack it. Note order of if statement is important - don't 2319 * map, attack it. Note order of if statement is important - don't
2036 * want to be calling move_ob if braced, because move_ob will move the 2320 * want to be calling move_ob if braced, because move_ob will move the
2037 * player. This is a pretty nasty hack, because if we could 2321 * player. This is a pretty nasty hack, because if we could
2038 * move to some space, it then means that if we are braced, we should 2322 * move to some space, it then means that if we are braced, we should
2039 * do nothing at all. As it is, if we are braced, we go through 2323 * do nothing at all. As it is, if we are braced, we go through
2040 * quite a bit of processing. However, it probably is less than what 2324 * quite a bit of processing. However, it probably is less than what
2041 * move_ob uses. 2325 * move_ob uses.
2042 */ 2326 */
2043 if ((op->contr->braced || !move_ob(tpl,dir,tpl)) && !out_of_map(tpl->map,nx,ny)) { 2327 if ((op->contr->braced || !move_ob (op, dir, op)) && !out_of_map (op->map, nx, ny))
2328 {
2044 if (OUT_OF_REAL_MAP(tpl->map, nx, ny)) { 2329 if (OUT_OF_REAL_MAP (op->map, nx, ny))
2330 {
2045 m = get_map_from_coord(tpl->map, &nx, &ny); 2331 m = get_map_from_coord (op->map, &nx, &ny);
2046 if (!m) return; /* Don't think this should happen */ 2332 if (!m)
2047 } 2333 return; /* Don't think this should happen */
2048 else m =tpl->map; 2334 }
2049 2335 else
2336 m = op->map;
2337
2050 if ((tmp=get_map_ob(m,nx,ny))==NULL) { 2338 if ((tmp = get_map_ob (m, nx, ny)) == NULL)
2339 {
2051 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n");*/ 2340 /* LOG(llevError,"player_move_attack: get_map_ob returns NULL, but player can not more there.\n"); */
2052 return; 2341 return;
2053 } 2342 }
2054 2343
2055 mon = NULL; 2344 mon = NULL;
2056 /* Go through all the objects, and find ones of interest. Only stop if 2345 /* Go through all the objects, and find ones of interest. Only stop if
2057 * we find a monster - that is something we know we want to attack. 2346 * we find a monster - that is something we know we want to attack.
2058 * if its a door or barrel (can roll) see if there may be monsters 2347 * if its a door or barrel (can roll) see if there may be monsters
2059 * on the space 2348 * on the space
2060 */ 2349 */
2061 while (tmp!=NULL) { 2350 while (tmp != NULL)
2351 {
2062 if (tmp == op) { 2352 if (tmp == op)
2063 tmp=tmp->above; 2353 {
2064 continue; 2354 tmp = tmp->above;
2065 } 2355 continue;
2356 }
2357
2066 if (QUERY_FLAG(tmp,FLAG_ALIVE)) { 2358 if (QUERY_FLAG (tmp, FLAG_ALIVE))
2067 mon = tmp; 2359 {
2068 break; 2360 mon = tmp;
2069 } 2361 break;
2362 }
2363
2070 if (tmp->type==LOCKED_DOOR || QUERY_FLAG(tmp,FLAG_CAN_ROLL)) 2364 if (tmp->type == LOCKED_DOOR || QUERY_FLAG (tmp, FLAG_CAN_ROLL))
2071 mon = tmp; 2365 mon = tmp;
2366
2072 tmp=tmp->above; 2367 tmp = tmp->above;
2073 } 2368 }
2074 2369
2075 if (mon==NULL) /* This happens anytime the player tries to move */ 2370 if (mon == NULL) /* This happens anytime the player tries to move */
2076 return; /* into a wall */ 2371 return; /* into a wall */
2077 2372
2078 if(mon->head != NULL) 2373 if (mon->head != NULL)
2079 mon = mon->head; 2374 mon = mon->head;
2080 2375
2081 if ((mon->type==DOOR && mon->stats.hp>=0) || (mon->type==LOCKED_DOOR)) 2376 if ((mon->type == DOOR && mon->stats.hp >= 0) || (mon->type == LOCKED_DOOR))
2082 if (player_attack_door(op, mon)) return; 2377 if (player_attack_door (op, mon))
2378 return;
2083 2379
2084 /* The following deals with possibly attacking peaceful 2380 /* The following deals with possibly attacking peaceful
2085 * or frienddly creatures. Basically, all players are considered 2381 * or frienddly creatures. Basically, all players are considered
2086 * unaggressive. If the moving player has peaceful set, then the 2382 * unaggressive. If the moving player has peaceful set, then the
2087 * object should be pushed instead of attacked. It is assumed that 2383 * object should be pushed instead of attacked. It is assumed that
2088 * if you are braced, you will not attack friends accidently, 2384 * if you are braced, you will not attack friends accidently,
2089 * and thus will not push them. 2385 * and thus will not push them.
2090 */ 2386 */
2091 2387
2092 /* If the creature is a pet, push it even if the player is not 2388 /* If the creature is a pet, push it even if the player is not
2093 * peaceful. Our assumption is the creature is a pet if the 2389 * peaceful. Our assumption is the creature is a pet if the
2094 * player owns it and it is either friendly or unagressive. 2390 * player owns it and it is either friendly or unagressive.
2095 */ 2391 */
2096 if ((op->type==PLAYER) 2392 if ((op->type == PLAYER)
2097#if COZY_SERVER 2393#if COZY_SERVER
2098 && 2394 &&
2099 (
2100 (get_owner(mon) && get_owner(mon)->contr 2395 ((get_owner (mon) && get_owner (mon)->contr
2101 && same_party (get_owner(mon)->contr->party, op->contr->party)) 2396 && same_party (get_owner (mon)->contr->party, op->contr->party)) || get_owner (mon) == op)
2102 || get_owner(mon) == op
2103 )
2104#else 2397#else
2105 && get_owner(mon)==op 2398 && get_owner (mon) == op
2106#endif 2399#endif
2107 && (QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY))) 2400 && (QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)))
2108 { 2401 {
2109 /* If we're braced, we don't want to switch places with it */ 2402 /* If we're braced, we don't want to switch places with it */
2110 if (op->contr->braced) return; 2403 if (op->contr->braced)
2404 return;
2111 play_sound_map(tpl->map, tpl->x, tpl->y, SOUND_PUSH_PLAYER); 2405 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2112 (void) push_ob(mon,dir,op); 2406 (void) push_ob (mon, dir, op);
2113 if(op->contr->tmp_invis||op->hide) make_visible(op); 2407 if (op->contr->tmp_invis || op->hide)
2408 make_visible (op);
2114 return; 2409 return;
2115 } 2410 }
2116 2411
2117 /* in certain circumstances, you shouldn't attack friendly 2412 /* in certain circumstances, you shouldn't attack friendly
2118 * creatures. Note that if you are braced, you can't push 2413 * creatures. Note that if you are braced, you can't push
2119 * someone, but put it inside this loop so that you won't 2414 * someone, but put it inside this loop so that you won't
2120 * attack them either. 2415 * attack them either.
2121 */ 2416 */
2122 if ((mon->type==PLAYER || mon->enemy != op) && 2417 if ((mon->type == PLAYER || mon->enemy != op) &&
2123 (mon->type==PLAYER || QUERY_FLAG(mon,FLAG_UNAGGRESSIVE) || QUERY_FLAG(mon, FLAG_FRIENDLY)) && 2418 (mon->type == PLAYER || QUERY_FLAG (mon, FLAG_UNAGGRESSIVE) || QUERY_FLAG (mon, FLAG_FRIENDLY)) && (
2124 (
2125#ifdef PROHIBIT_PLAYERKILL 2419#ifdef PROHIBIT_PLAYERKILL
2126 (op->contr->peaceful || (mon->type == PLAYER && mon->contr->peaceful)) && 2420 (op->contr->peaceful
2421 || (mon->type == PLAYER
2422 && mon->contr->
2423 peaceful)) &&
2127#else 2424#else
2128 op->contr->peaceful && 2425 op->contr->peaceful &&
2129#endif 2426#endif
2130 !on_battleground 2427 !on_battleground))
2428 {
2429 if (!op->contr->braced)
2131 )) { 2430 {
2132 if (!op->contr->braced) {
2133 play_sound_map(tpl->map, tpl->x, tpl->y, SOUND_PUSH_PLAYER); 2431 play_sound_map (op->map, op->x, op->y, SOUND_PUSH_PLAYER);
2134 (void) push_ob(mon,dir,op); 2432 (void) push_ob (mon, dir, op);
2135 } else { 2433 }
2434 else
2435 {
2136 new_draw_info(0, 0,op,"You withhold your attack"); 2436 new_draw_info (0, 0, op, "You withhold your attack");
2137 } 2437 }
2138 if(op->contr->tmp_invis||op->hide) make_visible(op); 2438 if (op->contr->tmp_invis || op->hide)
2139 } 2439 make_visible (op);
2440 }
2140 2441
2141 /* If the object is a boulder or other rollable object, then 2442 /* If the object is a boulder or other rollable object, then
2142 * roll it if not braced. You can't roll it if you are braced. 2443 * roll it if not braced. You can't roll it if you are braced.
2143 */ 2444 */
2144 else if(QUERY_FLAG(mon,FLAG_CAN_ROLL)&&(!op->contr->braced)) { 2445 else if (QUERY_FLAG (mon, FLAG_CAN_ROLL) && (!op->contr->braced))
2446 {
2145 recursive_roll(mon,dir,op); 2447 recursive_roll (mon, dir, op);
2146 if(action_makes_visible(op)) make_visible(op); 2448 if (action_makes_visible (op))
2147 } 2449 make_visible (op);
2450 }
2148 2451
2149 /* Any generic living creature. Including things like doors. 2452 /* Any generic living creature. Including things like doors.
2150 * Way it works is like this: First, it must have some hit points 2453 * Way it works is like this: First, it must have some hit points
2151 * and be living. Then, it must be one of the following: 2454 * and be living. Then, it must be one of the following:
2152 * 1) Not a player, 2) A player, but of a different party. Note 2455 * 1) Not a player, 2) A player, but of a different party. Note
2153 * that party_number -1 is no party, so attacks can still happen. 2456 * that party_number -1 is no party, so attacks can still happen.
2154 */ 2457 */
2155 2458
2156 else if ((mon->stats.hp>=0) && QUERY_FLAG(mon, FLAG_ALIVE) && 2459 else if ((mon->stats.hp >= 0) && QUERY_FLAG (mon, FLAG_ALIVE) &&
2157 ((mon->type!=PLAYER || op->contr->party==NULL || 2460 ((mon->type != PLAYER || op->contr->party == NULL || op->contr->party != mon->contr->party)))
2158 op->contr->party!=mon->contr->party))) { 2461 {
2159 2462
2160 /* If the player hasn't hit something this tick, and does 2463 /* If the player hasn't hit something this tick, and does
2161 * so, give them speed boost based on weapon speed. Doing 2464 * so, give them speed boost based on weapon speed. Doing
2162 * it here is better than process_players2, which basically 2465 * it here is better than process_players2, which basically
2163 * incurred a 1 tick offset. 2466 * incurred a 1 tick offset.
2164 */ 2467 */
2165 if (!op->contr->has_hit) { 2468 if (!op->contr->has_hit)
2469 {
2166 op->speed_left += op->speed / op->contr->weapon_sp; 2470 op->speed_left += op->speed / op->contr->weapon_sp;
2167 2471
2168 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */ 2472 op->contr->has_hit = 1; /* The last action was to hit, so use weapon_sp */
2169 } 2473 }
2170 2474
2171 skill_attack(mon, op, 0, NULL, NULL); 2475 skill_attack (mon, op, 0, NULL, NULL);
2172 2476
2173 /* If attacking another player, that player gets automatic 2477 /* If attacking another player, that player gets automatic
2174 * hitback, and doesn't loose luck either. 2478 * hitback, and doesn't loose luck either.
2175 * Disable hitback on the battleground or if the target is 2479 * Disable hitback on the battleground or if the target is
2176 * the wiz. 2480 * the wiz.
2177 */ 2481 */
2178 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && 2482 if (mon->type == PLAYER && mon->stats.hp >= 0 && !mon->contr->has_hit && !on_battleground && !QUERY_FLAG (mon, FLAG_WIZ))
2179 !on_battleground && !QUERY_FLAG(mon, FLAG_WIZ)) { 2483 {
2180 short luck = mon->stats.luck; 2484 short luck = mon->stats.luck;
2485
2181 mon->contr->has_hit = 1; 2486 mon->contr->has_hit = 1;
2182 skill_attack(op, mon, 0, NULL, NULL); 2487 skill_attack (op, mon, 0, NULL, NULL);
2183 mon->stats.luck = luck; 2488 mon->stats.luck = luck;
2184 } 2489 }
2185 if(action_makes_visible(op)) make_visible(op); 2490 if (action_makes_visible (op))
2186 } 2491 make_visible (op);
2492 }
2187 } /* if player should attack something */ 2493 } /* if player should attack something */
2188} 2494}
2189 2495
2496int
2190int move_player(object *op,int dir) { 2497move_player (object *op, int dir)
2498{
2191 int pick; 2499 int pick;
2192 object *transport = op->contr->transport;
2193 2500
2194 if(!transport && (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)) 2501 if (op->map == NULL || op->map->in_memory != MAP_IN_MEMORY)
2195 return 0;
2196
2197 /* Sanity check: make sure dir is valid */
2198 if ( ( dir < 0 ) || ( dir >= 9 ) ) {
2199 LOG( llevError, "move_player: invalid direction %d\n", dir);
2200 return 0;
2201 }
2202
2203 /* peterm: added following line */
2204 if(QUERY_FLAG(op,FLAG_CONFUSED) && dir)
2205 dir = absdir(dir + RANDOM()%3 + RANDOM()%3 - 2);
2206
2207 op->facing = dir;
2208
2209 if(!transport && op->hide) do_hidden_move(op);
2210
2211 if (transport) {
2212 /* transport->contr is set up for the person in charge of the boat.
2213 * if that isn't this person, he can't steer it, etc
2214 */
2215 if (transport->contr != op->contr) return 0;
2216
2217 /* Transport can't move. But update dir so it at least
2218 * will point in the same direction if player is running.
2219 */
2220 if (transport->speed_left < 0.0) {
2221 transport->direction = dir;
2222 op->direction = dir;
2223 return 0;
2224 }
2225 /* Remove transport speed. Give player just a little speed -
2226 * enough so that they will get an action again quickly.
2227 *
2228 */
2229 transport->speed_left -= 1.0;
2230 if (op->speed_left < 0.0) op->speed_left = -0.01;
2231
2232 }
2233
2234 if(op->contr->fire_on) {
2235 fire(op,dir);
2236 }
2237 else move_player_attack(op,dir);
2238
2239 pick = check_pick(op);
2240
2241
2242 /* Add special check for newcs players and fire on - this way, the
2243 * server can handle repeat firing.
2244 */
2245 if (op->contr->fire_on || (op->contr->run_on && pick!=0)) {
2246 op->direction = dir;
2247 } else {
2248 op->direction=0;
2249 }
2250 /* Update how the player looks. Use the facing, so direction may
2251 * get reset to zero. This allows for full animation capabilities
2252 * for players.
2253 */
2254 if (!transport) animate_object(op, op->facing);
2255 return 0; 2502 return 0;
2503
2504 /* Sanity check: make sure dir is valid */
2505 if ((dir < 0) || (dir >= 9))
2506 {
2507 LOG (llevError, "move_player: invalid direction %d\n", dir);
2508 return 0;
2509 }
2510
2511 /* peterm: added following line */
2512 if (QUERY_FLAG (op, FLAG_CONFUSED) && dir)
2513 dir = absdir (dir + RANDOM () % 3 + RANDOM () % 3 - 2);
2514
2515 op->facing = dir;
2516
2517 if (op->hide)
2518 do_hidden_move (op);
2519
2520 if (INVOKE_PLAYER (MOVE, op->contr, ARG_INT (dir)))
2521 /*nop */ ;
2522 else if (op->contr->fire_on)
2523 fire (op, dir);
2524 else
2525 {
2526 move_player_attack (op, dir);
2527 pick = check_pick (op);
2528 }
2529
2530 /* Add special check for newcs players and fire on - this way, the
2531 * server can handle repeat firing.
2532 */
2533 if (op->contr->fire_on || (op->contr->run_on && pick != 0))
2534 {
2535 op->direction = dir;
2536 }
2537 else
2538 {
2539 op->direction = 0;
2540 }
2541 /* Update how the player looks. Use the facing, so direction may
2542 * get reset to zero. This allows for full animation capabilities
2543 * for players.
2544 */
2545 animate_object (op, op->facing);
2546 return 0;
2256} 2547}
2257 2548
2258/* This is similar to handle_player, below, but is only used by the 2549/* This is similar to handle_player, below, but is only used by the
2259 * new client/server stuff. 2550 * new client/server stuff.
2260 * This is sort of special, in that the new client/server actually uses 2551 * This is sort of special, in that the new client/server actually uses
2261 * the new speed values for commands. 2552 * the new speed values for commands.
2262 * 2553 *
2263 * Returns true if there are more actions we can do. 2554 * Returns true if there are more actions we can do.
2264 */ 2555 */
2556int
2265int handle_newcs_player(object *op) 2557handle_newcs_player (object *op)
2266{ 2558{
2267 if (op->contr->hidden) { 2559 if (op->contr->hidden)
2560 {
2268 op->invisible = 1000; 2561 op->invisible = 1000;
2269 /* the socket code flashes the player visible/invisible 2562 /* the socket code flashes the player visible/invisible
2270 * depending on the value of invisible, so we need to 2563 * depending on the value of invisible, so we need to
2271 * alternate it here for it to work correctly. 2564 * alternate it here for it to work correctly.
2272 */ 2565 */
2273 if (pticks & 2) op->invisible--; 2566 if (pticks & 2)
2567 op->invisible--;
2274 } 2568 }
2275 else if(op->invisible&&!(QUERY_FLAG(op,FLAG_MAKE_INVIS))) { 2569 else if (op->invisible && !(QUERY_FLAG (op, FLAG_MAKE_INVIS)))
2570 {
2276 op->invisible--; 2571 op->invisible--;
2277 if(!op->invisible) { 2572 if (!op->invisible)
2573 {
2278 make_visible(op); 2574 make_visible (op);
2279 new_draw_info(NDI_UNIQUE, 0, op, "Your invisibility spell runs out."); 2575 new_draw_info (NDI_UNIQUE, 0, op, "Your invisibility spell runs out.");
2280 } 2576 }
2281 } 2577 }
2282 2578
2283 if (QUERY_FLAG(op, FLAG_SCARED)) { 2579 if (QUERY_FLAG (op, FLAG_SCARED))
2580 {
2284 flee_player(op); 2581 flee_player (op);
2285 /* If player is still scared, that is his action for this tick */ 2582 /* If player is still scared, that is his action for this tick */
2286 if (QUERY_FLAG(op, FLAG_SCARED)) { 2583 if (QUERY_FLAG (op, FLAG_SCARED))
2584 {
2287 op->speed_left--; 2585 op->speed_left--;
2288 return 0; 2586 return 0;
2289 } 2587 }
2290 } 2588 }
2291 2589
2292 /* I've been seeing crashes where the golem has been destroyed, but 2590 /* I've been seeing crashes where the golem has been destroyed, but
2293 * the player object still points to the defunct golem. The code that 2591 * the player object still points to the defunct golem. The code that
2294 * destroys the golem looks correct, and it doesn't always happen, so 2592 * destroys the golem looks correct, and it doesn't always happen, so
2295 * put this in a a workaround to clean up the golem pointer. 2593 * put this in a a workaround to clean up the golem pointer.
2296 */ 2594 */
2297 if (op->contr->ranges[range_golem] && 2595 if (op->contr->ranges[range_golem] &&
2298 ((op->contr->golem_count != op->contr->ranges[range_golem]->count) || 2596 ((op->contr->golem_count != op->contr->ranges[range_golem]->count) || QUERY_FLAG (op->contr->ranges[range_golem], FLAG_REMOVED)))
2299 QUERY_FLAG(op->contr->ranges[range_golem], FLAG_REMOVED))) { 2597 {
2300 op->contr->ranges[range_golem] = NULL; 2598 op->contr->ranges[range_golem] = NULL;
2301 op->contr->golem_count = 0; 2599 op->contr->golem_count = 0;
2302 } 2600 }
2303 2601
2304 /* call this here - we also will call this in do_ericserver, but 2602 /* call this here - we also will call this in do_ericserver, but
2305 * the players time has been increased when doericserver has been 2603 * the players time has been increased when doericserver has been
2306 * called, so we recheck it here. 2604 * called, so we recheck it here.
2307 */ 2605 */
2308 HandleClient(&op->contr->socket, op->contr); 2606 HandleClient (&op->contr->socket, op->contr);
2309 if (op->speed_left<0) return 0; 2607 if (op->speed_left < 0)
2310
2311 if(op->direction && (op->contr->run_on || op->contr->fire_on)) {
2312 /* All move commands take 1 tick, at least for now */
2313 op->speed_left--;
2314
2315 /* Instead of all the stuff below, let move_player take care
2316 * of it. Also, some of the skill stuff is only put in
2317 * there, as well as the confusion stuff.
2318 */
2319 move_player(op, op->direction);
2320 if (op->speed_left>0) return 1;
2321 else return 0;
2322 }
2323 return 0; 2608 return 0;
2324}
2325 2609
2610 if (op->direction && (op->contr->run_on || op->contr->fire_on))
2611 {
2612 /* All move commands take 1 tick, at least for now */
2613 op->speed_left--;
2614
2615 /* Instead of all the stuff below, let move_player take care
2616 * of it. Also, some of the skill stuff is only put in
2617 * there, as well as the confusion stuff.
2618 */
2619 move_player (op, op->direction);
2620 if (op->speed_left > 0)
2621 return 1;
2622 else
2623 return 0;
2624 }
2625 return 0;
2626}
2627
2628int
2326int save_life(object *op) { 2629save_life (object *op)
2630{
2327 object *tmp; 2631 object *tmp;
2328 2632
2329 if(!QUERY_FLAG(op,FLAG_LIFESAVE)) 2633 if (!QUERY_FLAG (op, FLAG_LIFESAVE))
2330 return 0;
2331
2332 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)
2333 if(QUERY_FLAG(tmp, FLAG_APPLIED)&&QUERY_FLAG(tmp,FLAG_LIFESAVE)) {
2334 play_sound_map(op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2335 new_draw_info_format(NDI_UNIQUE, 0,op,
2336 "Your %s vibrates violently, then evaporates.",
2337 query_name(tmp));
2338 if (op->contr)
2339 esrv_del_item(op->contr, tmp->count);
2340 remove_ob(tmp);
2341 free_object(tmp);
2342 CLEAR_FLAG(op, FLAG_LIFESAVE);
2343 if(op->stats.hp<0)
2344 op->stats.hp = op->stats.maxhp;
2345 if(op->stats.food<0)
2346 op->stats.food = 999;
2347 fix_player(op);
2348 return 1;
2349 }
2350 LOG(llevError,"Error: LIFESAVE set without applied object.\n");
2351 CLEAR_FLAG(op, FLAG_LIFESAVE);
2352 enter_player_savebed(op); /* bring him home. */
2353 return 0; 2634 return 0;
2635
2636 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2637 if (QUERY_FLAG (tmp, FLAG_APPLIED) && QUERY_FLAG (tmp, FLAG_LIFESAVE))
2638 {
2639 play_sound_map (op->map, op->x, op->y, SOUND_OB_EVAPORATE);
2640 new_draw_info_format (NDI_UNIQUE, 0, op, "Your %s vibrates violently, then evaporates.", query_name (tmp));
2641 if (op->contr)
2642 esrv_del_item (op->contr, tmp->count);
2643 remove_ob (tmp);
2644 free_object (tmp);
2645 CLEAR_FLAG (op, FLAG_LIFESAVE);
2646 if (op->stats.hp < 0)
2647 op->stats.hp = op->stats.maxhp;
2648 if (op->stats.food < 0)
2649 op->stats.food = 999;
2650 fix_player (op);
2651 return 1;
2652 }
2653 LOG (llevError, "Error: LIFESAVE set without applied object.\n");
2654 CLEAR_FLAG (op, FLAG_LIFESAVE);
2655 enter_player_savebed (op); /* bring him home. */
2656 return 0;
2354} 2657}
2355 2658
2356/* This goes throws the inventory and removes unpaid objects, and puts them 2659/* This goes throws the inventory and removes unpaid objects, and puts them
2357 * back in the map (location and map determined by values of env). This 2660 * back in the map (location and map determined by values of env). This
2358 * function will descend into containers. op is the object to start the search 2661 * function will descend into containers. op is the object to start the search
2359 * from. 2662 * from.
2360 */ 2663 */
2664void
2361void remove_unpaid_objects(object *op, object *env) 2665remove_unpaid_objects (object *op, object *env)
2362{ 2666{
2363 object *next; 2667 object *next;
2364 2668
2365 while (op) { 2669 while (op)
2670 {
2366 next=op->below; /* Make sure we have a good value, in case 2671 next = op->below; /* Make sure we have a good value, in case
2367 * we remove object 'op' 2672 * we remove object 'op'
2368 */ 2673 */
2369 if (QUERY_FLAG(op, FLAG_UNPAID)) { 2674 if (QUERY_FLAG (op, FLAG_UNPAID))
2675 {
2370 remove_ob(op); 2676 remove_ob (op);
2371 op->x = env->x; 2677 op->x = env->x;
2372 op->y = env->y; 2678 op->y = env->y;
2373 if (env->type == PLAYER) 2679 if (env->type == PLAYER)
2374 esrv_del_item(env->contr, op->count); 2680 esrv_del_item (env->contr, op->count);
2375 insert_ob_in_map(op, env->map, NULL,0); 2681 insert_ob_in_map (op, env->map, NULL, 0);
2376 } 2682 }
2377 else if (op->inv) remove_unpaid_objects(op->inv, env); 2683 else if (op->inv)
2378 op=next; 2684 remove_unpaid_objects (op->inv, env);
2685 op = next;
2379 } 2686 }
2380} 2687}
2381 2688
2382 2689
2383/* 2690/*
… …
2385 * Moved from apply.c to player.c - player.c is what 2692 * Moved from apply.c to player.c - player.c is what
2386 * actually uses this function. player.c may not be quite the 2693 * actually uses this function. player.c may not be quite the
2387 * best, a misc file for object actions is probably better, 2694 * best, a misc file for object actions is probably better,
2388 * but there isn't one in the server directory. 2695 * but there isn't one in the server directory.
2389 */ 2696 */
2697char *
2390char *gravestone_text (object *op) 2698gravestone_text (object *op)
2391{ 2699{
2392 static char buf2[MAX_BUF]; 2700 static char buf2[MAX_BUF];
2393 char buf[MAX_BUF]; 2701 char buf[MAX_BUF];
2394 time_t now = time (NULL); 2702 time_t now = time (NULL);
2395 2703
2396 strcpy (buf2, " R.I.P.\n\n"); 2704 strcpy (buf2, " R.I.P.\n\n");
2397 if (op->type == PLAYER) 2705 if (op->type == PLAYER)
2398 sprintf (buf, "%s the %s\n", op->name, op->contr->title); 2706 sprintf (buf, "%s the %s\n", &op->name, op->contr->title);
2399 else 2707 else
2400 sprintf (buf, "%s\n", op->name); 2708 sprintf (buf, "%s\n", &op->name);
2401 strncat (buf2, " ", 20 - strlen (buf) / 2); 2709 strncat (buf2, " ", 20 - strlen (buf) / 2);
2402 strcat (buf2, buf); 2710 strcat (buf2, buf);
2403 if (op->type == PLAYER) 2711 if (op->type == PLAYER)
2404 sprintf (buf, "who was in level %d when killed\n", op->level); 2712 sprintf (buf, "who was in level %d when killed\n", op->level);
2405 else 2713 else
2406 sprintf (buf, "who was in level %d when died.\n\n", op->level); 2714 sprintf (buf, "who was in level %d when died.\n\n", op->level);
2407 strncat (buf2, " ", 20 - strlen (buf) / 2); 2715 strncat (buf2, " ", 20 - strlen (buf) / 2);
2408 strcat (buf2, buf); 2716 strcat (buf2, buf);
2409 if (op->type == PLAYER) { 2717 if (op->type == PLAYER)
2718 {
2410 sprintf (buf, "by %s.\n\n", op->contr->killer); 2719 sprintf (buf, "by %s.\n\n", op->contr->killer);
2411 strncat (buf2, " ", 21 - strlen (buf) / 2); 2720 strncat (buf2, " ", 21 - strlen (buf) / 2);
2412 strcat (buf2, buf); 2721 strcat (buf2, buf);
2413 } 2722 }
2414 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now)); 2723 strftime (buf, MAX_BUF, "%b %d %Y\n", localtime (&now));
2415 strncat (buf2, " ", 20 - strlen (buf) / 2); 2724 strncat (buf2, " ", 20 - strlen (buf) / 2);
2416 strcat (buf2, buf); 2725 strcat (buf2, buf);
2417 return buf2; 2726 return buf2;
2418} 2727}
2419 2728
2420 2729
2421 2730
2731void
2422void do_some_living(object *op) { 2732do_some_living (object *op)
2733{
2423 int last_food=op->stats.food; 2734 int last_food = op->stats.food;
2424 int gen_hp, gen_sp, gen_grace; 2735 int gen_hp, gen_sp, gen_grace;
2425 int over_hp, over_sp, over_grace; 2736 int over_hp, over_sp, over_grace;
2426 int i; 2737 int i;
2427 int rate_hp = 1200; 2738 int rate_hp = 1200;
2428 int rate_sp = 2500; 2739 int rate_sp = 2500;
2429 int rate_grace = 2000; 2740 int rate_grace = 2000;
2430 const int max_hp = 1; 2741 const int max_hp = 1;
2431 const int max_sp = 1; 2742 const int max_sp = 1;
2432 const int max_grace = 1; 2743 const int max_grace = 1;
2433 2744
2434 if (op->contr->outputs_sync) { 2745 if (op->contr->outputs_sync)
2746 {
2435 for (i=0; i<NUM_OUTPUT_BUFS; i++) 2747 for (i = 0; i < NUM_OUTPUT_BUFS; i++)
2436 if (op->contr->outputs[i].buf!=NULL && 2748 if (op->contr->outputs[i].buf != NULL && (op->contr->outputs[i].first_update + op->contr->outputs_sync) < (uint16) pticks)
2437 (op->contr->outputs[i].first_update+op->contr->outputs_sync)<pticks)
2438 flush_output_element(op, &op->contr->outputs[i]); 2749 flush_output_element (op, &op->contr->outputs[i]);
2439 } 2750 }
2440 2751
2441 if(op->contr->state==ST_PLAYING) { 2752 if (op->contr->state == ST_PLAYING)
2753 {
2442 2754
2443 /* these next three if clauses make it possible to SLOW DOWN 2755 /* these next three if clauses make it possible to SLOW DOWN
2444 hp/grace/spellpoint regeneration. */ 2756 hp/grace/spellpoint regeneration. */
2445 if(op->contr->gen_hp >= 0 ) 2757 if (op->contr->gen_hp >= 0)
2446 gen_hp=(op->contr->gen_hp+1)*op->stats.maxhp; 2758 gen_hp = (op->contr->gen_hp + 1) * op->stats.maxhp;
2447 else { 2759 else
2760 {
2448 gen_hp = op->stats.maxhp; 2761 gen_hp = op->stats.maxhp;
2449 rate_hp -= rate_hp/2 * op->contr->gen_hp; 2762 rate_hp -= rate_hp / 2 * op->contr->gen_hp;
2450 } 2763 }
2451 if(op->contr->gen_sp >= 0 ) 2764 if (op->contr->gen_sp >= 0)
2452 gen_sp=(op->contr->gen_sp+1)*op->stats.maxsp; 2765 gen_sp = (op->contr->gen_sp + 1) * op->stats.maxsp;
2453 else { 2766 else
2767 {
2454 gen_sp = op->stats.maxsp; 2768 gen_sp = op->stats.maxsp;
2455 rate_sp -= rate_sp/2 * op->contr->gen_sp; 2769 rate_sp -= rate_sp / 2 * op->contr->gen_sp;
2456 } 2770 }
2457 if(op->contr->gen_grace >= 0) 2771 if (op->contr->gen_grace >= 0)
2458 gen_grace=(op->contr->gen_grace+1)*op->stats.maxgrace; 2772 gen_grace = (op->contr->gen_grace + 1) * op->stats.maxgrace;
2459 else { 2773 else
2774 {
2460 gen_grace = op->stats.maxgrace; 2775 gen_grace = op->stats.maxgrace;
2461 rate_grace -= rate_grace/2 * op->contr->gen_grace; 2776 rate_grace -= rate_grace / 2 * op->contr->gen_grace;
2462 } 2777 }
2463 2778
2464 /* Regenerate Spell Points */ 2779 /* Regenerate Spell Points */
2465 if(op->contr->ranges[range_golem]==NULL && --op->last_sp<0) { 2780 if (op->contr->ranges[range_golem] == NULL && --op->last_sp < 0)
2781 {
2466 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10? 10 : op->contr->gen_sp_armour); 2782 gen_sp = gen_sp * 10 / (op->contr->gen_sp_armour < 10 ? 10 : op->contr->gen_sp_armour);
2467 if(op->stats.sp<op->stats.maxsp) { 2783 if (op->stats.sp < op->stats.maxsp)
2468 op->stats.sp++; 2784 {
2785 op->stats.sp++;
2469 /* dms do not consume food */ 2786 /* dms do not consume food */
2470 if (!QUERY_FLAG(op,FLAG_WIZ)) { 2787 if (!QUERY_FLAG (op, FLAG_WIZ))
2471 op->stats.food--; 2788 {
2789 op->stats.food--;
2472 if(op->contr->digestion<0) 2790 if (op->contr->digestion < 0)
2473 op->stats.food+=op->contr->digestion; 2791 op->stats.food += op->contr->digestion;
2474 else if(op->contr->digestion>0 && 2792 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2475 random_roll(0, op->contr->digestion, op, PREFER_HIGH))
2476 op->stats.food=last_food; 2793 op->stats.food = last_food;
2794 }
2795 }
2796 if (max_sp > 1)
2797 {
2798 over_sp = (gen_sp + 10) / rate_sp;
2799 if (over_sp > 0)
2800 {
2801 if (op->stats.sp < op->stats.maxsp)
2802 {
2803 op->stats.sp += over_sp > max_sp ? max_sp : over_sp;
2804 if (random_roll (0, rate_sp - 1, op, PREFER_LOW) > ((gen_sp + 10) % rate_sp))
2805 op->stats.sp--;
2806 if (op->stats.sp > op->stats.maxsp)
2807 op->stats.sp = op->stats.maxsp;
2808 }
2809 op->last_sp = 0;
2810 }
2811 else
2812 {
2813 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2814 }
2815 }
2816 else
2817 {
2818 op->last_sp = rate_sp / (gen_sp < 20 ? 30 : gen_sp + 10);
2819 }
2477 } 2820 }
2478 }
2479 if (max_sp>1) {
2480 over_sp = (gen_sp+10)/rate_sp;
2481 if (over_sp > 0) {
2482 if(op->stats.sp<op->stats.maxsp) {
2483 op->stats.sp += over_sp>max_sp ? max_sp : over_sp;
2484 if(random_roll(0, rate_sp-1, op, PREFER_LOW) > ((gen_sp+10)%rate_sp))
2485 op->stats.sp--;
2486 if(op->stats.sp>op->stats.maxsp)
2487 op->stats.sp=op->stats.maxsp;
2488 }
2489 op->last_sp=0;
2490 } else {
2491 op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);
2492 }
2493 } else {
2494 op->last_sp=rate_sp/(gen_sp<20 ? 30 : gen_sp+10);
2495 }
2496 }
2497 2821
2498 /* Regenerate Grace */ 2822 /* Regenerate Grace */
2499 /* I altered this a little - maximum grace is ony achieved through prayer -b.t.*/ 2823 /* I altered this a little - maximum grace is ony achieved through prayer -b.t. */
2500 if(--op->last_grace<0) { 2824 if (--op->last_grace < 0)
2825 {
2501 if(op->stats.grace<op->stats.maxgrace/2) 2826 if (op->stats.grace < op->stats.maxgrace / 2)
2502 op->stats.grace++; /* no penalty in food for regaining grace */ 2827 op->stats.grace++; /* no penalty in food for regaining grace */
2503 if(max_grace>1) { 2828 if (max_grace > 1)
2829 {
2504 over_grace = (gen_grace<20 ? 30 : gen_grace+10)/rate_grace; 2830 over_grace = (gen_grace < 20 ? 30 : gen_grace + 10) / rate_grace;
2505 if (over_grace > 0) { 2831 if (over_grace > 0)
2506 op->stats.sp += over_grace 2832 {
2833 op->stats.sp += over_grace
2507 + (random_roll(0, rate_grace-1, op, PREFER_HIGH) > ((gen_grace<20 ? 30 : gen_grace+10)%rate_grace))? -1 : 0; 2834 + (random_roll (0, rate_grace - 1, op, PREFER_HIGH) > ((gen_grace < 20 ? 30 : gen_grace + 10) % rate_grace)) ? -1 : 0;
2508 op->last_grace=0; 2835 op->last_grace = 0;
2509 } else { 2836 }
2837 else
2838 {
2510 op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10); 2839 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2511 } 2840 }
2512 } else { 2841 }
2842 else
2843 {
2513 op->last_grace=rate_grace/(gen_grace<20 ? 30 : gen_grace+10); 2844 op->last_grace = rate_grace / (gen_grace < 20 ? 30 : gen_grace + 10);
2514 } 2845 }
2515 /* wearing stuff doesn't detract from grace generation. */ 2846 /* wearing stuff doesn't detract from grace generation. */
2516 } 2847 }
2517 2848
2518 /* Regenerate Hit Points */ 2849 /* Regenerate Hit Points */
2519 if(--op->last_heal<0) { 2850 if (--op->last_heal < 0)
2851 {
2520 if(op->stats.hp<op->stats.maxhp) { 2852 if (op->stats.hp < op->stats.maxhp)
2521 op->stats.hp++; 2853 {
2854 op->stats.hp++;
2522 /* dms do not consume food */ 2855 /* dms do not consume food */
2523 if (!QUERY_FLAG(op,FLAG_WIZ)) { 2856 if (!QUERY_FLAG (op, FLAG_WIZ))
2524 op->stats.food--; 2857 {
2858 op->stats.food--;
2525 if(op->contr->digestion<0) 2859 if (op->contr->digestion < 0)
2526 op->stats.food+=op->contr->digestion; 2860 op->stats.food += op->contr->digestion;
2527 else if(op->contr->digestion>0 && 2861 else if (op->contr->digestion > 0 && random_roll (0, op->contr->digestion, op, PREFER_HIGH))
2528 random_roll(0, op->contr->digestion, op, PREFER_HIGH))
2529 op->stats.food=last_food; 2862 op->stats.food = last_food;
2863 }
2864 }
2865 if (max_hp > 1)
2866 {
2867 over_hp = (gen_hp < 20 ? 30 : gen_hp + 10) / rate_hp;
2868 if (over_hp > 0)
2869 {
2870 op->stats.sp += over_hp + (RANDOM () % rate_hp > ((gen_hp < 20 ? 30 : gen_hp + 10) % rate_hp)) ? -1 : 0;
2871 op->last_heal = 0;
2872 }
2873 else
2874 {
2875 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2876 }
2877 }
2878 else
2879 {
2880 op->last_heal = rate_hp / (gen_hp < 20 ? 30 : gen_hp + 10);
2881 }
2530 } 2882 }
2531 }
2532 if(max_hp>1) {
2533 over_hp = (gen_hp<20 ? 30 : gen_hp+10)/rate_hp;
2534 if (over_hp > 0) {
2535 op->stats.sp += over_hp
2536 + (RANDOM()%rate_hp > ((gen_hp<20 ? 30 : gen_hp+10)%rate_hp))? -1 : 0;
2537 op->last_heal=0;
2538 } else {
2539 op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);
2540 }
2541 } else {
2542 op->last_heal=rate_hp/(gen_hp<20 ? 30 : gen_hp+10);
2543 }
2544 }
2545 2883
2546 /* Digestion */ 2884 /* Digestion */
2547 if(--op->last_eat<0) { 2885 if (--op->last_eat < 0)
2886 {
2548#ifdef COZY_SERVER 2887#ifdef COZY_SERVER
2549 int dg = op->contr->digestion>=0 && op->contr->digestion<2 ? 2 : op->contr->digestion; 2888 int dg = op->contr->digestion >= 0 && op->contr->digestion < 2 ? 2 : op->contr->digestion;
2550 int bonus=dg>0?dg:0, 2889 int bonus = dg > 0 ? dg : 0, penalty = dg < 0 ? -dg : 0;
2551 penalty=dg<0?-dg:0;
2552#else 2890#else
2553 int bonus=op->contr->digestion>0?op->contr->digestion:0, 2891 int bonus = op->contr->digestion > 0 ? op->contr->digestion : 0, penalty = op->contr->digestion < 0 ? -op->contr->digestion : 0;
2554 penalty=op->contr->digestion<0?-op->contr->digestion:0;
2555#endif 2892#endif
2556 2893
2557 if(op->contr->gen_hp > 0) 2894 if (op->contr->gen_hp > 0)
2558 op->last_eat=25*(1+bonus)/(op->contr->gen_hp+penalty+1); 2895 op->last_eat = 25 * (1 + bonus) / (op->contr->gen_hp + penalty + 1);
2559 else 2896 else
2560 op->last_eat=25*(1+bonus)/(penalty +1); 2897 op->last_eat = 25 * (1 + bonus) / (penalty + 1);
2561 /* dms do not consume food */ 2898 /* dms do not consume food */
2562 if (!QUERY_FLAG(op,FLAG_WIZ)) op->stats.food--; 2899 if (!QUERY_FLAG (op, FLAG_WIZ))
2563 } 2900 op->stats.food--;
2901 }
2564 } 2902 }
2565 2903
2566 if(op->contr->state==ST_PLAYING&&op->stats.food<0&&op->stats.hp>=0) { 2904 if (op->contr->state == ST_PLAYING && op->stats.food < 0 && op->stats.hp >= 0)
2905 {
2567 object *tmp, *flesh=NULL; 2906 object *tmp, *flesh = NULL;
2568 2907
2569 for(tmp=op->inv;tmp!=NULL;tmp=tmp->below) { 2908 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
2909 {
2570 if(!QUERY_FLAG(tmp, FLAG_UNPAID)) { 2910 if (!QUERY_FLAG (tmp, FLAG_UNPAID))
2911 {
2571 if (tmp->type==FOOD || tmp->type==DRINK || tmp->type==POISON) { 2912 if (tmp->type == FOOD || tmp->type == DRINK || tmp->type == POISON)
2913 {
2572 new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food."); 2914 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2573 manual_apply(op,tmp,0); 2915 manual_apply (op, tmp, 0);
2574 if(op->stats.food>=0||op->stats.hp<0) 2916 if (op->stats.food >= 0 || op->stats.hp < 0)
2575 break; 2917 break;
2576 } 2918 }
2577 else if (tmp->type==FLESH) flesh=tmp; 2919 else if (tmp->type == FLESH)
2578 } /* End if paid for object */ 2920 flesh = tmp;
2579 } /* end of for loop */ 2921 } /* End if paid for object */
2922 } /* end of for loop */
2580 /* If player is still starving, it means they don't have any food, so 2923 /* If player is still starving, it means they don't have any food, so
2581 * eat flesh instead. 2924 * eat flesh instead.
2582 */ 2925 */
2583 if (op->stats.food<0 && op->stats.hp>=0 && flesh) { 2926 if (op->stats.food < 0 && op->stats.hp >= 0 && flesh)
2927 {
2584 new_draw_info(NDI_UNIQUE, 0,op,"You blindly grab for a bite of food."); 2928 new_draw_info (NDI_UNIQUE, 0, op, "You blindly grab for a bite of food.");
2585 manual_apply(op,flesh,0); 2929 manual_apply (op, flesh, 0);
2586 } 2930 }
2587 } /* end if player is starving */ 2931 } /* end if player is starving */
2588 2932
2589 while(op->stats.food<0&&op->stats.hp>0) 2933 while (op->stats.food < 0 && op->stats.hp > 0)
2590 op->stats.food++,op->stats.hp--; 2934 op->stats.food++, op->stats.hp--;
2591 2935
2592 if (!op->contr->state&&!QUERY_FLAG(op,FLAG_WIZ)&&(op->stats.hp<0||op->stats.food<0)) 2936 if (!op->contr->state && !QUERY_FLAG (op, FLAG_WIZ) && (op->stats.hp < 0 || op->stats.food < 0))
2593 kill_player(op); 2937 kill_player (op);
2594} 2938}
2595 2939
2596 2940
2597 2941
2598/* If the player should die (lack of hp, food, etc), we call this. 2942/* If the player should die (lack of hp, food, etc), we call this.
2599 * op is the player in jeopardy. If the player can not be saved (not 2943 * op is the player in jeopardy. If the player can not be saved (not
2600 * permadeath, no lifesave), this will take care of removing the player 2944 * permadeath, no lifesave), this will take care of removing the player
2601 * file. 2945 * file.
2602 */ 2946 */
2947void
2603void kill_player(object *op) 2948kill_player (object *op)
2604{ 2949{
2605 char buf[MAX_BUF]; 2950 char buf[MAX_BUF];
2606 int x,y,i; 2951 int x, y;
2952
2953 //int i;
2607 mapstruct *map; /* this is for resurrection */ 2954 maptile *map; /* this is for resurrection */
2955
2608 int z; 2956 /* int z;
2609 int num_stats_lose; 2957 int num_stats_lose;
2610 int lost_a_stat; 2958 int lost_a_stat;
2611 int lose_this_stat; 2959 int lose_this_stat;
2612 int this_stat; 2960 int this_stat; */
2613 int will_kill_again; 2961 int will_kill_again;
2614 archetype *at; 2962 archetype *at;
2615 object *tmp; 2963 object *tmp;
2616 2964
2617 if(save_life(op)) 2965 if (save_life (op))
2618 return; 2966 return;
2619 2967
2620 2968
2621 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas 2969 /* If player dies on BATTLEGROUND, no stat/exp loss! For Combat-Arenas
2622 * in cities ONLY!!! It is very important that this doesn't get abused. 2970 * in cities ONLY!!! It is very important that this doesn't get abused.
2623 * Look at op_on_battleground() for more info --AndreasV 2971 * Look at op_on_battleground() for more info --AndreasV
2624 */ 2972 */
2625 if (op_on_battleground(op, &x, &y)) { 2973 if (op_on_battleground (op, &x, &y))
2626 new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op, 2974 {
2627 "You have been defeated in combat!"); 2975 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "You have been defeated in combat!");
2628 new_draw_info(NDI_UNIQUE | NDI_NAVY, 0,op, 2976 new_draw_info (NDI_UNIQUE | NDI_NAVY, 0, op, "Local medics have saved your life...");
2629 "Local medics have saved your life..."); 2977
2630
2631 /* restore player */ 2978 /* restore player */
2632 at = find_archetype("poisoning"); 2979 at = archetype::find ("poisoning");
2633 tmp=present_arch_in_ob(at,op); 2980 tmp = present_arch_in_ob (at, op);
2634 if (tmp) { 2981 if (tmp)
2982 {
2635 remove_ob(tmp); 2983 remove_ob (tmp);
2636 free_object(tmp); 2984 free_object (tmp);
2637 new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed"); 2985 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2638 } 2986 }
2639 2987
2640 at = find_archetype("confusion"); 2988 at = archetype::find ("confusion");
2641 tmp=present_arch_in_ob(at,op); 2989 tmp = present_arch_in_ob (at, op);
2642 if (tmp) { 2990 if (tmp)
2991 {
2643 remove_ob(tmp); 2992 remove_ob (tmp);
2644 free_object(tmp); 2993 free_object (tmp);
2645 new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer"); 2994 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2646 } 2995 }
2647 2996
2648 cure_disease(op,0); /* remove any disease */ 2997 cure_disease (op, 0); /* remove any disease */
2649 op->stats.hp=op->stats.maxhp; 2998 op->stats.hp = op->stats.maxhp;
2650 if (op->stats.food<=0) op->stats.food=999; 2999 if (op->stats.food <= 0)
2651 3000 op->stats.food = 999;
3001
2652 /* create a bodypart-trophy to make the winner happy */ 3002 /* create a bodypart-trophy to make the winner happy */
2653 tmp=arch_to_object(find_archetype("finger")); 3003 tmp = arch_to_object (archetype::find ("finger"));
2654 if (tmp != NULL) 3004 if (tmp != NULL)
2655 { 3005 {
2656 sprintf(buf,"%s's finger",op->name); 3006 sprintf (buf, "%s's finger", &op->name);
2657 tmp->name = add_string(buf); 3007 tmp->name = buf;
2658 sprintf(buf," This finger has been cut off %s\n" 3008 sprintf (buf, " This finger has been cut off %s\n"
2659 " the %s, when he was defeated at\n level %d by %s.\n", 3009 " the %s, when he was defeated at\n level %d by %s.\n",
2660 op->name, op->contr->title, (int)(op->level), 3010 &op->name, op->contr->title, (int) (op->level), op->contr->killer);
2661 op->contr->killer); 3011 tmp->msg = buf;
2662 tmp->msg=add_string(buf);
2663 tmp->value=0, tmp->material=0, tmp->type=0; 3012 tmp->value = 0, tmp->material = 0, tmp->type = 0;
2664 tmp->materialname = NULL; 3013 tmp->materialname = NULL;
2665 tmp->x = op->x, tmp->y = op->y; 3014 tmp->x = op->x, tmp->y = op->y;
2666 insert_ob_in_map(tmp,op->map,op,0); 3015 insert_ob_in_map (tmp, op->map, op, 0);
2667 }
2668 3016 }
3017
2669 /* teleport defeated player to new destination*/ 3018 /* teleport defeated player to new destination */
2670 transfer_ob(op, x, y, 0, NULL); 3019 transfer_ob (op, x, y, 0, NULL);
2671 op->contr->braced=0; 3020 op->contr->braced = 0;
2672 return; 3021 return;
2673 } 3022 }
2674 3023
2675 INVOKE_PLAYER (DEATH, op->contr); 3024 INVOKE_PLAYER (DEATH, op->contr);
2676 3025
2677 command_kill_pets (op, 0); 3026 command_kill_pets (op, 0);
2678 3027
2679 if(op->stats.food<0) { 3028 if (op->stats.food < 0)
3029 {
2680 if (op->contr->explore) { 3030 if (op->contr->explore)
3031 {
2681 new_draw_info(NDI_UNIQUE, 0,op,"You would have starved, but you are"); 3032 new_draw_info (NDI_UNIQUE, 0, op, "You would have starved, but you are");
2682 new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so..."); 3033 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2683 op->stats.food=999; 3034 op->stats.food = 999;
2684 return; 3035 return;
2685 } 3036 }
2686 sprintf(buf,"%s starved to death.",op->name); 3037 sprintf (buf, "%s starved to death.", &op->name);
2687 strcpy(op->contr->killer,"starvation"); 3038 strcpy (op->contr->killer, "starvation");
3039 }
3040 else
2688 } 3041 {
2689 else {
2690 if (op->contr->explore) { 3042 if (op->contr->explore)
3043 {
2691 new_draw_info(NDI_UNIQUE, 0,op,"You would have died, but you are"); 3044 new_draw_info (NDI_UNIQUE, 0, op, "You would have died, but you are");
2692 new_draw_info(NDI_UNIQUE, 0,op,"in explore mode, so..."); 3045 new_draw_info (NDI_UNIQUE, 0, op, "in explore mode, so...");
2693 op->stats.hp=op->stats.maxhp; 3046 op->stats.hp = op->stats.maxhp;
2694 return; 3047 return;
2695 } 3048 }
2696 sprintf(buf,"%s died.",op->name); 3049 sprintf (buf, "%s died.", &op->name);
2697 } 3050 }
2698 play_sound_player_only(op->contr, SOUND_PLAYER_DIES,0,0); 3051 play_sound_player_only (op->contr, SOUND_PLAYER_DIES, 0, 0);
2699 3052
2700 /* save the map location for corpse, gravestone*/ 3053 /* save the map location for corpse, gravestone */
2701 x=op->x;y=op->y;map=op->map; 3054 x = op->x;
3055 y = op->y;
3056 map = op->map;
2702 3057
2703 3058
2704 if (settings.not_permadeth == TRUE) { 3059 if (settings.not_permadeth == TRUE)
3060 {
2705 /* NOT_PERMADEATH code. This basically brings the character back to 3061 /* NOT_PERMADEATH code. This basically brings the character back to
2706 * life if they are dead - it takes some exp and a random stat. 3062 * life if they are dead - it takes some exp and a random stat.
2707 * See the config.h file for a little more in depth detail about this. 3063 * See the config.h file for a little more in depth detail about this.
2708 */ 3064 */
2709 3065
2710 /* Basically two ways to go - remove a stat permanently, or just 3066 /* Basically two ways to go - remove a stat permanently, or just
2711 * make it depletion. This bunch of code deals with that aspect 3067 * make it depletion. This bunch of code deals with that aspect
2712 * of death. 3068 * of death.
2713 */ 3069 */
2714#ifndef COZY_SERVER 3070#ifndef COZY_SERVER
2715 if (settings.balanced_stat_loss) { 3071 if (settings.balanced_stat_loss)
3072 {
2716 /* If stat loss is permanent, lose one stat only. */ 3073 /* If stat loss is permanent, lose one stat only. */
2717 /* Lower level chars don't lose as many stats because they suffer 3074 /* Lower level chars don't lose as many stats because they suffer
2718 more if they do. */ 3075 more if they do. */
2719 /* Higher level characters can afford things such as potions of 3076 /* Higher level characters can afford things such as potions of
2720 restoration, or better, stat potions. So we slug them that 3077 restoration, or better, stat potions. So we slug them that
2721 little bit harder. */ 3078 little bit harder. */
2722 /* GD */ 3079 /* GD */
2723 if (settings.stat_loss_on_death) 3080 if (settings.stat_loss_on_death)
2724 num_stats_lose = 1; 3081 num_stats_lose = 1;
2725 else 3082 else
2726 num_stats_lose = 1 + op->level/BALSL_NUMBER_LOSSES_RATIO; 3083 num_stats_lose = 1 + op->level / BALSL_NUMBER_LOSSES_RATIO;
2727 } else { 3084 }
3085 else
3086 {
2728 num_stats_lose = 1; 3087 num_stats_lose = 1;
2729 } 3088 }
2730 lost_a_stat = 0; 3089 lost_a_stat = 0;
2731 3090
2732 for (z=0; z<num_stats_lose; z++) { 3091 for (z = 0; z < num_stats_lose; z++)
3092 {
2733 i = RANDOM() % NUM_STATS; 3093 i = RANDOM () % NUM_STATS;
2734 3094
2735 if (settings.stat_loss_on_death) { 3095 if (settings.stat_loss_on_death)
2736 /* Pick a random stat and take a point off it. Tell the player
2737 * what he lost.
2738 */
2739 change_attr_value(&(op->stats), i,-1);
2740 check_stat_bounds(&(op->stats));
2741 change_attr_value(&(op->contr->orig_stats), i,-1);
2742 check_stat_bounds(&(op->contr->orig_stats));
2743 new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]);
2744 lost_a_stat = 1;
2745 } else {
2746 /* deplete a stat */
2747 archetype *deparch=find_archetype("depletion");
2748 object *dep;
2749 3096 {
2750 dep = present_arch_in_ob(deparch,op); 3097 /* Pick a random stat and take a point off it. Tell the player
2751 if(!dep) { 3098 * what he lost.
2752 dep = arch_to_object(deparch); 3099 */
2753 insert_ob_in_ob(dep, op); 3100 change_attr_value (&(op->stats), i, -1);
2754 } 3101 check_stat_bounds (&(op->stats));
2755 lose_this_stat = 1; 3102 change_attr_value (&(op->contr->orig_stats), i, -1);
2756 if (settings.balanced_stat_loss) { 3103 check_stat_bounds (&(op->contr->orig_stats));
2757 /* GD */ 3104 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2758 /* Get the stat that we're about to deplete. */ 3105 lost_a_stat = 1;
2759 this_stat = get_attr_value(&(dep->stats), i);
2760 if (this_stat < 0) {
2761 int loss_chance = 1 + op->level/BALSL_LOSS_CHANCE_RATIO;
2762 int keep_chance = this_stat * this_stat;
2763 /* Yes, I am paranoid. Sue me. */
2764 if (keep_chance < 1)
2765 keep_chance = 1;
2766
2767 /* There is a maximum depletion total per level. */
2768 if (this_stat < -1 - op->level/BALSL_MAX_LOSS_RATIO) {
2769 lose_this_stat = 0;
2770 /* Take loss chance vs keep chance to see if we
2771 retain the stat. */
2772 } else {
2773 if (random_roll(0, loss_chance + keep_chance-1,
2774 op, PREFER_LOW) < keep_chance)
2775 lose_this_stat = 0;
2776 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
2777 this_stat, keep_chance, loss_chance,
2778 lose_this_stat?"LOSE":"KEEP"); */
2779 }
2780 }
2781 }
2782 3106 }
2783 if (lose_this_stat) { 3107 else
3108 {
3109 /* deplete a stat */
3110 archetype *deparch = archetype::find ("depletion");
3111 object *dep;
3112
3113 dep = present_arch_in_ob (deparch, op);
3114 if (!dep)
3115 {
3116 dep = arch_to_object (deparch);
3117 insert_ob_in_ob (dep, op);
3118 }
3119 lose_this_stat = 1;
3120 if (settings.balanced_stat_loss)
3121 {
3122 /* GD */
3123 /* Get the stat that we're about to deplete. */
2784 this_stat = get_attr_value(&(dep->stats), i); 3124 this_stat = get_attr_value (&(dep->stats), i);
3125 if (this_stat < 0)
3126 {
3127 int loss_chance = 1 + op->level / BALSL_LOSS_CHANCE_RATIO;
3128 int keep_chance = this_stat * this_stat;
3129
3130 /* Yes, I am paranoid. Sue me. */
3131 if (keep_chance < 1)
3132 keep_chance = 1;
3133
3134 /* There is a maximum depletion total per level. */
3135 if (this_stat < -1 - op->level / BALSL_MAX_LOSS_RATIO)
3136 {
3137 lose_this_stat = 0;
3138 /* Take loss chance vs keep chance to see if we
3139 retain the stat. */
3140 }
3141 else
3142 {
3143 if (random_roll (0, loss_chance + keep_chance - 1, op, PREFER_LOW) < keep_chance)
3144 lose_this_stat = 0;
3145 /* LOG(llevDebug, "Determining stat loss. Stat: %d Keep: %d Lose: %d Result: %s.\n",
3146 this_stat, keep_chance, loss_chance,
3147 lose_this_stat?"LOSE":"KEEP"); */
3148 }
3149 }
3150 }
3151
3152 if (lose_this_stat)
3153 {
3154 this_stat = get_attr_value (&(dep->stats), i);
2785 /* We could try to do something clever like find another 3155 /* We could try to do something clever like find another
2786 * stat to reduce if this fails. But chances are, if 3156 * stat to reduce if this fails. But chances are, if
2787 * stats have been depleted to -50, all are pretty low 3157 * stats have been depleted to -50, all are pretty low
2788 * and should be roughly the same, so it shouldn't make a 3158 * and should be roughly the same, so it shouldn't make a
2789 * difference. 3159 * difference.
2790 */ 3160 */
2791 if (this_stat>=-50) { 3161 if (this_stat >= -50)
3162 {
2792 change_attr_value(&(dep->stats), i, -1); 3163 change_attr_value (&(dep->stats), i, -1);
2793 SET_FLAG(dep, FLAG_APPLIED); 3164 SET_FLAG (dep, FLAG_APPLIED);
2794 new_draw_info(NDI_UNIQUE, 0,op, lose_msg[i]); 3165 new_draw_info (NDI_UNIQUE, 0, op, lose_msg[i]);
2795 fix_player(op); 3166 fix_player (op);
2796 lost_a_stat = 1; 3167 lost_a_stat = 1;
2797 } 3168 }
2798 } 3169 }
2799 } 3170 }
2800 } 3171 }
2801 /* If no stat lost, tell the player. */ 3172 /* If no stat lost, tell the player. */
2802 if (!lost_a_stat) 3173 if (!lost_a_stat)
2803 { 3174 {
2804 /* determine_god() seems to not work sometimes... why is this? 3175 /* determine_god() seems to not work sometimes... why is this?
2805 Should I be using something else? GD */ 3176 Should I be using something else? GD */
2806 const char *god = determine_god(op); 3177 const char *god = determine_god (op);
3178
2807 if (god && (strcmp(god, "none"))) 3179 if (god && (strcmp (god, "none")))
2808 new_draw_info_format(NDI_UNIQUE, 0, op, "For a brief " 3180 new_draw_info_format (NDI_UNIQUE, 0, op, "For a brief " "moment you feel the holy presence of %s protecting" " you.", god);
2809 "moment you feel the holy presence of %s protecting" 3181 else
2810 " you.", god); 3182 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you.");
2811 else 3183 }
2812 new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you"
2813 " feel a holy presence protecting you.");
2814 }
2815#endif 3184#endif
2816 new_draw_info(NDI_UNIQUE, 0, op, "For a brief moment you" 3185 new_draw_info (NDI_UNIQUE, 0, op, "For a brief moment you" " feel a holy presence protecting you from losing yourself completely.");
2817 " feel a holy presence protecting you from losing yourself completely.");
2818 3186
2819 /* Put a gravestone up where the character 'almost' died. List the 3187 /* Put a gravestone up where the character 'almost' died. List the
2820 * exp loss on the stone. 3188 * exp loss on the stone.
2821 */ 3189 */
2822 tmp=arch_to_object(find_archetype("gravestone")); 3190 tmp = arch_to_object (archetype::find ("gravestone"));
2823 sprintf(buf,"%s's gravestone",op->name); 3191 sprintf (buf, "%s's gravestone", &op->name);
2824 FREE_AND_COPY(tmp->name, buf); 3192 tmp->name = buf;
2825 sprintf(buf,"%s's gravestones",op->name); 3193 sprintf (buf, "%s's gravestones", &op->name);
2826 FREE_AND_COPY(tmp->name_pl, buf); 3194 tmp->name_pl = buf;
2827 sprintf(buf,"RIP\nHere rests the hero %s the %s,\n" 3195 sprintf (buf, "RIP\nHere rests the hero %s the %s,\n" "who was killed\n" "by %s.\n", &op->name, op->contr->title, op->contr->killer);
2828 "who was killed\n" 3196 tmp->msg = buf;
2829 "by %s.\n",
2830 op->name, op->contr->title,
2831 op->contr->killer);
2832 tmp->msg = add_string(buf);
2833 tmp->x=op->x,tmp->y=op->y; 3197 tmp->x = op->x, tmp->y = op->y;
2834 insert_ob_in_map (tmp, op->map, NULL,0); 3198 insert_ob_in_map (tmp, op->map, NULL, 0);
2835 3199
2836 /**************************************/ 3200 /**************************************/
2837 /* */ 3201 /* */
2838 /* Subtract the experience points, */ 3202 /* Subtract the experience points, */
2839 /* if we died cause of food, give us */ 3203 /* if we died cause of food, give us */
2840 /* food, and reset HP's... */ 3204 /* food, and reset HP's... */
2841 /* */ 3205 /* */
3206
2842 /**************************************/ 3207 /**************************************/
2843 3208
2844 /* remove any poisoning and confusion the character may be suffering.*/ 3209 /* remove any poisoning and confusion the character may be suffering. */
2845 /* restore player */ 3210 /* restore player */
2846 at = find_archetype("poisoning"); 3211 at = archetype::find ("poisoning");
2847 tmp=present_arch_in_ob(at,op); 3212 tmp = present_arch_in_ob (at, op);
2848 if (tmp) { 3213 if (tmp)
3214 {
2849 remove_ob(tmp); 3215 remove_ob (tmp);
2850 free_object(tmp); 3216 free_object (tmp);
2851 new_draw_info(NDI_UNIQUE, 0,op, "Your body feels cleansed"); 3217 new_draw_info (NDI_UNIQUE, 0, op, "Your body feels cleansed");
2852 } 3218 }
2853 3219
2854 at = find_archetype("confusion"); 3220 at = archetype::find ("confusion");
2855 tmp=present_arch_in_ob(at,op); 3221 tmp = present_arch_in_ob (at, op);
2856 if (tmp) { 3222 if (tmp)
3223 {
2857 remove_ob(tmp); 3224 remove_ob (tmp);
2858 free_object(tmp); 3225 free_object (tmp);
2859 new_draw_info(NDI_UNIQUE, 0,tmp, "Your mind feels clearer"); 3226 new_draw_info (NDI_UNIQUE, 0, tmp, "Your mind feels clearer");
2860 } 3227 }
2861 cure_disease(op,0); /* remove any disease */ 3228 cure_disease (op, 0); /* remove any disease */
2862 3229
2863 /*add_exp(op, (op->stats.exp * -0.20)); */ 3230 /*add_exp(op, (op->stats.exp * -0.20)); */
2864 apply_death_exp_penalty(op); 3231 apply_death_exp_penalty (op);
2865 if(op->stats.food < 100) op->stats.food = 900; 3232 if (op->stats.food < 100)
3233 op->stats.food = 900;
2866 op->stats.hp = op->stats.maxhp; 3234 op->stats.hp = op->stats.maxhp;
2867 op->stats.sp = MAX(op->stats.sp, op->stats.maxsp); 3235 op->stats.sp = MAX (op->stats.sp, op->stats.maxsp);
2868 op->stats.grace = MAX(op->stats.grace, op->stats.maxgrace); 3236 op->stats.grace = MAX (op->stats.grace, op->stats.maxgrace);
2869 3237
2870 /* 3238 /*
2871 * Check to see if the player is in a shop. IF so, then check to see if 3239 * Check to see if the player is in a shop. IF so, then check to see if
2872 * the player has any unpaid items. If so, remove them and put them back 3240 * the player has any unpaid items. If so, remove them and put them back
2873 * in the map. 3241 * in the map.
2874 */ 3242 */
2875 3243
2876 for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) { 3244 if (is_in_shop (op))
2877 if (tmp->type == SHOP_FLOOR) {
2878 remove_unpaid_objects(op->inv, op); 3245 remove_unpaid_objects (op->inv, op);
2879 break;
2880 }
2881 }
2882
2883 3246
2884 /****************************************/ 3247 /****************************************/
2885 /* */ 3248 /* */
2886 /* Move player to his current respawn- */ 3249 /* Move player to his current respawn- */
2887 /* position (usually last savebed) */ 3250 /* position (usually last savebed) */
2888 /* */ 3251 /* */
3252
2889 /****************************************/ 3253 /****************************************/
2890 3254
2891 enter_player_savebed(op); 3255 enter_player_savebed (op);
2892 3256
2893 /* Save the player before inserting the force to reduce 3257 /* Save the player before inserting the force to reduce
2894 * chance of abuse. 3258 * chance of abuse.
2895 */ 3259 */
2896 op->contr->braced=0; 3260 op->contr->braced = 0;
2897 save_player(op,1); 3261 save_player (op, 1);
2898 3262
2899 /* it is possible that the player has blown something up 3263 /* it is possible that the player has blown something up
2900 * at his savebed location, and that can have long lasting 3264 * at his savebed location, and that can have long lasting
2901 * spell effects. So first see if there is a spell effect 3265 * spell effects. So first see if there is a spell effect
2902 * on the space that might harm the player. 3266 * on the space that might harm the player.
2903 */ 3267 */
2904 will_kill_again=0; 3268 will_kill_again = 0;
2905 for (tmp= get_map_ob(op->map, op->x, op->y); tmp; tmp=tmp->above) { 3269 for (tmp = get_map_ob (op->map, op->x, op->y); tmp; tmp = tmp->above)
3270 {
2906 if (tmp->type ==SPELL_EFFECT) 3271 if (tmp->type == SPELL_EFFECT)
2907 will_kill_again|=tmp->attacktype; 3272 will_kill_again |= tmp->attacktype;
2908 } 3273 }
2909 if (will_kill_again) { 3274 if (will_kill_again)
3275 {
2910 object *force; 3276 object *force;
2911 int at; 3277 int at;
2912 3278
2913 force=get_archetype(FORCE_NAME); 3279 force = get_archetype (FORCE_NAME);
2914 /* 50 ticks should be enough time for the spell to abate */ 3280 /* 50 ticks should be enough time for the spell to abate */
2915 force->speed=0.1; 3281 force->speed = 0.1;
2916 force->speed_left=-5.0; 3282 force->speed_left = -5.0;
2917 SET_FLAG(force, FLAG_APPLIED); 3283 SET_FLAG (force, FLAG_APPLIED);
2918 for (at=0; at<NROFATTACKS; at++) { 3284 for (at = 0; at < NROFATTACKS; at++)
3285 {
2919 if (will_kill_again & (1 << at)) 3286 if (will_kill_again & (1 << at))
2920 force->resist[at] = 100; 3287 force->resist[at] = 100;
2921 } 3288 }
2922 insert_ob_in_ob(force, op); 3289 insert_ob_in_ob (force, op);
2923 fix_player(op); 3290 fix_player (op);
2924
2925 }
2926 /**************************************/
2927 /* */
2928 /* Repaint the characters inv, and */
2929 /* stats, and show a nasty message ;) */
2930 /* */
2931 /**************************************/
2932 3291
3292 }
3293
2933 new_draw_info(NDI_UNIQUE, 0,op,"YOU HAVE DIED."); 3294 new_draw_info (NDI_UNIQUE, 0, op, "YOU HAVE DIED.");
2934 return; 3295 return;
2935 } /* NOT_PERMADETH */ 3296 } /* NOT_PERMADETH */
2936 else { 3297 else
3298 {
2937 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This 3299 /* If NOT_PERMADETH is set, then the rest of this is not reachable. This
2938 * should probably be embedded in an else statement. 3300 * should probably be embedded in an else statement.
2939 */ 3301 */
2940 3302
2941 op->contr->party=NULL; 3303 op->contr->party = NULL;
2942 if (settings.set_title == TRUE) 3304 if (settings.set_title == TRUE)
2943 op->contr->own_title[0]='\0'; 3305 op->contr->own_title[0] = '\0';
2944 new_draw_info(NDI_UNIQUE|NDI_ALL, 0,NULL, buf); 3306 new_draw_info (NDI_UNIQUE | NDI_ALL, 0, NULL, buf);
2945 check_score(op); 3307 check_score (op);
2946 if(op->contr->ranges[range_golem]!=NULL) { 3308 if (op->contr->ranges[range_golem] != NULL)
3309 {
2947 remove_friendly_object(op->contr->ranges[range_golem]); 3310 remove_friendly_object (op->contr->ranges[range_golem]);
2948 remove_ob(op->contr->ranges[range_golem]); 3311 remove_ob (op->contr->ranges[range_golem]);
2949 free_object(op->contr->ranges[range_golem]); 3312 free_object (op->contr->ranges[range_golem]);
2950 op->contr->ranges[range_golem]=NULL; 3313 op->contr->ranges[range_golem] = NULL;
2951 op->contr->golem_count=0; 3314 op->contr->golem_count = 0;
2952 } 3315 }
2953 loot_object(op); /* Remove some of the items for good */ 3316 loot_object (op); /* Remove some of the items for good */
2954 remove_ob(op); 3317 remove_ob (op);
2955 op->direction=0; 3318 op->direction = 0;
2956 3319
2957 if(!QUERY_FLAG(op,FLAG_WAS_WIZ)&&op->stats.exp) { 3320 if (!QUERY_FLAG (op, FLAG_WAS_WIZ) && op->stats.exp)
3321 {
2958 delete_character(op->name,0); 3322 delete_character (op->name, 0);
2959 if (settings.resurrection == TRUE) { 3323 if (settings.resurrection == TRUE)
3324 {
2960 /* save playerfile sans equipment when player dies 3325 /* save playerfile sans equipment when player dies
2961 ** then save it as player.pl.dead so that future resurrection 3326 ** then save it as player.pl.dead so that future resurrection
2962 ** type spells will work on them nicely 3327 ** type spells will work on them nicely
2963 */ 3328 */
2964 delete_character(op->name,0); 3329 delete_character (op->name, 0);
2965 op->stats.hp = op->stats.maxhp; 3330 op->stats.hp = op->stats.maxhp;
2966 op->stats.food = 999; 3331 op->stats.food = 999;
2967 3332
2968 /* set the location of where the person will reappear when */ 3333 /* set the location of where the person will reappear when */
2969 /* maybe resurrection code should fix map also */ 3334 /* maybe resurrection code should fix map also */
2970 strcpy(op->contr->maplevel, settings.emergency_mapname); 3335 strcpy (op->contr->maplevel, settings.emergency_mapname);
2971 if(op->map!=NULL) 3336 if (op->map != NULL)
2972 op->map = NULL; 3337 op->map = NULL;
2973 op->x = settings.emergency_x; 3338 op->x = settings.emergency_x;
2974 op->y = settings.emergency_y; 3339 op->y = settings.emergency_y;
2975 save_player(op,0); 3340 save_player (op, 0);
2976 op->map = map; 3341 op->map = map;
2977 /* please see resurrection.c: peterm */ 3342 /* please see resurrection.c: peterm */
2978 dead_player(op); 3343 dead_player (op);
2979 } else { 3344 }
3345 else
2980 delete_character(op->name,1); 3346 delete_character (op->name, 1);
2981 } 3347 }
2982 } 3348
2983 play_again(op); 3349 play_again (op);
2984 3350
2985 /* peterm: added to create a corpse at deathsite. */ 3351 /* peterm: added to create a corpse at deathsite. */
2986 tmp=arch_to_object(find_archetype("corpse_pl")); 3352 tmp = arch_to_object (archetype::find ("corpse_pl"));
2987 sprintf(buf,"%s", op->name); 3353 sprintf (buf, "%s", &op->name);
2988 FREE_AND_COPY(tmp->name, buf); 3354 tmp->name = tmp->name_pl = buf;
2989 FREE_AND_COPY(tmp->name_pl, buf);
2990 tmp->level=op->level; 3355 tmp->level = op->level;
2991 tmp->x=x;tmp->y=y; 3356 tmp->x = x;
2992 if (tmp->msg) 3357 tmp->y = y;
2993 free_string(tmp->msg); 3358 tmp->msg = gravestone_text (op);
2994 tmp->msg = add_string (gravestone_text(op));
2995 SET_FLAG (tmp, FLAG_UNIQUE); 3359 SET_FLAG (tmp, FLAG_UNIQUE);
2996 insert_ob_in_map (tmp, map, NULL,0); 3360 insert_ob_in_map (tmp, map, NULL, 0);
2997 } 3361 }
2998} 3362}
2999 3363
3000 3364
3001void loot_object(object *op) { /* Grab and destroy some treasure */ 3365void
3366loot_object (object *op)
3367{ /* Grab and destroy some treasure */
3002 object *tmp,*tmp2,*next; 3368 object *tmp, *tmp2, *next;
3003 3369
3004 if (op->container) { /* close open sack first */ 3370 if (op->container)
3371 { /* close open sack first */
3005 esrv_apply_container (op, op->container); 3372 esrv_apply_container (op, op->container);
3006 } 3373 }
3007 3374
3008 for(tmp=op->inv;tmp!=NULL;tmp=next) { 3375 for (tmp = op->inv; tmp != NULL; tmp = next)
3376 {
3009 next=tmp->below; 3377 next = tmp->below;
3010 if (tmp->type==EXPERIENCE || tmp->invisible) continue; 3378 if (tmp->type == EXPERIENCE || tmp->invisible)
3379 continue;
3011 remove_ob(tmp); 3380 remove_ob (tmp);
3012 tmp->x=op->x,tmp->y=op->y; 3381 tmp->x = op->x, tmp->y = op->y;
3013 if (tmp->type == CONTAINER) { /* empty container to ground */ 3382 if (tmp->type == CONTAINER)
3014 loot_object(tmp); 3383 { /* empty container to ground */
3015 } 3384 loot_object (tmp);
3016 if(!QUERY_FLAG(tmp, FLAG_UNIQUE) && (QUERY_FLAG(tmp, FLAG_STARTEQUIP) 3385 }
3017 || QUERY_FLAG(tmp,FLAG_NO_DROP) || !(RANDOM()%3))) { 3386 if (!QUERY_FLAG (tmp, FLAG_UNIQUE) && (QUERY_FLAG (tmp, FLAG_STARTEQUIP) || QUERY_FLAG (tmp, FLAG_NO_DROP) || !(RANDOM () % 3)))
3387 {
3018 if(tmp->nrof>1) { 3388 if (tmp->nrof > 1)
3389 {
3019 tmp2=get_split_ob(tmp,1+RANDOM()%(tmp->nrof-1)); 3390 tmp2 = get_split_ob (tmp, 1 + RANDOM () % (tmp->nrof - 1));
3020 free_object(tmp2); 3391 free_object (tmp2);
3021 insert_ob_in_map(tmp,op->map,NULL,0); 3392 insert_ob_in_map (tmp, op->map, NULL, 0);
3393 }
3394 else
3395 free_object (tmp);
3396 }
3022 } else 3397 else
3023 free_object(tmp);
3024 } else
3025 insert_ob_in_map(tmp,op->map,NULL,0); 3398 insert_ob_in_map (tmp, op->map, NULL, 0);
3026 } 3399 }
3027} 3400}
3028 3401
3029/* 3402/*
3030 * fix_weight(): Check recursively the weight of all players, and fix 3403 * fix_weight(): Check recursively the weight of all players, and fix
3031 * what needs to be fixed. Refresh windows and fix speed if anything 3404 * what needs to be fixed. Refresh windows and fix speed if anything
3032 * was changed. 3405 * was changed.
3033 */ 3406 */
3034 3407
3408void
3035void fix_weight(void) { 3409fix_weight (void)
3410{
3036 player *pl; 3411 player *pl;
3412
3037 for (pl = first_player; pl != NULL; pl = pl->next) { 3413 for (pl = first_player; pl != NULL; pl = pl->next)
3414 {
3038 int old = pl->ob->carrying, sum = sum_weight(pl->ob); 3415 int old = pl->ob->carrying, sum = sum_weight (pl->ob);
3416
3039 if(old == sum) 3417 if (old == sum)
3040 continue; 3418 continue;
3041 fix_player(pl->ob); 3419 fix_player (pl->ob);
3042 LOG(llevDebug,"Fixed inventory in %s (%d -> %d)\n", 3420 LOG (llevDebug, "Fixed inventory in %s (%d -> %d)\n", &pl->ob->name, old, sum);
3043 pl->ob->name, old, sum);
3044 } 3421 }
3045} 3422}
3046 3423
3424void
3047void fix_luck(void) { 3425fix_luck (void)
3426{
3048 player *pl; 3427 player *pl;
3428
3049 for (pl = first_player; pl != NULL; pl = pl->next) 3429 for (pl = first_player; pl != NULL; pl = pl->next)
3050 if (!pl->ob->contr->state) 3430 if (!pl->ob->contr->state)
3051 change_luck(pl->ob, 0); 3431 change_luck (pl->ob, 0);
3052} 3432}
3053 3433
3054 3434
3055/* cast_dust() - handles op throwing objects of type 'DUST'. 3435/* cast_dust() - handles op throwing objects of type 'DUST'.
3056 * This is much simpler in the new spell code - we basically 3436 * This is much simpler in the new spell code - we basically
3057 * just treat this as any other spell casting object. 3437 * just treat this as any other spell casting object.
3058 */ 3438 */
3059 3439
3060void 3440void
3061cast_dust (object * op, object * throw_ob, int dir) 3441cast_dust (object *op, object *throw_ob, int dir)
3062{ 3442{
3063 object *skop, *spob; 3443 object *skop, *spob;
3064 3444
3065 skop = find_skill_by_name (op, throw_ob->skill); 3445 skop = find_skill_by_name (op, throw_ob->skill);
3066 3446
3067 /* casting POTION 'dusts' is really a use_magic_item skill */ 3447 /* casting POTION 'dusts' is really a use_magic_item skill */
3068 if (op->type == PLAYER && throw_ob->type == POTION && !skop) 3448 if (op->type == PLAYER && throw_ob->type == POTION && !skop)
3069 { 3449 {
3070 LOG (llevError, "Player %s lacks critical skill use_magic_item!\n", 3450 LOG (llevError, "Player %s lacks critical skill use_magic_item!\n", &op->name);
3071 op->name);
3072 return; 3451 return;
3073 } 3452 }
3074 3453
3075 spob = throw_ob->inv; 3454 spob = throw_ob->inv;
3076 3455
3077 // elmex Tue Aug 15 17:19:46 CEST 2006: Added this check to 3456 // elmex Tue Aug 15 17:19:46 CEST 2006: Added this check to
3078 // not pass NULL to cast_spell (which did indeed check itself, but 3457 // not pass NULL to cast_spell (which did indeed check itself, but
3079 // errors should be reported as early as possible IMHO) 3458 // errors should be reported as early as possible IMHO)
3080 if (!spob) 3459 if (!spob)
3081 { 3460 {
3082 LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!", 3461 LOG (llevError, "cast_dust: thrown object %s (by %s) had no spell in it!", &throw_ob->name, &op->name);
3083 throw_ob->name, op->name);
3084 return; 3462 return;
3085 } 3463 }
3086 3464
3087 if (op->type == PLAYER) 3465 if (op->type == PLAYER)
3088 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", spob->name); 3466 new_draw_info_format (NDI_UNIQUE, 0, op, "You cast %s.", &spob->name);
3089 3467
3090 cast_spell (op, throw_ob, dir, spob, NULL); 3468 cast_spell (op, throw_ob, dir, spob, NULL);
3091 3469
3092 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED)) 3470 if (!QUERY_FLAG (throw_ob, FLAG_REMOVED))
3093 remove_ob (throw_ob); 3471 remove_ob (throw_ob);
3094 free_object (throw_ob); 3472 free_object (throw_ob);
3095} 3473}
3096 3474
3475void
3097void make_visible (object *op) { 3476make_visible (object *op)
3477{
3098 op->hide = 0; 3478 op->hide = 0;
3099 op->invisible = 0; 3479 op->invisible = 0;
3100 if(op->type==PLAYER) { 3480 if (op->type == PLAYER)
3481 {
3101 op->contr->tmp_invis = 0; 3482 op->contr->tmp_invis = 0;
3102 if (op->contr->invis_race) FREE_AND_CLEAR_STR(op->contr->invis_race); 3483 op->contr->invis_race = 0;
3103 } 3484 }
3104 update_object(op,UP_OBJ_FACE); 3485 update_object (op, UP_OBJ_FACE);
3105} 3486}
3106 3487
3488int
3107int is_true_undead(object *op) { 3489is_true_undead (object *op)
3490{
3108 object *tmp=NULL; 3491 object *tmp = NULL;
3109 3492
3110 if(QUERY_FLAG(&op->arch->clone,FLAG_UNDEAD)) return 1; 3493 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3494 return 1;
3111 3495
3112 if(op->type==PLAYER) 3496 if (op->type == PLAYER)
3113 for(tmp=op->inv;tmp;tmp=tmp->below) 3497 for (tmp = op->inv; tmp; tmp = tmp->below)
3114 if(tmp->type==EXPERIENCE && tmp->stats.Wis) 3498 if (tmp->type == EXPERIENCE && tmp->stats.Wis)
3115 if(QUERY_FLAG(tmp,FLAG_UNDEAD)) return 1; 3499 if (QUERY_FLAG (tmp, FLAG_UNDEAD))
3500 return 1;
3116 return 0; 3501 return 0;
3117} 3502}
3118 3503
3119/* look at the surrounding terrain to determine 3504/* look at the surrounding terrain to determine
3120 * the hideability of this object. Positive levels 3505 * the hideability of this object. Positive levels
3121 * indicate greater hideability. 3506 * indicate greater hideability.
3122 */ 3507 */
3123 3508
3509int
3124int hideability(object *ob) { 3510hideability (object *ob)
3511{
3125 int i,level=0, mflag; 3512 int i, level = 0, mflag;
3126 sint16 x,y; 3513 sint16 x, y;
3127 3514
3128 if(!ob||!ob->map) return 0; 3515 if (!ob || !ob->map)
3516 return 0;
3129 3517
3130 /* so, on normal lighted maps, its hard to hide */ 3518 /* so, on normal lighted maps, its hard to hide */
3131 level=ob->map->darkness - 2; 3519 level = ob->map->darkness - 2;
3132 3520
3133 /* this also picks up whether the object is glowing. 3521 /* this also picks up whether the object is glowing.
3134 * If you carry a light on a non-dark map, its not 3522 * If you carry a light on a non-dark map, its not
3135 * as bad as carrying a light on a pitch dark map */ 3523 * as bad as carrying a light on a pitch dark map */
3136 if(has_carried_lights(ob)) level =- (10 + (2*ob->map->darkness)); 3524 if (has_carried_lights (ob))
3525 level = -(10 + (2 * ob->map->darkness));
3137 3526
3138 /* scan through all nearby squares for terrain to hide in */ 3527 /* scan through all nearby squares for terrain to hide in */
3139 for(i=0,x=ob->x,y=ob->y;i<9;i++,x=ob->x+freearr_x[i],y=ob->y+freearr_y[i]) { 3528 for (i = 0, x = ob->x, y = ob->y; i < 9; i++, x = ob->x + freearr_x[i], y = ob->y + freearr_y[i])
3529 {
3140 mflag = get_map_flags(ob->map, NULL, x, y, NULL, NULL); 3530 mflag = get_map_flags (ob->map, NULL, x, y, NULL, NULL);
3141 if (mflag & P_OUT_OF_MAP) { continue; } 3531 if (mflag & P_OUT_OF_MAP)
3532 {
3533 continue;
3534 }
3142 if(mflag & P_BLOCKSVIEW) /* something to hide near! */ 3535 if (mflag & P_BLOCKSVIEW) /* something to hide near! */
3143 level += 2; 3536 level += 2;
3144 else /* open terrain! */ 3537 else /* open terrain! */
3145 level -= 1; 3538 level -= 1;
3146 } 3539 }
3147 3540
3148#if 0 3541#if 0
3149 LOG(llevDebug,"hideability of %s is %d\n",ob->name,level); 3542 LOG (llevDebug, "hideability of %s is %d\n", ob->name, level);
3150#endif 3543#endif
3151 return level; 3544 return level;
3152} 3545}
3153 3546
3154/* For Hidden creatures - a chance of becoming 'unhidden' 3547/* For Hidden creatures - a chance of becoming 'unhidden'
3155 * every time they move - as we subtract off 'invisibility' 3548 * every time they move - as we subtract off 'invisibility'
3156 * AND, for players, if they move into a ridiculously unhideable 3549 * AND, for players, if they move into a ridiculously unhideable
3157 * spot (surrounded by clear terrain in broad daylight). -b.t. 3550 * spot (surrounded by clear terrain in broad daylight). -b.t.
3158 */ 3551 */
3159 3552
3553void
3160void do_hidden_move (object *op) { 3554do_hidden_move (object *op)
3555{
3161 int hide=0, num=random_roll(0, 19, op, PREFER_LOW); 3556 int hide = 0, num = random_roll (0, 19, op, PREFER_LOW);
3162 object *skop; 3557 object *skop;
3163 3558
3164 if(!op || !op->map) return; 3559 if (!op || !op->map)
3560 return;
3165 3561
3166 skop = find_obj_by_type_subtype(op, SKILL, SK_HIDING); 3562 skop = find_obj_by_type_subtype (op, SKILL, SK_HIDING);
3167 3563
3168 /* its *extremely* hard to run and sneak/hide at the same time! */ 3564 /* its *extremely* hard to run and sneak/hide at the same time! */
3169 if(op->type==PLAYER && op->contr->run_on) { 3565 if (op->type == PLAYER && op->contr->run_on)
3566 {
3170 if(!skop || num >= skop->level) { 3567 if (!skop || num >= skop->level)
3568 {
3171 new_draw_info(NDI_UNIQUE,0,op,"You ran too much! You are no longer hidden!"); 3569 new_draw_info (NDI_UNIQUE, 0, op, "You ran too much! You are no longer hidden!");
3172 make_visible(op); 3570 make_visible (op);
3173 return; 3571 return;
3174 } else num += 20; 3572 }
3573 else
3574 num += 20;
3175 } 3575 }
3176 num += op->map->difficulty; 3576 num += op->map->difficulty;
3177 hide = hideability(op); /* modify by terrain hidden level */ 3577 hide = hideability (op); /* modify by terrain hidden level */
3178 num -= hide; 3578 num -= hide;
3179 if((op->type==PLAYER && hide<-10) || ((op->invisible-=num)<=0)) { 3579 if ((op->type == PLAYER && hide < -10) || ((op->invisible -= num) <= 0))
3580 {
3180 make_visible(op); 3581 make_visible (op);
3181 if(op->type==PLAYER) new_draw_info(NDI_UNIQUE, 0,op, 3582 if (op->type == PLAYER)
3182 "You moved out of hiding! You are visible!"); 3583 new_draw_info (NDI_UNIQUE, 0, op, "You moved out of hiding! You are visible!");
3183 } 3584 }
3184 else if (op->type == PLAYER && skop) { 3585 else if (op->type == PLAYER && skop)
3586 {
3185 change_exp(op, calc_skill_exp(op, NULL, skop), skop->skill, 0); 3587 change_exp (op, calc_skill_exp (op, NULL, skop), skop->skill, 0);
3186 } 3588 }
3187} 3589}
3188 3590
3189/* determine if who is standing near a hostile creature. */ 3591/* determine if who is standing near a hostile creature. */
3190 3592
3593int
3191int stand_near_hostile( object *who ) { 3594stand_near_hostile (object *who)
3595{
3192 object *tmp=NULL; 3596 object *tmp = NULL;
3193 int i,friendly=0,player=0, mflags; 3597 int i, friendly = 0, player = 0, mflags;
3194 mapstruct *m; 3598 maptile *m;
3195 sint16 x,y; 3599 sint16 x, y;
3196 3600
3197 if(!who) return 0; 3601 if (!who)
3198
3199 if(who->type==PLAYER) player=1;
3200 else friendly = QUERY_FLAG(who,FLAG_FRIENDLY);
3201
3202 /* search adjacent squares */
3203 for(i=1;i<9;i++) {
3204 x = who->x+freearr_x[i];
3205 y = who->y+freearr_y[i];
3206 m = who->map;
3207 mflags = get_map_flags(m, &m, x, y, &x, &y);
3208 /* space must be blocked if there is a monster. If not
3209 * blocked, don't need to check this space.
3210 */
3211 if (mflags & P_OUT_OF_MAP) continue;
3212 if (OB_TYPE_MOVE_BLOCK(who, GET_MAP_MOVE_BLOCK(m, x, y))) continue;
3213
3214 for(tmp=get_map_ob(m,x,y);tmp;tmp=tmp->above) {
3215 if((player||friendly)
3216 &&QUERY_FLAG(tmp,FLAG_MONSTER)&&!QUERY_FLAG(tmp,FLAG_UNAGGRESSIVE))
3217 return 1;
3218 else if(tmp->type==PLAYER)
3219 {
3220 /*don't let a hidden DM prevent you from hiding*/
3221 if(!QUERY_FLAG(tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3222 return 1;
3223 }
3224 }
3225 }
3226 return 0; 3602 return 0;
3603
3604 if (who->type == PLAYER)
3605 player = 1;
3606
3607 else
3608 friendly = QUERY_FLAG (who, FLAG_FRIENDLY);
3609
3610 /* search adjacent squares */
3611 for (i = 1; i < 9; i++)
3612 {
3613 x = who->x + freearr_x[i];
3614 y = who->y + freearr_y[i];
3615 m = who->map;
3616 mflags = get_map_flags (m, &m, x, y, &x, &y);
3617 /* space must be blocked if there is a monster. If not
3618 * blocked, don't need to check this space.
3619 */
3620 if (mflags & P_OUT_OF_MAP)
3621 continue;
3622 if (OB_TYPE_MOVE_BLOCK (who, GET_MAP_MOVE_BLOCK (m, x, y)))
3623 continue;
3624
3625 for (tmp = get_map_ob (m, x, y); tmp; tmp = tmp->above)
3626 {
3627 if ((player ||friendly) &&QUERY_FLAG (tmp, FLAG_MONSTER) && !QUERY_FLAG (tmp, FLAG_UNAGGRESSIVE))
3628 return 1;
3629 else if (tmp->type == PLAYER)
3630 {
3631 /*don't let a hidden DM prevent you from hiding */
3632 if (!QUERY_FLAG (tmp, FLAG_WIZ) || tmp->contr->hidden == 0)
3633 return 1;
3634 }
3635 }
3636 }
3637 return 0;
3227} 3638}
3228 3639
3229/* check the player los field for viewability of the 3640/* check the player los field for viewability of the
3230 * object op. This function works fine for monsters, 3641 * object op. This function works fine for monsters,
3231 * but we dont worry if the object isnt the top one in 3642 * but we dont worry if the object isnt the top one in
… …
3238 * for them to differ. Sigh, this fctn could get a bit more complex. 3649 * for them to differ. Sigh, this fctn could get a bit more complex.
3239 * -b.t. 3650 * -b.t.
3240 * This function is now map tiling safe. 3651 * This function is now map tiling safe.
3241 */ 3652 */
3242 3653
3654int
3243int player_can_view (object *pl,object *op) { 3655player_can_view (object *pl, object *op)
3656{
3244 rv_vector rv; 3657 rv_vector rv;
3245 int dx,dy; 3658 int dx, dy;
3246 3659
3247 if(pl->type!=PLAYER) { 3660 if (pl->type != PLAYER)
3661 {
3248 LOG(llevError,"player_can_view() called for non-player object\n"); 3662 LOG (llevError, "player_can_view() called for non-player object\n");
3249 return -1;
3250 }
3251 if (!pl || !op) return 0;
3252
3253 if(op->head) { op = op->head; }
3254 get_rangevector(pl, op, &rv, 0x1);
3255
3256 /* starting with the 'head' part, lets loop
3257 * through the object and find if it has any
3258 * part that is in the los array but isnt on
3259 * a blocked los square.
3260 * we use the archetype to figure out offsets.
3261 */
3262 while(op) {
3263 dx = rv.distance_x + op->arch->clone.x;
3264 dy = rv.distance_y + op->arch->clone.y;
3265
3266 /* only the viewable area the player sees is updated by LOS
3267 * code, so we need to restrict ourselves to that range of values
3268 * for any meaningful values.
3269 */
3270 if (FABS(dx) <= (pl->contr->socket.mapx/2) &&
3271 FABS(dy) <= (pl->contr->socket.mapy/2) &&
3272 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx/2)][dy+(pl->contr->socket.mapy/2)] )
3273 return 1; 3663 return -1;
3274 op = op->more;
3275 } 3664 }
3665 if (!pl || !op)
3276 return 0; 3666 return 0;
3667
3668 if (op->head)
3669 {
3670 op = op->head;
3671 }
3672 get_rangevector (pl, op, &rv, 0x1);
3673
3674 /* starting with the 'head' part, lets loop
3675 * through the object and find if it has any
3676 * part that is in the los array but isnt on
3677 * a blocked los square.
3678 * we use the archetype to figure out offsets.
3679 */
3680 while (op)
3681 {
3682 dx = rv.distance_x + op->arch->clone.x;
3683 dy = rv.distance_y + op->arch->clone.y;
3684
3685 /* only the viewable area the player sees is updated by LOS
3686 * code, so we need to restrict ourselves to that range of values
3687 * for any meaningful values.
3688 */
3689 if (FABS (dx) <= (pl->contr->socket.mapx / 2) &&
3690 FABS (dy) <= (pl->contr->socket.mapy / 2) &&
3691 !pl->contr->blocked_los[dx + (pl->contr->socket.mapx / 2)][dy + (pl->contr->socket.mapy / 2)])
3692 return 1;
3693 op = op->more;
3694 }
3695 return 0;
3277} 3696}
3278 3697
3279/* routine for both players and monsters. We call this when 3698/* routine for both players and monsters. We call this when
3280 * there is a possibility for our action distrubing our hiding 3699 * there is a possibility for our action distrubing our hiding
3281 * place or invisiblity spell. Artefact invisiblity is not 3700 * place or invisiblity spell. Artefact invisiblity is not
3282 * effected by this. If we arent invisible to begin with, we 3701 * effected by this. If we arent invisible to begin with, we
3283 * return 0. 3702 * return 0.
3284 */ 3703 */
3704int
3285int action_makes_visible (object *op) { 3705action_makes_visible (object *op)
3706{
3286 3707
3287 if(op->invisible && QUERY_FLAG(op,FLAG_ALIVE)) { 3708 if (op->invisible && QUERY_FLAG (op, FLAG_ALIVE))
3709 {
3288 if(QUERY_FLAG(op,FLAG_MAKE_INVIS)) 3710 if (QUERY_FLAG (op, FLAG_MAKE_INVIS))
3289 return 0; 3711 return 0;
3290 3712
3291 if (op->contr && op->contr->tmp_invis == 0) return 0; 3713 if (op->contr && op->contr->tmp_invis == 0)
3714 return 0;
3292 3715
3293 /* If monsters, they should become visible */ 3716 /* If monsters, they should become visible */
3294 if(op->hide || !op->contr || (op->contr && op->contr->tmp_invis)) { 3717 if (op->hide || !op->contr || (op->contr && op->contr->tmp_invis))
3718 {
3295 new_draw_info_format(NDI_UNIQUE, 0,op,"You become %s!",op->hide?"unhidden":"visible"); 3719 new_draw_info_format (NDI_UNIQUE, 0, op, "You become %s!", op->hide ? "unhidden" : "visible");
3296 return 1; 3720 return 1;
3297 } 3721 }
3298 } 3722 }
3299 return 0; 3723 return 0;
3300} 3724}
3301 3725
3302/* op_on_battleground - checks if the given object op (usually 3726/* op_on_battleground - checks if the given object op (usually
3303 * a player) is standing on a valid battleground-tile, 3727 * a player) is standing on a valid battleground-tile,
3304 * function returns TRUE/FALSE. If true x, y returns the battleground 3728 * function returns TRUE/FALSE. If true x, y returns the battleground
3305 * -exit-coord. (and if x, y not NULL) 3729 * -exit-coord. (and if x, y not NULL)
3306 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set 3730 * 19 March 2005 - josh@woosworld.net modifed to check if the battleground also has slaying, maxhp, and maxsp set
3307 * and if those are all set and the player has a marker that matches the slaying send them to a different x, y 3731 * and if those are all set and the player has a marker that matches the slaying send them to a different x, y
3308 * Default is to do the same as before, so only people wanting to have different points need worry about this 3732 * Default is to do the same as before, so only people wanting to have different points need worry about this
3309 */ 3733 */
3734int
3310int op_on_battleground (object *op, int *x, int *y) { 3735op_on_battleground (object *op, int *x, int *y)
3736{
3311 object *tmp; 3737 object *tmp;
3312 3738
3313 /* A battleground-tile needs the following attributes to be valid: 3739 /* A battleground-tile needs the following attributes to be valid:
3314 * is_floor 1 (has to be the FIRST floor beneath the player's feet), 3740 * is_floor 1 (has to be the FIRST floor beneath the player's feet),
3315 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND) 3741 * name="battleground", no_pick 1, type=58 (type BATTLEGROUND)
3316 * and the exit-coordinates sp/hp must both be > 0. 3742 * and the exit-coordinates sp/hp must both be > 0.
3317 * => The intention here is to prevent abuse of the battleground- 3743 * => The intention here is to prevent abuse of the battleground-
3318 * feature (like pickable or hidden battleground tiles). */ 3744 * feature (like pickable or hidden battleground tiles). */
3319 for (tmp=op->below; tmp!=NULL; tmp=tmp->below) { 3745 for (tmp = op->below; tmp != NULL; tmp = tmp->below)
3746 {
3320 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR)) { 3747 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR))
3748 {
3321 if (QUERY_FLAG (tmp, FLAG_NO_PICK) && 3749 if (QUERY_FLAG (tmp, FLAG_NO_PICK) &&
3322 strcmp(tmp->name, "battleground")==0 && 3750 strcmp (tmp->name, "battleground") == 0 && tmp->type == BATTLEGROUND && EXIT_X (tmp) && EXIT_Y (tmp))
3323 tmp->type == BATTLEGROUND && EXIT_X(tmp) && EXIT_Y(tmp)) { 3751 {
3324 /*before we assign the exit, check if this is a teambattle*/ 3752 /*before we assign the exit, check if this is a teambattle */
3325 if ( EXIT_ALT_X(tmp) && EXIT_ALT_Y(tmp) && EXIT_PATH(tmp) ){ 3753 if (EXIT_ALT_X (tmp) && EXIT_ALT_Y (tmp) && EXIT_PATH (tmp))
3754 {
3326 object *invtmp; 3755 object *invtmp;
3756
3327 for(invtmp=op->inv; invtmp != NULL; invtmp=invtmp->below) { 3757 for (invtmp = op->inv; invtmp != NULL; invtmp = invtmp->below)
3328 if(invtmp->type==FORCE && invtmp->slaying && 3758 {
3329 !strcmp(EXIT_PATH(tmp), invtmp->slaying)){ 3759 if (invtmp->type == FORCE && invtmp->slaying && !strcmp (EXIT_PATH (tmp), invtmp->slaying))
3760 {
3761 if (x != NULL && y != NULL)
3762 *x = EXIT_ALT_X (tmp), *y = EXIT_ALT_Y (tmp);
3763 return 1;
3764 }
3765 }
3766 }
3330 if (x != NULL && y != NULL) 3767 if (x != NULL && y != NULL)
3331 *x=EXIT_ALT_X(tmp), *y=EXIT_ALT_Y(tmp); 3768 *x = EXIT_X (tmp), *y = EXIT_Y (tmp);
3332 return 1; 3769 return 1;
3333 } 3770 }
3334 } 3771 }
3335 }
3336 if (x != NULL && y != NULL)
3337 *x=EXIT_X(tmp), *y=EXIT_Y(tmp);
3338 return 1;
3339 } 3772 }
3340 }
3341 }
3342 /* If we got here, did not find a battleground */ 3773 /* If we got here, did not find a battleground */
3343 return 0; 3774 return 0;
3344} 3775}
3345 3776
3346/* 3777/*
… …
3350 * attributes: 3781 * attributes:
3351 * object *who the dragon player 3782 * object *who the dragon player
3352 * int atnr the attack-number of the ability focus 3783 * int atnr the attack-number of the ability focus
3353 * int level ability level 3784 * int level ability level
3354 */ 3785 */
3786void
3355void dragon_ability_gain(object *who, int atnr, int level) { 3787dragon_ability_gain (object *who, int atnr, int level)
3788{
3356 treasurelist *trlist = NULL; /* treasurelist */ 3789 treasurelist *trlist = NULL; /* treasurelist */
3357 treasure *tr; /* treasure */ 3790 treasure *tr; /* treasure */
3358 object *tmp,*skop; /* tmp. object */ 3791 object *tmp, *skop; /* tmp. object */
3359 object *item; /* treasure object */ 3792 object *item; /* treasure object */
3360 char buf[MAX_BUF]; /* tmp. string buffer */ 3793 char buf[MAX_BUF]; /* tmp. string buffer */
3361 int i=0, j=0; 3794 int i = 0, j = 0;
3362 3795
3363 /* get the appropriate treasurelist */ 3796 /* get the appropriate treasurelist */
3364 if (atnr == ATNR_FIRE) 3797 if (atnr == ATNR_FIRE)
3365 trlist = find_treasurelist("dragon_ability_fire"); 3798 trlist = find_treasurelist ("dragon_ability_fire");
3366 else if (atnr == ATNR_COLD) 3799 else if (atnr == ATNR_COLD)
3367 trlist = find_treasurelist("dragon_ability_cold"); 3800 trlist = find_treasurelist ("dragon_ability_cold");
3368 else if (atnr == ATNR_ELECTRICITY) 3801 else if (atnr == ATNR_ELECTRICITY)
3369 trlist = find_treasurelist("dragon_ability_elec"); 3802 trlist = find_treasurelist ("dragon_ability_elec");
3370 else if (atnr == ATNR_POISON) 3803 else if (atnr == ATNR_POISON)
3371 trlist = find_treasurelist("dragon_ability_poison"); 3804 trlist = find_treasurelist ("dragon_ability_poison");
3372 3805
3373 if (trlist == NULL || who->type != PLAYER) 3806 if (trlist == NULL || who->type != PLAYER)
3374 return; 3807 return;
3375 3808
3376 for (i=0, tr = trlist->items; tr != NULL && i<level-1; 3809 for (i = 0, tr = trlist->items; tr != NULL && i < level - 1; tr = tr->next, i++);
3377 tr = tr->next, i++); 3810
3378
3379 if (tr == NULL || tr->item == NULL) { 3811 if (tr == NULL || tr->item == NULL)
3812 {
3380 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */ 3813 /* LOG(llevDebug, "-> no more treasure for %s\n", change_resist_msg[atnr]); */
3381 return; 3814 return;
3382 } 3815 }
3383 3816
3384 /* everything seems okay - now bring on the gift: */ 3817 /* everything seems okay - now bring on the gift: */
3385 item = &(tr->item->clone); 3818 item = &(tr->item->clone);
3386 3819
3387 if (item->type == SPELL) { 3820 if (item->type == SPELL)
3821 {
3388 if (check_spell_known (who, item->name)) 3822 if (check_spell_known (who, item->name))
3389 return; 3823 return;
3390 3824
3391 new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->name); 3825 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained the ability of %s", &item->name);
3392 do_learn_spell (who, item, 0); 3826 do_learn_spell (who, item, 0);
3393 return; 3827 return;
3394 } 3828 }
3395 3829
3396 /* grant direct spell */ 3830 /* grant direct spell */
3397 if (item->type == SPELLBOOK) { 3831 if (item->type == SPELLBOOK)
3832 {
3398 if (!item->inv) { 3833 if (!item->inv)
3834 {
3399 LOG(llevDebug,"dragon_ability_gain: Broken spellbook %s\n", 3835 LOG (llevDebug, "dragon_ability_gain: Broken spellbook %s\n", &item->name);
3400 item->name);
3401 return; 3836 return;
3402 } 3837 }
3403 if (check_spell_known (who, item->inv->name)) 3838 if (check_spell_known (who, item->inv->name))
3404 return; 3839 return;
3405 if (item->invisible) { 3840 if (item->invisible)
3841 {
3406 new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained the ability of %s", item->inv->name); 3842 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained the ability of %s", &item->inv->name);
3407 do_learn_spell (who, item->inv, 0); 3843 do_learn_spell (who, item->inv, 0);
3408 return; 3844 return;
3409 } 3845 }
3410 } 3846 }
3411 else if (item->type == SKILL_TOOL && item->invisible) { 3847 else if (item->type == SKILL_TOOL && item->invisible)
3848 {
3412 if (item->subtype == SK_CLAWING && (skop=find_skill_by_name(who, item->skill))!=NULL) { 3849 if (item->subtype == SK_CLAWING && (skop = find_skill_by_name (who, item->skill)) != NULL)
3850 {
3413 3851
3414 /* should this perhaps be (skop->attackyp & item->attacktype)!=item->attacktype ... 3852 /* should this perhaps be (skop->attackyp & item->attacktype)!=item->attacktype ...
3415 * in this way, if the player is missing any of the attacktypes, he gets 3853 * in this way, if the player is missing any of the attacktypes, he gets
3416 * them. As it is now, if the player has any that match the granted skill, 3854 * them. As it is now, if the player has any that match the granted skill,
3417 * but not all of them, he gets nothing. 3855 * but not all of them, he gets nothing.
3418 */ 3856 */
3419 if (!(skop->attacktype & item->attacktype)) { 3857 if (!(skop->attacktype & item->attacktype))
3858 {
3420 /* Give new attacktype */ 3859 /* Give new attacktype */
3421 skop->attacktype |= item->attacktype; 3860 skop->attacktype |= item->attacktype;
3422 3861
3423 /* always add physical if there's none */ 3862 /* always add physical if there's none */
3424 skop->attacktype |= AT_PHYSICAL; 3863 skop->attacktype |= AT_PHYSICAL;
3425 3864
3426 if (item->msg != NULL) 3865 if (item->msg != NULL)
3427 new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg); 3866 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3428 3867
3429 /* Give player new face */ 3868 /* Give player new face */
3430 if (item->animation_id) { 3869 if (item->animation_id)
3870 {
3431 who->face = skop->face; 3871 who->face = skop->face;
3432 who->animation_id = item->animation_id; 3872 who->animation_id = item->animation_id;
3433 who->anim_speed = item->anim_speed; 3873 who->anim_speed = item->anim_speed;
3434 who->last_anim = 0; 3874 who->last_anim = 0;
3435 who->state = 0; 3875 who->state = 0;
3436 animate_object(who, who->direction); 3876 animate_object (who, who->direction);
3437 } 3877 }
3878 }
3879 }
3438 } 3880 }
3439 }
3440 }
3441 else if (item->type == FORCE) { 3881 else if (item->type == FORCE)
3882 {
3442 /* forces in the treasurelist can alter the player's stats */ 3883 /* forces in the treasurelist can alter the player's stats */
3443 object *skin; 3884 object *skin;
3885
3444 /* first get the dragon skin force */ 3886 /* first get the dragon skin force */
3445 for (skin=who->inv; skin!=NULL && strcmp(skin->arch->name, "dragon_skin_force")!=0; 3887 for (skin = who->inv; skin != NULL && strcmp (skin->arch->name, "dragon_skin_force") != 0; skin = skin->below);
3446 skin=skin->below); 3888 if (skin == NULL)
3447 if (skin == NULL) return; 3889 return;
3448 3890
3449 /* adding new spellpath attunements */ 3891 /* adding new spellpath attunements */
3450 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned)) { 3892 if (item->path_attuned > 0 && !(skin->path_attuned & item->path_attuned))
3893 {
3451 skin->path_attuned |= item->path_attuned; /* add attunement to skin */ 3894 skin->path_attuned |= item->path_attuned; /* add attunement to skin */
3452 3895
3453 /* print message */ 3896 /* print message */
3454 sprintf(buf, "You feel attuned to "); 3897 sprintf (buf, "You feel attuned to ");
3455 for(i=0, j=0; i<NRSPELLPATHS; i++) { 3898 for (i = 0, j = 0; i < NRSPELLPATHS; i++)
3456 if(item->path_attuned & (1<<i)) { 3899 {
3457 if (j) 3900 if (item->path_attuned & (1 << i))
3458 strcat(buf," and "); 3901 {
3459 else 3902 if (j)
3460 j = 1; 3903 strcat (buf, " and ");
3904 else
3905 j = 1;
3461 strcat(buf, spellpathnames[i]); 3906 strcat (buf, spellpathnames[i]);
3462 } 3907 }
3463 } 3908 }
3464 strcat(buf,"."); 3909 strcat (buf, ".");
3465 new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, buf); 3910 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, buf);
3466 } 3911 }
3467 3912
3468 /* evtl. adding flags: */ 3913 /* evtl. adding flags: */
3469 if(QUERY_FLAG(item, FLAG_XRAYS)) 3914 if (QUERY_FLAG (item, FLAG_XRAYS))
3470 SET_FLAG(skin, FLAG_XRAYS); 3915 SET_FLAG (skin, FLAG_XRAYS);
3471 if(QUERY_FLAG(item, FLAG_STEALTH)) 3916 if (QUERY_FLAG (item, FLAG_STEALTH))
3472 SET_FLAG(skin, FLAG_STEALTH); 3917 SET_FLAG (skin, FLAG_STEALTH);
3473 if(QUERY_FLAG(item, FLAG_SEE_IN_DARK)) 3918 if (QUERY_FLAG (item, FLAG_SEE_IN_DARK))
3474 SET_FLAG(skin, FLAG_SEE_IN_DARK); 3919 SET_FLAG (skin, FLAG_SEE_IN_DARK);
3475 3920
3476 /* print message if there is one */ 3921 /* print message if there is one */
3477 if (item->msg != NULL) 3922 if (item->msg != NULL)
3478 new_draw_info(NDI_UNIQUE|NDI_BLUE, 0, who, item->msg); 3923 new_draw_info (NDI_UNIQUE | NDI_BLUE, 0, who, item->msg);
3924 }
3925 else
3479 } 3926 {
3480 else {
3481 /* generate misc. treasure */ 3927 /* generate misc. treasure */
3482 tmp = arch_to_object (tr->item); 3928 tmp = arch_to_object (tr->item);
3483 new_draw_info_format(NDI_UNIQUE|NDI_BLUE, 0, who, "You gained %s", query_short_name(tmp)); 3929 new_draw_info_format (NDI_UNIQUE | NDI_BLUE, 0, who, "You gained %s", query_short_name (tmp));
3484 tmp = insert_ob_in_ob (tmp, who); 3930 tmp = insert_ob_in_ob (tmp, who);
3485 if (who->type == PLAYER) 3931 if (who->type == PLAYER)
3486 esrv_send_item(who, tmp); 3932 esrv_send_item (who, tmp);
3487 } 3933 }
3488} 3934}
3489 3935
3490/** 3936/**
3491 * Unready an object for a player. This function does nothing if the object was 3937 * Unready an object for a player. This function does nothing if the object was
3492 * not readied. 3938 * not readied.
3493 */ 3939 */
3940void
3494void player_unready_range_ob(player *pl, object *ob) { 3941player_unready_range_ob (player *pl, object *ob)
3942{
3495 rangetype i; 3943 rangetype i;
3496 3944
3497 for (i = (rangetype)0; i < range_size; i = (rangetype) ((int)i + 1)) { 3945 for (i = (rangetype) 0; i < range_size; i = (rangetype) ((int) i + 1))
3946 {
3498 if (pl->ranges[i] == ob) { 3947 if (pl->ranges[i] == ob)
3948 {
3499 pl->ranges[i] = NULL; 3949 pl->ranges[i] = NULL;
3500 if (pl->shoottype == i) { 3950 if (pl->shoottype == i)
3951 {
3501 pl->shoottype = range_none; 3952 pl->shoottype = range_none;
3502 } 3953 }
3503 } 3954 }
3504 } 3955 }
3505} 3956}

Diff Legend

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