ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_misc.C
(Generate patch)

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.2 by root, Thu Aug 24 13:13:49 2006 UTC vs.
Revision 1.3 by root, Tue Aug 29 08:01:37 2006 UTC

1/* 1/*
2 * static char *rcsid_c_misc_c = 2 * static char *rcsid_c_misc_c =
3 * "$Id: c_misc.C,v 1.2 2006/08/24 13:13:49 root Exp $"; 3 * "$Id: c_misc.C,v 1.3 2006/08/29 08:01:37 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
41void map_info(object *op, char *search) { 41void map_info(object *op, char *search) {
42 mapstruct *m; 42 mapstruct *m;
43 char buf[MAX_BUF], map_path[MAX_BUF]; 43 char buf[MAX_BUF], map_path[MAX_BUF];
44 long sec = seconds(); 44 long sec = seconds();
45 new_draw_info_format(NDI_UNIQUE, 0, op, 45 new_draw_info_format(NDI_UNIQUE, 0, op,
46 "Current time is: %02ld:%02ld:%02ld.", 46 "Current time is: %02ld:%02ld:%02ld.",
47 (sec%86400)/3600,(sec%3600)/60,sec%60); 47 (sec%86400)/3600,(sec%3600)/60,sec%60);
48 new_draw_info(NDI_UNIQUE, 0,op,"Path Pl PlM IM TO Dif Reset"); 48 new_draw_info(NDI_UNIQUE, 0,op,"Path Pl PlM IM TO Dif Reset");
49 for(m=first_map;m!=NULL;m=m->next) { 49 for(m=first_map;m!=NULL;m=m->next) {
50 50
51 if ( search && strstr(m->path,search)==NULL ) continue; /* Skip unwanted maps */ 51 if ( search && strstr(m->path,search)==NULL ) continue; /* Skip unwanted maps */
52 /* Print out the last 18 characters of the map name... */ 52 /* Print out the last 18 characters of the map name... */
53 if (strlen(m->path)<=18) strcpy(map_path, m->path); 53 if (strlen(m->path)<=18) strcpy(map_path, m->path);
54 else strcpy(map_path, m->path + strlen(m->path) - 18); 54 else strcpy(map_path, m->path + strlen(m->path) - 18);
55 sprintf(buf,"%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d", 55 sprintf(buf,"%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56 map_path, m->players,players_on_map(m,FALSE), 56 map_path, m->players,players_on_map(m,FALSE),
57 m->in_memory,m->timeout,m->difficulty, 57 m->in_memory,m->timeout,m->difficulty,
58 (MAP_WHEN_RESET(m)%86400)/3600,(MAP_WHEN_RESET(m)%3600)/60, 58 (MAP_WHEN_RESET(m)%86400)/3600,(MAP_WHEN_RESET(m)%3600)/60,
59 MAP_WHEN_RESET(m)%60); 59 MAP_WHEN_RESET(m)%60);
60 new_draw_info(NDI_UNIQUE, 0,op,buf); 60 new_draw_info(NDI_UNIQUE, 0,op,buf);
61 } 61 }
62} 62}
63 63
… …
74 */ 74 */
75 new_draw_info(NDI_UNIQUE, 0, op, "The first column is the name of the body location."); 75 new_draw_info(NDI_UNIQUE, 0, op, "The first column is the name of the body location.");
76 new_draw_info(NDI_UNIQUE, 0, op, "The second column is how many of those locations your body has."); 76 new_draw_info(NDI_UNIQUE, 0, op, "The second column is how many of those locations your body has.");
77 new_draw_info(NDI_UNIQUE, 0, op, "The third column is how many slots in that location are available."); 77 new_draw_info(NDI_UNIQUE, 0, op, "The third column is how many slots in that location are available.");
78 for (i=0; i<NUM_BODY_LOCATIONS; i++) { 78 for (i=0; i<NUM_BODY_LOCATIONS; i++) {
79 /* really debugging - normally body_used should not be set to anything 79 /* really debugging - normally body_used should not be set to anything
80 * if body_info isn't also set. 80 * if body_info isn't also set.
81 */ 81 */
82 if (op->body_info[i] || op->body_used[i]) { 82 if (op->body_info[i] || op->body_used[i]) {
83 new_draw_info_format(NDI_UNIQUE, 0, op, 83 new_draw_info_format(NDI_UNIQUE, 0, op,
84 "%-30s %5d %5d", body_locations[i].use_name, op->body_info[i], op->body_used[i]); 84 "%-30s %5d %5d", body_locations[i].use_name, op->body_info[i], op->body_used[i]);
85 } 85 }
86 } 86 }
87 if (!QUERY_FLAG(op, FLAG_USE_ARMOUR)) 87 if (!QUERY_FLAG(op, FLAG_USE_ARMOUR))
88 new_draw_info(NDI_UNIQUE, 0, op, "You are not allowed to wear armor"); 88 new_draw_info(NDI_UNIQUE, 0, op, "You are not allowed to wear armor");
89 if (!QUERY_FLAG(op, FLAG_USE_WEAPON)) 89 if (!QUERY_FLAG(op, FLAG_USE_WEAPON))
90 new_draw_info(NDI_UNIQUE, 0, op, "You are not allowed to use weapons"); 90 new_draw_info(NDI_UNIQUE, 0, op, "You are not allowed to use weapons");
91 91
92 return 1; 92 return 1;
93} 93}
94 94
95 95
96int command_motd(object *op, char *params) 96int command_motd(object *op, char *params)
97{ 97{
98 display_motd(op); 98 display_motd(op);
99 return 1; 99 return 1;
100} 100}
101 101
102int command_bug(object *op, char *params) 102int command_bug(object *op, char *params)
103{ 103{
104 char buf[MAX_BUF]; 104 char buf[MAX_BUF];
… …
137 for (i=1; i<num_animations; i++) 137 for (i=1; i<num_animations; i++)
138 anims += animations[i].num_animations; 138 anims += animations[i].num_animations;
139 139
140 for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++); 140 for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++);
141 for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++) 141 for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++)
142 if(m->in_memory == MAP_IN_MEMORY) { 142 if(m->in_memory == MAP_IN_MEMORY) {
143 mapmem+=MAP_WIDTH(m)*MAP_HEIGHT(m)*(sizeof(object *)+sizeof(MapSpace)); 143 mapmem+=MAP_WIDTH(m)*MAP_HEIGHT(m)*(sizeof(object *)+sizeof(MapSpace));
144 nrm++; 144 nrm++;
145 } 145 }
146 sprintf(errmsg,"Sizeof: object=%ld player=%ld map=%ld", 146 sprintf(errmsg,"Sizeof: object=%ld player=%ld map=%ld",
147 (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct)); 147 (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct));
148 new_draw_info(NDI_UNIQUE, 0,op,errmsg); 148 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
149 sprintf(errmsg,"%4d used objects: %8d",ob_used,i=(ob_used*sizeof(object))); 149 sprintf(errmsg,"%4d used objects: %8d",ob_used,i=(ob_used*sizeof(object)));
150 new_draw_info(NDI_UNIQUE, 0,op,errmsg); 150 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
… …
209 * going to be /that/ slow, and won't get called much 209 * going to be /that/ slow, and won't get called much
210 */ 210 */
211 region *r = get_region_by_name(get_name_of_region_for_map(op->map)); 211 region *r = get_region_by_name(get_name_of_region_for_map(op->map));
212 212
213 if (!r) 213 if (!r)
214 return; 214 return;
215 /* This should only be possible if regions are not operating on this server. */ 215 /* This should only be possible if regions are not operating on this server. */
216 216
217 new_draw_info_format(NDI_UNIQUE, 0,op, 217 new_draw_info_format(NDI_UNIQUE, 0,op,
218 "You are in %s. \n %s", get_region_longname(r), get_region_msg(r)); 218 "You are in %s. \n %s", get_region_longname(r), get_region_msg(r));
219} 219}
220 220
221void current_map_info(object *op) { 221void current_map_info(object *op) {
222 mapstruct *m = op->map; 222 mapstruct *m = op->map;
223 223
224 if (!m) 224 if (!m)
225 return; 225 return;
226 226
227 new_draw_info_format(NDI_UNIQUE, 0,op, 227 new_draw_info_format(NDI_UNIQUE, 0,op,
228 "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map(m)); 228 "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map(m));
229 229
230 if (QUERY_FLAG(op,FLAG_WIZ)) { 230 if (QUERY_FLAG(op,FLAG_WIZ)) {
231 new_draw_info_format(NDI_UNIQUE, 0, op, 231 new_draw_info_format(NDI_UNIQUE, 0, op,
232 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 232 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
233 m->players, m->difficulty, 233 m->players, m->difficulty,
234 MAP_WIDTH(m), MAP_HEIGHT(m), 234 MAP_WIDTH(m), MAP_HEIGHT(m),
235 MAP_ENTER_X(m), MAP_ENTER_Y(m), 235 MAP_ENTER_X(m), MAP_ENTER_Y(m),
236 MAP_TIMEOUT(m)); 236 MAP_TIMEOUT(m));
237 237
238 } 238 }
239 if (m->msg) 239 if (m->msg)
240 new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->msg); 240 new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->msg);
241} 241}
242 242
243#ifdef DEBUG_MALLOC_LEVEL 243#ifdef DEBUG_MALLOC_LEVEL
244int command_malloc_verify(object *op, char *parms) 244int command_malloc_verify(object *op, char *parms)
245{ 245{
246 extern int malloc_verify(void); 246 extern int malloc_verify(void);
247 247
248 if (!malloc_verify()) 248 if (!malloc_verify())
249 new_draw_info(NDI_UNIQUE, 0,op,"Heap is corrupted."); 249 new_draw_info(NDI_UNIQUE, 0,op,"Heap is corrupted.");
250 else 250 else
251 new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK."); 251 new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK.");
252 return 1; 252 return 1;
253 } 253 }
254#endif 254#endif
255 255
256int command_whereabouts(object *op, char *params) { 256int command_whereabouts(object *op, char *params) {
257 257
258 region *reg; 258 region *reg;
… …
270 if (pl->ob->map!=NULL) 270 if (pl->ob->map!=NULL)
271 get_region_by_map(pl->ob->map)->counter++; 271 get_region_by_map(pl->ob->map)->counter++;
272 272
273 /* we only want to print out by places with a 'longname' field...*/ 273 /* we only want to print out by places with a 'longname' field...*/
274 for (reg=first_region;reg!=NULL;reg=reg->next) { 274 for (reg=first_region;reg!=NULL;reg=reg->next) {
275 if (reg->longname==NULL && reg->counter>0) { 275 if (reg->longname==NULL && reg->counter>0) {
276 if(reg->parent !=NULL) { 276 if(reg->parent !=NULL) {
277 reg->parent->counter+=reg->counter; 277 reg->parent->counter+=reg->counter;
278 reg->counter=0; 278 reg->counter=0;
279 } 279 }
280 else /*uh oh, we shouldn't be here. */ 280 else /*uh oh, we shouldn't be here. */
281 LOG(llevError,"command_whereabouts() Region %s with no longname has no parent", reg->name); 281 LOG(llevError,"command_whereabouts() Region %s with no longname has no parent", reg->name);
282 } 282 }
283 } 283 }
284 new_draw_info_format(NDI_UNIQUE, 0,op, 284 new_draw_info_format(NDI_UNIQUE, 0,op,
285 "In the world currently there are:"); 285 "In the world currently there are:");
286 for (reg=first_region;reg!=NULL;reg=reg->next) 286 for (reg=first_region;reg!=NULL;reg=reg->next)
287 if(reg->counter>0) 287 if(reg->counter>0)
288 new_draw_info_format(NDI_UNIQUE, 0,op, 288 new_draw_info_format(NDI_UNIQUE, 0,op,
289 "%u players in %s", reg->counter, get_region_longname(reg)); 289 "%u players in %s", reg->counter, get_region_longname(reg));
290 return 1; 290 return 1;
291} 291}
292 292
293typedef struct 293typedef struct
294 { 294 {
… …
328 format=settings.who_format; 328 format=settings.who_format;
329 329
330 reg=get_region_from_string(params); 330 reg=get_region_from_string(params);
331 331
332 for (pl=first_player;pl!=NULL;pl=pl->next) { 332 for (pl=first_player;pl!=NULL;pl=pl->next) {
333 if (pl->ob->map == NULL) 333 if (pl->ob->map == NULL)
334 continue; 334 continue;
335 if (pl->hidden && !QUERY_FLAG(op, FLAG_WIZ)) continue; 335 if (pl->hidden && !QUERY_FLAG(op, FLAG_WIZ)) continue;
336 336
337 if(!region_is_child_of_region(get_region_by_map(pl->ob->map),reg)) continue; 337 if(!region_is_child_of_region(get_region_by_map(pl->ob->map),reg)) continue;
338 338
339 if (pl->state==ST_PLAYING || pl->state==ST_GET_PARTY_PASSWORD) { 339 if (pl->state==ST_PLAYING || pl->state==ST_GET_PARTY_PASSWORD) {
340 340
341 num_players++; 341 num_players++;
342 chars = (chars_names *) realloc(chars, num_players*sizeof(chars_names)); 342 chars = (chars_names *) realloc(chars, num_players*sizeof(chars_names));
343 if (chars == NULL) { 343 if (chars == NULL) {
344 new_draw_info(NDI_UNIQUE, 0, op, "who failed - out of memory!"); 344 new_draw_info(NDI_UNIQUE, 0, op, "who failed - out of memory!");
345 return 0; 345 return 0;
346 } 346 }
347 sprintf(chars[num_players-1].namebuf, "%s", pl->ob->name); 347 sprintf(chars[num_players-1].namebuf, "%s", pl->ob->name);
348 chars[num_players-1].login_order = num_players; 348 chars[num_players-1].login_order = num_players;
349 /*Check for WIZ's & AFK's*/ 349 /*Check for WIZ's & AFK's*/
350 if (QUERY_FLAG(pl->ob,FLAG_WIZ)) 350 if (QUERY_FLAG(pl->ob,FLAG_WIZ))
351 num_wiz++; 351 num_wiz++;
352 if (QUERY_FLAG(pl->ob,FLAG_AFK)) 352 if (QUERY_FLAG(pl->ob,FLAG_AFK))
353 num_afk++; 353 num_afk++;
354 } 354 }
355 } 355 }
356 if (first_player != (player *) NULL) { 356 if (first_player != (player *) NULL) {
357 if (reg == NULL) 357 if (reg == NULL)
358 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players (%d) -- WIZ(%d) AFK(%d)", 358 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players (%d) -- WIZ(%d) AFK(%d)",
359 num_players, num_wiz, num_afk); 359 num_players, num_wiz, num_afk);
360 else if (reg->longname == NULL) 360 else if (reg->longname == NULL)
361 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)", 361 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
362 reg->name, num_players, num_wiz, num_afk); 362 reg->name, num_players, num_wiz, num_afk);
363 else 363 else
364 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)", 364 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
365 reg->longname, num_players, num_wiz, num_afk); 365 reg->longname, num_players, num_wiz, num_afk);
366 } 366 }
367 qsort (chars, num_players, sizeof(chars_names), (int (*)(const void *, const void *))name_cmp); 367 qsort (chars, num_players, sizeof(chars_names), (int (*)(const void *, const void *))name_cmp);
368 for (i=0;i<num_players;i++) 368 for (i=0;i<num_players;i++)
369 display_who_entry(op, find_player(chars[i].namebuf), format); 369 display_who_entry(op, find_player(chars[i].namebuf), format);
370 free(chars); 370 free(chars);
371 return 1; 371 return 1;
372} 372}
373 373
374/* Display a line of 'who' to op, about pl, using the formatting specified by format */ 374/* Display a line of 'who' to op, about pl, using the formatting specified by format */
… …
377 char outbuf[MAX_BUF]; 377 char outbuf[MAX_BUF];
378 size_t i; 378 size_t i;
379 outbuf[0]='\0'; /* we strcat to this, so reset it here. */ 379 outbuf[0]='\0'; /* we strcat to this, so reset it here. */
380 if (pl==NULL) { 380 if (pl==NULL) {
381 LOG(llevError,"display_who_entry(): I was passed a null player"); 381 LOG(llevError,"display_who_entry(): I was passed a null player");
382 return; 382 return;
383 } 383 }
384 for (i=0;i<=strlen(format);i++) { 384 for (i=0;i<=strlen(format);i++) {
385 if (format[i]=='%') { 385 if (format[i]=='%') {
386 i++; 386 i++;
387 get_who_escape_code_value(tmpbuf,format[i],pl); 387 get_who_escape_code_value(tmpbuf,format[i],pl);
… …
418 */ 418 */
419 419
420void get_who_escape_code_value(char *return_val, const char letter, player *pl) { 420void get_who_escape_code_value(char *return_val, const char letter, player *pl) {
421 421
422 switch (letter) { 422 switch (letter) {
423 case 'N' : strcpy(return_val, pl->ob->name); 423 case 'N' : strcpy(return_val, pl->ob->name);
424 break; 424 break;
425 case 't' : strcpy(return_val,(pl->own_title[0]=='\0'?pl->title:pl->own_title)); 425 case 't' : strcpy(return_val,(pl->own_title[0]=='\0'?pl->title:pl->own_title));
426 break; 426 break;
427 case 'T' : if (pl->own_title[0]=='\0') 427 case 'T' : if (pl->own_title[0]=='\0')
428 strcpy(return_val,"the "); 428 strcpy(return_val,"the ");
429 else 429 else
430 *return_val='\0'; 430 *return_val='\0';
431 break; 431 break;
432 case 'c' : sprintf(return_val,"%d",pl->ob->count); 432 case 'c' : sprintf(return_val,"%d",pl->ob->count);
433 break; 433 break;
434 case 'n' : strcpy(return_val, "\n"); 434 case 'n' : strcpy(return_val, "\n");
435 break; 435 break;
436 case 'h' : strcpy(return_val,pl->peaceful?"":" [Hostile]"); 436 case 'h' : strcpy(return_val,pl->peaceful?"":" [Hostile]");
437 break; 437 break;
438 case 'l' : sprintf(return_val,"%d",pl->ob->level); 438 case 'l' : sprintf(return_val,"%d",pl->ob->level);
439 break; 439 break;
440 case 'd' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":"")); 440 case 'd' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":""));
441 break; 441 break;
442 case 'a' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_AFK)?" [AFK]":"")); 442 case 'a' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_AFK)?" [AFK]":""));
443 break; 443 break;
444 case 'm' : strcpy(return_val,pl->ob->map->path); 444 case 'm' : strcpy(return_val,pl->ob->map->path);
445 break; 445 break;
446 case 'M' : strcpy(return_val,pl->ob->map->name?pl->ob->map->name:"Untitled"); 446 case 'M' : strcpy(return_val,pl->ob->map->name?pl->ob->map->name:"Untitled");
447 break; 447 break;
448 case 'r' : strcpy(return_val,get_name_of_region_for_map(pl->ob->map)); 448 case 'r' : strcpy(return_val,get_name_of_region_for_map(pl->ob->map));
449 break; 449 break;
450 case 'R' : strcpy(return_val,get_region_longname(get_region_by_map(pl->ob->map))); 450 case 'R' : strcpy(return_val,get_region_longname(get_region_by_map(pl->ob->map)));
451 break; 451 break;
452 case 'i' : strcpy(return_val,pl->socket.host); 452 case 'i' : strcpy(return_val,pl->socket.host);
453 break; 453 break;
454 case '%' : strcpy(return_val, "%"); 454 case '%' : strcpy(return_val, "%");
455 break; 455 break;
456 case '_' : strcpy(return_val, "_"); 456 case '_' : strcpy(return_val, "_");
457 break; 457 break;
458 } 458 }
459 459
460} 460}
461 461
462 462
… …
524{ 524{
525 int wx, wy, temp, sky; 525 int wx, wy, temp, sky;
526 char buf[MAX_BUF]; 526 char buf[MAX_BUF];
527 527
528 if (settings.dynamiclevel < 1) 528 if (settings.dynamiclevel < 1)
529 return 1; 529 return 1;
530 530
531 if (op->map == NULL) 531 if (op->map == NULL)
532 return 1; 532 return 1;
533 533
534 if (worldmap_to_weathermap(op->x, op->y, &wx, &wy, op->map) != 0) 534 if (worldmap_to_weathermap(op->x, op->y, &wx, &wy, op->map) != 0)
535 return 1; 535 return 1;
536 536
537 if (QUERY_FLAG(op, FLAG_WIZ)) { 537 if (QUERY_FLAG(op, FLAG_WIZ)) {
538 /* dump the weather, Dm style! Yo! */ 538 /* dump the weather, Dm style! Yo! */
539 new_draw_info_format(NDI_UNIQUE, 0, op, "Real temp: %d", 539 new_draw_info_format(NDI_UNIQUE, 0, op, "Real temp: %d",
540 real_world_temperature(op->x, op->y, op->map)); 540 real_world_temperature(op->x, op->y, op->map));
541 new_draw_info_format(NDI_UNIQUE, 0, op, "Base temp: %d", 541 new_draw_info_format(NDI_UNIQUE, 0, op, "Base temp: %d",
542 weathermap[wx][wy].temp); 542 weathermap[wx][wy].temp);
543 new_draw_info_format(NDI_UNIQUE, 0, op, "Humid: %d", 543 new_draw_info_format(NDI_UNIQUE, 0, op, "Humid: %d",
544 weathermap[wx][wy].humid); 544 weathermap[wx][wy].humid);
545 new_draw_info_format(NDI_UNIQUE, 0, op, "Wind: dir=%d speed=%d", 545 new_draw_info_format(NDI_UNIQUE, 0, op, "Wind: dir=%d speed=%d",
546 weathermap[wx][wy].winddir, weathermap[wx][wy].windspeed); 546 weathermap[wx][wy].winddir, weathermap[wx][wy].windspeed);
547 new_draw_info_format(NDI_UNIQUE, 0, op, "Pressure: %d", 547 new_draw_info_format(NDI_UNIQUE, 0, op, "Pressure: %d",
548 weathermap[wx][wy].pressure); 548 weathermap[wx][wy].pressure);
549 new_draw_info_format(NDI_UNIQUE, 0, op, "Avg Elevation: %d", 549 new_draw_info_format(NDI_UNIQUE, 0, op, "Avg Elevation: %d",
550 weathermap[wx][wy].avgelev); 550 weathermap[wx][wy].avgelev);
551 new_draw_info_format(NDI_UNIQUE, 0, op, "Rainfall: %d Water: %d", 551 new_draw_info_format(NDI_UNIQUE, 0, op, "Rainfall: %d Water: %d",
552 weathermap[wx][wy].rainfall, weathermap[wx][wy].water); 552 weathermap[wx][wy].rainfall, weathermap[wx][wy].water);
553 } 553 }
554 554
555 temp = real_world_temperature(op->x, op->y, op->map); 555 temp = real_world_temperature(op->x, op->y, op->map);
556 new_draw_info_format(NDI_UNIQUE, 0, op, "It's currently %d degrees " 556 new_draw_info_format(NDI_UNIQUE, 0, op, "It's currently %d degrees "
557 "Centigrade out.", temp); 557 "Centigrade out.", temp);
558 558
559 /* humid */ 559 /* humid */
560 if (weathermap[wx][wy].humid < 20) 560 if (weathermap[wx][wy].humid < 20)
561 new_draw_info(NDI_UNIQUE, 0, op, "It is very dry."); 561 new_draw_info(NDI_UNIQUE, 0, op, "It is very dry.");
562 else if (weathermap[wx][wy].humid < 40) 562 else if (weathermap[wx][wy].humid < 40)
563 new_draw_info(NDI_UNIQUE, 0, op, "It is very comfortable today."); 563 new_draw_info(NDI_UNIQUE, 0, op, "It is very comfortable today.");
564 else if (weathermap[wx][wy].humid < 60) 564 else if (weathermap[wx][wy].humid < 60)
565 new_draw_info(NDI_UNIQUE, 0, op, "It is a bit muggy."); 565 new_draw_info(NDI_UNIQUE, 0, op, "It is a bit muggy.");
566 else if (weathermap[wx][wy].humid < 80) 566 else if (weathermap[wx][wy].humid < 80)
567 new_draw_info(NDI_UNIQUE, 0, op, "It is muggy."); 567 new_draw_info(NDI_UNIQUE, 0, op, "It is muggy.");
568 else 568 else
569 new_draw_info(NDI_UNIQUE, 0, op, "It is uncomfortably muggy."); 569 new_draw_info(NDI_UNIQUE, 0, op, "It is uncomfortably muggy.");
570 570
571 /* wind */ 571 /* wind */
572 switch (weathermap[wx][wy].winddir) { 572 switch (weathermap[wx][wy].winddir) {
573 case 1: sprintf(buf, "north"); break; 573 case 1: sprintf(buf, "north"); break;
574 case 2: sprintf(buf, "northeast"); break; 574 case 2: sprintf(buf, "northeast"); break;
… …
578 case 6: sprintf(buf, "southwest"); break; 578 case 6: sprintf(buf, "southwest"); break;
579 case 7: sprintf(buf, "west"); break; 579 case 7: sprintf(buf, "west"); break;
580 case 8: sprintf(buf, "northwest"); break; 580 case 8: sprintf(buf, "northwest"); break;
581 } 581 }
582 if (weathermap[wx][wy].windspeed < 5) 582 if (weathermap[wx][wy].windspeed < 5)
583 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a mild breeze " 583 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a mild breeze "
584 "coming from the %s.", buf); 584 "coming from the %s.", buf);
585 else if (weathermap[wx][wy].windspeed < 10) 585 else if (weathermap[wx][wy].windspeed < 10)
586 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong breeze " 586 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong breeze "
587 "coming from the %s.", buf); 587 "coming from the %s.", buf);
588 else if (weathermap[wx][wy].windspeed < 15) 588 else if (weathermap[wx][wy].windspeed < 15)
589 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a light wind " 589 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a light wind "
590 "coming from the %s.", buf); 590 "coming from the %s.", buf);
591 else if (weathermap[wx][wy].windspeed < 25) 591 else if (weathermap[wx][wy].windspeed < 25)
592 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong wind " 592 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong wind "
593 "coming from the %s.", buf); 593 "coming from the %s.", buf);
594 else if (weathermap[wx][wy].windspeed < 35) 594 else if (weathermap[wx][wy].windspeed < 35)
595 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a heavy wind " 595 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a heavy wind "
596 "coming from the %s.", buf); 596 "coming from the %s.", buf);
597 else 597 else
598 new_draw_info_format(NDI_UNIQUE, 0, op, "The wind from the %s is " 598 new_draw_info_format(NDI_UNIQUE, 0, op, "The wind from the %s is "
599 "incredibly strong!", buf); 599 "incredibly strong!", buf);
600 600
601 sky = weathermap[wx][wy].sky; 601 sky = weathermap[wx][wy].sky;
602 if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG) 602 if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG)
603 sky += 10; /*let it snow*/ 603 sky += 10; /*let it snow*/
604 switch (sky) { 604 switch (sky) {
605 case SKY_CLEAR: new_draw_info(NDI_UNIQUE, 0, op, "There isn''t a cloud in the sky."); break; 605 case SKY_CLEAR: new_draw_info(NDI_UNIQUE, 0, op, "There isn''t a cloud in the sky."); break;
606 case SKY_LIGHTCLOUD: new_draw_info(NDI_UNIQUE, 0, op, "There are a few light clouds in the sky."); break; 606 case SKY_LIGHTCLOUD: new_draw_info(NDI_UNIQUE, 0, op, "There are a few light clouds in the sky."); break;
607 case SKY_OVERCAST: new_draw_info(NDI_UNIQUE, 0, op, "The sky is cloudy and dreary."); break; 607 case SKY_OVERCAST: new_draw_info(NDI_UNIQUE, 0, op, "The sky is cloudy and dreary."); break;
608 case SKY_LIGHT_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining softly."); break; 608 case SKY_LIGHT_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining softly."); break;
… …
656 */ 656 */
657 657
658int command_dumpbelow (object *op, char *params) 658int command_dumpbelow (object *op, char *params)
659{ 659{
660 if (op && op->below) { 660 if (op && op->below) {
661 dump_object(op->below); 661 dump_object(op->below);
662 new_draw_info(NDI_UNIQUE, 0,op,errmsg); 662 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
663 /* Let's push that item on the dm's stack */ 663 /* Let's push that item on the dm's stack */
664 dm_stack_push( op->contr, op->below->count ); 664 dm_stack_push( op->contr, op->below->count );
665 } 665 }
666 return 0; 666 return 0;
667} 667}
… …
678 else 678 else
679 i =onoff_value(params); 679 i =onoff_value(params);
680 680
681 if (i) { 681 if (i) {
682 new_draw_info(NDI_UNIQUE, 0,op, "You will now walk through walls.\n"); 682 new_draw_info(NDI_UNIQUE, 0,op, "You will now walk through walls.\n");
683 SET_FLAG(op, FLAG_WIZPASS); 683 SET_FLAG(op, FLAG_WIZPASS);
684 } else { 684 } else {
685 new_draw_info(NDI_UNIQUE, 0,op, "You will now be stopped by walls.\n"); 685 new_draw_info(NDI_UNIQUE, 0,op, "You will now be stopped by walls.\n");
686 CLEAR_FLAG(op, FLAG_WIZPASS); 686 CLEAR_FLAG(op, FLAG_WIZPASS);
687 } 687 }
688 return 0; 688 return 0;
… …
778int command_output_sync(object *op, char *params) 778int command_output_sync(object *op, char *params)
779{ 779{
780 int val; 780 int val;
781 781
782 if (!params) { 782 if (!params) {
783 new_draw_info_format(NDI_UNIQUE, 0, op, 783 new_draw_info_format(NDI_UNIQUE, 0, op,
784 "Output sync time is presently %d", op->contr->outputs_sync); 784 "Output sync time is presently %d", op->contr->outputs_sync);
785 return 1; 785 return 1;
786 } 786 }
787 val=atoi(params); 787 val=atoi(params);
788 if (val>0) { 788 if (val>0) {
789 op->contr->outputs_sync = val; 789 op->contr->outputs_sync = val;
790 new_draw_info_format(NDI_UNIQUE, 0, op, 790 new_draw_info_format(NDI_UNIQUE, 0, op,
791 "Output sync time now set to %d", op->contr->outputs_sync); 791 "Output sync time now set to %d", op->contr->outputs_sync);
792 } 792 }
793 else 793 else
794 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_sync."); 794 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_sync.");
795 795
796 return 1; 796 return 1;
797} 797}
798 798
799int command_output_count(object *op, char *params) 799int command_output_count(object *op, char *params)
800{ 800{
801 int val; 801 int val;
802 802
803 if (!params) { 803 if (!params) {
804 new_draw_info_format(NDI_UNIQUE, 0, op, 804 new_draw_info_format(NDI_UNIQUE, 0, op,
805 "Output count is presently %d", op->contr->outputs_count); 805 "Output count is presently %d", op->contr->outputs_count);
806 return 1; 806 return 1;
807 } 807 }
808 val=atoi(params); 808 val=atoi(params);
809 if (val>0) { 809 if (val>0) {
810 op->contr->outputs_count = val; 810 op->contr->outputs_count = val;
811 new_draw_info_format(NDI_UNIQUE, 0, op, 811 new_draw_info_format(NDI_UNIQUE, 0, op,
812 "Output count now set to %d", op->contr->outputs_count); 812 "Output count now set to %d", op->contr->outputs_count);
813 } 813 }
814 else 814 else
815 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_count."); 815 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_count.");
816 816
817 return 1; 817 return 1;
818} 818}
819 819
820int command_listen (object *op, char *params) 820int command_listen (object *op, char *params)
821{ 821{
822 int i; 822 int i;
823 823
824 if(params==NULL || !sscanf(params, "%d", &i)) { 824 if(params==NULL || !sscanf(params, "%d", &i)) {
825 new_draw_info_format(NDI_UNIQUE, 0, op, 825 new_draw_info_format(NDI_UNIQUE, 0, op,
826 "Set listen to what (presently %d)?", op->contr->listening); 826 "Set listen to what (presently %d)?", op->contr->listening);
827 return 1; 827 return 1;
828 } 828 }
829 op->contr->listening=(char) i; 829 op->contr->listening=(char) i;
830 new_draw_info_format(NDI_UNIQUE, 0, op, 830 new_draw_info_format(NDI_UNIQUE, 0, op,
831 "Your verbose level is now %d.",i); 831 "Your verbose level is now %d.",i);
832 return 1; 832 return 1;
833} 833}
834 834
835/* Prints out some useful information for the character. Everything we print 835/* Prints out some useful information for the character. Everything we print
836 * out can be determined by the docs, so we aren't revealing anything extra - 836 * out can be determined by the docs, so we aren't revealing anything extra -
… …
848 new_draw_info_format(NDI_UNIQUE, 0, pl," Next Level: %I64d",level_exp(pl->level+1, pl->expmul)); 848 new_draw_info_format(NDI_UNIQUE, 0, pl," Next Level: %I64d",level_exp(pl->level+1, pl->expmul));
849#endif 849#endif
850 new_draw_info(NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 850 new_draw_info(NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
851 851
852 new_draw_info_format(NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 852 new_draw_info_format(NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
853 pl->contr->orig_stats.Str, pl->stats.Str, 20+pl->arch->clone.stats.Str); 853 pl->contr->orig_stats.Str, pl->stats.Str, 20+pl->arch->clone.stats.Str);
854 new_draw_info_format(NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d", 854 new_draw_info_format(NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
855 pl->contr->orig_stats.Dex, pl->stats.Dex, 20+pl->arch->clone.stats.Dex); 855 pl->contr->orig_stats.Dex, pl->stats.Dex, 20+pl->arch->clone.stats.Dex);
856 new_draw_info_format(NDI_UNIQUE, 0, pl, "Con %2d/ %3d/%3d", 856 new_draw_info_format(NDI_UNIQUE, 0, pl, "Con %2d/ %3d/%3d",
857 pl->contr->orig_stats.Con, pl->stats.Con, 20+pl->arch->clone.stats.Con); 857 pl->contr->orig_stats.Con, pl->stats.Con, 20+pl->arch->clone.stats.Con);
858 new_draw_info_format(NDI_UNIQUE, 0, pl, "Int %2d/ %3d/%3d", 858 new_draw_info_format(NDI_UNIQUE, 0, pl, "Int %2d/ %3d/%3d",
859 pl->contr->orig_stats.Int, pl->stats.Int, 20+pl->arch->clone.stats.Int); 859 pl->contr->orig_stats.Int, pl->stats.Int, 20+pl->arch->clone.stats.Int);
860 new_draw_info_format(NDI_UNIQUE, 0, pl, "Wis %2d/ %3d/%3d", 860 new_draw_info_format(NDI_UNIQUE, 0, pl, "Wis %2d/ %3d/%3d",
861 pl->contr->orig_stats.Wis, pl->stats.Wis, 20+pl->arch->clone.stats.Wis); 861 pl->contr->orig_stats.Wis, pl->stats.Wis, 20+pl->arch->clone.stats.Wis);
862 new_draw_info_format(NDI_UNIQUE, 0, pl, "Pow %2d/ %3d/%3d", 862 new_draw_info_format(NDI_UNIQUE, 0, pl, "Pow %2d/ %3d/%3d",
863 pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow); 863 pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow);
864 new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d", 864 new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d",
865 pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha); 865 pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha);
866 new_draw_info_format(NDI_UNIQUE, 0, pl, "\nAttack Mode: %s",pl->contr->peaceful? "Peaceful":"Hostile"); 866 new_draw_info_format(NDI_UNIQUE, 0, pl, "\nAttack Mode: %s",pl->contr->peaceful? "Peaceful":"Hostile");
867 867
868 /* Can't think of anything else to print right now */ 868 /* Can't think of anything else to print right now */
869 return 0; 869 return 0;
870} 870}
… …
883 DIR *Dir; 883 DIR *Dir;
884 884
885 sprintf(buf,"%s/%s/",settings.localdir,settings.playerdir); 885 sprintf(buf,"%s/%s/",settings.localdir,settings.playerdir);
886 t=buf+strlen(buf); 886 t=buf+strlen(buf);
887 if ((Dir=opendir(buf))!=NULL) { 887 if ((Dir=opendir(buf))!=NULL) {
888 const struct dirent *Entry; 888 const struct dirent *Entry;
889 889
890 while ((Entry=readdir(Dir))!=NULL) { 890 while ((Entry=readdir(Dir))!=NULL) {
891 /* skip '.' , '..' */ 891 /* skip '.' , '..' */
892 if (!((Entry->d_name[0]=='.' && Entry->d_name[1]=='\0') || 892 if (!((Entry->d_name[0]=='.' && Entry->d_name[1]=='\0') ||
893 (Entry->d_name[0]=='.' && Entry->d_name[1]=='.' && Entry->d_name[2]=='\0'))) 893 (Entry->d_name[0]=='.' && Entry->d_name[1]=='.' && Entry->d_name[2]=='\0')))
894 { 894 {
895 struct stat Stat; 895 struct stat Stat;
896 896
897 strcpy(t,Entry->d_name); 897 strcpy(t,Entry->d_name);
898 if (stat(buf,&Stat)==0) { 898 if (stat(buf,&Stat)==0) {
899 /* This was not posix compatible 899 /* This was not posix compatible
900 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) { 900 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) {
901 */ 901 */
902 if (S_ISDIR(Stat.st_mode)){ 902 if (S_ISDIR(Stat.st_mode)){
903 char buf2[MAX_BUF]; 903 char buf2[MAX_BUF];
904 struct tm *tm=localtime(&Stat.st_mtime); 904 struct tm *tm=localtime(&Stat.st_mtime);
905 sprintf(buf2,"%s\t%04d %02d %02d %02d %02d %02d", 905 sprintf(buf2,"%s\t%04d %02d %02d %02d %02d %02d",
906 Entry->d_name, 906 Entry->d_name,
907 1900+tm->tm_year, 907 1900+tm->tm_year,
908 1+tm->tm_mon, 908 1+tm->tm_mon,
909 tm->tm_mday, 909 tm->tm_mday,
910 tm->tm_hour, 910 tm->tm_hour,
911 tm->tm_min, 911 tm->tm_min,
912 tm->tm_sec); 912 tm->tm_sec);
913 new_draw_info(NDI_UNIQUE, 0, op, buf2); 913 new_draw_info(NDI_UNIQUE, 0, op, buf2);
914 } 914 }
915 } 915 }
916 } 916 }
917 } 917 }
918 } 918 }
919 closedir(Dir); 919 closedir(Dir);
920 return 0; 920 return 0;
921} 921}
922 922
… …
927 int i; 927 int i;
928 int first; 928 int first;
929 929
930 first=1; 930 first=1;
931 for(i=2; i<socket_info.allocated_sockets; i++) { 931 for(i=2; i<socket_info.allocated_sockets; i++) {
932 if (init_sockets[i].old_mode == Old_Listen) { 932 if (init_sockets[i].old_mode == Old_Listen) {
933 if (first) { 933 if (first) {
934 new_draw_info(NDI_UNIQUE,0,op,"Kill-logs are sent to:"); 934 new_draw_info(NDI_UNIQUE,0,op,"Kill-logs are sent to:");
935 first=0; 935 first=0;
936 } 936 }
937 new_draw_info_format(NDI_UNIQUE, 0, op, "%s: %s", 937 new_draw_info_format(NDI_UNIQUE, 0, op, "%s: %s",
938 init_sockets[i].host,init_sockets[i].comment); 938 init_sockets[i].host,init_sockets[i].comment);
939 } 939 }
940 } 940 }
941 if (first) { 941 if (first) {
942 new_draw_info(NDI_UNIQUE,0,op,"Nobody is currently logging kills."); 942 new_draw_info(NDI_UNIQUE,0,op,"Nobody is currently logging kills.");
943 } 943 }
944 return 1; 944 return 1;
945} 945}
946 946
947int command_applymode(object *op, char *params) 947int command_applymode(object *op, char *params)
948{ 948{
949 unapplymode unapply = op->contr->unapply; 949 unapplymode unapply = op->contr->unapply;
950 static const char* const types[]={"nochoice", "never", "always"}; 950 static const char* const types[]={"nochoice", "never", "always"};
951 951
952 if (!params) { 952 if (!params) {
953 new_draw_info_format(NDI_UNIQUE, 0, op, "applymode is set to %s", 953 new_draw_info_format(NDI_UNIQUE, 0, op, "applymode is set to %s",
954 types[op->contr->unapply]); 954 types[op->contr->unapply]);
955 return 1; 955 return 1;
956 } 956 }
957 957
958 if (!strcmp(params,"nochoice")) 958 if (!strcmp(params,"nochoice"))
959 op->contr->unapply=unapply_nochoice; 959 op->contr->unapply=unapply_nochoice;
960 else if (!strcmp(params,"never")) 960 else if (!strcmp(params,"never"))
961 op->contr->unapply=unapply_never; 961 op->contr->unapply=unapply_never;
962 else if (!strcmp(params,"always")) 962 else if (!strcmp(params,"always"))
963 op->contr->unapply=unapply_always; 963 op->contr->unapply=unapply_always;
964 else { 964 else {
965 new_draw_info_format(NDI_UNIQUE, 0, op, 965 new_draw_info_format(NDI_UNIQUE, 0, op,
966 "applymode: Unknown options %s, valid options are nochoice, never, always", 966 "applymode: Unknown options %s, valid options are nochoice, never, always",
967 params); 967 params);
968 return 0; 968 return 0;
969 } 969 }
970 new_draw_info_format(NDI_UNIQUE, 0, op, "Applymode %s set to %s", 970 new_draw_info_format(NDI_UNIQUE, 0, op, "Applymode %s set to %s",
971 (unapply==op->contr->unapply?"":" now"), 971 (unapply==op->contr->unapply?"":" now"),
972 types[op->contr->unapply]); 972 types[op->contr->unapply]);
973 return 1; 973 return 1;
974} 974}
975 975
976int command_bowmode(object *op, char *params) 976int command_bowmode(object *op, char *params)
977{ 977{
978 bowtype_t oldtype=op->contr->bowtype; 978 bowtype_t oldtype=op->contr->bowtype;
979 static const char* const types[] = 979 static const char* const types[] =
980 {"normal", "threewide", "spreadshot", "firenorth", 980 {"normal", "threewide", "spreadshot", "firenorth",
981 "firene", "fireeast", "firese", "firesouth", 981 "firene", "fireeast", "firese", "firesouth",
982 "firesw", "firewest", "firenw", "bestarrow"}; 982 "firesw", "firewest", "firenw", "bestarrow"};
983 char buf[MAX_BUF]; 983 char buf[MAX_BUF];
984 int i, found; 984 int i, found;
985 985
986 if (!params) { 986 if (!params) {
987 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode is set to %s", 987 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode is set to %s",
988 types[op->contr->bowtype]); 988 types[op->contr->bowtype]);
989 return 1; 989 return 1;
990 } 990 }
991 991
992 for (i=0,found=0; i<=bow_bestarrow; i++) { 992 for (i=0,found=0; i<=bow_bestarrow; i++) {
993 if (!strcmp(params, types[i])) { 993 if (!strcmp(params, types[i])) {
994 found++; 994 found++;
995 op->contr->bowtype= (bowtype_t) i; 995 op->contr->bowtype= (bowtype_t) i;
996 break; 996 break;
997 } 997 }
998 } 998 }
999 if (!found) { 999 if (!found) {
1000 sprintf(buf, "bowmode: Unknown options %s, valid options are:", params); 1000 sprintf(buf, "bowmode: Unknown options %s, valid options are:", params);
1001 for (i=0; i<=bow_bestarrow; i++) { 1001 for (i=0; i<=bow_bestarrow; i++) {
1002 strcat(buf, " "); 1002 strcat(buf, " ");
1003 strcat(buf, types[i]); 1003 strcat(buf, types[i]);
1004 if (i < bow_nw) 1004 if (i < bow_nw)
1005 strcat(buf, ","); 1005 strcat(buf, ",");
1006 else 1006 else
1007 strcat(buf, "."); 1007 strcat(buf, ".");
1008 } 1008 }
1009 new_draw_info_format(NDI_UNIQUE, 0, op, buf); 1009 new_draw_info_format(NDI_UNIQUE, 0, op, buf);
1010 return 0; 1010 return 0;
1011 } 1011 }
1012 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode %s set to %s", 1012 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode %s set to %s",
1013 (oldtype==op->contr->bowtype?"":"now"), 1013 (oldtype==op->contr->bowtype?"":"now"),
1014 types[op->contr->bowtype]); 1014 types[op->contr->bowtype]);
1015 return 1; 1015 return 1;
1016} 1016}
1017 1017
1018int command_petmode(object *op, char *params) 1018int command_petmode(object *op, char *params)
1019{ 1019{
1020 petmode_t oldtype=op->contr->petmode; 1020 petmode_t oldtype=op->contr->petmode;
1021 static const char* const types[]={"normal", "sad", "defend", "arena"}; 1021 static const char* const types[]={"normal", "sad", "defend", "arena"};
1022 1022
1023 if (!params) { 1023 if (!params) {
1024 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode is set to %s", 1024 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode is set to %s",
1025 types[op->contr->petmode]); 1025 types[op->contr->petmode]);
1026 return 1; 1026 return 1;
1027 } 1027 }
1028 1028
1029 if (!strcmp(params,"normal")) 1029 if (!strcmp(params,"normal"))
1030 op->contr->petmode=pet_normal; 1030 op->contr->petmode=pet_normal;
1031 else if (!strcmp(params,"sad")) 1031 else if (!strcmp(params,"sad"))
1032 op->contr->petmode=pet_sad; 1032 op->contr->petmode=pet_sad;
1033 else if (!strcmp(params,"defend")) 1033 else if (!strcmp(params,"defend"))
1034 op->contr->petmode=pet_defend; 1034 op->contr->petmode=pet_defend;
1035 else if (!strcmp(params,"arena")) 1035 else if (!strcmp(params,"arena"))
1036 op->contr->petmode=pet_arena; 1036 op->contr->petmode=pet_arena;
1037 else { 1037 else {
1038 new_draw_info_format(NDI_UNIQUE, 0, op, 1038 new_draw_info_format(NDI_UNIQUE, 0, op,
1039 "petmode: Unknown options %s, valid options are normal," 1039 "petmode: Unknown options %s, valid options are normal,"
1040 "sad (seek and destroy), defend, arena", params); 1040 "sad (seek and destroy), defend, arena", params);
1041 return 0; 1041 return 0;
1042 } 1042 }
1043 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode %s set to %s", 1043 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode %s set to %s",
1044 (oldtype==op->contr->petmode?"":"now"), 1044 (oldtype==op->contr->petmode?"":"now"),
1045 types[op->contr->petmode]); 1045 types[op->contr->petmode]);
1046 return 1; 1046 return 1;
1047} 1047}
1048 1048
1049int command_showpets(object *op, char *params) 1049int command_showpets(object *op, char *params)
1050{ 1050{
… …
1054 if (params !=NULL) target= atoi(params); 1054 if (params !=NULL) target= atoi(params);
1055 for (obl = first_friendly_object; obl != NULL; obl = next) { 1055 for (obl = first_friendly_object; obl != NULL; obl = next) {
1056 object *ob = obl->ob; 1056 object *ob = obl->ob;
1057 next = obl->next; 1057 next = obl->next;
1058 if (get_owner(ob) == op) { 1058 if (get_owner(ob) == op) {
1059 if (target ==0) { 1059 if (target ==0) {
1060 if (counter==0) 1060 if (counter==0)
1061 new_draw_info(NDI_UNIQUE, 0, op, "Pets:"); 1061 new_draw_info(NDI_UNIQUE, 0, op, "Pets:");
1062 new_draw_info_format(NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, ob->name, ob->level ); 1062 new_draw_info_format(NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, ob->name, ob->level );
1063 } 1063 }
1064 else if (!have_shown_pet && ++counter==target) { 1064 else if (!have_shown_pet && ++counter==target) {
1065 new_draw_info_format(NDI_UNIQUE, 0, op, "level %d %s", ob->level, ob->name); 1065 new_draw_info_format(NDI_UNIQUE, 0, op, "level %d %s", ob->level, ob->name);
1066 new_draw_info_format(NDI_UNIQUE, 0, op, "%d/%d HP, %d/%d SP", 1066 new_draw_info_format(NDI_UNIQUE, 0, op, "%d/%d HP, %d/%d SP",
1067 ob->stats.hp, ob->stats.maxhp, ob->stats.sp, ob->stats.maxsp); 1067 ob->stats.hp, ob->stats.maxhp, ob->stats.sp, ob->stats.maxsp);
1068 /* this is not a nice way to do this, it should be made to be more like the statistics command */ 1068 /* this is not a nice way to do this, it should be made to be more like the statistics command */
1069 new_draw_info_format(NDI_UNIQUE, 0, op, "Str %d", ob->stats.Str); 1069 new_draw_info_format(NDI_UNIQUE, 0, op, "Str %d", ob->stats.Str);
1070 new_draw_info_format(NDI_UNIQUE, 0, op, "Dex %d", ob->stats.Dex); 1070 new_draw_info_format(NDI_UNIQUE, 0, op, "Dex %d", ob->stats.Dex);
1071 new_draw_info_format(NDI_UNIQUE, 0, op, "Con %d", ob->stats.Con); 1071 new_draw_info_format(NDI_UNIQUE, 0, op, "Con %d", ob->stats.Con);
1072 new_draw_info_format(NDI_UNIQUE, 0, op, "Int %d", ob->stats.Int); 1072 new_draw_info_format(NDI_UNIQUE, 0, op, "Int %d", ob->stats.Int);
1073 new_draw_info_format(NDI_UNIQUE, 0, op, "Wis %d", ob->stats.Wis); 1073 new_draw_info_format(NDI_UNIQUE, 0, op, "Wis %d", ob->stats.Wis);
1074 new_draw_info_format(NDI_UNIQUE, 0, op, "Cha %d", ob->stats.Cha); 1074 new_draw_info_format(NDI_UNIQUE, 0, op, "Cha %d", ob->stats.Cha);
1075 new_draw_info_format(NDI_UNIQUE, 0, op, "Pow %d", ob->stats.Pow); 1075 new_draw_info_format(NDI_UNIQUE, 0, op, "Pow %d", ob->stats.Pow);
1076 new_draw_info_format(NDI_UNIQUE, 0, op, "wc %d damage %d ac %d ", 1076 new_draw_info_format(NDI_UNIQUE, 0, op, "wc %d damage %d ac %d ",
1077 ob->stats.wc, ob->stats.dam, ob->stats.ac); 1077 ob->stats.wc, ob->stats.dam, ob->stats.ac);
1078 have_shown_pet=1; 1078 have_shown_pet=1;
1079 } 1079 }
1080 } 1080 }
1081 } 1081 }
1082 if (counter == 0) 1082 if (counter == 0)
1083 new_draw_info(NDI_UNIQUE, 0, op, "you have no pets."); 1083 new_draw_info(NDI_UNIQUE, 0, op, "you have no pets.");
1084 else if (target !=0 && have_shown_pet==0) 1084 else if (target !=0 && have_shown_pet==0)
1085 new_draw_info(NDI_UNIQUE, 0, op, "no such pet."); 1085 new_draw_info(NDI_UNIQUE, 0, op, "no such pet.");
… …
1090{ 1090{
1091 usekeytype oldtype=op->contr->usekeys; 1091 usekeytype oldtype=op->contr->usekeys;
1092 static const char* const types[]={"inventory", "keyrings", "containers"}; 1092 static const char* const types[]={"inventory", "keyrings", "containers"};
1093 1093
1094 if (!params) { 1094 if (!params) {
1095 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys is set to %s", 1095 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys is set to %s",
1096 types[op->contr->usekeys]); 1096 types[op->contr->usekeys]);
1097 return 1; 1097 return 1;
1098 } 1098 }
1099 1099
1100 if (!strcmp(params,"inventory")) 1100 if (!strcmp(params,"inventory"))
1101 op->contr->usekeys=key_inventory; 1101 op->contr->usekeys=key_inventory;
1102 else if (!strcmp(params,"keyrings")) 1102 else if (!strcmp(params,"keyrings"))
1103 op->contr->usekeys=keyrings; 1103 op->contr->usekeys=keyrings;
1104 else if (!strcmp(params,"containers")) 1104 else if (!strcmp(params,"containers"))
1105 op->contr->usekeys=containers; 1105 op->contr->usekeys=containers;
1106 else { 1106 else {
1107 new_draw_info_format(NDI_UNIQUE, 0, op, 1107 new_draw_info_format(NDI_UNIQUE, 0, op,
1108 "usekeys: Unknown options %s, valid options are inventory, keyrings, containers", 1108 "usekeys: Unknown options %s, valid options are inventory, keyrings, containers",
1109 params); 1109 params);
1110 return 0; 1110 return 0;
1111 } 1111 }
1112 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys %s set to %s", 1112 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys %s set to %s",
1113 (oldtype==op->contr->usekeys?"":"now"), 1113 (oldtype==op->contr->usekeys?"":"now"),
1114 types[op->contr->usekeys]); 1114 types[op->contr->usekeys]);
1115 return 1; 1115 return 1;
1116} 1116}
1117 1117
1118int command_resistances(object *op, char *params) 1118int command_resistances(object *op, char *params)
1119{ 1119{
1120 int i; 1120 int i;
1121 if (!op) 1121 if (!op)
1122 return 0; 1122 return 0;
1123 1123
1124 for (i=0; i<NROFATTACKS; i++) { 1124 for (i=0; i<NROFATTACKS; i++) {
1125 if (i==ATNR_INTERNAL) continue; 1125 if (i==ATNR_INTERNAL) continue;
1126 1126
1127 new_draw_info_format(NDI_UNIQUE, 0, op, "%-20s %+5d", 1127 new_draw_info_format(NDI_UNIQUE, 0, op, "%-20s %+5d",
1128 attacktype_desc[i], op->resist[i]); 1128 attacktype_desc[i], op->resist[i]);
1129 } 1129 }
1130 1130
1131 /* If dragon player, let's display natural resistances */ 1131 /* If dragon player, let's display natural resistances */
1132 if ( is_dragon_pl( op ) ) 1132 if ( is_dragon_pl( op ) )
1133 { 1133 {
… …
1164 struct dirent *de; 1164 struct dirent *de;
1165 char filename[MAX_BUF], line[80]; 1165 char filename[MAX_BUF], line[80];
1166 int namelen, linelen=0; 1166 int namelen, linelen=0;
1167 1167
1168 switch (what) { 1168 switch (what) {
1169 case 1: 1169 case 1:
1170 sprintf(filename, "%s/wizhelp", settings.datadir); 1170 sprintf(filename, "%s/wizhelp", settings.datadir);
1171 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:"); 1171 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:");
1172 break; 1172 break;
1173 case 3: 1173 case 3:
1174 sprintf(filename, "%s/mischelp", settings.datadir); 1174 sprintf(filename, "%s/mischelp", settings.datadir);
1175 new_draw_info(NDI_UNIQUE, 0,op, " Misc help:"); 1175 new_draw_info(NDI_UNIQUE, 0,op, " Misc help:");
1176 break; 1176 break;
1177 default: 1177 default:
1178 sprintf(filename, "%s/help", settings.datadir); 1178 sprintf(filename, "%s/help", settings.datadir);
1179 new_draw_info(NDI_UNIQUE, 0,op, " Commands:"); 1179 new_draw_info(NDI_UNIQUE, 0,op, " Commands:");
1180 break; 1180 break;
1181 } 1181 }
1182 if (!(dirp=opendir(filename))) 1182 if (!(dirp=opendir(filename)))
1183 return; 1183 return;
1184 1184
1185 line[0] ='\0'; 1185 line[0] ='\0';
1186 for (de = readdir(dirp); de; de = readdir(dirp)) { 1186 for (de = readdir(dirp); de; de = readdir(dirp)) {
1187 namelen = NAMLEN(de); 1187 namelen = NAMLEN(de);
1188 if (namelen <= 2 && *de->d_name == '.' && 1188 if (namelen <= 2 && *de->d_name == '.' &&
1189 (namelen == 1 || de->d_name[1] == '.' ) ) 1189 (namelen == 1 || de->d_name[1] == '.' ) )
1190 continue; 1190 continue;
1191 linelen +=namelen+1; 1191 linelen +=namelen+1;
1192 if (linelen > 42) { 1192 if (linelen > 42) {
1193 new_draw_info(NDI_UNIQUE, 0,op, line); 1193 new_draw_info(NDI_UNIQUE, 0,op, line);
1194 sprintf(line, " %s", de->d_name); 1194 sprintf(line, " %s", de->d_name);
1195 linelen =namelen+1; 1195 linelen =namelen+1;
1196 continue; 1196 continue;
1197 } 1197 }
1198 strcat(line, " "); 1198 strcat(line, " ");
1199 strcat(line, de->d_name); 1199 strcat(line, de->d_name);
1200 } 1200 }
1201 new_draw_info(NDI_UNIQUE, 0,op, line); 1201 new_draw_info(NDI_UNIQUE, 0,op, line);
1202 closedir(dirp); 1202 closedir(dirp);
1203} 1203}
1204 1204
… …
1266 } 1266 }
1267 while (fgets(line, MAX_BUF, fp)) { 1267 while (fgets(line, MAX_BUF, fp)) {
1268 line[MAX_BUF-1] ='\0'; 1268 line[MAX_BUF-1] ='\0';
1269 len =strlen(line)-1; 1269 len =strlen(line)-1;
1270 if (line[len] == '\n') 1270 if (line[len] == '\n')
1271 line[len] ='\0'; 1271 line[len] ='\0';
1272 new_draw_info(NDI_UNIQUE, 0,op, line); 1272 new_draw_info(NDI_UNIQUE, 0,op, line);
1273 } 1273 }
1274 fclose(fp); 1274 fclose(fp);
1275 return 0; 1275 return 0;
1276 } 1276 }
… …
1309 sprintf(filename, "%s/mischelp/%s", settings.datadir, params); 1309 sprintf(filename, "%s/mischelp/%s", settings.datadir, params);
1310 if (stat(filename, &st) || !S_ISREG(st.st_mode)) { 1310 if (stat(filename, &st) || !S_ISREG(st.st_mode)) {
1311 if (op) { 1311 if (op) {
1312 sprintf(filename, "%s/help/%s", settings.datadir, params); 1312 sprintf(filename, "%s/help/%s", settings.datadir, params);
1313 if (stat(filename, &st) || !S_ISREG(st.st_mode)) { 1313 if (stat(filename, &st) || !S_ISREG(st.st_mode)) {
1314 if (QUERY_FLAG(op, FLAG_WIZ)) { 1314 if (QUERY_FLAG(op, FLAG_WIZ)) {
1315 sprintf(filename, "%s/wizhelp/%s", settings.datadir, params); 1315 sprintf(filename, "%s/wizhelp/%s", settings.datadir, params);
1316 if (stat(filename, &st) || !S_ISREG(st.st_mode)) 1316 if (stat(filename, &st) || !S_ISREG(st.st_mode))
1317 goto nohelp;
1318 } else
1317 goto nohelp; 1319 goto nohelp;
1318 } else
1319 goto nohelp;
1320 } 1320 }
1321 } 1321 }
1322 } 1322 }
1323 1323
1324 /* 1324 /*
… …
1382} 1382}
1383 1383
1384int command_real_quit (object *op, char *params) 1384int command_real_quit (object *op, char *params)
1385{ 1385{
1386 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR, 1386 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,
1387 "Quitting will delete your character.\nAre you sure you want to quit (y/n):"); 1387 "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1388 1388
1389 op->contr->state = ST_CONFIRM_QUIT; 1389 op->contr->state = ST_CONFIRM_QUIT;
1390 return 1; 1390 return 1;
1391 } 1391 }
1392 1392
… …
1395 * really easy to abuse this. 1395 * really easy to abuse this.
1396 */ 1396 */
1397int command_explore (object *op, char *params) 1397int command_explore (object *op, char *params)
1398{ 1398{
1399 if (settings.explore_mode == FALSE) 1399 if (settings.explore_mode == FALSE)
1400 return 1; 1400 return 1;
1401 /* 1401 /*
1402 * I guess this is the best way to see if we are solo or not. Actually, 1402 * I guess this is the best way to see if we are solo or not. Actually,
1403 * are there any cases when first_player->next==NULL and we are not solo? 1403 * are there any cases when first_player->next==NULL and we are not solo?
1404 */ 1404 */
1405 if ((first_player!=op->contr) || (first_player->next!=NULL)) { 1405 if ((first_player!=op->contr) || (first_player->next!=NULL)) {
1406 new_draw_info(NDI_UNIQUE, 0,op,"You can not enter explore mode if you are in a party"); 1406 new_draw_info(NDI_UNIQUE, 0,op,"You can not enter explore mode if you are in a party");
1407 } else if (op->contr->explore) 1407 } else if (op->contr->explore)
1408 new_draw_info(NDI_UNIQUE, 0,op, "There is no return from explore mode"); 1408 new_draw_info(NDI_UNIQUE, 0,op, "There is no return from explore mode");
1409 else { 1409 else {
1410 op->contr->explore=1; 1410 op->contr->explore=1;
1411 new_draw_info(NDI_UNIQUE, 0,op, "You are now in explore mode"); 1411 new_draw_info(NDI_UNIQUE, 0,op, "You are now in explore mode");
1412 } 1412 }
1413 return 1; 1413 return 1;
1414} 1414}
1415 1415
1416int command_sound (object *op, char *params) 1416int command_sound (object *op, char *params)
… …
1431 */ 1431 */
1432 1432
1433void receive_player_name(object *op,char k) { 1433void receive_player_name(object *op,char k) {
1434 1434
1435 if(!check_name(op->contr,op->contr->write_buf+1)) { 1435 if(!check_name(op->contr,op->contr->write_buf+1)) {
1436 get_name(op); 1436 get_name(op);
1437 return; 1437 return;
1438 } 1438 }
1439 FREE_AND_COPY(op->name, op->contr->write_buf+1); 1439 FREE_AND_COPY(op->name, op->contr->write_buf+1);
1440 FREE_AND_COPY(op->name_pl, op->contr->write_buf+1); 1440 FREE_AND_COPY(op->name_pl, op->contr->write_buf+1);
1441 new_draw_info(NDI_UNIQUE, 0,op,op->contr->write_buf); 1441 new_draw_info(NDI_UNIQUE, 0,op,op->contr->write_buf);
1442 op->contr->name_changed=1; 1442 op->contr->name_changed=1;
… …
1483 1483
1484int explore_mode(void) { 1484int explore_mode(void) {
1485 player *pl; 1485 player *pl;
1486 1486
1487 if (settings.explore_mode == TRUE) { 1487 if (settings.explore_mode == TRUE) {
1488 for (pl = first_player; pl != (player *) NULL; pl = pl->next) 1488 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1489 if (pl->explore) 1489 if (pl->explore)
1490 return 1; 1490 return 1;
1491 } 1491 }
1492 return 0; 1492 return 0;
1493} 1493}
1494 1494
1495 1495
1496int command_title (object *op, char *params) 1496int command_title (object *op, char *params)
1497{ 1497{
1498 char buf[MAX_BUF]; 1498 char buf[MAX_BUF];
1499 1499
1500 if (settings.set_title == FALSE) { 1500 if (settings.set_title == FALSE) {
1501 new_draw_info(NDI_UNIQUE, 0, op, "You cannot change your title."); 1501 new_draw_info(NDI_UNIQUE, 0, op, "You cannot change your title.");
1502 return 1; 1502 return 1;
1503 } 1503 }
1504 1504
1505 /* dragon players cannot change titles */ 1505 /* dragon players cannot change titles */
1506 if (is_dragon_pl(op)) { 1506 if (is_dragon_pl(op)) {
1507 new_draw_info(NDI_UNIQUE, 0, op, "Dragons cannot change titles."); 1507 new_draw_info(NDI_UNIQUE, 0, op, "Dragons cannot change titles.");
1508 return 1; 1508 return 1;
1509 } 1509 }
1510 1510
1511 if(params == NULL) { 1511 if(params == NULL) {
1512 if(op->contr->own_title[0]=='\0') 1512 if(op->contr->own_title[0]=='\0')
1513 sprintf(buf,"Your title is '%s'.", op->contr->title); 1513 sprintf(buf,"Your title is '%s'.", op->contr->title);
1514 else 1514 else
1515 sprintf(buf,"Your title is '%s'.", op->contr->own_title); 1515 sprintf(buf,"Your title is '%s'.", op->contr->own_title);
1516 new_draw_info(NDI_UNIQUE, 0,op,buf); 1516 new_draw_info(NDI_UNIQUE, 0,op,buf);
1517 return 1; 1517 return 1;
1518 } 1518 }
1519 if(strcmp(params, "clear")==0 || strcmp(params, "default")==0) { 1519 if(strcmp(params, "clear")==0 || strcmp(params, "default")==0) {
1520 if(op->contr->own_title[0]=='\0') 1520 if(op->contr->own_title[0]=='\0')
1521 new_draw_info(NDI_UNIQUE, 0,op,"Your title is the default title."); 1521 new_draw_info(NDI_UNIQUE, 0,op,"Your title is the default title.");
1522 else 1522 else
1523 new_draw_info(NDI_UNIQUE, 0,op,"Title set to default."); 1523 new_draw_info(NDI_UNIQUE, 0,op,"Title set to default.");
1524 op->contr->own_title[0]='\0'; 1524 op->contr->own_title[0]='\0';
1525 return 1; 1525 return 1;
1526 } 1526 }
1527 1527
1528 if((int)strlen(params) >= MAX_NAME) { 1528 if((int)strlen(params) >= MAX_NAME) {
1529 new_draw_info(NDI_UNIQUE, 0,op,"Title too long."); 1529 new_draw_info(NDI_UNIQUE, 0,op,"Title too long.");
1530 return 1; 1530 return 1;
1531 } 1531 }
1532 strcpy(op->contr->own_title, params); 1532 strcpy(op->contr->own_title, params);
1533 return 1; 1533 return 1;
1534} 1534}
1535 1535
… …
1537{ 1537{
1538// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) { 1538// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1539// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground"); 1539// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1540// } else 1540// } else
1541 if (!op->stats.exp) { 1541 if (!op->stats.exp) {
1542 new_draw_info(NDI_UNIQUE, 0, op, "You don't deserve to save yet."); 1542 new_draw_info(NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1543 } else { 1543 } else {
1544 if(save_player(op,1)) 1544 if(save_player(op,1))
1545 new_draw_info(NDI_UNIQUE, 0,op,"You have been saved."); 1545 new_draw_info(NDI_UNIQUE, 0,op,"You have been saved.");
1546 else 1546 else
1547 new_draw_info(NDI_UNIQUE, 0,op,"SAVE FAILED!"); 1547 new_draw_info(NDI_UNIQUE, 0,op,"SAVE FAILED!");
1548 } 1548 }
1549 return 1; 1549 return 1;
1550} 1550}
1551 1551
1552 1552
… …
1574{ 1574{
1575 int i; 1575 int i;
1576 char buf[MAX_BUF]; 1576 char buf[MAX_BUF];
1577 1577
1578 if (params==NULL || !sscanf(params, "%d", &i)) { 1578 if (params==NULL || !sscanf(params, "%d", &i)) {
1579 sprintf(buf, "Your current wimpy level is %d.", op->run_away); 1579 sprintf(buf, "Your current wimpy level is %d.", op->run_away);
1580 new_draw_info(NDI_UNIQUE, 0,op, buf); 1580 new_draw_info(NDI_UNIQUE, 0,op, buf);
1581 return 1; 1581 return 1;
1582 } 1582 }
1583 sprintf(buf, "Your new wimpy level is %d.", i); 1583 sprintf(buf, "Your new wimpy level is %d.", i);
1584 new_draw_info(NDI_UNIQUE, 0,op, buf); 1584 new_draw_info(NDI_UNIQUE, 0,op, buf);
1585 op->run_away = i; 1585 op->run_away = i;
1586 return 1; 1586 return 1;
… …
1609 mapstruct *mp; 1609 mapstruct *mp;
1610 int maps_used=0, mapmem=0, objects_used=0, x,y; 1610 int maps_used=0, mapmem=0, objects_used=0, x,y;
1611 object *tmp; 1611 object *tmp;
1612 1612
1613 for (mp = styles; mp!=NULL; mp=mp->next) { 1613 for (mp = styles; mp!=NULL; mp=mp->next) {
1614 maps_used++; 1614 maps_used++;
1615 mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct); 1615 mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct);
1616 for (x=0; x<MAP_WIDTH(mp); x++) { 1616 for (x=0; x<MAP_WIDTH(mp); x++) {
1617 for (y=0; y<MAP_HEIGHT(mp); y++) { 1617 for (y=0; y<MAP_HEIGHT(mp); y++) {
1618 for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above) 1618 for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above)
1619 objects_used++; 1619 objects_used++;
1620 } 1620 }
1621 } 1621 }
1622 } 1622 }
1623 new_draw_info_format(NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used); 1623 new_draw_info_format(NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1624 new_draw_info(NDI_UNIQUE, 0, op, "Memory used, not"); 1624 new_draw_info(NDI_UNIQUE, 0, op, "Memory used, not");
1625 new_draw_info_format(NDI_UNIQUE, 0, op, "including objects: %d", mapmem); 1625 new_draw_info_format(NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1626 new_draw_info_format(NDI_UNIQUE, 0, op, "Style objects: %d", objects_used); 1626 new_draw_info_format(NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
… …
1632{ 1632{
1633 objectlink *obl, *next; 1633 objectlink *obl, *next;
1634 int counter=0, removecount=0; 1634 int counter=0, removecount=0;
1635 if (params == NULL) { 1635 if (params == NULL) {
1636 terminate_all_pets(op); 1636 terminate_all_pets(op);
1637 new_draw_info(NDI_UNIQUE, 0, op, "Your pets have been killed."); 1637 new_draw_info(NDI_UNIQUE, 0, op, "Your pets have been killed.");
1638 } 1638 }
1639 else { 1639 else {
1640 int target = atoi(params); 1640 int target = atoi(params);
1641 for(obl = first_friendly_object; obl != NULL; obl = next) { 1641 for(obl = first_friendly_object; obl != NULL; obl = next) {
1642 object *ob = obl->ob; 1642 object *ob = obl->ob;
1643 next = obl->next; 1643 next = obl->next;
1644 if (get_owner(ob) == op) 1644 if (get_owner(ob) == op)
1645 if (++counter==target || (target==0 && !strcasecmp(ob->name, params))) { 1645 if (++counter==target || (target==0 && !strcasecmp(ob->name, params))) {
1646 if (!QUERY_FLAG(ob, FLAG_REMOVED)) 1646 if (!QUERY_FLAG(ob, FLAG_REMOVED))
1647 remove_ob(ob); 1647 remove_ob(ob);
1648 remove_friendly_object(ob); 1648 remove_friendly_object(ob);
1649 free_object(ob); 1649 free_object(ob);
1650 removecount++; 1650 removecount++;
1651 } 1651 }
1652 } 1652 }
1653 if (removecount!=0) 1653 if (removecount!=0)
1654 new_draw_info_format(NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1654 new_draw_info_format(NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);
1655 else 1655 else
1656 new_draw_info(NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n"); 1656 new_draw_info(NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n");
1657 } 1657 }
1658 return 0; 1658 return 0;
1659} 1659}
1660 1660
1661/** 1661/**

Diff Legend

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