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

Diff Legend

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