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.6 by root, Mon Sep 4 11:08:00 2006 UTC vs.
Revision 1.40 by root, Wed Jan 31 17:42:43 2007 UTC

1/* 1/*
2 * static char *rcsid_c_misc_c = 2 * CrossFire, A Multiplayer game for X-windows
3 * "$Id: c_misc.C,v 1.6 2006/09/04 11:08:00 root Exp $"; 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen
7 *
8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21 *
22 * The authors can be reached via e-mail at <crossfire@schmorp.de>
4 */ 23 */
5
6/*
7 CrossFire, A Multiplayer game for X-windows
8
9 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10 Copyright (C) 1992 Frank Tore Johansen
11
12 This program is free software; you can redistribute it and/or modify
13 it under the terms of the GNU General Public License as published by
14 the Free Software Foundation; either version 2 of the License, or
15 (at your option) any later version.
16
17 This program is distributed in the hope that it will be useful,
18 but WITHOUT ANY WARRANTY; without even the implied warranty of
19 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
20 GNU General Public License for more details.
21
22 You should have received a copy of the GNU General Public License
23 along with this program; if not, write to the Free Software
24 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25
26 The authors can be reached via e-mail at crossfire-devel@real-time.com
27*/
28 24
29#include <global.h> 25#include <global.h>
30#include <loader.h> 26#include <loader.h>
31#ifndef __CEXTRACT__
32#include <sproto.h> 27#include <sproto.h>
33#endif
34
35extern weathermap_t **weathermap;
36 28
37/* Handles misc. input request - things like hash table, malloc, maps, 29/* Handles misc. input request - things like hash table, malloc, maps,
38 * who, etc. 30 * who, etc.
39 */ 31 */
40
41void map_info(object *op, char *search) {
42 mapstruct *m;
43 char buf[MAX_BUF], map_path[MAX_BUF];
44 long sec = seconds();
45 new_draw_info_format(NDI_UNIQUE, 0, op,
46 "Current time is: %02ld:%02ld:%02ld.",
47 (sec%86400)/3600,(sec%3600)/60,sec%60);
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) {
50
51 if ( search && strstr(m->path,search)==NULL ) continue; /* Skip unwanted maps */
52 /* Print out the last 18 characters of the map name... */
53 if (strlen(m->path)<=18) strcpy(map_path, m->path);
54 else strcpy(map_path, m->path + strlen(m->path) - 18);
55 sprintf(buf,"%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56 map_path, m->players,players_on_map(m,FALSE),
57 m->in_memory,m->timeout,m->difficulty,
58 (MAP_WHEN_RESET(m)%86400)/3600,(MAP_WHEN_RESET(m)%3600)/60,
59 MAP_WHEN_RESET(m)%60);
60 new_draw_info(NDI_UNIQUE, 0,op,buf);
61 }
62}
63 32
64/* This command dumps the body information for object *op. 33/* This command dumps the body information for object *op.
65 * it doesn't care what the params are. 34 * it doesn't care what the params are.
66 * This is mostly meant as a debug command. 35 * This is mostly meant as a debug command.
67 */ 36 */
37int
68int command_body(object *op, char *params) 38command_body (object *op, char *params)
69{ 39{
70 int i; 40 int i;
71 41
72 /* Too hard to try and make a header that lines everything up, so just 42 /* Too hard to try and make a header that lines everything up, so just
73 * give a description. 43 * give a description.
74 */ 44 */
75 new_draw_info(NDI_UNIQUE, 0, op, "The first column is the name of the body location."); 45 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."); 46 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."); 47 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++) { 48 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
49 {
79 /* really debugging - normally body_used should not be set to anything 50 /* really debugging - normally body_used should not be set to anything
80 * if body_info isn't also set. 51 * if body_info isn't also set.
81 */ 52 */
82 if (op->body_info[i] || op->body_used[i]) { 53 if (op->body_info[i] || op->body_used[i])
83 new_draw_info_format(NDI_UNIQUE, 0, op, 54 {
84 "%-30s %5d %5d", body_locations[i].use_name, op->body_info[i], op->body_used[i]); 55 new_draw_info_format (NDI_UNIQUE, 0, op, "%-30s %5d %5d", body_locations[i].use_name, op->body_info[i], op->body_used[i]);
85 } 56 }
86 } 57 }
87 if (!QUERY_FLAG(op, FLAG_USE_ARMOUR)) 58 if (!QUERY_FLAG (op, FLAG_USE_ARMOUR))
88 new_draw_info(NDI_UNIQUE, 0, op, "You are not allowed to wear armor"); 59 new_draw_info (NDI_UNIQUE, 0, op, "You are not allowed to wear armor");
89 if (!QUERY_FLAG(op, FLAG_USE_WEAPON)) 60 if (!QUERY_FLAG (op, FLAG_USE_WEAPON))
90 new_draw_info(NDI_UNIQUE, 0, op, "You are not allowed to use weapons"); 61 new_draw_info (NDI_UNIQUE, 0, op, "You are not allowed to use weapons");
91 62
92 return 1; 63 return 1;
93} 64}
94 65
95 66
67int
96int command_motd(object *op, char *params) 68command_motd (object *op, char *params)
97{ 69{
98 display_motd(op); 70 display_motd (op);
99 return 1; 71 return 1;
100} 72}
101 73
74int
102int command_bug(object *op, char *params) 75command_bug (object *op, char *params)
103{ 76{
104 char buf[MAX_BUF]; 77 char buf[MAX_BUF];
105 78
106 if (params == NULL) { 79 if (params == NULL)
80 {
107 new_draw_info(NDI_UNIQUE, 0,op,"what bugs?"); 81 new_draw_info (NDI_UNIQUE, 0, op, "what bugs?");
108 return 1; 82 return 1;
109 } 83 }
110 strcpy(buf,op->name); 84 strcpy (buf, op->name);
111 strcat(buf," bug-reports: "); 85 strcat (buf, " bug-reports: ");
112 strncat(buf,++params,MAX_BUF - strlen(buf) ); 86 strncat (buf, ++params, MAX_BUF - strlen (buf));
113 buf[MAX_BUF - 1] = '\0'; 87 buf[MAX_BUF - 1] = '\0';
114 bug_report(buf); 88 bug_report (buf);
115 LOG(llevError,"%s\n",buf); 89 LOG (llevError, "%s\n", buf);
116 new_draw_info(NDI_ALL | NDI_UNIQUE, 1, NULL, buf); 90 new_draw_info (NDI_ALL | NDI_UNIQUE, 1, NULL, buf);
117 new_draw_info(NDI_UNIQUE, 0,op, "OK, thanks!"); 91 new_draw_info (NDI_UNIQUE, 0, op, "OK, thanks!");
118 return 1; 92 return 1;
119} 93}
120 94
121/* 95/*
122 * Pretty much identical to current map_info, but on a bigger scale 96 * Pretty much identical to current map_info, but on a bigger scale
123 * This function returns the name of the players current region, and 97 * This function returns the name of the players current region, and
124 * a description of it. It is there merely for flavour text. 98 * a description of it. It is there merely for flavour text.
125 */ 99 */
100void
126void current_region_info(object *op) { 101current_region_info (object *op)
127 /* 102{
128 * Ok I /suppose/ I should write a seperate function for this, but it isn't 103 if (region *reg = op->region ())
129 * going to be /that/ slow, and won't get called much 104 new_draw_info_format (NDI_UNIQUE, 0, op, "You are in %s.\n%s", reg->longname, &reg->msg);
130 */
131 region *r = get_region_by_name(get_name_of_region_for_map(op->map));
132
133 if (!r)
134 return;
135 /* This should only be possible if regions are not operating on this server. */
136
137 new_draw_info_format(NDI_UNIQUE, 0,op,
138 "You are in %s. \n %s", get_region_longname(r), get_region_msg(r));
139} 105}
140 106
107void
141void current_map_info(object *op) { 108current_map_info (object *op)
109{
142 mapstruct *m = op->map; 110 maptile *m = op->map;
143 111
144 if (!m) 112 if (!m)
145 return; 113 return;
146 114
147 new_draw_info_format(NDI_UNIQUE, 0,op, 115 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", &m->name, &m->path, &op->region ()->name);
148 "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map(m));
149 116
150 if (QUERY_FLAG(op,FLAG_WIZ)) { 117 if (QUERY_FLAG (op, FLAG_WIZ))
151 new_draw_info_format(NDI_UNIQUE, 0, op, 118 new_draw_info_format (NDI_UNIQUE, 0, op,
152 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 119 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
153 m->players, m->difficulty, 120 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
154 MAP_WIDTH(m), MAP_HEIGHT(m),
155 MAP_ENTER_X(m), MAP_ENTER_Y(m),
156 MAP_TIMEOUT(m));
157 121
158 }
159 if (m->msg) 122 if (m->msg)
160 new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->msg); 123 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
161} 124}
162 125
163#ifdef DEBUG_MALLOC_LEVEL 126#ifdef DEBUG_MALLOC_LEVEL
127int
164int command_malloc_verify(object *op, char *parms) 128command_malloc_verify (object *op, char *parms)
165{ 129{
166 extern int malloc_verify(void); 130 extern int malloc_verify (void);
167 131
168 if (!malloc_verify()) 132 if (!malloc_verify ())
169 new_draw_info(NDI_UNIQUE, 0,op,"Heap is corrupted."); 133 new_draw_info (NDI_UNIQUE, 0, op, "Heap is corrupted.");
170 else 134 else
171 new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK."); 135 new_draw_info (NDI_UNIQUE, 0, op, "Heap checks out OK.");
172 return 1; 136 return 1;
137}
138#endif
139
140int
141command_whereabouts (object *op, char *params)
142{
143 //TODO: should obviously not waste space in struct region for this.
144 /*
145 * reset the counter on the region, then use it to store the number of
146 * players there.
147 * I don't know how thread-safe this would be, I suspect not very....
148 */
149 for (region *reg = first_region; reg; reg = reg->next)
150 reg->counter = 0;
151
152 for_all_players (pl)
153 if (pl->ob->map)
154 ++pl->ob->region ()->counter;
155
156 /* we only want to print out by places with a 'longname' field... */
157 for (region *reg = first_region; reg; reg = reg->next)
158 {
159 if (reg->longname == NULL && reg->counter > 0)
160 {
161 if (reg->parent)
162 {
163 reg->parent->counter += reg->counter;
164 reg->counter = 0;
165 }
166 else /*uh oh, we shouldn't be here. */
167 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", &reg->name);
173 } 168 }
169 }
170
171 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:");
172
173 for (region *reg = first_region; reg; reg = reg->next)
174 if (reg->counter)
175 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players in %s", reg->counter, reg->longname);
176
177 return 1;
178}
179
180typedef struct
181{
182 char namebuf[MAX_BUF];
183 int login_order;
184} chars_names;
185
186int
187command_afk (object *op, char *params)
188{
189 if ((op->contr->ns->afk = !op->contr->ns->afk))
190 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
191 else
192 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
193
194 return 1;
195}
196
197int
198command_mapinfo (object *op, char *params)
199{
200 current_map_info (op);
201 return 1;
202}
203
204int
205command_whereami (object *op, char *params)
206{
207 current_region_info (op);
208 return 1;
209}
210
211int
212command_time (object *op, char *params)
213{
214 print_tod (op);
215 return 1;
216}
217
218int
219command_weather (object *op, char *params)
220{
221#if 0
222 int wx, wy, temp, sky;
223 char buf[MAX_BUF];
224
225 if (settings.dynamiclevel < 1)
226 return 1;
227
228 if (op->map == NULL)
229 return 1;
230
231 if (worldmap_to_weathermap (op->x, op->y, &wx, &wy, op->map) != 0)
232 return 1;
233
234 if (QUERY_FLAG (op, FLAG_WIZ))
235 {
236 /* dump the weather, Dm style! Yo! */
237 new_draw_info_format (NDI_UNIQUE, 0, op, "Real temp: %d", real_world_temperature (op->x, op->y, op->map));
238 new_draw_info_format (NDI_UNIQUE, 0, op, "Base temp: %d", weathermap[wx][wy].temp);
239 new_draw_info_format (NDI_UNIQUE, 0, op, "Humid: %d", weathermap[wx][wy].humid);
240 new_draw_info_format (NDI_UNIQUE, 0, op, "Wind: dir=%d speed=%d", weathermap[wx][wy].winddir, weathermap[wx][wy].windspeed);
241 new_draw_info_format (NDI_UNIQUE, 0, op, "Pressure: %d", weathermap[wx][wy].pressure);
242 new_draw_info_format (NDI_UNIQUE, 0, op, "Avg Elevation: %d", weathermap[wx][wy].avgelev);
243 new_draw_info_format (NDI_UNIQUE, 0, op, "Rainfall: %d Water: %d", weathermap[wx][wy].rainfall, weathermap[wx][wy].water);
244 }
245
246 temp = real_world_temperature (op->x, op->y, op->map);
247 new_draw_info_format (NDI_UNIQUE, 0, op, "It's currently %d degrees " "Centigrade out.", temp);
248
249 /* humid */
250 if (weathermap[wx][wy].humid < 20)
251 new_draw_info (NDI_UNIQUE, 0, op, "It is very dry.");
252 else if (weathermap[wx][wy].humid < 40)
253 new_draw_info (NDI_UNIQUE, 0, op, "It is very comfortable today.");
254 else if (weathermap[wx][wy].humid < 60)
255 new_draw_info (NDI_UNIQUE, 0, op, "It is a bit muggy.");
256 else if (weathermap[wx][wy].humid < 80)
257 new_draw_info (NDI_UNIQUE, 0, op, "It is muggy.");
258 else
259 new_draw_info (NDI_UNIQUE, 0, op, "It is uncomfortably muggy.");
260
261 /* wind */
262 switch (weathermap[wx][wy].winddir)
263 {
264 case 1:
265 sprintf (buf, "north");
266 break;
267 case 2:
268 sprintf (buf, "northeast");
269 break;
270 case 3:
271 sprintf (buf, "east");
272 break;
273 case 4:
274 sprintf (buf, "southeast");
275 break;
276 case 5:
277 sprintf (buf, "south");
278 break;
279 case 6:
280 sprintf (buf, "southwest");
281 break;
282 case 7:
283 sprintf (buf, "west");
284 break;
285 case 8:
286 sprintf (buf, "northwest");
287 break;
288 }
289 if (weathermap[wx][wy].windspeed < 5)
290 new_draw_info_format (NDI_UNIQUE, 0, op, "There is a mild breeze " "coming from the %s.", buf);
291 else if (weathermap[wx][wy].windspeed < 10)
292 new_draw_info_format (NDI_UNIQUE, 0, op, "There is a strong breeze " "coming from the %s.", buf);
293 else if (weathermap[wx][wy].windspeed < 15)
294 new_draw_info_format (NDI_UNIQUE, 0, op, "There is a light wind " "coming from the %s.", buf);
295 else if (weathermap[wx][wy].windspeed < 25)
296 new_draw_info_format (NDI_UNIQUE, 0, op, "There is a strong wind " "coming from the %s.", buf);
297 else if (weathermap[wx][wy].windspeed < 35)
298 new_draw_info_format (NDI_UNIQUE, 0, op, "There is a heavy wind " "coming from the %s.", buf);
299 else
300 new_draw_info_format (NDI_UNIQUE, 0, op, "The wind from the %s is " "incredibly strong!", buf);
301
302 sky = weathermap[wx][wy].sky;
303 if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG)
304 sky += 10; /*let it snow */
305 switch (sky)
306 {
307 case SKY_CLEAR:
308 new_draw_info (NDI_UNIQUE, 0, op, "There isn''t a cloud in the sky.");
309 break;
310 case SKY_LIGHTCLOUD:
311 new_draw_info (NDI_UNIQUE, 0, op, "There are a few light clouds in the sky.");
312 break;
313 case SKY_OVERCAST:
314 new_draw_info (NDI_UNIQUE, 0, op, "The sky is cloudy and dreary.");
315 break;
316 case SKY_LIGHT_RAIN:
317 new_draw_info (NDI_UNIQUE, 0, op, "It is raining softly.");
318 break;
319 case SKY_RAIN:
320 new_draw_info (NDI_UNIQUE, 0, op, "It is raining.");
321 break;
322 case SKY_HEAVY_RAIN:
323 new_draw_info (NDI_UNIQUE, 0, op, "It is raining heavily.");
324 break;
325 case SKY_HURRICANE:
326 new_draw_info (NDI_UNIQUE, 0, op, "There is a heavy storm! You should go inside!");
327 break;
328 case SKY_FOG:
329 new_draw_info (NDI_UNIQUE, 0, op, "It''s foggy and miserable.");
330 break;
331 case SKY_HAIL:
332 new_draw_info (NDI_UNIQUE, 0, op, "It''s hailing out! Take cover!");
333 break;
334 case SKY_LIGHT_SNOW:
335 new_draw_info (NDI_UNIQUE, 0, op, "Snow is gently falling from the sky.");
336 break;
337 case SKY_SNOW:
338 new_draw_info (NDI_UNIQUE, 0, op, "It''s snowing out.");
339 break;
340 case SKY_HEAVY_SNOW:
341 new_draw_info (NDI_UNIQUE, 0, op, "The snow is falling very heavily now.");
342 break;
343 case SKY_BLIZZARD:
344 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!");
345 break;
346 }
174#endif 347#endif
175
176int command_whereabouts(object *op, char *params) {
177
178 region *reg;
179 player *pl;
180
181 /*
182 * reset the counter on the region, then use it to store the number of
183 * players there.
184 * I don't know how thread-safe this would be, I suspect not very....
185 */
186 for (reg=first_region;reg!=NULL;reg=reg->next) {
187 reg->counter=0;
188 }
189 for (pl=first_player;pl!=NULL;pl=pl->next)
190 if (pl->ob->map!=NULL)
191 get_region_by_map(pl->ob->map)->counter++;
192
193 /* we only want to print out by places with a 'longname' field...*/
194 for (reg=first_region;reg!=NULL;reg=reg->next) {
195 if (reg->longname==NULL && reg->counter>0) {
196 if(reg->parent !=NULL) {
197 reg->parent->counter+=reg->counter;
198 reg->counter=0;
199 }
200 else /*uh oh, we shouldn't be here. */
201 LOG(llevError,"command_whereabouts() Region %s with no longname has no parent", reg->name);
202 }
203 }
204 new_draw_info_format(NDI_UNIQUE, 0,op,
205 "In the world currently there are:");
206 for (reg=first_region;reg!=NULL;reg=reg->next)
207 if(reg->counter>0)
208 new_draw_info_format(NDI_UNIQUE, 0,op,
209 "%u players in %s", reg->counter, get_region_longname(reg));
210 return 1; 348 return 1;
211} 349}
212 350
213typedef struct 351int
214 {
215 char namebuf[MAX_BUF];
216 int login_order;
217 } chars_names;
218
219/*local functon for qsort comparison*/
220static int name_cmp (const chars_names *c1, const chars_names *c2)
221 {
222 return strcasecmp (c1->namebuf, c2->namebuf);
223 }
224
225int command_who (object *op, char *params) {
226 player *pl;
227 uint16 i;
228 region *reg;
229 char* format;
230 int num_players = 0;
231 int num_wiz = 0;
232 int num_afk = 0;
233 chars_names *chars = NULL;
234
235 /*
236 * The who formats are defined in config to be blank. They should have been
237 * overridden by the settings file, if there are no entries however, it will
238 * have stayed blank. Since this probably isn't what is wanted, we will check if
239 * new formats have been specified, and if not we will use the old defaults.
240 */
241 if (!strcmp(settings.who_format,""))
242 strcpy(settings.who_format, "%N_%T%t%h%d%n[%m]");
243 if (!strcmp(settings.who_wiz_format,""))
244 strcpy(settings.who_wiz_format, "%N_%T%t%h%d%nLevel %l [%m](@%i)(%c)");
245 if (op == NULL || QUERY_FLAG(op, FLAG_WIZ))
246 format=settings.who_wiz_format;
247 else
248 format=settings.who_format;
249
250 reg=get_region_from_string(params);
251
252 for (pl=first_player;pl!=NULL;pl=pl->next) {
253 if (pl->ob->map == NULL)
254 continue;
255 if (pl->hidden && !QUERY_FLAG(op, FLAG_WIZ)) continue;
256
257 if(!region_is_child_of_region(get_region_by_map(pl->ob->map),reg)) continue;
258
259 if (pl->state==ST_PLAYING || pl->state==ST_GET_PARTY_PASSWORD) {
260
261 num_players++;
262 chars = (chars_names *) realloc(chars, num_players*sizeof(chars_names));
263 if (chars == NULL) {
264 new_draw_info(NDI_UNIQUE, 0, op, "who failed - out of memory!");
265 return 0;
266 }
267 sprintf(chars[num_players-1].namebuf, "%s", &pl->ob->name);
268 chars[num_players-1].login_order = num_players;
269 /*Check for WIZ's & AFK's*/
270 if (QUERY_FLAG(pl->ob,FLAG_WIZ))
271 num_wiz++;
272 if (QUERY_FLAG(pl->ob,FLAG_AFK))
273 num_afk++;
274 }
275 }
276 if (first_player != (player *) NULL) {
277 if (reg == NULL)
278 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players (%d) -- WIZ(%d) AFK(%d)",
279 num_players, num_wiz, num_afk);
280 else if (reg->longname == NULL)
281 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
282 reg->name, num_players, num_wiz, num_afk);
283 else
284 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
285 reg->longname, num_players, num_wiz, num_afk);
286 }
287 qsort (chars, num_players, sizeof(chars_names), (int (*)(const void *, const void *))name_cmp);
288 for (i=0;i<num_players;i++)
289 display_who_entry(op, find_player(chars[i].namebuf), format);
290 free(chars);
291 return 1;
292}
293
294/* Display a line of 'who' to op, about pl, using the formatting specified by format */
295void display_who_entry(object *op, player *pl, const char *format) {
296 char tmpbuf[MAX_BUF];
297 char outbuf[MAX_BUF];
298 size_t i;
299 outbuf[0]='\0'; /* we strcat to this, so reset it here. */
300 if (pl==NULL) {
301 LOG(llevError,"display_who_entry(): I was passed a null player");
302 return;
303 }
304 for (i=0;i<=strlen(format);i++) {
305 if (format[i]=='%') {
306 i++;
307 get_who_escape_code_value(tmpbuf,format[i],pl);
308 strcat(outbuf, tmpbuf);
309 }
310 else if (format[i]=='_')
311 strcat(outbuf," "); /* allow '_' to be used in place of spaces */
312 else {
313 sprintf(tmpbuf,"%c",format[i]);
314 strcat(outbuf,tmpbuf);
315 }
316 }
317 new_draw_info(NDI_UNIQUE, 0, op, outbuf);
318}
319
320/* Returns the value of the escape code used in the who format specifier
321 * the values are:
322 * N Name of character
323 * t title of character
324 * T the optional "the " sequence value (depend if player has own_title or not)
325 * c count
326 * n newline
327 * h [Hostile] if character is hostile, nothing otherwise
328 * d [WIZ] if character is a dm, nothing otherwise
329 * a [AFK] if character is afk, nothing otherwise
330 * l the level of the character
331 * m the map path the character is currently on
332 * M the map name of the map the character is currently on
333 * r the region name (eg scorn, wolfsburg)
334 * R the regional title (eg The Kingdom of Scorn, The Port of Wolfsburg)
335 * i player's ip adress
336 * % a literal %
337 * _ a literal underscore
338 */
339
340void get_who_escape_code_value(char *return_val, const char letter, player *pl) {
341
342 switch (letter) {
343 case 'N' : strcpy(return_val, pl->ob->name);
344 break;
345 case 't' : strcpy(return_val,(pl->own_title[0]=='\0'?pl->title:pl->own_title));
346 break;
347 case 'T' : if (pl->own_title[0]=='\0')
348 strcpy(return_val,"the ");
349 else
350 *return_val='\0';
351 break;
352 case 'c' : sprintf(return_val,"%d",pl->ob->count);
353 break;
354 case 'n' : strcpy(return_val, "\n");
355 break;
356 case 'h' : strcpy(return_val,pl->peaceful?"":" [Hostile]");
357 break;
358 case 'l' : sprintf(return_val,"%d",pl->ob->level);
359 break;
360 case 'd' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":""));
361 break;
362 case 'a' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_AFK)?" [AFK]":""));
363 break;
364 case 'm' : strcpy(return_val,pl->ob->map->path);
365 break;
366 case 'M' : strcpy(return_val,pl->ob->map->name?pl->ob->map->name:"Untitled");
367 break;
368 case 'r' : strcpy(return_val,get_name_of_region_for_map(pl->ob->map));
369 break;
370 case 'R' : strcpy(return_val,get_region_longname(get_region_by_map(pl->ob->map)));
371 break;
372 case 'i' : strcpy(return_val,pl->socket.host);
373 break;
374 case '%' : strcpy(return_val, "%");
375 break;
376 case '_' : strcpy(return_val, "_");
377 break;
378 }
379
380}
381
382
383int command_afk (object *op, char *params)
384{
385 if QUERY_FLAG(op,FLAG_AFK) {
386 CLEAR_FLAG(op,FLAG_AFK);
387 new_draw_info(NDI_UNIQUE, 0, op, "You are no longer AFK");
388 }
389 else
390 {
391 SET_FLAG(op,FLAG_AFK);
392 new_draw_info(NDI_UNIQUE, 0, op, "You are now AFK");
393 }
394 return 1;
395}
396
397int command_mapinfo (object *op, char *params)
398{
399 current_map_info(op);
400 return 1;
401 }
402
403int command_whereami (object *op, char *params)
404{
405 current_region_info(op);
406 return 1;
407}
408
409 int command_maps (object *op, char *params)
410{
411 map_info(op,params);
412 return 1;
413 }
414
415int command_time (object *op, char *params)
416{
417 print_tod (op);
418 return 1;
419}
420
421int command_weather (object *op, char *params)
422{
423 int wx, wy, temp, sky;
424 char buf[MAX_BUF];
425
426 if (settings.dynamiclevel < 1)
427 return 1;
428
429 if (op->map == NULL)
430 return 1;
431
432 if (worldmap_to_weathermap(op->x, op->y, &wx, &wy, op->map) != 0)
433 return 1;
434
435 if (QUERY_FLAG(op, FLAG_WIZ)) {
436 /* dump the weather, Dm style! Yo! */
437 new_draw_info_format(NDI_UNIQUE, 0, op, "Real temp: %d",
438 real_world_temperature(op->x, op->y, op->map));
439 new_draw_info_format(NDI_UNIQUE, 0, op, "Base temp: %d",
440 weathermap[wx][wy].temp);
441 new_draw_info_format(NDI_UNIQUE, 0, op, "Humid: %d",
442 weathermap[wx][wy].humid);
443 new_draw_info_format(NDI_UNIQUE, 0, op, "Wind: dir=%d speed=%d",
444 weathermap[wx][wy].winddir, weathermap[wx][wy].windspeed);
445 new_draw_info_format(NDI_UNIQUE, 0, op, "Pressure: %d",
446 weathermap[wx][wy].pressure);
447 new_draw_info_format(NDI_UNIQUE, 0, op, "Avg Elevation: %d",
448 weathermap[wx][wy].avgelev);
449 new_draw_info_format(NDI_UNIQUE, 0, op, "Rainfall: %d Water: %d",
450 weathermap[wx][wy].rainfall, weathermap[wx][wy].water);
451 }
452
453 temp = real_world_temperature(op->x, op->y, op->map);
454 new_draw_info_format(NDI_UNIQUE, 0, op, "It's currently %d degrees "
455 "Centigrade out.", temp);
456
457 /* humid */
458 if (weathermap[wx][wy].humid < 20)
459 new_draw_info(NDI_UNIQUE, 0, op, "It is very dry.");
460 else if (weathermap[wx][wy].humid < 40)
461 new_draw_info(NDI_UNIQUE, 0, op, "It is very comfortable today.");
462 else if (weathermap[wx][wy].humid < 60)
463 new_draw_info(NDI_UNIQUE, 0, op, "It is a bit muggy.");
464 else if (weathermap[wx][wy].humid < 80)
465 new_draw_info(NDI_UNIQUE, 0, op, "It is muggy.");
466 else
467 new_draw_info(NDI_UNIQUE, 0, op, "It is uncomfortably muggy.");
468
469 /* wind */
470 switch (weathermap[wx][wy].winddir) {
471 case 1: sprintf(buf, "north"); break;
472 case 2: sprintf(buf, "northeast"); break;
473 case 3: sprintf(buf, "east"); break;
474 case 4: sprintf(buf, "southeast"); break;
475 case 5: sprintf(buf, "south"); break;
476 case 6: sprintf(buf, "southwest"); break;
477 case 7: sprintf(buf, "west"); break;
478 case 8: sprintf(buf, "northwest"); break;
479 }
480 if (weathermap[wx][wy].windspeed < 5)
481 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a mild breeze "
482 "coming from the %s.", buf);
483 else if (weathermap[wx][wy].windspeed < 10)
484 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong breeze "
485 "coming from the %s.", buf);
486 else if (weathermap[wx][wy].windspeed < 15)
487 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a light wind "
488 "coming from the %s.", buf);
489 else if (weathermap[wx][wy].windspeed < 25)
490 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong wind "
491 "coming from the %s.", buf);
492 else if (weathermap[wx][wy].windspeed < 35)
493 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a heavy wind "
494 "coming from the %s.", buf);
495 else
496 new_draw_info_format(NDI_UNIQUE, 0, op, "The wind from the %s is "
497 "incredibly strong!", buf);
498
499 sky = weathermap[wx][wy].sky;
500 if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG)
501 sky += 10; /*let it snow*/
502 switch (sky) {
503 case SKY_CLEAR: new_draw_info(NDI_UNIQUE, 0, op, "There isn''t a cloud in the sky."); break;
504 case SKY_LIGHTCLOUD: new_draw_info(NDI_UNIQUE, 0, op, "There are a few light clouds in the sky."); break;
505 case SKY_OVERCAST: new_draw_info(NDI_UNIQUE, 0, op, "The sky is cloudy and dreary."); break;
506 case SKY_LIGHT_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining softly."); break;
507 case SKY_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining."); break;
508 case SKY_HEAVY_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining heavily."); break;
509 case SKY_HURRICANE: new_draw_info(NDI_UNIQUE, 0, op, "There is a heavy storm! You should go inside!"); break;
510 case SKY_FOG: new_draw_info(NDI_UNIQUE, 0, op, "It''s foggy and miserable."); break;
511 case SKY_HAIL: new_draw_info(NDI_UNIQUE, 0, op, "It''s hailing out! Take cover!"); break;
512 case SKY_LIGHT_SNOW: new_draw_info(NDI_UNIQUE, 0, op, "Snow is gently falling from the sky."); break;
513 case SKY_SNOW: new_draw_info(NDI_UNIQUE, 0, op, "It''s snowing out."); break;
514 case SKY_HEAVY_SNOW: new_draw_info(NDI_UNIQUE, 0, op, "The snow is falling very heavily now."); break;
515 case SKY_BLIZZARD: new_draw_info(NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!"); break;
516 }
517 return 1;
518}
519
520int command_archs (object *op, char *params) 352command_archs (object *op, char *params)
521{ 353{
522 arch_info(op); 354 arch_info (op);
523 return 1; 355 return 1;
524 } 356}
525 357
358int
526int command_hiscore (object *op, char *params) 359command_hiscore (object *op, char *params)
527{ 360{
528 display_high_score(op,op==NULL?9999:50, params); 361 display_high_score (op, op == NULL ? 9999 : 50, params);
529 return 1; 362 return 1;
530 } 363}
531 364
365int
532int command_debug (object *op, char *params) 366command_debug (object *op, char *params)
533{ 367{
534 int i; 368 int i;
535 char buf[MAX_BUF]; 369 char buf[MAX_BUF];
370
536 if(params==NULL || !sscanf(params, "%d", &i)) { 371 if (params == NULL || !sscanf (params, "%d", &i))
372 {
537 sprintf(buf,"Global debug level is %d.",settings.debug); 373 sprintf (buf, "Global debug level is %d.", settings.debug);
538 new_draw_info(NDI_UNIQUE, 0,op,buf); 374 new_draw_info (NDI_UNIQUE, 0, op, buf);
539 return 1; 375 return 1;
540 } 376 }
541 if(op != NULL && !QUERY_FLAG(op, FLAG_WIZ)) { 377 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
378 {
542 new_draw_info(NDI_UNIQUE, 0,op,"Privileged command."); 379 new_draw_info (NDI_UNIQUE, 0, op, "Privileged command.");
543 return 1; 380 return 1;
544 } 381 }
545 settings.debug = (enum LogLevel) FABS(i); 382 settings.debug = (enum LogLevel) FABS (i);
546 sprintf(buf,"Set debug level to %d.", i); 383 sprintf (buf, "Set debug level to %d.", i);
547 new_draw_info(NDI_UNIQUE, 0,op,buf); 384 new_draw_info (NDI_UNIQUE, 0, op, buf);
548 return 1; 385 return 1;
549 } 386}
550 387
551 388
552/* 389/*
553 * Those dumps should be just one dump with good parser 390 * Those dumps should be just one dump with good parser
554 */ 391 */
555 392
393int
556int command_dumpbelow (object *op, char *params) 394command_dumpbelow (object *op, char *params)
557{ 395{
558 if (op && op->below) { 396 if (op && op->below)
397 {
559 dump_object(op->below); 398 char *dump = dump_object (op->below);
560 new_draw_info(NDI_UNIQUE, 0,op,errmsg); 399 new_draw_info (NDI_UNIQUE, 0, op, dump);
400 free (dump);
561 /* Let's push that item on the dm's stack */ 401 /* Let's push that item on the dm's stack */
562 dm_stack_push( op->contr, op->below->count ); 402 dm_stack_push (op->contr, op->below->count);
563 } 403 }
564 return 0; 404 return 0;
565} 405}
566 406
407int
408command_dumpfriendlyobjects (object *op, char *params)
409{
410 dump_friendly_objects ();
411 return 0;
412}
413
414int
415command_printlos (object *op, char *params)
416{
417 if (op)
418 print_los (op);
419 return 0;
420}
421
422
423int
424command_version (object *op, char *params)
425{
426 version (op);
427 return 0;
428}
429
430#ifndef BUG_LOG
431# define BUG_LOG "bug_log"
432#endif
433void
434bug_report (const char *reportstring)
435{
436 FILE *fp;
437
438 if ((fp = fopen (BUG_LOG, "a")) != NULL)
439 {
440 fprintf (fp, "%s\n", reportstring);
441 fclose (fp);
442 }
443 else
444 {
445 LOG (llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror (errno));
446 }
447}
448
449int
450command_output_sync (object *op, char *params)
451{
452 int val;
453
454 if (!params)
455 {
456 new_draw_info_format (NDI_UNIQUE, 0, op, "Output sync time is presently %d", op->contr->outputs_sync);
457 return 1;
458 }
459 val = atoi (params);
460 if (val > 0)
461 {
462 op->contr->outputs_sync = val;
463 new_draw_info_format (NDI_UNIQUE, 0, op, "Output sync time now set to %d", op->contr->outputs_sync);
464 }
465 else
466 new_draw_info (NDI_UNIQUE, 0, op, "Invalid value for output_sync.");
467
468 return 1;
469}
470
471int
472command_output_count (object *op, char *params)
473{
474 int val;
475
476 if (!params)
477 {
478 new_draw_info_format (NDI_UNIQUE, 0, op, "Output count is presently %d", op->contr->outputs_count);
479 return 1;
480 }
481 val = atoi (params);
482 if (val > 0)
483 {
484 op->contr->outputs_count = val;
485 new_draw_info_format (NDI_UNIQUE, 0, op, "Output count now set to %d", op->contr->outputs_count);
486 }
487 else
488 new_draw_info (NDI_UNIQUE, 0, op, "Invalid value for output_count.");
489
490 return 1;
491}
492
493int
567int command_wizpass (object *op, char *params) 494command_listen (object *op, char *params)
568{ 495{
569 int i; 496 int i;
570 497
571 if (!op)
572 return 0;
573
574 if (!params)
575 i = (QUERY_FLAG(op, FLAG_WIZPASS)) ? 0 : 1;
576 else
577 i =onoff_value(params);
578
579 if (i) {
580 new_draw_info(NDI_UNIQUE, 0,op, "You will now walk through walls.\n");
581 SET_FLAG(op, FLAG_WIZPASS);
582 } else {
583 new_draw_info(NDI_UNIQUE, 0,op, "You will now be stopped by walls.\n");
584 CLEAR_FLAG(op, FLAG_WIZPASS);
585 }
586 return 0;
587}
588
589int command_wizcast (object *op, char *params)
590{
591 int i;
592
593 if (!op)
594 return 0;
595
596 if (!params)
597 i = (QUERY_FLAG(op, FLAG_WIZCAST)) ? 0 : 1;
598 else
599 i = onoff_value(params);
600
601 if (i) {
602 new_draw_info(NDI_UNIQUE, 0, op, "You can now cast spells anywhere.");
603 SET_FLAG(op, FLAG_WIZCAST);
604 } else {
605 new_draw_info(NDI_UNIQUE, 0, op, "You now cannot cast spells in no-magic areas.");
606 CLEAR_FLAG(op, FLAG_WIZCAST);
607 }
608 return 0;
609}
610
611int command_dumpallobjects (object *op, char *params)
612{
613 dump_all_objects();
614 return 0;
615}
616
617int command_dumpfriendlyobjects (object *op, char *params)
618{
619 dump_friendly_objects();
620 return 0;
621}
622
623int command_dumpallarchetypes (object *op, char *params)
624{
625 dump_all_archetypes();
626 return 0;
627 }
628
629int command_dumpmap (object *op, char *params)
630{
631 if(op)
632 dump_map(op->map);
633 return 0;
634}
635
636int command_dumpallmaps (object *op, char *params)
637{
638 dump_all_maps();
639 return 0;
640}
641
642int command_printlos (object *op, char *params)
643{
644 if (op)
645 print_los(op);
646 return 0;
647}
648
649
650int command_version (object *op, char *params)
651{
652 version(op);
653 return 0;
654}
655
656
657#ifndef BUG_LOG
658#define BUG_LOG "bug_log"
659#endif
660void bug_report(const char * reportstring){
661 FILE * fp;
662 if((fp = fopen( BUG_LOG , "a")) != NULL){
663 fprintf(fp,"%s\n", reportstring);
664 fclose(fp);
665 } else {
666 LOG(llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror(errno));
667 }
668}
669
670int command_output_sync(object *op, char *params)
671{
672 int val;
673
674 if (!params) {
675 new_draw_info_format(NDI_UNIQUE, 0, op,
676 "Output sync time is presently %d", op->contr->outputs_sync);
677 return 1;
678 }
679 val=atoi(params);
680 if (val>0) {
681 op->contr->outputs_sync = val;
682 new_draw_info_format(NDI_UNIQUE, 0, op,
683 "Output sync time now set to %d", op->contr->outputs_sync);
684 }
685 else
686 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_sync.");
687
688 return 1;
689}
690
691int command_output_count(object *op, char *params)
692{
693 int val;
694
695 if (!params) {
696 new_draw_info_format(NDI_UNIQUE, 0, op,
697 "Output count is presently %d", op->contr->outputs_count);
698 return 1;
699 }
700 val=atoi(params);
701 if (val>0) {
702 op->contr->outputs_count = val;
703 new_draw_info_format(NDI_UNIQUE, 0, op,
704 "Output count now set to %d", op->contr->outputs_count);
705 }
706 else
707 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_count.");
708
709 return 1;
710}
711
712int command_listen (object *op, char *params)
713{
714 int i;
715
716 if(params==NULL || !sscanf(params, "%d", &i)) { 498 if (params == NULL || !sscanf (params, "%d", &i))
717 new_draw_info_format(NDI_UNIQUE, 0, op,
718 "Set listen to what (presently %d)?", op->contr->listening);
719 return 1;
720 } 499 {
500 new_draw_info_format (NDI_UNIQUE, 0, op, "Set listen to what (presently %d)?", op->contr->listening);
501 return 1;
502 }
721 op->contr->listening=(char) i; 503 op->contr->listening = (char) i;
722 new_draw_info_format(NDI_UNIQUE, 0, op, 504 new_draw_info_format (NDI_UNIQUE, 0, op, "Your verbose level is now %d.", i);
723 "Your verbose level is now %d.",i);
724 return 1; 505 return 1;
725} 506}
726 507
727/* Prints out some useful information for the character. Everything we print 508/* Prints out some useful information for the character. Everything we print
728 * out can be determined by the docs, so we aren't revealing anything extra - 509 * out can be determined by the docs, so we aren't revealing anything extra -
729 * rather, we are making it convenient to find the values. params have 510 * rather, we are making it convenient to find the values. params have
730 * no meaning here. 511 * no meaning here.
731 */ 512 */
513int
732int command_statistics(object *pl, char *params) 514command_statistics (object *pl, char *params)
733{ 515{
734 if (!pl->contr) return 1; 516 if (!pl->contr)
735#ifndef WIN32
736 new_draw_info_format(NDI_UNIQUE, 0, pl," Experience: %lld",pl->stats.exp);
737 new_draw_info_format(NDI_UNIQUE, 0, pl," Next Level: %lld",level_exp(pl->level+1, pl->expmul));
738#else
739 new_draw_info_format(NDI_UNIQUE, 0, pl," Experience: %I64d",pl->stats.exp);
740 new_draw_info_format(NDI_UNIQUE, 0, pl," Next Level: %I64d",level_exp(pl->level+1, pl->expmul));
741#endif
742 new_draw_info(NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
743
744 new_draw_info_format(NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
745 pl->contr->orig_stats.Str, pl->stats.Str, 20+pl->arch->clone.stats.Str);
746 new_draw_info_format(NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
747 pl->contr->orig_stats.Dex, pl->stats.Dex, 20+pl->arch->clone.stats.Dex);
748 new_draw_info_format(NDI_UNIQUE, 0, pl, "Con %2d/ %3d/%3d",
749 pl->contr->orig_stats.Con, pl->stats.Con, 20+pl->arch->clone.stats.Con);
750 new_draw_info_format(NDI_UNIQUE, 0, pl, "Int %2d/ %3d/%3d",
751 pl->contr->orig_stats.Int, pl->stats.Int, 20+pl->arch->clone.stats.Int);
752 new_draw_info_format(NDI_UNIQUE, 0, pl, "Wis %2d/ %3d/%3d",
753 pl->contr->orig_stats.Wis, pl->stats.Wis, 20+pl->arch->clone.stats.Wis);
754 new_draw_info_format(NDI_UNIQUE, 0, pl, "Pow %2d/ %3d/%3d",
755 pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow);
756 new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d",
757 pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha);
758 new_draw_info_format(NDI_UNIQUE, 0, pl, "\nAttack Mode: %s",pl->contr->peaceful? "Peaceful":"Hostile");
759
760 /* Can't think of anything else to print right now */
761 return 0;
762}
763
764int command_fix_me(object *op, char *params)
765{
766 sum_weight(op);
767 fix_player(op);
768 return 1; 517 return 1;
769} 518 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %" PRId64, pl->stats.exp);
519 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %" PRId64, level_exp (pl->level + 1, pl->expmul));
520 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
770 521
522 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
523 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);
524 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
525 pl->contr->orig_stats.Dex, pl->stats.Dex, 20 + pl->arch->clone.stats.Dex);
526 new_draw_info_format (NDI_UNIQUE, 0, pl, "Con %2d/ %3d/%3d",
527 pl->contr->orig_stats.Con, pl->stats.Con, 20 + pl->arch->clone.stats.Con);
528 new_draw_info_format (NDI_UNIQUE, 0, pl, "Int %2d/ %3d/%3d",
529 pl->contr->orig_stats.Int, pl->stats.Int, 20 + pl->arch->clone.stats.Int);
530 new_draw_info_format (NDI_UNIQUE, 0, pl, "Wis %2d/ %3d/%3d",
531 pl->contr->orig_stats.Wis, pl->stats.Wis, 20 + pl->arch->clone.stats.Wis);
532 new_draw_info_format (NDI_UNIQUE, 0, pl, "Pow %2d/ %3d/%3d",
533 pl->contr->orig_stats.Pow, pl->stats.Pow, 20 + pl->arch->clone.stats.Pow);
534 new_draw_info_format (NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d",
535 pl->contr->orig_stats.Cha, pl->stats.Cha, 20 + pl->arch->clone.stats.Cha);
536 new_draw_info_format (NDI_UNIQUE, 0, pl, "\nAttack Mode: %s", pl->contr->peaceful ? "Peaceful" : "Hostile");
537
538 /* Can't think of anything else to print right now */
539 return 0;
540}
541
542int
543command_fix_me (object *op, char *params)
544{
545 sum_weight (op);
546 op->update_stats ();
547 return 1;
548}
549
550int
771int command_players(object *op, char *paramss) 551command_logs (object *op, char *params)
772{ 552{
553 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills.");
554
555 return 1;
556}
557
558int
559command_applymode (object *op, char *params)
560{
561 unapplymode unapply = op->contr->unapply;
562 static const char *const types[] = { "nochoice", "never", "always" };
563
564 if (!params)
565 {
566 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode is set to %s", types[op->contr->unapply]);
567 return 1;
568 }
569
570 if (!strcmp (params, "nochoice"))
571 op->contr->unapply = unapply_nochoice;
572 else if (!strcmp (params, "never"))
573 op->contr->unapply = unapply_never;
574 else if (!strcmp (params, "always"))
575 op->contr->unapply = unapply_always;
576 else
577 {
578 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params);
579 return 0;
580 }
581
582 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s",
583 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]);
584 return 1;
585}
586
587int
588command_bowmode (object *op, char *params)
589{
590 bowtype_t oldtype = op->contr->bowtype;
591 static const char *const types[] = { "normal", "threewide", "spreadshot", "firenorth",
592 "firene", "fireeast", "firese", "firesouth",
593 "firesw", "firewest", "firenw", "bestarrow"
594 };
773 char buf[MAX_BUF]; 595 char buf[MAX_BUF];
774 char *t; 596 int i, found;
775 DIR *Dir;
776
777 sprintf(buf,"%s/%s/",settings.localdir,settings.playerdir);
778 t=buf+strlen(buf);
779 if ((Dir=opendir(buf))!=NULL) {
780 const struct dirent *Entry;
781 597
782 while ((Entry=readdir(Dir))!=NULL) { 598 if (!params)
783 /* skip '.' , '..' */ 599 {
784 if (!((Entry->d_name[0]=='.' && Entry->d_name[1]=='\0') || 600 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode is set to %s", types[op->contr->bowtype]);
785 (Entry->d_name[0]=='.' && Entry->d_name[1]=='.' && Entry->d_name[2]=='\0'))) 601 return 1;
602 }
603
604 for (i = 0, found = 0; i <= bow_bestarrow; i++)
605 {
606 if (!strcmp (params, types[i]))
607 {
608 found++;
609 op->contr->bowtype = (bowtype_t) i;
610 break;
611 }
612 }
613
614 if (!found)
615 {
616 sprintf (buf, "bowmode: Unknown options %s, valid options are:", params);
617 for (i = 0; i <= bow_bestarrow; i++)
618 {
619 strcat (buf, " ");
620 strcat (buf, types[i]);
621 if (i < bow_nw)
622 strcat (buf, ",");
623 else
624 strcat (buf, ".");
625 }
626 new_draw_info_format (NDI_UNIQUE, 0, op, buf);
627 return 0;
628 }
629
630 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]);
631 return 1;
632}
633
634int
635command_petmode (object *op, char *params)
636{
637 petmode_t oldtype = op->contr->petmode;
638 static const char *const types[] = { "normal", "sad", "defend", "arena" };
639
640 if (!params)
641 {
642 new_draw_info_format (NDI_UNIQUE, 0, op, "petmode is set to %s", types[op->contr->petmode]);
643 return 1;
644 }
645
646 if (!strcmp (params, "normal"))
647 op->contr->petmode = pet_normal;
648 else if (!strcmp (params, "sad"))
649 op->contr->petmode = pet_sad;
650 else if (!strcmp (params, "defend"))
651 op->contr->petmode = pet_defend;
652 else if (!strcmp (params, "arena"))
653 op->contr->petmode = pet_arena;
654 else
655 {
656 new_draw_info_format (NDI_UNIQUE, 0, op,
657 "petmode: Unknown options %s, valid options are normal," "sad (seek and destroy), defend, arena", params);
658 return 0;
659 }
660 new_draw_info_format (NDI_UNIQUE, 0, op, "petmode %s set to %s", (oldtype == op->contr->petmode ? "" : "now"), types[op->contr->petmode]);
661 return 1;
662}
663
664int
665command_showpets (object *op, char *params)
666{
667 objectlink *obl, *next;
668 int counter = 0, target = 0;
669 int have_shown_pet = 0;
670
671 if (params != NULL)
672 target = atoi (params);
673 for (obl = first_friendly_object; obl != NULL; obl = next)
674 {
675 object *ob = obl->ob;
676
677 next = obl->next;
678 if (ob->owner == op)
679 {
680 if (target == 0)
786 { 681 {
787 struct stat Stat; 682 if (counter == 0)
788 683 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
789 strcpy(t,Entry->d_name); 684 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, &ob->name, ob->level);
790 if (stat(buf,&Stat)==0) {
791 /* This was not posix compatible
792 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) {
793 */ 685 }
794 if (S_ISDIR(Stat.st_mode)){ 686 else if (!have_shown_pet && ++counter == target)
795 char buf2[MAX_BUF]; 687 {
796 struct tm *tm=localtime(&Stat.st_mtime); 688 new_draw_info_format (NDI_UNIQUE, 0, op, "level %d %s", ob->level, &ob->name);
797 sprintf(buf2,"%s\t%04d %02d %02d %02d %02d %02d", 689 new_draw_info_format (NDI_UNIQUE, 0, op, "%d/%d HP, %d/%d SP", ob->stats.hp, ob->stats.maxhp, ob->stats.sp, ob->stats.maxsp);
798 Entry->d_name, 690 /* this is not a nice way to do this, it should be made to be more like the statistics command */
799 1900+tm->tm_year, 691 new_draw_info_format (NDI_UNIQUE, 0, op, "Str %d", ob->stats.Str);
800 1+tm->tm_mon, 692 new_draw_info_format (NDI_UNIQUE, 0, op, "Dex %d", ob->stats.Dex);
801 tm->tm_mday, 693 new_draw_info_format (NDI_UNIQUE, 0, op, "Con %d", ob->stats.Con);
802 tm->tm_hour, 694 new_draw_info_format (NDI_UNIQUE, 0, op, "Int %d", ob->stats.Int);
803 tm->tm_min, 695 new_draw_info_format (NDI_UNIQUE, 0, op, "Wis %d", ob->stats.Wis);
804 tm->tm_sec); 696 new_draw_info_format (NDI_UNIQUE, 0, op, "Cha %d", ob->stats.Cha);
805 new_draw_info(NDI_UNIQUE, 0, op, buf2); 697 new_draw_info_format (NDI_UNIQUE, 0, op, "Pow %d", ob->stats.Pow);
698 new_draw_info_format (NDI_UNIQUE, 0, op, "wc %d damage %d ac %d ", ob->stats.wc, ob->stats.dam, ob->stats.ac);
699 have_shown_pet = 1;
700 }
701 }
702 }
703 if (counter == 0)
704 new_draw_info (NDI_UNIQUE, 0, op, "you have no pets.");
705 else if (target != 0 && have_shown_pet == 0)
706 new_draw_info (NDI_UNIQUE, 0, op, "no such pet.");
707 return 0;
708}
709
710int
711command_usekeys (object *op, char *params)
712{
713 usekeytype oldtype = op->contr->usekeys;
714 static const char *const types[] = { "inventory", "keyrings", "containers" };
715
716 if (!params)
717 {
718 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys is set to %s", types[op->contr->usekeys]);
719 return 1;
720 }
721
722 if (!strcmp (params, "inventory"))
723 op->contr->usekeys = key_inventory;
724 else if (!strcmp (params, "keyrings"))
725 op->contr->usekeys = keyrings;
726 else if (!strcmp (params, "containers"))
727 op->contr->usekeys = containers;
728 else
729 {
730 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys: Unknown options %s, valid options are inventory, keyrings, containers", params);
731 return 0;
732 }
733 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys %s set to %s", (oldtype == op->contr->usekeys ? "" : "now"), types[op->contr->usekeys]);
734 return 1;
735}
736
737int
738command_resistances (object *op, char *params)
739{
740 int i;
741
742 if (!op)
743 return 0;
744
745 for (i = 0; i < NROFATTACKS; i++)
746 {
747 if (i == ATNR_INTERNAL)
748 continue;
749
750 new_draw_info_format (NDI_UNIQUE, 0, op, "%-20s %+5d", attacktype_desc[i], op->resist[i]);
751 }
752
753 /* If dragon player, let's display natural resistances */
754 if (is_dragon_pl (op))
755 {
756 int attack;
757 object *tmp;
758
759 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
760 {
761 if ((tmp->type == FORCE) && (strcmp (tmp->arch->name, "dragon_skin_force") == 0))
762 {
763 new_draw_info (NDI_UNIQUE, 0, op, "\nNatural skin resistances:");
764 for (attack = 0; attack < NROFATTACKS; attack++)
765 {
766 if (atnr_is_dragon_enabled (attack))
767 {
768 new_draw_info_format (NDI_UNIQUE, 0, op, "%s: %d", change_resist_msg[attack], tmp->resist[attack]);
806 } 769 }
807 } 770 }
771 break;
808 } 772 }
809 } 773 }
810 } 774 }
811 closedir(Dir); 775
812 return 0; 776 return 0;
813} 777}
814 778
815
816
817int command_logs (object *op, char *params)
818{
819 int i;
820 int first;
821
822 first=1;
823 for(i=2; i<socket_info.allocated_sockets; i++) {
824 if (init_sockets[i].old_mode == Old_Listen) {
825 if (first) {
826 new_draw_info(NDI_UNIQUE,0,op,"Kill-logs are sent to:");
827 first=0;
828 }
829 new_draw_info_format(NDI_UNIQUE, 0, op, "%s: %s",
830 init_sockets[i].host,init_sockets[i].comment);
831 }
832 }
833 if (first) {
834 new_draw_info(NDI_UNIQUE,0,op,"Nobody is currently logging kills.");
835 }
836 return 1;
837}
838
839int command_applymode(object *op, char *params)
840{
841 unapplymode unapply = op->contr->unapply;
842 static const char* const types[]={"nochoice", "never", "always"};
843
844 if (!params) {
845 new_draw_info_format(NDI_UNIQUE, 0, op, "applymode is set to %s",
846 types[op->contr->unapply]);
847 return 1;
848 }
849
850 if (!strcmp(params,"nochoice"))
851 op->contr->unapply=unapply_nochoice;
852 else if (!strcmp(params,"never"))
853 op->contr->unapply=unapply_never;
854 else if (!strcmp(params,"always"))
855 op->contr->unapply=unapply_always;
856 else {
857 new_draw_info_format(NDI_UNIQUE, 0, op,
858 "applymode: Unknown options %s, valid options are nochoice, never, always",
859 params);
860 return 0;
861 }
862 new_draw_info_format(NDI_UNIQUE, 0, op, "Applymode %s set to %s",
863 (unapply==op->contr->unapply?"":" now"),
864 types[op->contr->unapply]);
865 return 1;
866}
867
868int command_bowmode(object *op, char *params)
869{
870 bowtype_t oldtype=op->contr->bowtype;
871 static const char* const types[] =
872 {"normal", "threewide", "spreadshot", "firenorth",
873 "firene", "fireeast", "firese", "firesouth",
874 "firesw", "firewest", "firenw", "bestarrow"};
875 char buf[MAX_BUF];
876 int i, found;
877
878 if (!params) {
879 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode is set to %s",
880 types[op->contr->bowtype]);
881 return 1;
882 }
883
884 for (i=0,found=0; i<=bow_bestarrow; i++) {
885 if (!strcmp(params, types[i])) {
886 found++;
887 op->contr->bowtype= (bowtype_t) i;
888 break;
889 }
890 }
891 if (!found) {
892 sprintf(buf, "bowmode: Unknown options %s, valid options are:", params);
893 for (i=0; i<=bow_bestarrow; i++) {
894 strcat(buf, " ");
895 strcat(buf, types[i]);
896 if (i < bow_nw)
897 strcat(buf, ",");
898 else
899 strcat(buf, ".");
900 }
901 new_draw_info_format(NDI_UNIQUE, 0, op, buf);
902 return 0;
903 }
904 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode %s set to %s",
905 (oldtype==op->contr->bowtype?"":"now"),
906 types[op->contr->bowtype]);
907 return 1;
908}
909
910int command_petmode(object *op, char *params)
911{
912 petmode_t oldtype=op->contr->petmode;
913 static const char* const types[]={"normal", "sad", "defend", "arena"};
914
915 if (!params) {
916 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode is set to %s",
917 types[op->contr->petmode]);
918 return 1;
919 }
920
921 if (!strcmp(params,"normal"))
922 op->contr->petmode=pet_normal;
923 else if (!strcmp(params,"sad"))
924 op->contr->petmode=pet_sad;
925 else if (!strcmp(params,"defend"))
926 op->contr->petmode=pet_defend;
927 else if (!strcmp(params,"arena"))
928 op->contr->petmode=pet_arena;
929 else {
930 new_draw_info_format(NDI_UNIQUE, 0, op,
931 "petmode: Unknown options %s, valid options are normal,"
932 "sad (seek and destroy), defend, arena", params);
933 return 0;
934 }
935 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode %s set to %s",
936 (oldtype==op->contr->petmode?"":"now"),
937 types[op->contr->petmode]);
938 return 1;
939}
940
941int command_showpets(object *op, char *params)
942{
943 objectlink *obl, *next;
944 int counter=0, target=0;
945 int have_shown_pet=0;
946 if (params !=NULL) target= atoi(params);
947 for (obl = first_friendly_object; obl != NULL; obl = next) {
948 object *ob = obl->ob;
949 next = obl->next;
950 if (get_owner(ob) == op) {
951 if (target ==0) {
952 if (counter==0)
953 new_draw_info(NDI_UNIQUE, 0, op, "Pets:");
954 new_draw_info_format(NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, &ob->name, ob->level );
955 }
956 else if (!have_shown_pet && ++counter==target) {
957 new_draw_info_format(NDI_UNIQUE, 0, op, "level %d %s", ob->level, &ob->name);
958 new_draw_info_format(NDI_UNIQUE, 0, op, "%d/%d HP, %d/%d SP",
959 ob->stats.hp, ob->stats.maxhp, ob->stats.sp, ob->stats.maxsp);
960 /* this is not a nice way to do this, it should be made to be more like the statistics command */
961 new_draw_info_format(NDI_UNIQUE, 0, op, "Str %d", ob->stats.Str);
962 new_draw_info_format(NDI_UNIQUE, 0, op, "Dex %d", ob->stats.Dex);
963 new_draw_info_format(NDI_UNIQUE, 0, op, "Con %d", ob->stats.Con);
964 new_draw_info_format(NDI_UNIQUE, 0, op, "Int %d", ob->stats.Int);
965 new_draw_info_format(NDI_UNIQUE, 0, op, "Wis %d", ob->stats.Wis);
966 new_draw_info_format(NDI_UNIQUE, 0, op, "Cha %d", ob->stats.Cha);
967 new_draw_info_format(NDI_UNIQUE, 0, op, "Pow %d", ob->stats.Pow);
968 new_draw_info_format(NDI_UNIQUE, 0, op, "wc %d damage %d ac %d ",
969 ob->stats.wc, ob->stats.dam, ob->stats.ac);
970 have_shown_pet=1;
971 }
972 }
973 }
974 if (counter == 0)
975 new_draw_info(NDI_UNIQUE, 0, op, "you have no pets.");
976 else if (target !=0 && have_shown_pet==0)
977 new_draw_info(NDI_UNIQUE, 0, op, "no such pet.");
978 return 0;
979}
980
981int command_usekeys(object *op, char *params)
982{
983 usekeytype oldtype=op->contr->usekeys;
984 static const char* const types[]={"inventory", "keyrings", "containers"};
985
986 if (!params) {
987 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys is set to %s",
988 types[op->contr->usekeys]);
989 return 1;
990 }
991
992 if (!strcmp(params,"inventory"))
993 op->contr->usekeys=key_inventory;
994 else if (!strcmp(params,"keyrings"))
995 op->contr->usekeys=keyrings;
996 else if (!strcmp(params,"containers"))
997 op->contr->usekeys=containers;
998 else {
999 new_draw_info_format(NDI_UNIQUE, 0, op,
1000 "usekeys: Unknown options %s, valid options are inventory, keyrings, containers",
1001 params);
1002 return 0;
1003 }
1004 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys %s set to %s",
1005 (oldtype==op->contr->usekeys?"":"now"),
1006 types[op->contr->usekeys]);
1007 return 1;
1008}
1009
1010int command_resistances(object *op, char *params)
1011{
1012 int i;
1013 if (!op)
1014 return 0;
1015
1016 for (i=0; i<NROFATTACKS; i++) {
1017 if (i==ATNR_INTERNAL) continue;
1018
1019 new_draw_info_format(NDI_UNIQUE, 0, op, "%-20s %+5d",
1020 attacktype_desc[i], op->resist[i]);
1021 }
1022
1023 /* If dragon player, let's display natural resistances */
1024 if ( is_dragon_pl( op ) )
1025 {
1026 int attack;
1027 object* tmp;
1028 for ( tmp = op->inv; tmp != NULL; tmp = tmp->below )
1029 {
1030 if ( ( tmp->type == FORCE ) && ( strcmp( tmp->arch->name, "dragon_skin_force" )== 0 ) )
1031 {
1032 new_draw_info( NDI_UNIQUE, 0, op, "\nNatural skin resistances:" );
1033 for ( attack = 0; attack < NROFATTACKS; attack++ )
1034 {
1035 if ( atnr_is_dragon_enabled( attack ) )
1036 {
1037 new_draw_info_format( NDI_UNIQUE, 0, op, "%s: %d", change_resist_msg[ attack ], tmp->resist[ attack ] );
1038 }
1039 }
1040 break;
1041 }
1042 }
1043 }
1044
1045return 0;
1046}
1047/* 779/*
1048 * Actual commands. 780 * Actual commands.
1049 * Those should be in small separate files (c_object.c, c_wiz.c, cmove.c,...) 781 * Those should be in small separate files (c_object.c, c_wiz.c, cmove.c,...)
1050 */ 782 */
1051 783
1052 784
785static void
1053static void help_topics(object *op, int what) 786help_topics (object *op, int what)
1054{ 787{
1055 DIR *dirp; 788 DIR *dirp;
1056 struct dirent *de; 789 struct dirent *de;
1057 char filename[MAX_BUF], line[80]; 790 char filename[MAX_BUF], line[80];
1058 int namelen, linelen=0; 791 int namelen, linelen = 0;
1059 792
1060 switch (what) { 793 switch (what)
794 {
1061 case 1: 795 case 1:
1062 sprintf(filename, "%s/wizhelp", settings.datadir); 796 sprintf (filename, "%s/wizhelp", settings.datadir);
1063 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:"); 797 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
1064 break; 798 break;
1065 case 3: 799 case 3:
1066 sprintf(filename, "%s/mischelp", settings.datadir); 800 sprintf (filename, "%s/mischelp", settings.datadir);
1067 new_draw_info(NDI_UNIQUE, 0,op, " Misc help:"); 801 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
1068 break; 802 break;
1069 default: 803 default:
1070 sprintf(filename, "%s/help", settings.datadir); 804 sprintf (filename, "%s/help", settings.datadir);
1071 new_draw_info(NDI_UNIQUE, 0,op, " Commands:"); 805 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
1072 break; 806 break;
1073 } 807 }
808
1074 if (!(dirp=opendir(filename))) 809 if (!(dirp = opendir (filename)))
1075 return; 810 return;
1076 811
1077 line[0] ='\0'; 812 line[0] = '\0';
1078 for (de = readdir(dirp); de; de = readdir(dirp)) { 813 while (de = readdir (dirp))
1079 namelen = NAMLEN(de); 814 {
1080 if (namelen <= 2 && *de->d_name == '.' && 815 namelen = strlen (de->d_name);
1081 (namelen == 1 || de->d_name[1] == '.' ) ) 816 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
1082 continue; 817 continue;
1083 linelen +=namelen+1; 818 linelen += namelen + 1;
1084 if (linelen > 42) { 819 if (linelen > 42)
820 {
1085 new_draw_info(NDI_UNIQUE, 0,op, line); 821 new_draw_info (NDI_UNIQUE, 0, op, line);
1086 sprintf(line, " %s", de->d_name); 822 sprintf (line, " %s", de->d_name);
1087 linelen =namelen+1; 823 linelen = namelen + 1;
1088 continue; 824 continue;
1089 } 825 }
1090 strcat(line, " "); 826 strcat (line, " ");
1091 strcat(line, de->d_name); 827 strcat (line, de->d_name);
1092 } 828 }
1093 new_draw_info(NDI_UNIQUE, 0,op, line); 829 new_draw_info (NDI_UNIQUE, 0, op, line);
1094 closedir(dirp); 830 closedir (dirp);
1095} 831}
1096 832
833static void
1097static void show_commands(object *op, int what) 834show_commands (object *op, int what)
1098{ 835{
1099 char line[80]; 836 char line[80];
1100 int i, size, namelen, linelen=0; 837 int i, size, namelen, linelen = 0;
1101 CommArray_s *ap; 838 CommArray_s *ap;
1102 extern CommArray_s Commands[], WizCommands[]; 839 extern CommArray_s Commands[], WizCommands[];
1103 extern const int CommandsSize, WizCommandsSize; 840 extern const int CommandsSize, WizCommandsSize;
1104 841
1105 switch (what) { 842 switch (what)
843 {
1106 case 1: 844 case 1:
1107 ap =WizCommands; 845 ap = WizCommands;
1108 size =WizCommandsSize; 846 size = WizCommandsSize;
1109 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:"); 847 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
1110 break; 848 break;
1111 case 2: 849 case 2:
1112 ap= CommunicationCommands; 850 ap = CommunicationCommands;
1113 size= CommunicationCommandSize; 851 size = CommunicationCommandSize;
1114 new_draw_info(NDI_UNIQUE, 0, op, " Communication commands:"); 852 new_draw_info (NDI_UNIQUE, 0, op, " Communication commands:");
1115 break; 853 break;
1116 default: 854 default:
1117 ap =Commands; 855 ap = Commands;
1118 size =CommandsSize; 856 size = CommandsSize;
1119 new_draw_info(NDI_UNIQUE, 0,op, " Commands:"); 857 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
1120 break; 858 break;
1121 } 859 }
1122 860
1123 line[0] ='\0'; 861 line[0] = '\0';
1124 for (i=0; i<size; i++) { 862 for (i = 0; i < size; i++)
863 {
1125 namelen = strlen(ap[i].name); 864 namelen = strlen (ap[i].name);
1126 linelen +=namelen+1; 865 linelen += namelen + 1;
1127 if (linelen > 42) { 866 if (linelen > 42)
867 {
1128 new_draw_info(NDI_UNIQUE, 0,op, line); 868 new_draw_info (NDI_UNIQUE, 0, op, line);
1129 sprintf(line, " %s", ap[i].name); 869 sprintf (line, " %s", ap[i].name);
1130 linelen =namelen+1; 870 linelen = namelen + 1;
1131 continue; 871 continue;
1132 } 872 }
1133 strcat(line, " "); 873 strcat (line, " ");
1134 strcat(line, ap[i].name); 874 strcat (line, ap[i].name);
1135 } 875 }
1136 new_draw_info(NDI_UNIQUE, 0,op, line); 876 new_draw_info (NDI_UNIQUE, 0, op, line);
1137} 877}
1138 878
1139 879
880int
1140int command_help (object *op, char *params) 881command_help (object *op, char *params)
1141{ 882{
1142 struct stat st; 883 struct stat st;
1143 FILE *fp; 884 FILE *fp;
1144 char filename[MAX_BUF], line[MAX_BUF]; 885 char filename[MAX_BUF], line[MAX_BUF];
1145 int len; 886 int len;
1146 887
1147 if(op != NULL) 888 if (op != NULL)
1148 clear_win_info(op); 889 clear_win_info (op);
1149 890
1150/* 891/*
1151 * Main help page? 892 * Main help page?
1152 */ 893 */
1153 if (!params) { 894 if (!params)
895 {
1154 sprintf(filename, "%s/def_help", settings.datadir); 896 sprintf (filename, "%s/def_help", settings.datadir);
1155 if ((fp=fopen(filename, "r")) == NULL) { 897 if ((fp = fopen (filename, "r")) == NULL)
898 {
1156 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror(errno)); 899 LOG (llevError, "Cannot open help file %s: %s\n", filename, strerror (errno));
900 return 0;
901 }
902 while (fgets (line, MAX_BUF, fp))
903 {
904 line[MAX_BUF - 1] = '\0';
905 len = strlen (line) - 1;
906 if (line[len] == '\n')
907 line[len] = '\0';
908 new_draw_info (NDI_UNIQUE, 0, op, line);
909 }
910 fclose (fp);
1157 return 0; 911 return 0;
1158 } 912 }
1159 while (fgets(line, MAX_BUF, fp)) {
1160 line[MAX_BUF-1] ='\0';
1161 len =strlen(line)-1;
1162 if (line[len] == '\n')
1163 line[len] ='\0';
1164 new_draw_info(NDI_UNIQUE, 0,op, line);
1165 }
1166 fclose(fp);
1167 return 0;
1168 }
1169 913
1170 /* 914 /*
1171 * Topics list 915 * Topics list
1172 */ 916 */
1173 if (!strcmp(params, "topics")) { 917 if (!strcmp (params, "topics"))
918 {
1174 help_topics(op, 3); 919 help_topics (op, 3);
1175 help_topics(op, 0); 920 help_topics (op, 0);
1176 if (QUERY_FLAG(op, FLAG_WIZ)) 921 if (QUERY_FLAG (op, FLAG_WIZ))
1177 help_topics(op, 1); 922 help_topics (op, 1);
1178 return 0; 923 return 0;
1179 } 924 }
1180 925
1181 /* 926 /*
1182 * Commands list 927 * Commands list
1183 */ 928 */
1184 if (!strcmp(params, "commands")) { 929 if (!strcmp (params, "commands"))
930 {
1185 show_commands(op, 0); 931 show_commands (op, 0);
1186 show_commands(op, 2); /* show comm commands */ 932 show_commands (op, 2); /* show comm commands */
1187 if (QUERY_FLAG(op, FLAG_WIZ)) 933 if (QUERY_FLAG (op, FLAG_WIZ))
1188 show_commands(op, 1); 934 show_commands (op, 1);
1189 return 0; 935 return 0;
1190 } 936 }
1191 937
1192 /* 938 /*
1193 * User wants info about command 939 * User wants info about command
1194 */ 940 */
1195 if (strchr(params, '.') || strchr(params, ' ') || strchr(params, '/')) { 941 if (strchr (params, '.') || strchr (params, ' ') || strchr (params, '/'))
942 {
1196 sprintf(line, "Illegal characters in '%s'", params); 943 sprintf (line, "Illegal characters in '%s'", params);
1197 new_draw_info(NDI_UNIQUE, 0,op, line); 944 new_draw_info (NDI_UNIQUE, 0, op, line);
1198 return 0; 945 return 0;
1199 } 946 }
1200 947
1201 sprintf(filename, "%s/mischelp/%s", settings.datadir, params); 948 sprintf (filename, "%s/mischelp/%s", settings.datadir, params);
1202 if (stat(filename, &st) || !S_ISREG(st.st_mode)) { 949 if (stat (filename, &st) || !S_ISREG (st.st_mode))
950 {
1203 if (op) { 951 if (op)
1204 sprintf(filename, "%s/help/%s", settings.datadir, params); 952 {
1205 if (stat(filename, &st) || !S_ISREG(st.st_mode)) {
1206 if (QUERY_FLAG(op, FLAG_WIZ)) {
1207 sprintf(filename, "%s/wizhelp/%s", settings.datadir, params); 953 sprintf (filename, "%s/help/%s", settings.datadir, params);
1208 if (stat(filename, &st) || !S_ISREG(st.st_mode)) 954 if (stat (filename, &st) || !S_ISREG (st.st_mode))
955 {
956 if (QUERY_FLAG (op, FLAG_WIZ))
957 {
958 sprintf (filename, "%s/wizhelp/%s", settings.datadir, params);
959 if (stat (filename, &st) || !S_ISREG (st.st_mode))
960 goto nohelp;
961 }
962 else
1209 goto nohelp; 963 goto nohelp;
1210 } else 964 }
1211 goto nohelp;
1212 } 965 }
1213 } 966 }
1214 }
1215 967
1216 /* 968 /*
1217 * Found that. Just cat it to screen. 969 * Found that. Just cat it to screen.
1218 */ 970 */
1219 if ((fp=fopen(filename, "r")) == NULL) { 971 if ((fp = fopen (filename, "r")) == NULL)
972 {
1220 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror(errno)); 973 LOG (llevError, "Cannot open help file %s: %s\n", filename, strerror (errno));
1221 return 0; 974 return 0;
1222 } 975 }
1223 sprintf(line, "Help about '%s'", params); 976 sprintf (line, "Help about '%s'", params);
1224 new_draw_info(NDI_UNIQUE, 0,op, line); 977 new_draw_info (NDI_UNIQUE, 0, op, line);
1225 while (fgets(line, MAX_BUF, fp)) { 978 while (fgets (line, MAX_BUF, fp))
979 {
1226 line[MAX_BUF-1] ='\0'; 980 line[MAX_BUF - 1] = '\0';
1227 len =strlen(line)-1; 981 len = strlen (line) - 1;
1228 if (line[len] == '\n') 982 if (line[len] == '\n')
1229 line[len] ='\0'; 983 line[len] = '\0';
1230 new_draw_info(NDI_UNIQUE, 0,op, line); 984 new_draw_info (NDI_UNIQUE, 0, op, line);
1231 } 985 }
1232 fclose(fp); 986 fclose (fp);
1233 return 0; 987 return 0;
1234 988
1235 /* 989 /*
1236 * No_help -escape 990 * No_help -escape
1237 */ 991 */
1238 nohelp: 992nohelp:
1239 sprintf(line, "No help available on '%s'", params); 993 sprintf (line, "No help available on '%s'", params);
1240 new_draw_info(NDI_UNIQUE, 0,op, line); 994 new_draw_info (NDI_UNIQUE, 0, op, line);
1241 return 0; 995 return 0;
1242} 996}
1243 997
1244 998
999int
1245int onoff_value(const char *line) 1000onoff_value (const char *line)
1246{ 1001{
1247 int i; 1002 int i;
1248 1003
1249 if (sscanf(line, "%d", &i)) 1004 if (sscanf (line, "%d", &i))
1250 return (i != 0); 1005 return (i != 0);
1251 switch (line[0]) { 1006 switch (line[0])
1007 {
1252 case 'o': 1008 case 'o':
1253 switch (line[1]) { 1009 switch (line[1])
1254 case 'n': return 1; /* on */ 1010 {
1255 default: return 0; /* o[ff] */ 1011 case 'n':
1256 } 1012 return 1; /* on */
1257 case 'y': /* y[es] */ 1013 default:
1258 case 'k': /* k[ylla] */ 1014 return 0; /* o[ff] */
1015 }
1016 case 'y': /* y[es] */
1017 case 'k': /* k[ylla] */
1259 case 's': 1018 case 's':
1260 case 'd': 1019 case 'd':
1261 return 1;
1262 case 'n': /* n[o] */
1263 case 'e': /* e[i] */
1264 case 'u':
1265 default:
1266 return 0;
1267 }
1268}
1269
1270int command_quit (object *op, char *params)
1271{
1272 new_draw_info(NDI_UNIQUE, 0, op, "Quitting will delete your character PERMANENTLY. If you are sure you want to do this, then use the quit_character command instead of quit.");
1273 return 1;
1274}
1275
1276int command_real_quit (object *op, char *params)
1277{
1278 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,
1279 "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1280
1281 op->contr->state = ST_CONFIRM_QUIT;
1282 return 1;
1283 }
1284
1285/*
1286 * don't allow people to exit explore mode. It otherwise becomes
1287 * really easy to abuse this.
1288 */
1289int command_explore (object *op, char *params)
1290{
1291 if (settings.explore_mode == FALSE)
1292 return 1; 1020 return 1;
1293 /* 1021 case 'n': /* n[o] */
1294 * I guess this is the best way to see if we are solo or not. Actually, 1022 case 'e': /* e[i] */
1295 * are there any cases when first_player->next==NULL and we are not solo? 1023 case 'u':
1296 */ 1024 default:
1297 if ((first_player!=op->contr) || (first_player->next!=NULL)) {
1298 new_draw_info(NDI_UNIQUE, 0,op,"You can not enter explore mode if you are in a party");
1299 } else if (op->contr->explore)
1300 new_draw_info(NDI_UNIQUE, 0,op, "There is no return from explore mode");
1301 else {
1302 op->contr->explore=1;
1303 new_draw_info(NDI_UNIQUE, 0,op, "You are now in explore mode");
1304 }
1305 return 1; 1025 return 0;
1026 }
1306} 1027}
1307 1028
1029int
1308int command_sound (object *op, char *params) 1030command_sound (object *op, char *params)
1309{ 1031{
1310 if (op->contr->socket.sound) { 1032 if (op->contr->ns->sound)
1033 {
1311 op->contr->socket.sound=0; 1034 op->contr->ns->sound = 0;
1312 new_draw_info(NDI_UNIQUE, 0,op, "Silence is golden..."); 1035 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1036 }
1037 else
1313 } 1038 {
1314 else {
1315 op->contr->socket.sound=1; 1039 op->contr->ns->sound = 1;
1316 new_draw_info(NDI_UNIQUE, 0,op, "The sounds are enabled."); 1040 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1317 } 1041 }
1042
1318 return 1; 1043 return 1;
1319} 1044}
1320 1045
1321/* Perhaps these should be in player.c, but that file is 1046int
1322 * already a bit big.
1323 */
1324
1325void receive_player_name(object *op,char k) {
1326
1327 if(!check_name(op->contr,op->contr->write_buf+1)) {
1328 get_name(op);
1329 return;
1330 }
1331 op->name = op->contr->write_buf + 1;
1332 op->name_pl = op->contr->write_buf + 1;
1333 new_draw_info(NDI_UNIQUE, 0,op,op->contr->write_buf);
1334 op->contr->name_changed=1;
1335 get_password(op);
1336}
1337
1338void receive_player_password(object *op,char k) {
1339
1340 unsigned int pwd_len=strlen(op->contr->write_buf);
1341 if(pwd_len<=1||pwd_len>17) {
1342 get_name(op);
1343 return;
1344 }
1345 new_draw_info(NDI_UNIQUE, 0,op," "); /* To hide the password better */
1346
1347 if (checkbanned(op->name, op->contr->socket.host)) {
1348 LOG(llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1349 new_draw_info(NDI_UNIQUE|NDI_RED, 0, op, "You are not allowed to play.");
1350 get_name(op);
1351 return;
1352 }
1353
1354 if(op->contr->state==ST_CONFIRM_PASSWORD) {
1355 if(!check_password(op->contr->write_buf+1,op->contr->password)) {
1356 new_draw_info(NDI_UNIQUE, 0,op,"The passwords did not match.");
1357 get_name(op);
1358 return;
1359 }
1360 clear_win_info(op);
1361 display_motd(op);
1362 new_draw_info(NDI_UNIQUE, 0,op," ");
1363 new_draw_info(NDI_UNIQUE, 0,op,"Welcome, Brave New Warrior!");
1364 new_draw_info(NDI_UNIQUE, 0,op," ");
1365 Roll_Again(op);
1366 op->contr->state=ST_ROLL_STAT;
1367 return;
1368 }
1369 strcpy(op->contr->password,crypt_string(op->contr->write_buf+1,NULL));
1370 op->contr->state=ST_ROLL_STAT;
1371 check_login(op);
1372 return;
1373}
1374
1375
1376int explore_mode(void) {
1377 player *pl;
1378
1379 if (settings.explore_mode == TRUE) {
1380 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1381 if (pl->explore)
1382 return 1;
1383 }
1384 return 0;
1385}
1386
1387
1388int command_title (object *op, char *params) 1047command_title (object *op, char *params)
1389{ 1048{
1390 char buf[MAX_BUF]; 1049 char buf[MAX_BUF];
1391 1050
1392 if (settings.set_title == FALSE) { 1051 if (settings.set_title == FALSE)
1052 {
1393 new_draw_info(NDI_UNIQUE, 0, op, "You cannot change your title."); 1053 new_draw_info (NDI_UNIQUE, 0, op, "You cannot change your title.");
1394 return 1; 1054 return 1;
1395 } 1055 }
1396 1056
1397 /* dragon players cannot change titles */ 1057 /* dragon players cannot change titles */
1398 if (is_dragon_pl(op)) { 1058 if (is_dragon_pl (op))
1059 {
1399 new_draw_info(NDI_UNIQUE, 0, op, "Dragons cannot change titles."); 1060 new_draw_info (NDI_UNIQUE, 0, op, "Dragons cannot change titles.");
1400 return 1; 1061 return 1;
1401 }
1402 1062 }
1063
1403 if(params == NULL) { 1064 if (params == NULL)
1065 {
1404 if(op->contr->own_title[0]=='\0') 1066 if (op->contr->own_title[0] == '\0')
1405 sprintf(buf,"Your title is '%s'.", op->contr->title); 1067 sprintf (buf, "Your title is '%s'.", op->contr->title);
1406 else 1068 else
1407 sprintf(buf,"Your title is '%s'.", op->contr->own_title); 1069 sprintf (buf, "Your title is '%s'.", op->contr->own_title);
1408 new_draw_info(NDI_UNIQUE, 0,op,buf); 1070 new_draw_info (NDI_UNIQUE, 0, op, buf);
1409 return 1; 1071 return 1;
1410 } 1072 }
1411 if(strcmp(params, "clear")==0 || strcmp(params, "default")==0) { 1073 if (strcmp (params, "clear") == 0 || strcmp (params, "default") == 0)
1074 {
1412 if(op->contr->own_title[0]=='\0') 1075 if (op->contr->own_title[0] == '\0')
1413 new_draw_info(NDI_UNIQUE, 0,op,"Your title is the default title."); 1076 new_draw_info (NDI_UNIQUE, 0, op, "Your title is the default title.");
1414 else 1077 else
1415 new_draw_info(NDI_UNIQUE, 0,op,"Title set to default."); 1078 new_draw_info (NDI_UNIQUE, 0, op, "Title set to default.");
1416 op->contr->own_title[0]='\0'; 1079 op->contr->own_title[0] = '\0';
1417 return 1; 1080 return 1;
1418 } 1081 }
1419 1082
1420 if((int)strlen(params) >= MAX_NAME) { 1083 if ((int) strlen (params) >= MAX_NAME)
1084 {
1421 new_draw_info(NDI_UNIQUE, 0,op,"Title too long."); 1085 new_draw_info (NDI_UNIQUE, 0, op, "Title too long.");
1422 return 1; 1086 return 1;
1423 } 1087 }
1424 strcpy(op->contr->own_title, params); 1088 strcpy (op->contr->own_title, params);
1425 return 1; 1089 return 1;
1426} 1090}
1427 1091
1428int command_save (object *op, char *params) 1092int
1429{
1430// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1431// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1432// } else
1433 if (!op->stats.exp) {
1434 new_draw_info(NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1435 } else {
1436 if(save_player(op,1))
1437 new_draw_info(NDI_UNIQUE, 0,op,"You have been saved.");
1438 else
1439 new_draw_info(NDI_UNIQUE, 0,op,"SAVE FAILED!");
1440 }
1441 return 1;
1442}
1443
1444
1445int command_peaceful (object *op, char *params) 1093command_peaceful (object *op, char *params)
1446{ 1094{
1447 new_draw_info(NDI_UNIQUE, 0, op, 1095 new_draw_info (NDI_UNIQUE, 0, op,
1448 "You cannot change your peaceful setting with this command." 1096 "You cannot change your peaceful setting with this command."
1449 " Please speak to the priest in the temple of Gorokh" 1097 " Please speak to the priest in the temple of Gorokh"
1450 " if you want to become hostile or in temple of Valriel" 1098 " if you want to become hostile or in temple of Valriel" " if you want to become peaceful again.");
1451 " if you want to become peaceful again."
1452 );
1453 1099
1454/* 1100/*
1455 if((op->contr->peaceful=!op->contr->peaceful)) 1101 if((op->contr->peaceful=!op->contr->peaceful))
1456 new_draw_info(NDI_UNIQUE, 0,op,"You will not attack other players."); 1102 new_draw_info(NDI_UNIQUE, 0,op,"You will not attack other players.");
1457 else 1103 else
1458 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1104 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1459*/ 1105*/
1460 return 1; 1106 return 1;
1461} 1107}
1462 1108
1463 1109int
1464
1465int command_wimpy (object *op, char *params) 1110command_wimpy (object *op, char *params)
1466{ 1111{
1467 int i; 1112 int i;
1468 char buf[MAX_BUF]; 1113 char buf[MAX_BUF];
1469 1114
1470 if (params==NULL || !sscanf(params, "%d", &i)) { 1115 if (params == NULL || !sscanf (params, "%d", &i))
1116 {
1471 sprintf(buf, "Your current wimpy level is %d.", op->run_away); 1117 sprintf (buf, "Your current wimpy level is %d.", op->run_away);
1472 new_draw_info(NDI_UNIQUE, 0,op, buf); 1118 new_draw_info (NDI_UNIQUE, 0, op, buf);
1473 return 1; 1119 return 1;
1474 } 1120 }
1475 sprintf(buf, "Your new wimpy level is %d.", i); 1121 sprintf (buf, "Your new wimpy level is %d.", i);
1476 new_draw_info(NDI_UNIQUE, 0,op, buf); 1122 new_draw_info (NDI_UNIQUE, 0, op, buf);
1477 op->run_away = i; 1123 op->run_away = i;
1478 return 1; 1124 return 1;
1479} 1125}
1480 1126
1481 1127int
1482int command_brace (object *op, char *params) 1128command_brace (object *op, char *params)
1483{ 1129{
1484 if (!params) 1130 if (!params)
1485 op->contr->braced =!op->contr->braced; 1131 op->contr->braced = !op->contr->braced;
1486 else 1132 else
1487 op->contr->braced =onoff_value(params); 1133 op->contr->braced = onoff_value (params);
1488 1134
1489 if(op->contr->braced) 1135 if (op->contr->braced)
1490 new_draw_info(NDI_UNIQUE, 0,op, "You are braced."); 1136 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1491 else 1137 else
1492 new_draw_info(NDI_UNIQUE, 0,op, "Not braced."); 1138 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1493 1139
1494 fix_player(op); 1140 op->update_stats ();
1495 return 0; 1141 return 0;
1496} 1142}
1497 1143
1498int command_style_map_info(object *op, char *params) 1144int
1145command_kill_pets (object *op, char *params)
1499{ 1146{
1500 extern mapstruct *styles; 1147 objectlink *obl, *next;
1501 mapstruct *mp; 1148 int counter = 0, removecount = 0;
1502 int maps_used=0, mapmem=0, objects_used=0, x,y;
1503 object *tmp;
1504 1149
1505 for (mp = styles; mp!=NULL; mp=mp->next) { 1150 if (params == NULL)
1506 maps_used++; 1151 {
1507 mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct); 1152 terminate_all_pets (op);
1508 for (x=0; x<MAP_WIDTH(mp); x++) { 1153 new_draw_info (NDI_UNIQUE, 0, op, "Your pets have been killed.");
1509 for (y=0; y<MAP_HEIGHT(mp); y++) { 1154 }
1510 for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above) 1155 else
1511 objects_used++; 1156 {
1157 int target = atoi (params);
1158
1159 for (obl = first_friendly_object; obl != NULL; obl = next)
1160 {
1161 object *ob = obl->ob;
1162
1163 next = obl->next;
1164 if (ob->owner == op)
1165 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1166 {
1167 ob->destroy ();
1168 removecount++;
1512 } 1169 }
1513 } 1170 }
1514 }
1515 new_draw_info_format(NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1516 new_draw_info(NDI_UNIQUE, 0, op, "Memory used, not");
1517 new_draw_info_format(NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1518 new_draw_info_format(NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
1519 new_draw_info_format(NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof(object));
1520 return 0;
1521}
1522
1523int command_kill_pets(object *op, char *params)
1524{
1525 objectlink *obl, *next;
1526 int counter=0, removecount=0;
1527 if (params == NULL) {
1528 terminate_all_pets(op);
1529 new_draw_info(NDI_UNIQUE, 0, op, "Your pets have been killed.");
1530 }
1531 else {
1532 int target = atoi(params);
1533 for(obl = first_friendly_object; obl != NULL; obl = next) {
1534 object *ob = obl->ob;
1535 next = obl->next;
1536 if (get_owner(ob) == op)
1537 if (++counter==target || (target==0 && !strcasecmp(ob->name, params))) {
1538 if (!QUERY_FLAG(ob, FLAG_REMOVED))
1539 remove_ob(ob);
1540 remove_friendly_object(ob);
1541 free_object(ob);
1542 removecount++;
1543 }
1544 }
1545 if (removecount!=0) 1171 if (removecount != 0)
1546 new_draw_info_format(NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1172 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);
1547 else 1173 else
1548 new_draw_info(NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n"); 1174 new_draw_info (NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n");
1549 } 1175 }
1550 return 0; 1176 return 0;
1551} 1177}
1552

Diff Legend

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