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.13 by root, Mon Oct 2 00:22:01 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 dump_object (op->below);
560 new_draw_info(NDI_UNIQUE, 0,op,errmsg); 459 new_draw_info (NDI_UNIQUE, 0, op, errmsg);
561 /* Let's push that item on the dm's stack */ 460 /* Let's push that item on the dm's stack */
562 dm_stack_push( op->contr, op->below->count ); 461 dm_stack_push (op->contr, op->below->count);
563 } 462 }
463 return 0;
464}
465
466int
467command_dumpallobjects (object *op, char *params)
468{
469 dump_all_objects ();
470 return 0;
471}
472
473int
474command_dumpfriendlyobjects (object *op, char *params)
475{
476 dump_friendly_objects ();
477 return 0;
478}
479
480int
481command_dumpallarchetypes (object *op, char *params)
482{
483 dump_all_archetypes ();
484 return 0;
485}
486
487int
488command_dumpmap (object *op, char *params)
489{
490 if (op)
491 dump_map (op->map);
492 return 0;
493}
494
495int
496command_dumpallmaps (object *op, char *params)
497{
498 dump_all_maps ();
499 return 0;
500}
501
502int
503command_printlos (object *op, char *params)
504{
505 if (op)
506 print_los (op);
507 return 0;
508}
509
510
511int
512command_version (object *op, char *params)
513{
514 version (op);
515 return 0;
516}
517
518
519#ifndef BUG_LOG
520# define BUG_LOG "bug_log"
521#endif
522void
523bug_report (const char *reportstring)
524{
525 FILE *fp;
526
527 if ((fp = fopen (BUG_LOG, "a")) != NULL)
528 {
529 fprintf (fp, "%s\n", reportstring);
530 fclose (fp);
531 }
532 else
533 {
534 LOG (llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror (errno));
535 }
536}
537
538int
539command_output_sync (object *op, char *params)
540{
541 int val;
542
543 if (!params)
544 {
545 new_draw_info_format (NDI_UNIQUE, 0, op, "Output sync time is presently %d", op->contr->outputs_sync);
546 return 1;
547 }
548 val = atoi (params);
549 if (val > 0)
550 {
551 op->contr->outputs_sync = val;
552 new_draw_info_format (NDI_UNIQUE, 0, op, "Output sync time now set to %d", op->contr->outputs_sync);
553 }
554 else
555 new_draw_info (NDI_UNIQUE, 0, op, "Invalid value for output_sync.");
556
564 return 0; 557 return 1;
565} 558}
566 559
560int
561command_output_count (object *op, char *params)
562{
563 int val;
564
565 if (!params)
566 {
567 new_draw_info_format (NDI_UNIQUE, 0, op, "Output count is presently %d", op->contr->outputs_count);
568 return 1;
569 }
570 val = atoi (params);
571 if (val > 0)
572 {
573 op->contr->outputs_count = val;
574 new_draw_info_format (NDI_UNIQUE, 0, op, "Output count now set to %d", op->contr->outputs_count);
575 }
576 else
577 new_draw_info (NDI_UNIQUE, 0, op, "Invalid value for output_count.");
578
579 return 1;
580}
581
582int
567int command_wizpass (object *op, char *params) 583command_listen (object *op, char *params)
568{ 584{
569 int i; 585 int i;
570 586
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)) { 587 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 } 588 {
589 new_draw_info_format (NDI_UNIQUE, 0, op, "Set listen to what (presently %d)?", op->contr->listening);
590 return 1;
591 }
721 op->contr->listening=(char) i; 592 op->contr->listening = (char) i;
722 new_draw_info_format(NDI_UNIQUE, 0, op, 593 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; 594 return 1;
725} 595}
726 596
727/* Prints out some useful information for the character. Everything we print 597/* 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 - 598 * 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 599 * rather, we are making it convenient to find the values. params have
730 * no meaning here. 600 * no meaning here.
731 */ 601 */
602int
732int command_statistics(object *pl, char *params) 603command_statistics (object *pl, char *params)
733{ 604{
734 if (!pl->contr) return 1; 605 if (!pl->contr)
606 return 1;
735#ifndef WIN32 607#ifndef WIN32
736 new_draw_info_format(NDI_UNIQUE, 0, pl," Experience: %lld",pl->stats.exp); 608 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)); 609 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
738#else 610#else
739 new_draw_info_format(NDI_UNIQUE, 0, pl," Experience: %I64d",pl->stats.exp); 611 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)); 612 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %I64d", level_exp (pl->level + 1, pl->expmul));
741#endif 613#endif
742 new_draw_info(NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 614 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
743 615
744 new_draw_info_format(NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 616 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); 617 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", 618 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); 619 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", 620 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); 621 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", 622 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); 623 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", 624 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); 625 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", 626 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); 627 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", 628 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); 629 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"); 630 new_draw_info_format (NDI_UNIQUE, 0, pl, "\nAttack Mode: %s", pl->contr->peaceful ? "Peaceful" : "Hostile");
759 631
760 /* Can't think of anything else to print right now */ 632 /* Can't think of anything else to print right now */
761 return 0; 633 return 0;
762} 634}
763 635
636int
764int command_fix_me(object *op, char *params) 637command_fix_me (object *op, char *params)
765{ 638{
766 sum_weight(op); 639 sum_weight (op);
767 fix_player(op); 640 fix_player (op);
768 return 1; 641 return 1;
769} 642}
770 643
644int
771int command_players(object *op, char *paramss) 645command_players (object *op, char *paramss)
772{ 646{
773 char buf[MAX_BUF]; 647 char buf[MAX_BUF];
774 char *t; 648 char *t;
775 DIR *Dir; 649 DIR *Dir;
776 650
777 sprintf(buf,"%s/%s/",settings.localdir,settings.playerdir); 651 sprintf (buf, "%s/%s/", settings.localdir, settings.playerdir);
778 t=buf+strlen(buf); 652 t = buf + strlen (buf);
779 if ((Dir=opendir(buf))!=NULL) { 653 if ((Dir = opendir (buf)) != NULL)
654 {
780 const struct dirent *Entry; 655 const struct dirent *Entry;
781 656
782 while ((Entry=readdir(Dir))!=NULL) { 657 while ((Entry = readdir (Dir)) != NULL)
658 {
783 /* skip '.' , '..' */ 659 /* skip '.' , '..' */
784 if (!((Entry->d_name[0]=='.' && Entry->d_name[1]=='\0') || 660 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
785 (Entry->d_name[0]=='.' && Entry->d_name[1]=='.' && Entry->d_name[2]=='\0'))) 661 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
786 { 662 {
787 struct stat Stat; 663 struct stat Stat;
788 664
789 strcpy(t,Entry->d_name); 665 strcpy (t, Entry->d_name);
790 if (stat(buf,&Stat)==0) { 666 if (stat (buf, &Stat) == 0)
667 {
791 /* This was not posix compatible 668 /* This was not posix compatible
792 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) { 669 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) {
793 */ 670 */
794 if (S_ISDIR(Stat.st_mode)){ 671 if (S_ISDIR (Stat.st_mode))
672 {
795 char buf2[MAX_BUF]; 673 char buf2[MAX_BUF];
796 struct tm *tm=localtime(&Stat.st_mtime); 674 struct tm *tm = localtime (&Stat.st_mtime);
675
797 sprintf(buf2,"%s\t%04d %02d %02d %02d %02d %02d", 676 sprintf (buf2, "%s\t%04d %02d %02d %02d %02d %02d",
798 Entry->d_name, 677 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); 678 new_draw_info (NDI_UNIQUE, 0, op, buf2);
806 } 679 }
807 } 680 }
808 } 681 }
809 } 682 }
810 } 683 }
811 closedir(Dir); 684 closedir (Dir);
812 return 0; 685 return 0;
813} 686}
814 687
815 688
816 689
690int
817int command_logs (object *op, char *params) 691command_logs (object *op, char *params)
818{ 692{
819 int i; 693 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills.");
820 int first;
821 694
822 first=1; 695 return 1;
823 for(i=2; i<socket_info.allocated_sockets; i++) { 696}
824 if (init_sockets[i].old_mode == Old_Listen) { 697
825 if (first) { 698int
699command_applymode (object *op, char *params)
700{
701 unapplymode unapply = op->contr->unapply;
702 static const char *const types[] = { "nochoice", "never", "always" };
703
704 if (!params)
705 {
706 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode is set to %s", types[op->contr->unapply]);
707 return 1;
708 }
709
710 if (!strcmp (params, "nochoice"))
711 op->contr->unapply = unapply_nochoice;
712 else if (!strcmp (params, "never"))
713 op->contr->unapply = unapply_never;
714 else if (!strcmp (params, "always"))
715 op->contr->unapply = unapply_always;
716 else
717 {
718 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params);
719 return 0;
720 }
721 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s",
722 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]);
723 return 1;
724}
725
726int
727command_bowmode (object *op, char *params)
728{
729 bowtype_t oldtype = op->contr->bowtype;
730 static const char *const types[] = { "normal", "threewide", "spreadshot", "firenorth",
731 "firene", "fireeast", "firese", "firesouth",
732 "firesw", "firewest", "firenw", "bestarrow"
733 };
734 char buf[MAX_BUF];
735 int i, found;
736
737 if (!params)
738 {
739 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode is set to %s", types[op->contr->bowtype]);
740 return 1;
741 }
742
743 for (i = 0, found = 0; i <= bow_bestarrow; i++)
744 {
745 if (!strcmp (params, types[i]))
746 {
747 found++;
748 op->contr->bowtype = (bowtype_t) i;
749 break;
750 }
751 }
752 if (!found)
753 {
754 sprintf (buf, "bowmode: Unknown options %s, valid options are:", params);
755 for (i = 0; i <= bow_bestarrow; i++)
756 {
757 strcat (buf, " ");
758 strcat (buf, types[i]);
759 if (i < bow_nw)
760 strcat (buf, ",");
761 else
762 strcat (buf, ".");
763 }
764 new_draw_info_format (NDI_UNIQUE, 0, op, buf);
765 return 0;
766 }
767 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]);
768 return 1;
769}
770
771int
772command_petmode (object *op, char *params)
773{
774 petmode_t oldtype = op->contr->petmode;
775 static const char *const types[] = { "normal", "sad", "defend", "arena" };
776
777 if (!params)
778 {
779 new_draw_info_format (NDI_UNIQUE, 0, op, "petmode is set to %s", types[op->contr->petmode]);
780 return 1;
781 }
782
783 if (!strcmp (params, "normal"))
784 op->contr->petmode = pet_normal;
785 else if (!strcmp (params, "sad"))
786 op->contr->petmode = pet_sad;
787 else if (!strcmp (params, "defend"))
788 op->contr->petmode = pet_defend;
789 else if (!strcmp (params, "arena"))
790 op->contr->petmode = pet_arena;
791 else
792 {
793 new_draw_info_format (NDI_UNIQUE, 0, op,
794 "petmode: Unknown options %s, valid options are normal," "sad (seek and destroy), defend, arena", params);
795 return 0;
796 }
797 new_draw_info_format (NDI_UNIQUE, 0, op, "petmode %s set to %s", (oldtype == op->contr->petmode ? "" : "now"), types[op->contr->petmode]);
798 return 1;
799}
800
801int
802command_showpets (object *op, char *params)
803{
804 objectlink *obl, *next;
805 int counter = 0, target = 0;
806 int have_shown_pet = 0;
807
808 if (params != NULL)
809 target = atoi (params);
810 for (obl = first_friendly_object; obl != NULL; obl = next)
811 {
812 object *ob = obl->ob;
813
814 next = obl->next;
815 if (get_owner (ob) == op)
816 {
817 if (target == 0)
818 {
819 if (counter == 0)
826 new_draw_info(NDI_UNIQUE,0,op,"Kill-logs are sent to:"); 820 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
827 first=0; 821 new_draw_info_format (NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, &ob->name, ob->level);
828 } 822 }
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) { 823 else if (!have_shown_pet && ++counter == target)
824 {
957 new_draw_info_format(NDI_UNIQUE, 0, op, "level %d %s", ob->level, &ob->name); 825 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", 826 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 */ 827 /* 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); 828 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); 829 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); 830 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); 831 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); 832 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); 833 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); 834 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 ", 835 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; 836 have_shown_pet = 1;
971 } 837 }
972 } 838 }
973 } 839 }
974 if (counter == 0) 840 if (counter == 0)
975 new_draw_info(NDI_UNIQUE, 0, op, "you have no pets."); 841 new_draw_info (NDI_UNIQUE, 0, op, "you have no pets.");
976 else if (target !=0 && have_shown_pet==0) 842 else if (target != 0 && have_shown_pet == 0)
977 new_draw_info(NDI_UNIQUE, 0, op, "no such pet."); 843 new_draw_info (NDI_UNIQUE, 0, op, "no such pet.");
844 return 0;
845}
846
847int
848command_usekeys (object *op, char *params)
849{
850 usekeytype oldtype = op->contr->usekeys;
851 static const char *const types[] = { "inventory", "keyrings", "containers" };
852
853 if (!params)
854 {
855 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys is set to %s", types[op->contr->usekeys]);
856 return 1;
857 }
858
859 if (!strcmp (params, "inventory"))
860 op->contr->usekeys = key_inventory;
861 else if (!strcmp (params, "keyrings"))
862 op->contr->usekeys = keyrings;
863 else if (!strcmp (params, "containers"))
864 op->contr->usekeys = containers;
865 else
866 {
867 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys: Unknown options %s, valid options are inventory, keyrings, containers", params);
868 return 0;
869 }
870 new_draw_info_format (NDI_UNIQUE, 0, op, "usekeys %s set to %s", (oldtype == op->contr->usekeys ? "" : "now"), types[op->contr->usekeys]);
871 return 1;
872}
873
874int
875command_resistances (object *op, char *params)
876{
877 int i;
878
879 if (!op)
978 return 0; 880 return 0;
979}
980 881
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++) { 882 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 } 883 {
884 if (i == ATNR_INTERNAL)
885 continue;
1022 886
887 new_draw_info_format (NDI_UNIQUE, 0, op, "%-20s %+5d", attacktype_desc[i], op->resist[i]);
888 }
889
1023 /* If dragon player, let's display natural resistances */ 890 /* If dragon player, let's display natural resistances */
1024 if ( is_dragon_pl( op ) ) 891 if (is_dragon_pl (op))
892 {
893 int attack;
894 object *tmp;
895
896 for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1025 { 897 {
1026 int attack; 898 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 { 899 {
1030 if ( ( tmp->type == FORCE ) && ( strcmp( tmp->arch->name, "dragon_skin_force" )== 0 ) ) 900 new_draw_info (NDI_UNIQUE, 0, op, "\nNatural skin resistances:");
901 for (attack = 0; attack < NROFATTACKS; attack++)
1031 { 902 {
1032 new_draw_info( NDI_UNIQUE, 0, op, "\nNatural skin resistances:" ); 903 if (atnr_is_dragon_enabled (attack))
1033 for ( attack = 0; attack < NROFATTACKS; attack++ )
1034 { 904 {
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 ] ); 905 new_draw_info_format (NDI_UNIQUE, 0, op, "%s: %d", change_resist_msg[attack], tmp->resist[attack]);
1038 }
1039 } 906 }
1040 break;
1041 } 907 }
908 break;
1042 } 909 }
1043 } 910 }
911 }
1044 912
1045return 0; 913 return 0;
1046} 914}
915
1047/* 916/*
1048 * Actual commands. 917 * Actual commands.
1049 * Those should be in small separate files (c_object.c, c_wiz.c, cmove.c,...) 918 * Those should be in small separate files (c_object.c, c_wiz.c, cmove.c,...)
1050 */ 919 */
1051 920
1052 921
922static void
1053static void help_topics(object *op, int what) 923help_topics (object *op, int what)
1054{ 924{
1055 DIR *dirp; 925 DIR *dirp;
1056 struct dirent *de; 926 struct dirent *de;
1057 char filename[MAX_BUF], line[80]; 927 char filename[MAX_BUF], line[80];
1058 int namelen, linelen=0; 928 int namelen, linelen = 0;
1059 929
1060 switch (what) { 930 switch (what)
931 {
1061 case 1: 932 case 1:
1062 sprintf(filename, "%s/wizhelp", settings.datadir); 933 sprintf (filename, "%s/wizhelp", settings.datadir);
1063 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:"); 934 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
1064 break; 935 break;
1065 case 3: 936 case 3:
1066 sprintf(filename, "%s/mischelp", settings.datadir); 937 sprintf (filename, "%s/mischelp", settings.datadir);
1067 new_draw_info(NDI_UNIQUE, 0,op, " Misc help:"); 938 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
1068 break; 939 break;
1069 default: 940 default:
1070 sprintf(filename, "%s/help", settings.datadir); 941 sprintf (filename, "%s/help", settings.datadir);
1071 new_draw_info(NDI_UNIQUE, 0,op, " Commands:"); 942 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
1072 break; 943 break;
1073 } 944 }
1074 if (!(dirp=opendir(filename))) 945 if (!(dirp = opendir (filename)))
1075 return; 946 return;
1076 947
1077 line[0] ='\0'; 948 line[0] = '\0';
1078 for (de = readdir(dirp); de; de = readdir(dirp)) { 949 for (de = readdir (dirp); de; de = readdir (dirp))
950 {
1079 namelen = NAMLEN(de); 951 namelen = NAMLEN (de);
1080 if (namelen <= 2 && *de->d_name == '.' && 952 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
1081 (namelen == 1 || de->d_name[1] == '.' ) )
1082 continue; 953 continue;
1083 linelen +=namelen+1; 954 linelen += namelen + 1;
1084 if (linelen > 42) { 955 if (linelen > 42)
956 {
1085 new_draw_info(NDI_UNIQUE, 0,op, line); 957 new_draw_info (NDI_UNIQUE, 0, op, line);
1086 sprintf(line, " %s", de->d_name); 958 sprintf (line, " %s", de->d_name);
1087 linelen =namelen+1; 959 linelen = namelen + 1;
1088 continue; 960 continue;
1089 } 961 }
1090 strcat(line, " "); 962 strcat (line, " ");
1091 strcat(line, de->d_name); 963 strcat (line, de->d_name);
1092 } 964 }
1093 new_draw_info(NDI_UNIQUE, 0,op, line); 965 new_draw_info (NDI_UNIQUE, 0, op, line);
1094 closedir(dirp); 966 closedir (dirp);
1095} 967}
1096 968
969static void
1097static void show_commands(object *op, int what) 970show_commands (object *op, int what)
1098{ 971{
1099 char line[80]; 972 char line[80];
1100 int i, size, namelen, linelen=0; 973 int i, size, namelen, linelen = 0;
1101 CommArray_s *ap; 974 CommArray_s *ap;
1102 extern CommArray_s Commands[], WizCommands[]; 975 extern CommArray_s Commands[], WizCommands[];
1103 extern const int CommandsSize, WizCommandsSize; 976 extern const int CommandsSize, WizCommandsSize;
1104 977
1105 switch (what) { 978 switch (what)
979 {
1106 case 1: 980 case 1:
1107 ap =WizCommands; 981 ap = WizCommands;
1108 size =WizCommandsSize; 982 size = WizCommandsSize;
1109 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:"); 983 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
1110 break; 984 break;
1111 case 2: 985 case 2:
1112 ap= CommunicationCommands; 986 ap = CommunicationCommands;
1113 size= CommunicationCommandSize; 987 size = CommunicationCommandSize;
1114 new_draw_info(NDI_UNIQUE, 0, op, " Communication commands:"); 988 new_draw_info (NDI_UNIQUE, 0, op, " Communication commands:");
1115 break; 989 break;
1116 default: 990 default:
1117 ap =Commands; 991 ap = Commands;
1118 size =CommandsSize; 992 size = CommandsSize;
1119 new_draw_info(NDI_UNIQUE, 0,op, " Commands:"); 993 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
1120 break; 994 break;
1121 } 995 }
1122 996
1123 line[0] ='\0'; 997 line[0] = '\0';
1124 for (i=0; i<size; i++) { 998 for (i = 0; i < size; i++)
999 {
1125 namelen = strlen(ap[i].name); 1000 namelen = strlen (ap[i].name);
1126 linelen +=namelen+1; 1001 linelen += namelen + 1;
1127 if (linelen > 42) { 1002 if (linelen > 42)
1003 {
1128 new_draw_info(NDI_UNIQUE, 0,op, line); 1004 new_draw_info (NDI_UNIQUE, 0, op, line);
1129 sprintf(line, " %s", ap[i].name); 1005 sprintf (line, " %s", ap[i].name);
1130 linelen =namelen+1; 1006 linelen = namelen + 1;
1131 continue; 1007 continue;
1132 } 1008 }
1133 strcat(line, " "); 1009 strcat (line, " ");
1134 strcat(line, ap[i].name); 1010 strcat (line, ap[i].name);
1135 } 1011 }
1136 new_draw_info(NDI_UNIQUE, 0,op, line); 1012 new_draw_info (NDI_UNIQUE, 0, op, line);
1137} 1013}
1138 1014
1139 1015
1016int
1140int command_help (object *op, char *params) 1017command_help (object *op, char *params)
1141{ 1018{
1142 struct stat st; 1019 struct stat st;
1143 FILE *fp; 1020 FILE *fp;
1144 char filename[MAX_BUF], line[MAX_BUF]; 1021 char filename[MAX_BUF], line[MAX_BUF];
1145 int len; 1022 int len;
1146 1023
1147 if(op != NULL) 1024 if (op != NULL)
1148 clear_win_info(op); 1025 clear_win_info (op);
1149 1026
1150/* 1027/*
1151 * Main help page? 1028 * Main help page?
1152 */ 1029 */
1153 if (!params) { 1030 if (!params)
1031 {
1154 sprintf(filename, "%s/def_help", settings.datadir); 1032 sprintf (filename, "%s/def_help", settings.datadir);
1155 if ((fp=fopen(filename, "r")) == NULL) { 1033 if ((fp = fopen (filename, "r")) == NULL)
1034 {
1156 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror(errno)); 1035 LOG (llevError, "Cannot open help file %s: %s\n", filename, strerror (errno));
1036 return 0;
1037 }
1038 while (fgets (line, MAX_BUF, fp))
1039 {
1040 line[MAX_BUF - 1] = '\0';
1041 len = strlen (line) - 1;
1042 if (line[len] == '\n')
1043 line[len] = '\0';
1044 new_draw_info (NDI_UNIQUE, 0, op, line);
1045 }
1046 fclose (fp);
1157 return 0; 1047 return 0;
1158 } 1048 }
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 1049
1170 /* 1050 /*
1171 * Topics list 1051 * Topics list
1172 */ 1052 */
1173 if (!strcmp(params, "topics")) { 1053 if (!strcmp (params, "topics"))
1054 {
1174 help_topics(op, 3); 1055 help_topics (op, 3);
1175 help_topics(op, 0); 1056 help_topics (op, 0);
1176 if (QUERY_FLAG(op, FLAG_WIZ)) 1057 if (QUERY_FLAG (op, FLAG_WIZ))
1177 help_topics(op, 1); 1058 help_topics (op, 1);
1178 return 0; 1059 return 0;
1179 } 1060 }
1180 1061
1181 /* 1062 /*
1182 * Commands list 1063 * Commands list
1183 */ 1064 */
1184 if (!strcmp(params, "commands")) { 1065 if (!strcmp (params, "commands"))
1066 {
1185 show_commands(op, 0); 1067 show_commands (op, 0);
1186 show_commands(op, 2); /* show comm commands */ 1068 show_commands (op, 2); /* show comm commands */
1187 if (QUERY_FLAG(op, FLAG_WIZ)) 1069 if (QUERY_FLAG (op, FLAG_WIZ))
1188 show_commands(op, 1); 1070 show_commands (op, 1);
1189 return 0; 1071 return 0;
1190 } 1072 }
1191 1073
1192 /* 1074 /*
1193 * User wants info about command 1075 * User wants info about command
1194 */ 1076 */
1195 if (strchr(params, '.') || strchr(params, ' ') || strchr(params, '/')) { 1077 if (strchr (params, '.') || strchr (params, ' ') || strchr (params, '/'))
1078 {
1196 sprintf(line, "Illegal characters in '%s'", params); 1079 sprintf (line, "Illegal characters in '%s'", params);
1197 new_draw_info(NDI_UNIQUE, 0,op, line); 1080 new_draw_info (NDI_UNIQUE, 0, op, line);
1198 return 0; 1081 return 0;
1199 } 1082 }
1200 1083
1201 sprintf(filename, "%s/mischelp/%s", settings.datadir, params); 1084 sprintf (filename, "%s/mischelp/%s", settings.datadir, params);
1202 if (stat(filename, &st) || !S_ISREG(st.st_mode)) { 1085 if (stat (filename, &st) || !S_ISREG (st.st_mode))
1086 {
1203 if (op) { 1087 if (op)
1204 sprintf(filename, "%s/help/%s", settings.datadir, params); 1088 {
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); 1089 sprintf (filename, "%s/help/%s", settings.datadir, params);
1208 if (stat(filename, &st) || !S_ISREG(st.st_mode)) 1090 if (stat (filename, &st) || !S_ISREG (st.st_mode))
1091 {
1092 if (QUERY_FLAG (op, FLAG_WIZ))
1093 {
1094 sprintf (filename, "%s/wizhelp/%s", settings.datadir, params);
1095 if (stat (filename, &st) || !S_ISREG (st.st_mode))
1096 goto nohelp;
1097 }
1098 else
1209 goto nohelp; 1099 goto nohelp;
1210 } else 1100 }
1211 goto nohelp;
1212 } 1101 }
1213 } 1102 }
1214 }
1215 1103
1216 /* 1104 /*
1217 * Found that. Just cat it to screen. 1105 * Found that. Just cat it to screen.
1218 */ 1106 */
1219 if ((fp=fopen(filename, "r")) == NULL) { 1107 if ((fp = fopen (filename, "r")) == NULL)
1108 {
1220 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror(errno)); 1109 LOG (llevError, "Cannot open help file %s: %s\n", filename, strerror (errno));
1221 return 0; 1110 return 0;
1222 } 1111 }
1223 sprintf(line, "Help about '%s'", params); 1112 sprintf (line, "Help about '%s'", params);
1224 new_draw_info(NDI_UNIQUE, 0,op, line); 1113 new_draw_info (NDI_UNIQUE, 0, op, line);
1225 while (fgets(line, MAX_BUF, fp)) { 1114 while (fgets (line, MAX_BUF, fp))
1115 {
1226 line[MAX_BUF-1] ='\0'; 1116 line[MAX_BUF - 1] = '\0';
1227 len =strlen(line)-1; 1117 len = strlen (line) - 1;
1228 if (line[len] == '\n') 1118 if (line[len] == '\n')
1229 line[len] ='\0'; 1119 line[len] = '\0';
1230 new_draw_info(NDI_UNIQUE, 0,op, line); 1120 new_draw_info (NDI_UNIQUE, 0, op, line);
1231 } 1121 }
1232 fclose(fp); 1122 fclose (fp);
1233 return 0; 1123 return 0;
1234 1124
1235 /* 1125 /*
1236 * No_help -escape 1126 * No_help -escape
1237 */ 1127 */
1238 nohelp: 1128nohelp:
1239 sprintf(line, "No help available on '%s'", params); 1129 sprintf (line, "No help available on '%s'", params);
1240 new_draw_info(NDI_UNIQUE, 0,op, line); 1130 new_draw_info (NDI_UNIQUE, 0, op, line);
1241 return 0; 1131 return 0;
1242} 1132}
1243 1133
1244 1134
1135int
1245int onoff_value(const char *line) 1136onoff_value (const char *line)
1246{ 1137{
1247 int i; 1138 int i;
1248 1139
1249 if (sscanf(line, "%d", &i)) 1140 if (sscanf (line, "%d", &i))
1250 return (i != 0); 1141 return (i != 0);
1251 switch (line[0]) { 1142 switch (line[0])
1143 {
1252 case 'o': 1144 case 'o':
1253 switch (line[1]) { 1145 switch (line[1])
1254 case 'n': return 1; /* on */ 1146 {
1255 default: return 0; /* o[ff] */ 1147 case 'n':
1256 } 1148 return 1; /* on */
1257 case 'y': /* y[es] */ 1149 default:
1258 case 'k': /* k[ylla] */ 1150 return 0; /* o[ff] */
1151 }
1152 case 'y': /* y[es] */
1153 case 'k': /* k[ylla] */
1259 case 's': 1154 case 's':
1260 case 'd': 1155 case 'd':
1261 return 1; 1156 return 1;
1262 case 'n': /* n[o] */ 1157 case 'n': /* n[o] */
1263 case 'e': /* e[i] */ 1158 case 'e': /* e[i] */
1264 case 'u': 1159 case 'u':
1265 default: 1160 default:
1266 return 0; 1161 return 0;
1267 } 1162 }
1268} 1163}
1269 1164
1165int
1270int command_quit (object *op, char *params) 1166command_quit (object *op, char *params)
1271{ 1167{
1168 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."); 1169 "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; 1170 return 1;
1274} 1171}
1275 1172
1173int
1276int command_real_quit (object *op, char *params) 1174command_real_quit (object *op, char *params)
1277{ 1175{
1278 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR, 1176 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 1177
1281 op->contr->state = ST_CONFIRM_QUIT; 1178 op->contr->state = ST_CONFIRM_QUIT;
1282 return 1; 1179 return 1;
1283 } 1180}
1284 1181
1285/* 1182/*
1286 * don't allow people to exit explore mode. It otherwise becomes 1183 * don't allow people to exit explore mode. It otherwise becomes
1287 * really easy to abuse this. 1184 * really easy to abuse this.
1288 */ 1185 */
1186int
1289int command_explore (object *op, char *params) 1187command_explore (object *op, char *params)
1290{ 1188{
1291 if (settings.explore_mode == FALSE) 1189 if (settings.explore_mode == FALSE)
1292 return 1; 1190 return 1;
1293 /* 1191 /*
1294 * I guess this is the best way to see if we are solo or not. Actually, 1192 * 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? 1193 * are there any cases when first_player->next==NULL and we are not solo?
1296 */ 1194 */
1297 if ((first_player!=op->contr) || (first_player->next!=NULL)) { 1195 if ((first_player != op->contr) || (first_player->next != NULL))
1196 {
1298 new_draw_info(NDI_UNIQUE, 0,op,"You can not enter explore mode if you are in a party"); 1197 new_draw_info (NDI_UNIQUE, 0, op, "You can not enter explore mode if you are in a party");
1198 }
1299 } else if (op->contr->explore) 1199 else if (op->contr->explore)
1300 new_draw_info(NDI_UNIQUE, 0,op, "There is no return from explore mode"); 1200 new_draw_info (NDI_UNIQUE, 0, op, "There is no return from explore mode");
1301 else { 1201 else
1202 {
1302 op->contr->explore=1; 1203 op->contr->explore = 1;
1303 new_draw_info(NDI_UNIQUE, 0,op, "You are now in explore mode"); 1204 new_draw_info (NDI_UNIQUE, 0, op, "You are now in explore mode");
1304 } 1205 }
1305 return 1; 1206 return 1;
1306} 1207}
1307 1208
1209int
1308int command_sound (object *op, char *params) 1210command_sound (object *op, char *params)
1309{ 1211{
1310 if (op->contr->socket.sound) { 1212 if (op->contr->socket.sound)
1213 {
1311 op->contr->socket.sound=0; 1214 op->contr->socket.sound = 0;
1312 new_draw_info(NDI_UNIQUE, 0,op, "Silence is golden..."); 1215 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1216 }
1217 else
1313 } 1218 {
1314 else {
1315 op->contr->socket.sound=1; 1219 op->contr->socket.sound = 1;
1316 new_draw_info(NDI_UNIQUE, 0,op, "The sounds are enabled."); 1220 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1317 } 1221 }
1318 return 1; 1222 return 1;
1319} 1223}
1320 1224
1321/* Perhaps these should be in player.c, but that file is 1225/* Perhaps these should be in player.c, but that file is
1322 * already a bit big. 1226 * already a bit big.
1323 */ 1227 */
1324 1228
1229void
1325void receive_player_name(object *op,char k) { 1230receive_player_name (object *op, char k)
1231{
1326 1232
1327 if(!check_name(op->contr,op->contr->write_buf+1)) { 1233 if (!check_name (op->contr, op->contr->write_buf + 1))
1328 get_name(op);
1329 return;
1330 } 1234 {
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); 1235 get_name (op);
1358 return; 1236 return;
1359 } 1237 }
1238 op->name = op->contr->write_buf + 1;
1239 op->name_pl = op->contr->write_buf + 1;
1240 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1241 op->contr->name_changed = 1;
1242 get_password (op);
1243}
1244
1245void
1246receive_player_password (object *op, char k)
1247{
1248
1249 unsigned int pwd_len = strlen (op->contr->write_buf);
1250
1251 if (pwd_len <= 1 || pwd_len > 17)
1252 {
1253 get_name (op);
1254 return;
1255 }
1256 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1257
1258 if (checkbanned (op->name, op->contr->socket.host))
1259 {
1260 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1261 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1262 get_name (op);
1263 return;
1264 }
1265
1266 if (op->contr->state == ST_CONFIRM_PASSWORD)
1267 {
1268 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1269 {
1270 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1271 get_name (op);
1272 return;
1273 }
1360 clear_win_info(op); 1274 clear_win_info (op);
1361 display_motd(op); 1275 display_motd (op);
1362 new_draw_info(NDI_UNIQUE, 0,op," "); 1276 new_draw_info (NDI_UNIQUE, 0, op, " ");
1363 new_draw_info(NDI_UNIQUE, 0,op,"Welcome, Brave New Warrior!"); 1277 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1364 new_draw_info(NDI_UNIQUE, 0,op," "); 1278 new_draw_info (NDI_UNIQUE, 0, op, " ");
1365 Roll_Again(op); 1279 Roll_Again (op);
1366 op->contr->state=ST_ROLL_STAT; 1280 op->contr->state = ST_ROLL_STAT;
1367 return; 1281 return;
1368 } 1282 }
1369 strcpy(op->contr->password,crypt_string(op->contr->write_buf+1,NULL)); 1283 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1370 op->contr->state=ST_ROLL_STAT; 1284 op->contr->state = ST_ROLL_STAT;
1371 check_login(op); 1285 check_login (op);
1372 return; 1286 return;
1373} 1287}
1374 1288
1375 1289
1290int
1376int explore_mode(void) { 1291explore_mode (void)
1292{
1377 player *pl; 1293 player *pl;
1378 1294
1379 if (settings.explore_mode == TRUE) { 1295 if (settings.explore_mode == TRUE)
1296 {
1380 for (pl = first_player; pl != (player *) NULL; pl = pl->next) 1297 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1381 if (pl->explore) 1298 if (pl->explore)
1382 return 1; 1299 return 1;
1383 } 1300 }
1384 return 0; 1301 return 0;
1385} 1302}
1386 1303
1387 1304
1305int
1388int command_title (object *op, char *params) 1306command_title (object *op, char *params)
1389{ 1307{
1390 char buf[MAX_BUF]; 1308 char buf[MAX_BUF];
1391 1309
1392 if (settings.set_title == FALSE) { 1310 if (settings.set_title == FALSE)
1311 {
1393 new_draw_info(NDI_UNIQUE, 0, op, "You cannot change your title."); 1312 new_draw_info (NDI_UNIQUE, 0, op, "You cannot change your title.");
1394 return 1; 1313 return 1;
1395 } 1314 }
1396 1315
1397 /* dragon players cannot change titles */ 1316 /* dragon players cannot change titles */
1398 if (is_dragon_pl(op)) { 1317 if (is_dragon_pl (op))
1318 {
1399 new_draw_info(NDI_UNIQUE, 0, op, "Dragons cannot change titles."); 1319 new_draw_info (NDI_UNIQUE, 0, op, "Dragons cannot change titles.");
1400 return 1; 1320 return 1;
1401 }
1402 1321 }
1322
1403 if(params == NULL) { 1323 if (params == NULL)
1324 {
1404 if(op->contr->own_title[0]=='\0') 1325 if (op->contr->own_title[0] == '\0')
1405 sprintf(buf,"Your title is '%s'.", op->contr->title); 1326 sprintf (buf, "Your title is '%s'.", op->contr->title);
1406 else 1327 else
1407 sprintf(buf,"Your title is '%s'.", op->contr->own_title); 1328 sprintf (buf, "Your title is '%s'.", op->contr->own_title);
1408 new_draw_info(NDI_UNIQUE, 0,op,buf); 1329 new_draw_info (NDI_UNIQUE, 0, op, buf);
1409 return 1; 1330 return 1;
1410 } 1331 }
1411 if(strcmp(params, "clear")==0 || strcmp(params, "default")==0) { 1332 if (strcmp (params, "clear") == 0 || strcmp (params, "default") == 0)
1333 {
1412 if(op->contr->own_title[0]=='\0') 1334 if (op->contr->own_title[0] == '\0')
1413 new_draw_info(NDI_UNIQUE, 0,op,"Your title is the default title."); 1335 new_draw_info (NDI_UNIQUE, 0, op, "Your title is the default title.");
1414 else 1336 else
1415 new_draw_info(NDI_UNIQUE, 0,op,"Title set to default."); 1337 new_draw_info (NDI_UNIQUE, 0, op, "Title set to default.");
1416 op->contr->own_title[0]='\0'; 1338 op->contr->own_title[0] = '\0';
1417 return 1; 1339 return 1;
1418 } 1340 }
1419 1341
1420 if((int)strlen(params) >= MAX_NAME) { 1342 if ((int) strlen (params) >= MAX_NAME)
1343 {
1421 new_draw_info(NDI_UNIQUE, 0,op,"Title too long."); 1344 new_draw_info (NDI_UNIQUE, 0, op, "Title too long.");
1422 return 1; 1345 return 1;
1423 } 1346 }
1424 strcpy(op->contr->own_title, params); 1347 strcpy (op->contr->own_title, params);
1425 return 1; 1348 return 1;
1426} 1349}
1427 1350
1351int
1428int command_save (object *op, char *params) 1352command_save (object *op, char *params)
1429{ 1353{
1430// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) { 1354// 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"); 1355// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1432// } else 1356// } else
1433 if (!op->stats.exp) { 1357 if (!op->stats.exp)
1358 {
1434 new_draw_info(NDI_UNIQUE, 0, op, "You don't deserve to save yet."); 1359 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1435 } else { 1360 }
1361 else
1362 {
1436 if(save_player(op,1)) 1363 if (save_player (op, 1))
1437 new_draw_info(NDI_UNIQUE, 0,op,"You have been saved."); 1364 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1438 else 1365 else
1439 new_draw_info(NDI_UNIQUE, 0,op,"SAVE FAILED!"); 1366 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1440 } 1367 }
1441 return 1; 1368 return 1;
1442} 1369}
1443 1370
1444 1371
1372int
1445int command_peaceful (object *op, char *params) 1373command_peaceful (object *op, char *params)
1446{ 1374{
1447 new_draw_info(NDI_UNIQUE, 0, op, 1375 new_draw_info (NDI_UNIQUE, 0, op,
1448 "You cannot change your peaceful setting with this command." 1376 "You cannot change your peaceful setting with this command."
1449 " Please speak to the priest in the temple of Gorokh" 1377 " Please speak to the priest in the temple of Gorokh"
1450 " if you want to become hostile or in temple of Valriel" 1378 " 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 1379
1454/* 1380/*
1455 if((op->contr->peaceful=!op->contr->peaceful)) 1381 if((op->contr->peaceful=!op->contr->peaceful))
1456 new_draw_info(NDI_UNIQUE, 0,op,"You will not attack other players."); 1382 new_draw_info(NDI_UNIQUE, 0,op,"You will not attack other players.");
1457 else 1383 else
1458 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1384 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1459*/ 1385*/
1460 return 1; 1386 return 1;
1461} 1387}
1462 1388
1463 1389
1464 1390
1391int
1465int command_wimpy (object *op, char *params) 1392command_wimpy (object *op, char *params)
1466{ 1393{
1467 int i; 1394 int i;
1468 char buf[MAX_BUF]; 1395 char buf[MAX_BUF];
1469 1396
1470 if (params==NULL || !sscanf(params, "%d", &i)) { 1397 if (params == NULL || !sscanf (params, "%d", &i))
1398 {
1471 sprintf(buf, "Your current wimpy level is %d.", op->run_away); 1399 sprintf (buf, "Your current wimpy level is %d.", op->run_away);
1472 new_draw_info(NDI_UNIQUE, 0,op, buf); 1400 new_draw_info (NDI_UNIQUE, 0, op, buf);
1473 return 1; 1401 return 1;
1474 } 1402 }
1475 sprintf(buf, "Your new wimpy level is %d.", i); 1403 sprintf (buf, "Your new wimpy level is %d.", i);
1476 new_draw_info(NDI_UNIQUE, 0,op, buf); 1404 new_draw_info (NDI_UNIQUE, 0, op, buf);
1477 op->run_away = i; 1405 op->run_away = i;
1478 return 1; 1406 return 1;
1479} 1407}
1480 1408
1481 1409
1410int
1482int command_brace (object *op, char *params) 1411command_brace (object *op, char *params)
1483{ 1412{
1484 if (!params) 1413 if (!params)
1485 op->contr->braced =!op->contr->braced; 1414 op->contr->braced = !op->contr->braced;
1486 else 1415 else
1487 op->contr->braced =onoff_value(params); 1416 op->contr->braced = onoff_value (params);
1488 1417
1489 if(op->contr->braced) 1418 if (op->contr->braced)
1490 new_draw_info(NDI_UNIQUE, 0,op, "You are braced."); 1419 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1491 else 1420 else
1492 new_draw_info(NDI_UNIQUE, 0,op, "Not braced."); 1421 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1493 1422
1494 fix_player(op); 1423 fix_player (op);
1495 return 0; 1424 return 0;
1496} 1425}
1497 1426
1427int
1498int command_style_map_info(object *op, char *params) 1428command_style_map_info (object *op, char *params)
1499{ 1429{
1500 extern mapstruct *styles; 1430 extern maptile *styles;
1501 mapstruct *mp; 1431 maptile *mp;
1502 int maps_used=0, mapmem=0, objects_used=0, x,y; 1432 int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
1503 object *tmp; 1433 object *tmp;
1504 1434
1505 for (mp = styles; mp!=NULL; mp=mp->next) { 1435 for (mp = styles; mp != NULL; mp = mp->next)
1436 {
1506 maps_used++; 1437 maps_used++;
1507 mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct); 1438 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile);
1508 for (x=0; x<MAP_WIDTH(mp); x++) { 1439 for (x = 0; x < MAP_WIDTH (mp); x++)
1440 {
1509 for (y=0; y<MAP_HEIGHT(mp); y++) { 1441 for (y = 0; y < MAP_HEIGHT (mp); y++)
1442 {
1510 for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above) 1443 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)
1511 objects_used++; 1444 objects_used++;
1512 } 1445 }
1513 } 1446 }
1514 } 1447 }
1515 new_draw_info_format(NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used); 1448 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"); 1449 new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
1517 new_draw_info_format(NDI_UNIQUE, 0, op, "including objects: %d", mapmem); 1450 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); 1451 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)); 1452 new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
1520 return 0; 1453 return 0;
1521} 1454}
1522 1455
1456int
1523int command_kill_pets(object *op, char *params) 1457command_kill_pets (object *op, char *params)
1524{ 1458{
1525 objectlink *obl, *next; 1459 objectlink *obl, *next;
1526 int counter=0, removecount=0; 1460 int counter = 0, removecount = 0;
1461
1527 if (params == NULL) { 1462 if (params == NULL)
1463 {
1528 terminate_all_pets(op); 1464 terminate_all_pets (op);
1529 new_draw_info(NDI_UNIQUE, 0, op, "Your pets have been killed."); 1465 new_draw_info (NDI_UNIQUE, 0, op, "Your pets have been killed.");
1466 }
1467 else
1530 } 1468 {
1531 else {
1532 int target = atoi(params); 1469 int target = atoi (params);
1470
1533 for(obl = first_friendly_object; obl != NULL; obl = next) { 1471 for (obl = first_friendly_object; obl != NULL; obl = next)
1472 {
1534 object *ob = obl->ob; 1473 object *ob = obl->ob;
1474
1535 next = obl->next; 1475 next = obl->next;
1536 if (get_owner(ob) == op) 1476 if (get_owner (ob) == op)
1537 if (++counter==target || (target==0 && !strcasecmp(ob->name, params))) { 1477 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1478 {
1538 if (!QUERY_FLAG(ob, FLAG_REMOVED)) 1479 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1539 remove_ob(ob); 1480 remove_ob (ob);
1540 remove_friendly_object(ob); 1481 remove_friendly_object (ob);
1541 free_object(ob); 1482 free_object (ob);
1542 removecount++; 1483 removecount++;
1543 } 1484 }
1544 } 1485 }
1545 if (removecount!=0) 1486 if (removecount != 0)
1546 new_draw_info_format(NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1487 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);
1547 else 1488 else
1548 new_draw_info(NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n"); 1489 new_draw_info (NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n");
1549 } 1490 }
1550 return 0; 1491 return 0;
1551} 1492}
1552

Diff Legend

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