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.3 by root, Tue Aug 29 08:01:37 2006 UTC vs.
Revision 1.7 by root, Sun Sep 10 15:59:57 2006 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines