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

Comparing deliantra/server/server/c_misc.C (file contents):
Revision 1.6 by root, Mon Sep 4 11:08:00 2006 UTC vs.
Revision 1.14 by root, Tue Nov 7 16:30:55 2006 UTC

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

Diff Legend

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