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

Diff Legend

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