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.2 by root, Thu Aug 24 13:13:49 2006 UTC vs.
Revision 1.6 by root, Mon Sep 4 11:08:00 2006 UTC

1/* 1/*
2 * static char *rcsid_c_misc_c = 2 * static char *rcsid_c_misc_c =
3 * "$Id: c_misc.C,v 1.2 2006/08/24 13:13:49 root Exp $"; 3 * "$Id: c_misc.C,v 1.6 2006/09/04 11:08:00 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
41void map_info(object *op, char *search) { 41void map_info(object *op, char *search) {
42 mapstruct *m; 42 mapstruct *m;
43 char buf[MAX_BUF], map_path[MAX_BUF]; 43 char buf[MAX_BUF], map_path[MAX_BUF];
44 long sec = seconds(); 44 long sec = seconds();
45 new_draw_info_format(NDI_UNIQUE, 0, op, 45 new_draw_info_format(NDI_UNIQUE, 0, op,
46 "Current time is: %02ld:%02ld:%02ld.", 46 "Current time is: %02ld:%02ld:%02ld.",
47 (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"); 48 new_draw_info(NDI_UNIQUE, 0,op,"Path Pl PlM IM TO Dif Reset");
49 for(m=first_map;m!=NULL;m=m->next) { 49 for(m=first_map;m!=NULL;m=m->next) {
50 50
51 if ( search && strstr(m->path,search)==NULL ) continue; /* Skip unwanted maps */ 51 if ( search && strstr(m->path,search)==NULL ) continue; /* Skip unwanted maps */
52 /* Print out the last 18 characters of the map name... */ 52 /* Print out the last 18 characters of the map name... */
53 if (strlen(m->path)<=18) strcpy(map_path, m->path); 53 if (strlen(m->path)<=18) strcpy(map_path, m->path);
54 else strcpy(map_path, m->path + strlen(m->path) - 18); 54 else strcpy(map_path, m->path + strlen(m->path) - 18);
55 sprintf(buf,"%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d", 55 sprintf(buf,"%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56 map_path, m->players,players_on_map(m,FALSE), 56 map_path, m->players,players_on_map(m,FALSE),
57 m->in_memory,m->timeout,m->difficulty, 57 m->in_memory,m->timeout,m->difficulty,
58 (MAP_WHEN_RESET(m)%86400)/3600,(MAP_WHEN_RESET(m)%3600)/60, 58 (MAP_WHEN_RESET(m)%86400)/3600,(MAP_WHEN_RESET(m)%3600)/60,
59 MAP_WHEN_RESET(m)%60); 59 MAP_WHEN_RESET(m)%60);
60 new_draw_info(NDI_UNIQUE, 0,op,buf); 60 new_draw_info(NDI_UNIQUE, 0,op,buf);
61 } 61 }
62} 62}
63 63
… …
74 */ 74 */
75 new_draw_info(NDI_UNIQUE, 0, op, "The first column is the name of the body location."); 75 new_draw_info(NDI_UNIQUE, 0, op, "The first column is the name of the body location.");
76 new_draw_info(NDI_UNIQUE, 0, op, "The second column is how many of those locations your body has."); 76 new_draw_info(NDI_UNIQUE, 0, op, "The second column is how many of those locations your body has.");
77 new_draw_info(NDI_UNIQUE, 0, op, "The third column is how many slots in that location are available."); 77 new_draw_info(NDI_UNIQUE, 0, op, "The third column is how many slots in that location are available.");
78 for (i=0; i<NUM_BODY_LOCATIONS; i++) { 78 for (i=0; i<NUM_BODY_LOCATIONS; i++) {
79 /* 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 new_draw_info_format(NDI_UNIQUE, 0, op,
84 "%-30s %5d %5d", body_locations[i].use_name, op->body_info[i], op->body_used[i]); 84 "%-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 command_motd(object *op, char *params) 96int command_motd(object *op, char *params)
97{ 97{
98 display_motd(op); 98 display_motd(op);
99 return 1; 99 return 1;
100} 100}
101 101
102int command_bug(object *op, char *params) 102int command_bug(object *op, char *params)
103{ 103{
104 char buf[MAX_BUF]; 104 char buf[MAX_BUF];
… …
114 bug_report(buf); 114 bug_report(buf);
115 LOG(llevError,"%s\n",buf); 115 LOG(llevError,"%s\n",buf);
116 new_draw_info(NDI_ALL | NDI_UNIQUE, 1, NULL, buf); 116 new_draw_info(NDI_ALL | NDI_UNIQUE, 1, NULL, buf);
117 new_draw_info(NDI_UNIQUE, 0,op, "OK, thanks!"); 117 new_draw_info(NDI_UNIQUE, 0,op, "OK, thanks!");
118 return 1; 118 return 1;
119}
120
121
122void malloc_info(object *op) {
123 int ob_used=count_used(),ob_free=count_free(),players,nrofmaps;
124 int nrm=0,mapmem=0,anr,anims,sum_alloc=0,sum_used=0,i,tlnr, alnr;
125 treasurelist *tl;
126 player *pl;
127 mapstruct *m;
128 archetype *at;
129 artifactlist *al;
130
131 for(tl=first_treasurelist,tlnr=0;tl!=NULL;tl=tl->next,tlnr++);
132 for(al=first_artifactlist, alnr=0; al!=NULL; al=al->next, alnr++);
133
134 for(at=first_archetype,anr=0,anims=0;at!=NULL;
135 at=at->more==NULL?at->next:at->more,anr++);
136
137 for (i=1; i<num_animations; i++)
138 anims += animations[i].num_animations;
139
140 for(pl=first_player,players=0;pl!=NULL;pl=pl->next,players++);
141 for(m=first_map,nrofmaps=0;m!=NULL;m=m->next,nrofmaps++)
142 if(m->in_memory == MAP_IN_MEMORY) {
143 mapmem+=MAP_WIDTH(m)*MAP_HEIGHT(m)*(sizeof(object *)+sizeof(MapSpace));
144 nrm++;
145 }
146 sprintf(errmsg,"Sizeof: object=%ld player=%ld map=%ld",
147 (long)sizeof(object),(long)sizeof(player),(long)sizeof(mapstruct));
148 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
149 sprintf(errmsg,"%4d used objects: %8d",ob_used,i=(ob_used*sizeof(object)));
150 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
151 sum_used+=i; sum_alloc+=i;
152 sprintf(errmsg,"%4d free objects: %8d",ob_free,i=(ob_free*sizeof(object)));
153 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
154 sprintf(errmsg,"%4d active objects: %8d",count_active(), 0);
155 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
156 sum_alloc+=i;
157 sprintf(errmsg,"%4d players: %8d",players,i=(players*sizeof(player)));
158 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
159 sum_alloc+=i; sum_used+=i;
160
161
162 sprintf(errmsg,"%4d maps allocated: %8d",nrofmaps,
163 i=(nrofmaps*sizeof(mapstruct)));
164 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
165 sum_alloc+=i; sum_used+=nrm*sizeof(mapstruct);
166 sprintf(errmsg,"%4d maps in memory: %8d",nrm,mapmem);
167 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
168 sum_alloc+=mapmem; sum_used+=mapmem;
169 sprintf(errmsg,"%4d archetypes: %8d",anr,i=(anr*sizeof(archetype)));
170 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
171 sum_alloc+=i; sum_used+=i;
172 sprintf(errmsg,"%4d animations: %8d",anims,i=(anims*sizeof(Fontindex)));
173 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
174 sum_alloc+=i; sum_used+=i;
175
176 sprintf(errmsg,"%4d treasurelists %8d",tlnr,i=(tlnr*sizeof(treasurelist)));
177 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
178 sum_alloc+=i; sum_used+=i;
179 sprintf(errmsg,"%4ld treasures %8d",nroftreasures,
180 i=(nroftreasures*sizeof(treasure)));
181 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
182 sum_alloc+=i; sum_used+=i;
183 sprintf(errmsg,"%4ld artifacts %8d", nrofartifacts,
184 i=(nrofartifacts*sizeof(artifact)));
185 new_draw_info(NDI_UNIQUE, 0,op, errmsg);
186 sum_alloc+=i; sum_used +=i;
187 sprintf(errmsg,"%4ld artifacts strngs %8d", nrofallowedstr,
188 i=(nrofallowedstr*sizeof(linked_char)));
189 new_draw_info(NDI_UNIQUE, 0,op, errmsg);
190 sum_alloc += i;sum_used+=i;
191 sprintf(errmsg,"%4d artifactlists %8d",alnr,i=(alnr*sizeof(artifactlist)));
192 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
193 sum_alloc += i; sum_used += i;
194
195 sprintf(errmsg,"Total space allocated:%8d",sum_alloc);
196 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
197 sprintf(errmsg,"Total space used: %8d",sum_used);
198 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
199} 119}
200 120
201/* 121/*
202 * Pretty much identical to current map_info, but on a bigger scale 122 * Pretty much identical to current map_info, but on a bigger scale
203 * This function returns the name of the players current region, and 123 * This function returns the name of the players current region, and
… …
209 * going to be /that/ slow, and won't get called much 129 * going to be /that/ slow, and won't get called much
210 */ 130 */
211 region *r = get_region_by_name(get_name_of_region_for_map(op->map)); 131 region *r = get_region_by_name(get_name_of_region_for_map(op->map));
212 132
213 if (!r) 133 if (!r)
214 return; 134 return;
215 /* This should only be possible if regions are not operating on this server. */ 135 /* This should only be possible if regions are not operating on this server. */
216 136
217 new_draw_info_format(NDI_UNIQUE, 0,op, 137 new_draw_info_format(NDI_UNIQUE, 0,op,
218 "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));
219} 139}
220 140
221void current_map_info(object *op) { 141void current_map_info(object *op) {
222 mapstruct *m = op->map; 142 mapstruct *m = op->map;
223 143
224 if (!m) 144 if (!m)
225 return; 145 return;
226 146
227 new_draw_info_format(NDI_UNIQUE, 0,op, 147 new_draw_info_format(NDI_UNIQUE, 0,op,
228 "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map(m)); 148 "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map(m));
229 149
230 if (QUERY_FLAG(op,FLAG_WIZ)) { 150 if (QUERY_FLAG(op,FLAG_WIZ)) {
231 new_draw_info_format(NDI_UNIQUE, 0, op, 151 new_draw_info_format(NDI_UNIQUE, 0, op,
232 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 152 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
233 m->players, m->difficulty, 153 m->players, m->difficulty,
234 MAP_WIDTH(m), MAP_HEIGHT(m), 154 MAP_WIDTH(m), MAP_HEIGHT(m),
235 MAP_ENTER_X(m), MAP_ENTER_Y(m), 155 MAP_ENTER_X(m), MAP_ENTER_Y(m),
236 MAP_TIMEOUT(m)); 156 MAP_TIMEOUT(m));
237 157
238 } 158 }
239 if (m->msg) 159 if (m->msg)
240 new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->msg); 160 new_draw_info(NDI_UNIQUE, NDI_NAVY, op, m->msg);
241} 161}
242 162
243#ifdef DEBUG_MALLOC_LEVEL 163#ifdef DEBUG_MALLOC_LEVEL
244int command_malloc_verify(object *op, char *parms) 164int command_malloc_verify(object *op, char *parms)
245{ 165{
246 extern int malloc_verify(void); 166 extern int malloc_verify(void);
247 167
248 if (!malloc_verify()) 168 if (!malloc_verify())
249 new_draw_info(NDI_UNIQUE, 0,op,"Heap is corrupted."); 169 new_draw_info(NDI_UNIQUE, 0,op,"Heap is corrupted.");
250 else 170 else
251 new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK."); 171 new_draw_info(NDI_UNIQUE, 0,op,"Heap checks out OK.");
252 return 1; 172 return 1;
253 } 173 }
254#endif 174#endif
255 175
256int command_whereabouts(object *op, char *params) { 176int command_whereabouts(object *op, char *params) {
257 177
258 region *reg; 178 region *reg;
… …
270 if (pl->ob->map!=NULL) 190 if (pl->ob->map!=NULL)
271 get_region_by_map(pl->ob->map)->counter++; 191 get_region_by_map(pl->ob->map)->counter++;
272 192
273 /* we only want to print out by places with a 'longname' field...*/ 193 /* we only want to print out by places with a 'longname' field...*/
274 for (reg=first_region;reg!=NULL;reg=reg->next) { 194 for (reg=first_region;reg!=NULL;reg=reg->next) {
275 if (reg->longname==NULL && reg->counter>0) { 195 if (reg->longname==NULL && reg->counter>0) {
276 if(reg->parent !=NULL) { 196 if(reg->parent !=NULL) {
277 reg->parent->counter+=reg->counter; 197 reg->parent->counter+=reg->counter;
278 reg->counter=0; 198 reg->counter=0;
279 } 199 }
280 else /*uh oh, we shouldn't be here. */ 200 else /*uh oh, we shouldn't be here. */
281 LOG(llevError,"command_whereabouts() Region %s with no longname has no parent", reg->name); 201 LOG(llevError,"command_whereabouts() Region %s with no longname has no parent", reg->name);
282 } 202 }
283 } 203 }
284 new_draw_info_format(NDI_UNIQUE, 0,op, 204 new_draw_info_format(NDI_UNIQUE, 0,op,
285 "In the world currently there are:"); 205 "In the world currently there are:");
286 for (reg=first_region;reg!=NULL;reg=reg->next) 206 for (reg=first_region;reg!=NULL;reg=reg->next)
287 if(reg->counter>0) 207 if(reg->counter>0)
288 new_draw_info_format(NDI_UNIQUE, 0,op, 208 new_draw_info_format(NDI_UNIQUE, 0,op,
289 "%u players in %s", reg->counter, get_region_longname(reg)); 209 "%u players in %s", reg->counter, get_region_longname(reg));
290 return 1; 210 return 1;
291} 211}
292 212
293typedef struct 213typedef struct
294 { 214 {
… …
328 format=settings.who_format; 248 format=settings.who_format;
329 249
330 reg=get_region_from_string(params); 250 reg=get_region_from_string(params);
331 251
332 for (pl=first_player;pl!=NULL;pl=pl->next) { 252 for (pl=first_player;pl!=NULL;pl=pl->next) {
333 if (pl->ob->map == NULL) 253 if (pl->ob->map == NULL)
334 continue; 254 continue;
335 if (pl->hidden && !QUERY_FLAG(op, FLAG_WIZ)) continue; 255 if (pl->hidden && !QUERY_FLAG(op, FLAG_WIZ)) continue;
336 256
337 if(!region_is_child_of_region(get_region_by_map(pl->ob->map),reg)) continue; 257 if(!region_is_child_of_region(get_region_by_map(pl->ob->map),reg)) continue;
338 258
339 if (pl->state==ST_PLAYING || pl->state==ST_GET_PARTY_PASSWORD) { 259 if (pl->state==ST_PLAYING || pl->state==ST_GET_PARTY_PASSWORD) {
340 260
341 num_players++; 261 num_players++;
342 chars = (chars_names *) realloc(chars, num_players*sizeof(chars_names)); 262 chars = (chars_names *) realloc(chars, num_players*sizeof(chars_names));
343 if (chars == NULL) { 263 if (chars == NULL) {
344 new_draw_info(NDI_UNIQUE, 0, op, "who failed - out of memory!"); 264 new_draw_info(NDI_UNIQUE, 0, op, "who failed - out of memory!");
345 return 0; 265 return 0;
346 } 266 }
347 sprintf(chars[num_players-1].namebuf, "%s", pl->ob->name); 267 sprintf(chars[num_players-1].namebuf, "%s", &pl->ob->name);
348 chars[num_players-1].login_order = num_players; 268 chars[num_players-1].login_order = num_players;
349 /*Check for WIZ's & AFK's*/ 269 /*Check for WIZ's & AFK's*/
350 if (QUERY_FLAG(pl->ob,FLAG_WIZ)) 270 if (QUERY_FLAG(pl->ob,FLAG_WIZ))
351 num_wiz++; 271 num_wiz++;
352 if (QUERY_FLAG(pl->ob,FLAG_AFK)) 272 if (QUERY_FLAG(pl->ob,FLAG_AFK))
353 num_afk++; 273 num_afk++;
354 } 274 }
355 } 275 }
356 if (first_player != (player *) NULL) { 276 if (first_player != (player *) NULL) {
357 if (reg == NULL) 277 if (reg == NULL)
358 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players (%d) -- WIZ(%d) AFK(%d)", 278 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players (%d) -- WIZ(%d) AFK(%d)",
359 num_players, num_wiz, num_afk); 279 num_players, num_wiz, num_afk);
360 else if (reg->longname == NULL) 280 else if (reg->longname == NULL)
361 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)", 281 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
362 reg->name, num_players, num_wiz, num_afk); 282 reg->name, num_players, num_wiz, num_afk);
363 else 283 else
364 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)", 284 new_draw_info_format(NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
365 reg->longname, num_players, num_wiz, num_afk); 285 reg->longname, num_players, num_wiz, num_afk);
366 } 286 }
367 qsort (chars, num_players, sizeof(chars_names), (int (*)(const void *, const void *))name_cmp); 287 qsort (chars, num_players, sizeof(chars_names), (int (*)(const void *, const void *))name_cmp);
368 for (i=0;i<num_players;i++) 288 for (i=0;i<num_players;i++)
369 display_who_entry(op, find_player(chars[i].namebuf), format); 289 display_who_entry(op, find_player(chars[i].namebuf), format);
370 free(chars); 290 free(chars);
371 return 1; 291 return 1;
372} 292}
373 293
374/* Display a line of 'who' to op, about pl, using the formatting specified by format */ 294/* Display a line of 'who' to op, about pl, using the formatting specified by format */
… …
377 char outbuf[MAX_BUF]; 297 char outbuf[MAX_BUF];
378 size_t i; 298 size_t i;
379 outbuf[0]='\0'; /* we strcat to this, so reset it here. */ 299 outbuf[0]='\0'; /* we strcat to this, so reset it here. */
380 if (pl==NULL) { 300 if (pl==NULL) {
381 LOG(llevError,"display_who_entry(): I was passed a null player"); 301 LOG(llevError,"display_who_entry(): I was passed a null player");
382 return; 302 return;
383 } 303 }
384 for (i=0;i<=strlen(format);i++) { 304 for (i=0;i<=strlen(format);i++) {
385 if (format[i]=='%') { 305 if (format[i]=='%') {
386 i++; 306 i++;
387 get_who_escape_code_value(tmpbuf,format[i],pl); 307 get_who_escape_code_value(tmpbuf,format[i],pl);
… …
418 */ 338 */
419 339
420void get_who_escape_code_value(char *return_val, const char letter, player *pl) { 340void get_who_escape_code_value(char *return_val, const char letter, player *pl) {
421 341
422 switch (letter) { 342 switch (letter) {
423 case 'N' : strcpy(return_val, pl->ob->name); 343 case 'N' : strcpy(return_val, pl->ob->name);
424 break; 344 break;
425 case 't' : strcpy(return_val,(pl->own_title[0]=='\0'?pl->title:pl->own_title)); 345 case 't' : strcpy(return_val,(pl->own_title[0]=='\0'?pl->title:pl->own_title));
426 break; 346 break;
427 case 'T' : if (pl->own_title[0]=='\0') 347 case 'T' : if (pl->own_title[0]=='\0')
428 strcpy(return_val,"the "); 348 strcpy(return_val,"the ");
429 else 349 else
430 *return_val='\0'; 350 *return_val='\0';
431 break; 351 break;
432 case 'c' : sprintf(return_val,"%d",pl->ob->count); 352 case 'c' : sprintf(return_val,"%d",pl->ob->count);
433 break; 353 break;
434 case 'n' : strcpy(return_val, "\n"); 354 case 'n' : strcpy(return_val, "\n");
435 break; 355 break;
436 case 'h' : strcpy(return_val,pl->peaceful?"":" [Hostile]"); 356 case 'h' : strcpy(return_val,pl->peaceful?"":" [Hostile]");
437 break; 357 break;
438 case 'l' : sprintf(return_val,"%d",pl->ob->level); 358 case 'l' : sprintf(return_val,"%d",pl->ob->level);
439 break; 359 break;
440 case 'd' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":"")); 360 case 'd' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_WIZ)?" [WIZ]":""));
441 break; 361 break;
442 case 'a' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_AFK)?" [AFK]":"")); 362 case 'a' : strcpy(return_val,(QUERY_FLAG(pl->ob,FLAG_AFK)?" [AFK]":""));
443 break; 363 break;
444 case 'm' : strcpy(return_val,pl->ob->map->path); 364 case 'm' : strcpy(return_val,pl->ob->map->path);
445 break; 365 break;
446 case 'M' : strcpy(return_val,pl->ob->map->name?pl->ob->map->name:"Untitled"); 366 case 'M' : strcpy(return_val,pl->ob->map->name?pl->ob->map->name:"Untitled");
447 break; 367 break;
448 case 'r' : strcpy(return_val,get_name_of_region_for_map(pl->ob->map)); 368 case 'r' : strcpy(return_val,get_name_of_region_for_map(pl->ob->map));
449 break; 369 break;
450 case 'R' : strcpy(return_val,get_region_longname(get_region_by_map(pl->ob->map))); 370 case 'R' : strcpy(return_val,get_region_longname(get_region_by_map(pl->ob->map)));
451 break; 371 break;
452 case 'i' : strcpy(return_val,pl->socket.host); 372 case 'i' : strcpy(return_val,pl->socket.host);
453 break; 373 break;
454 case '%' : strcpy(return_val, "%"); 374 case '%' : strcpy(return_val, "%");
455 break; 375 break;
456 case '_' : strcpy(return_val, "_"); 376 case '_' : strcpy(return_val, "_");
457 break; 377 break;
458 } 378 }
459 379
460} 380}
461 381
462 382
… …
472 new_draw_info(NDI_UNIQUE, 0, op, "You are now AFK"); 392 new_draw_info(NDI_UNIQUE, 0, op, "You are now AFK");
473 } 393 }
474 return 1; 394 return 1;
475} 395}
476 396
477int command_malloc (object *op, char *params)
478{
479 malloc_info(op);
480 return 1;
481 }
482
483int command_mapinfo (object *op, char *params) 397int command_mapinfo (object *op, char *params)
484{ 398{
485 current_map_info(op); 399 current_map_info(op);
486 return 1; 400 return 1;
487 } 401 }
… …
495 int command_maps (object *op, char *params) 409 int command_maps (object *op, char *params)
496{ 410{
497 map_info(op,params); 411 map_info(op,params);
498 return 1; 412 return 1;
499 } 413 }
500
501int command_strings (object *op, char *params)
502{
503 ss_dump_statistics();
504 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
505 new_draw_info(NDI_UNIQUE, 0,op,ss_dump_table(2));
506 return 1;
507 }
508
509#ifdef DEBUG
510int command_sstable (object *op, char *params)
511{
512 ss_dump_table(1);
513 return 1;
514 }
515#endif
516 414
517int command_time (object *op, char *params) 415int command_time (object *op, char *params)
518{ 416{
519 print_tod (op); 417 print_tod (op);
520 return 1; 418 return 1;
… …
524{ 422{
525 int wx, wy, temp, sky; 423 int wx, wy, temp, sky;
526 char buf[MAX_BUF]; 424 char buf[MAX_BUF];
527 425
528 if (settings.dynamiclevel < 1) 426 if (settings.dynamiclevel < 1)
529 return 1; 427 return 1;
530 428
531 if (op->map == NULL) 429 if (op->map == NULL)
532 return 1; 430 return 1;
533 431
534 if (worldmap_to_weathermap(op->x, op->y, &wx, &wy, op->map) != 0) 432 if (worldmap_to_weathermap(op->x, op->y, &wx, &wy, op->map) != 0)
535 return 1; 433 return 1;
536 434
537 if (QUERY_FLAG(op, FLAG_WIZ)) { 435 if (QUERY_FLAG(op, FLAG_WIZ)) {
538 /* dump the weather, Dm style! Yo! */ 436 /* dump the weather, Dm style! Yo! */
539 new_draw_info_format(NDI_UNIQUE, 0, op, "Real temp: %d", 437 new_draw_info_format(NDI_UNIQUE, 0, op, "Real temp: %d",
540 real_world_temperature(op->x, op->y, op->map)); 438 real_world_temperature(op->x, op->y, op->map));
541 new_draw_info_format(NDI_UNIQUE, 0, op, "Base temp: %d", 439 new_draw_info_format(NDI_UNIQUE, 0, op, "Base temp: %d",
542 weathermap[wx][wy].temp); 440 weathermap[wx][wy].temp);
543 new_draw_info_format(NDI_UNIQUE, 0, op, "Humid: %d", 441 new_draw_info_format(NDI_UNIQUE, 0, op, "Humid: %d",
544 weathermap[wx][wy].humid); 442 weathermap[wx][wy].humid);
545 new_draw_info_format(NDI_UNIQUE, 0, op, "Wind: dir=%d speed=%d", 443 new_draw_info_format(NDI_UNIQUE, 0, op, "Wind: dir=%d speed=%d",
546 weathermap[wx][wy].winddir, weathermap[wx][wy].windspeed); 444 weathermap[wx][wy].winddir, weathermap[wx][wy].windspeed);
547 new_draw_info_format(NDI_UNIQUE, 0, op, "Pressure: %d", 445 new_draw_info_format(NDI_UNIQUE, 0, op, "Pressure: %d",
548 weathermap[wx][wy].pressure); 446 weathermap[wx][wy].pressure);
549 new_draw_info_format(NDI_UNIQUE, 0, op, "Avg Elevation: %d", 447 new_draw_info_format(NDI_UNIQUE, 0, op, "Avg Elevation: %d",
550 weathermap[wx][wy].avgelev); 448 weathermap[wx][wy].avgelev);
551 new_draw_info_format(NDI_UNIQUE, 0, op, "Rainfall: %d Water: %d", 449 new_draw_info_format(NDI_UNIQUE, 0, op, "Rainfall: %d Water: %d",
552 weathermap[wx][wy].rainfall, weathermap[wx][wy].water); 450 weathermap[wx][wy].rainfall, weathermap[wx][wy].water);
553 } 451 }
554 452
555 temp = real_world_temperature(op->x, op->y, op->map); 453 temp = real_world_temperature(op->x, op->y, op->map);
556 new_draw_info_format(NDI_UNIQUE, 0, op, "It's currently %d degrees " 454 new_draw_info_format(NDI_UNIQUE, 0, op, "It's currently %d degrees "
557 "Centigrade out.", temp); 455 "Centigrade out.", temp);
558 456
559 /* humid */ 457 /* humid */
560 if (weathermap[wx][wy].humid < 20) 458 if (weathermap[wx][wy].humid < 20)
561 new_draw_info(NDI_UNIQUE, 0, op, "It is very dry."); 459 new_draw_info(NDI_UNIQUE, 0, op, "It is very dry.");
562 else if (weathermap[wx][wy].humid < 40) 460 else if (weathermap[wx][wy].humid < 40)
563 new_draw_info(NDI_UNIQUE, 0, op, "It is very comfortable today."); 461 new_draw_info(NDI_UNIQUE, 0, op, "It is very comfortable today.");
564 else if (weathermap[wx][wy].humid < 60) 462 else if (weathermap[wx][wy].humid < 60)
565 new_draw_info(NDI_UNIQUE, 0, op, "It is a bit muggy."); 463 new_draw_info(NDI_UNIQUE, 0, op, "It is a bit muggy.");
566 else if (weathermap[wx][wy].humid < 80) 464 else if (weathermap[wx][wy].humid < 80)
567 new_draw_info(NDI_UNIQUE, 0, op, "It is muggy."); 465 new_draw_info(NDI_UNIQUE, 0, op, "It is muggy.");
568 else 466 else
569 new_draw_info(NDI_UNIQUE, 0, op, "It is uncomfortably muggy."); 467 new_draw_info(NDI_UNIQUE, 0, op, "It is uncomfortably muggy.");
570 468
571 /* wind */ 469 /* wind */
572 switch (weathermap[wx][wy].winddir) { 470 switch (weathermap[wx][wy].winddir) {
573 case 1: sprintf(buf, "north"); break; 471 case 1: sprintf(buf, "north"); break;
574 case 2: sprintf(buf, "northeast"); break; 472 case 2: sprintf(buf, "northeast"); break;
… …
578 case 6: sprintf(buf, "southwest"); break; 476 case 6: sprintf(buf, "southwest"); break;
579 case 7: sprintf(buf, "west"); break; 477 case 7: sprintf(buf, "west"); break;
580 case 8: sprintf(buf, "northwest"); break; 478 case 8: sprintf(buf, "northwest"); break;
581 } 479 }
582 if (weathermap[wx][wy].windspeed < 5) 480 if (weathermap[wx][wy].windspeed < 5)
583 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a mild breeze " 481 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a mild breeze "
584 "coming from the %s.", buf); 482 "coming from the %s.", buf);
585 else if (weathermap[wx][wy].windspeed < 10) 483 else if (weathermap[wx][wy].windspeed < 10)
586 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong breeze " 484 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong breeze "
587 "coming from the %s.", buf); 485 "coming from the %s.", buf);
588 else if (weathermap[wx][wy].windspeed < 15) 486 else if (weathermap[wx][wy].windspeed < 15)
589 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a light wind " 487 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a light wind "
590 "coming from the %s.", buf); 488 "coming from the %s.", buf);
591 else if (weathermap[wx][wy].windspeed < 25) 489 else if (weathermap[wx][wy].windspeed < 25)
592 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong wind " 490 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a strong wind "
593 "coming from the %s.", buf); 491 "coming from the %s.", buf);
594 else if (weathermap[wx][wy].windspeed < 35) 492 else if (weathermap[wx][wy].windspeed < 35)
595 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a heavy wind " 493 new_draw_info_format(NDI_UNIQUE, 0, op, "There is a heavy wind "
596 "coming from the %s.", buf); 494 "coming from the %s.", buf);
597 else 495 else
598 new_draw_info_format(NDI_UNIQUE, 0, op, "The wind from the %s is " 496 new_draw_info_format(NDI_UNIQUE, 0, op, "The wind from the %s is "
599 "incredibly strong!", buf); 497 "incredibly strong!", buf);
600 498
601 sky = weathermap[wx][wy].sky; 499 sky = weathermap[wx][wy].sky;
602 if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG) 500 if (temp <= 0 && sky > SKY_OVERCAST && sky < SKY_FOG)
603 sky += 10; /*let it snow*/ 501 sky += 10; /*let it snow*/
604 switch (sky) { 502 switch (sky) {
605 case SKY_CLEAR: new_draw_info(NDI_UNIQUE, 0, op, "There isn''t a cloud in the sky."); break; 503 case SKY_CLEAR: new_draw_info(NDI_UNIQUE, 0, op, "There isn''t a cloud in the sky."); break;
606 case SKY_LIGHTCLOUD: new_draw_info(NDI_UNIQUE, 0, op, "There are a few light clouds in the sky."); break; 504 case SKY_LIGHTCLOUD: new_draw_info(NDI_UNIQUE, 0, op, "There are a few light clouds in the sky."); break;
607 case SKY_OVERCAST: new_draw_info(NDI_UNIQUE, 0, op, "The sky is cloudy and dreary."); break; 505 case SKY_OVERCAST: new_draw_info(NDI_UNIQUE, 0, op, "The sky is cloudy and dreary."); break;
608 case SKY_LIGHT_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining softly."); break; 506 case SKY_LIGHT_RAIN: new_draw_info(NDI_UNIQUE, 0, op, "It is raining softly."); break;
… …
656 */ 554 */
657 555
658int command_dumpbelow (object *op, char *params) 556int command_dumpbelow (object *op, char *params)
659{ 557{
660 if (op && op->below) { 558 if (op && op->below) {
661 dump_object(op->below); 559 dump_object(op->below);
662 new_draw_info(NDI_UNIQUE, 0,op,errmsg); 560 new_draw_info(NDI_UNIQUE, 0,op,errmsg);
663 /* Let's push that item on the dm's stack */ 561 /* Let's push that item on the dm's stack */
664 dm_stack_push( op->contr, op->below->count ); 562 dm_stack_push( op->contr, op->below->count );
665 } 563 }
666 return 0; 564 return 0;
667} 565}
… …
678 else 576 else
679 i =onoff_value(params); 577 i =onoff_value(params);
680 578
681 if (i) { 579 if (i) {
682 new_draw_info(NDI_UNIQUE, 0,op, "You will now walk through walls.\n"); 580 new_draw_info(NDI_UNIQUE, 0,op, "You will now walk through walls.\n");
683 SET_FLAG(op, FLAG_WIZPASS); 581 SET_FLAG(op, FLAG_WIZPASS);
684 } else { 582 } else {
685 new_draw_info(NDI_UNIQUE, 0,op, "You will now be stopped by walls.\n"); 583 new_draw_info(NDI_UNIQUE, 0,op, "You will now be stopped by walls.\n");
686 CLEAR_FLAG(op, FLAG_WIZPASS); 584 CLEAR_FLAG(op, FLAG_WIZPASS);
687 } 585 }
688 return 0; 586 return 0;
… …
725int command_dumpallarchetypes (object *op, char *params) 623int command_dumpallarchetypes (object *op, char *params)
726{ 624{
727 dump_all_archetypes(); 625 dump_all_archetypes();
728 return 0; 626 return 0;
729 } 627 }
730
731int command_ssdumptable (object *op, char *params)
732{
733 (void) ss_dump_table(1);
734 return 0;
735}
736 628
737int command_dumpmap (object *op, char *params) 629int command_dumpmap (object *op, char *params)
738{ 630{
739 if(op) 631 if(op)
740 dump_map(op->map); 632 dump_map(op->map);
… …
769 FILE * fp; 661 FILE * fp;
770 if((fp = fopen( BUG_LOG , "a")) != NULL){ 662 if((fp = fopen( BUG_LOG , "a")) != NULL){
771 fprintf(fp,"%s\n", reportstring); 663 fprintf(fp,"%s\n", reportstring);
772 fclose(fp); 664 fclose(fp);
773 } else { 665 } else {
774 LOG(llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror_local(errno)); 666 LOG(llevError, "Cannot write bugs file %s: %s\n", BUG_LOG, strerror(errno));
775 } 667 }
776} 668}
777 669
778int command_output_sync(object *op, char *params) 670int command_output_sync(object *op, char *params)
779{ 671{
780 int val; 672 int val;
781 673
782 if (!params) { 674 if (!params) {
783 new_draw_info_format(NDI_UNIQUE, 0, op, 675 new_draw_info_format(NDI_UNIQUE, 0, op,
784 "Output sync time is presently %d", op->contr->outputs_sync); 676 "Output sync time is presently %d", op->contr->outputs_sync);
785 return 1; 677 return 1;
786 } 678 }
787 val=atoi(params); 679 val=atoi(params);
788 if (val>0) { 680 if (val>0) {
789 op->contr->outputs_sync = val; 681 op->contr->outputs_sync = val;
790 new_draw_info_format(NDI_UNIQUE, 0, op, 682 new_draw_info_format(NDI_UNIQUE, 0, op,
791 "Output sync time now set to %d", op->contr->outputs_sync); 683 "Output sync time now set to %d", op->contr->outputs_sync);
792 } 684 }
793 else 685 else
794 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_sync."); 686 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_sync.");
795 687
796 return 1; 688 return 1;
797} 689}
798 690
799int command_output_count(object *op, char *params) 691int command_output_count(object *op, char *params)
800{ 692{
801 int val; 693 int val;
802 694
803 if (!params) { 695 if (!params) {
804 new_draw_info_format(NDI_UNIQUE, 0, op, 696 new_draw_info_format(NDI_UNIQUE, 0, op,
805 "Output count is presently %d", op->contr->outputs_count); 697 "Output count is presently %d", op->contr->outputs_count);
806 return 1; 698 return 1;
807 } 699 }
808 val=atoi(params); 700 val=atoi(params);
809 if (val>0) { 701 if (val>0) {
810 op->contr->outputs_count = val; 702 op->contr->outputs_count = val;
811 new_draw_info_format(NDI_UNIQUE, 0, op, 703 new_draw_info_format(NDI_UNIQUE, 0, op,
812 "Output count now set to %d", op->contr->outputs_count); 704 "Output count now set to %d", op->contr->outputs_count);
813 } 705 }
814 else 706 else
815 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_count."); 707 new_draw_info(NDI_UNIQUE, 0, op,"Invalid value for output_count.");
816 708
817 return 1; 709 return 1;
818} 710}
819 711
820int command_listen (object *op, char *params) 712int command_listen (object *op, char *params)
821{ 713{
822 int i; 714 int i;
823 715
824 if(params==NULL || !sscanf(params, "%d", &i)) { 716 if(params==NULL || !sscanf(params, "%d", &i)) {
825 new_draw_info_format(NDI_UNIQUE, 0, op, 717 new_draw_info_format(NDI_UNIQUE, 0, op,
826 "Set listen to what (presently %d)?", op->contr->listening); 718 "Set listen to what (presently %d)?", op->contr->listening);
827 return 1; 719 return 1;
828 } 720 }
829 op->contr->listening=(char) i; 721 op->contr->listening=(char) i;
830 new_draw_info_format(NDI_UNIQUE, 0, op, 722 new_draw_info_format(NDI_UNIQUE, 0, op,
831 "Your verbose level is now %d.",i); 723 "Your verbose level is now %d.",i);
832 return 1; 724 return 1;
833} 725}
834 726
835/* Prints out some useful information for the character. Everything we print 727/* Prints out some useful information for the character. Everything we print
836 * out can be determined by the docs, so we aren't revealing anything extra - 728 * out can be determined by the docs, so we aren't revealing anything extra -
… …
848 new_draw_info_format(NDI_UNIQUE, 0, pl," Next Level: %I64d",level_exp(pl->level+1, pl->expmul)); 740 new_draw_info_format(NDI_UNIQUE, 0, pl," Next Level: %I64d",level_exp(pl->level+1, pl->expmul));
849#endif 741#endif
850 new_draw_info(NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 742 new_draw_info(NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
851 743
852 new_draw_info_format(NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 744 new_draw_info_format(NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
853 pl->contr->orig_stats.Str, pl->stats.Str, 20+pl->arch->clone.stats.Str); 745 pl->contr->orig_stats.Str, pl->stats.Str, 20+pl->arch->clone.stats.Str);
854 new_draw_info_format(NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d", 746 new_draw_info_format(NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
855 pl->contr->orig_stats.Dex, pl->stats.Dex, 20+pl->arch->clone.stats.Dex); 747 pl->contr->orig_stats.Dex, pl->stats.Dex, 20+pl->arch->clone.stats.Dex);
856 new_draw_info_format(NDI_UNIQUE, 0, pl, "Con %2d/ %3d/%3d", 748 new_draw_info_format(NDI_UNIQUE, 0, pl, "Con %2d/ %3d/%3d",
857 pl->contr->orig_stats.Con, pl->stats.Con, 20+pl->arch->clone.stats.Con); 749 pl->contr->orig_stats.Con, pl->stats.Con, 20+pl->arch->clone.stats.Con);
858 new_draw_info_format(NDI_UNIQUE, 0, pl, "Int %2d/ %3d/%3d", 750 new_draw_info_format(NDI_UNIQUE, 0, pl, "Int %2d/ %3d/%3d",
859 pl->contr->orig_stats.Int, pl->stats.Int, 20+pl->arch->clone.stats.Int); 751 pl->contr->orig_stats.Int, pl->stats.Int, 20+pl->arch->clone.stats.Int);
860 new_draw_info_format(NDI_UNIQUE, 0, pl, "Wis %2d/ %3d/%3d", 752 new_draw_info_format(NDI_UNIQUE, 0, pl, "Wis %2d/ %3d/%3d",
861 pl->contr->orig_stats.Wis, pl->stats.Wis, 20+pl->arch->clone.stats.Wis); 753 pl->contr->orig_stats.Wis, pl->stats.Wis, 20+pl->arch->clone.stats.Wis);
862 new_draw_info_format(NDI_UNIQUE, 0, pl, "Pow %2d/ %3d/%3d", 754 new_draw_info_format(NDI_UNIQUE, 0, pl, "Pow %2d/ %3d/%3d",
863 pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow); 755 pl->contr->orig_stats.Pow, pl->stats.Pow, 20+pl->arch->clone.stats.Pow);
864 new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d", 756 new_draw_info_format(NDI_UNIQUE, 0, pl, "Cha %2d/ %3d/%3d",
865 pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha); 757 pl->contr->orig_stats.Cha, pl->stats.Cha, 20+pl->arch->clone.stats.Cha);
866 new_draw_info_format(NDI_UNIQUE, 0, pl, "\nAttack Mode: %s",pl->contr->peaceful? "Peaceful":"Hostile"); 758 new_draw_info_format(NDI_UNIQUE, 0, pl, "\nAttack Mode: %s",pl->contr->peaceful? "Peaceful":"Hostile");
867 759
868 /* Can't think of anything else to print right now */ 760 /* Can't think of anything else to print right now */
869 return 0; 761 return 0;
870} 762}
… …
883 DIR *Dir; 775 DIR *Dir;
884 776
885 sprintf(buf,"%s/%s/",settings.localdir,settings.playerdir); 777 sprintf(buf,"%s/%s/",settings.localdir,settings.playerdir);
886 t=buf+strlen(buf); 778 t=buf+strlen(buf);
887 if ((Dir=opendir(buf))!=NULL) { 779 if ((Dir=opendir(buf))!=NULL) {
888 const struct dirent *Entry; 780 const struct dirent *Entry;
889 781
890 while ((Entry=readdir(Dir))!=NULL) { 782 while ((Entry=readdir(Dir))!=NULL) {
891 /* skip '.' , '..' */ 783 /* skip '.' , '..' */
892 if (!((Entry->d_name[0]=='.' && Entry->d_name[1]=='\0') || 784 if (!((Entry->d_name[0]=='.' && Entry->d_name[1]=='\0') ||
893 (Entry->d_name[0]=='.' && Entry->d_name[1]=='.' && Entry->d_name[2]=='\0'))) 785 (Entry->d_name[0]=='.' && Entry->d_name[1]=='.' && Entry->d_name[2]=='\0')))
894 { 786 {
895 struct stat Stat; 787 struct stat Stat;
896 788
897 strcpy(t,Entry->d_name); 789 strcpy(t,Entry->d_name);
898 if (stat(buf,&Stat)==0) { 790 if (stat(buf,&Stat)==0) {
899 /* This was not posix compatible 791 /* This was not posix compatible
900 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) { 792 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) {
901 */ 793 */
902 if (S_ISDIR(Stat.st_mode)){ 794 if (S_ISDIR(Stat.st_mode)){
903 char buf2[MAX_BUF]; 795 char buf2[MAX_BUF];
904 struct tm *tm=localtime(&Stat.st_mtime); 796 struct tm *tm=localtime(&Stat.st_mtime);
905 sprintf(buf2,"%s\t%04d %02d %02d %02d %02d %02d", 797 sprintf(buf2,"%s\t%04d %02d %02d %02d %02d %02d",
906 Entry->d_name, 798 Entry->d_name,
907 1900+tm->tm_year, 799 1900+tm->tm_year,
908 1+tm->tm_mon, 800 1+tm->tm_mon,
909 tm->tm_mday, 801 tm->tm_mday,
910 tm->tm_hour, 802 tm->tm_hour,
911 tm->tm_min, 803 tm->tm_min,
912 tm->tm_sec); 804 tm->tm_sec);
913 new_draw_info(NDI_UNIQUE, 0, op, buf2); 805 new_draw_info(NDI_UNIQUE, 0, op, buf2);
914 } 806 }
915 } 807 }
916 } 808 }
917 } 809 }
918 } 810 }
919 closedir(Dir); 811 closedir(Dir);
920 return 0; 812 return 0;
921} 813}
922 814
… …
927 int i; 819 int i;
928 int first; 820 int first;
929 821
930 first=1; 822 first=1;
931 for(i=2; i<socket_info.allocated_sockets; i++) { 823 for(i=2; i<socket_info.allocated_sockets; i++) {
932 if (init_sockets[i].old_mode == Old_Listen) { 824 if (init_sockets[i].old_mode == Old_Listen) {
933 if (first) { 825 if (first) {
934 new_draw_info(NDI_UNIQUE,0,op,"Kill-logs are sent to:"); 826 new_draw_info(NDI_UNIQUE,0,op,"Kill-logs are sent to:");
935 first=0; 827 first=0;
936 } 828 }
937 new_draw_info_format(NDI_UNIQUE, 0, op, "%s: %s", 829 new_draw_info_format(NDI_UNIQUE, 0, op, "%s: %s",
938 init_sockets[i].host,init_sockets[i].comment); 830 init_sockets[i].host,init_sockets[i].comment);
939 } 831 }
940 } 832 }
941 if (first) { 833 if (first) {
942 new_draw_info(NDI_UNIQUE,0,op,"Nobody is currently logging kills."); 834 new_draw_info(NDI_UNIQUE,0,op,"Nobody is currently logging kills.");
943 } 835 }
944 return 1; 836 return 1;
945} 837}
946 838
947int command_applymode(object *op, char *params) 839int command_applymode(object *op, char *params)
948{ 840{
949 unapplymode unapply = op->contr->unapply; 841 unapplymode unapply = op->contr->unapply;
950 static const char* const types[]={"nochoice", "never", "always"}; 842 static const char* const types[]={"nochoice", "never", "always"};
951 843
952 if (!params) { 844 if (!params) {
953 new_draw_info_format(NDI_UNIQUE, 0, op, "applymode is set to %s", 845 new_draw_info_format(NDI_UNIQUE, 0, op, "applymode is set to %s",
954 types[op->contr->unapply]); 846 types[op->contr->unapply]);
955 return 1; 847 return 1;
956 } 848 }
957 849
958 if (!strcmp(params,"nochoice")) 850 if (!strcmp(params,"nochoice"))
959 op->contr->unapply=unapply_nochoice; 851 op->contr->unapply=unapply_nochoice;
960 else if (!strcmp(params,"never")) 852 else if (!strcmp(params,"never"))
961 op->contr->unapply=unapply_never; 853 op->contr->unapply=unapply_never;
962 else if (!strcmp(params,"always")) 854 else if (!strcmp(params,"always"))
963 op->contr->unapply=unapply_always; 855 op->contr->unapply=unapply_always;
964 else { 856 else {
965 new_draw_info_format(NDI_UNIQUE, 0, op, 857 new_draw_info_format(NDI_UNIQUE, 0, op,
966 "applymode: Unknown options %s, valid options are nochoice, never, always", 858 "applymode: Unknown options %s, valid options are nochoice, never, always",
967 params); 859 params);
968 return 0; 860 return 0;
969 } 861 }
970 new_draw_info_format(NDI_UNIQUE, 0, op, "Applymode %s set to %s", 862 new_draw_info_format(NDI_UNIQUE, 0, op, "Applymode %s set to %s",
971 (unapply==op->contr->unapply?"":" now"), 863 (unapply==op->contr->unapply?"":" now"),
972 types[op->contr->unapply]); 864 types[op->contr->unapply]);
973 return 1; 865 return 1;
974} 866}
975 867
976int command_bowmode(object *op, char *params) 868int command_bowmode(object *op, char *params)
977{ 869{
978 bowtype_t oldtype=op->contr->bowtype; 870 bowtype_t oldtype=op->contr->bowtype;
979 static const char* const types[] = 871 static const char* const types[] =
980 {"normal", "threewide", "spreadshot", "firenorth", 872 {"normal", "threewide", "spreadshot", "firenorth",
981 "firene", "fireeast", "firese", "firesouth", 873 "firene", "fireeast", "firese", "firesouth",
982 "firesw", "firewest", "firenw", "bestarrow"}; 874 "firesw", "firewest", "firenw", "bestarrow"};
983 char buf[MAX_BUF]; 875 char buf[MAX_BUF];
984 int i, found; 876 int i, found;
985 877
986 if (!params) { 878 if (!params) {
987 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode is set to %s", 879 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode is set to %s",
988 types[op->contr->bowtype]); 880 types[op->contr->bowtype]);
989 return 1; 881 return 1;
990 } 882 }
991 883
992 for (i=0,found=0; i<=bow_bestarrow; i++) { 884 for (i=0,found=0; i<=bow_bestarrow; i++) {
993 if (!strcmp(params, types[i])) { 885 if (!strcmp(params, types[i])) {
994 found++; 886 found++;
995 op->contr->bowtype= (bowtype_t) i; 887 op->contr->bowtype= (bowtype_t) i;
996 break; 888 break;
997 } 889 }
998 } 890 }
999 if (!found) { 891 if (!found) {
1000 sprintf(buf, "bowmode: Unknown options %s, valid options are:", params); 892 sprintf(buf, "bowmode: Unknown options %s, valid options are:", params);
1001 for (i=0; i<=bow_bestarrow; i++) { 893 for (i=0; i<=bow_bestarrow; i++) {
1002 strcat(buf, " "); 894 strcat(buf, " ");
1003 strcat(buf, types[i]); 895 strcat(buf, types[i]);
1004 if (i < bow_nw) 896 if (i < bow_nw)
1005 strcat(buf, ","); 897 strcat(buf, ",");
1006 else 898 else
1007 strcat(buf, "."); 899 strcat(buf, ".");
1008 } 900 }
1009 new_draw_info_format(NDI_UNIQUE, 0, op, buf); 901 new_draw_info_format(NDI_UNIQUE, 0, op, buf);
1010 return 0; 902 return 0;
1011 } 903 }
1012 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode %s set to %s", 904 new_draw_info_format(NDI_UNIQUE, 0, op, "bowmode %s set to %s",
1013 (oldtype==op->contr->bowtype?"":"now"), 905 (oldtype==op->contr->bowtype?"":"now"),
1014 types[op->contr->bowtype]); 906 types[op->contr->bowtype]);
1015 return 1; 907 return 1;
1016} 908}
1017 909
1018int command_petmode(object *op, char *params) 910int command_petmode(object *op, char *params)
1019{ 911{
1020 petmode_t oldtype=op->contr->petmode; 912 petmode_t oldtype=op->contr->petmode;
1021 static const char* const types[]={"normal", "sad", "defend", "arena"}; 913 static const char* const types[]={"normal", "sad", "defend", "arena"};
1022 914
1023 if (!params) { 915 if (!params) {
1024 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode is set to %s", 916 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode is set to %s",
1025 types[op->contr->petmode]); 917 types[op->contr->petmode]);
1026 return 1; 918 return 1;
1027 } 919 }
1028 920
1029 if (!strcmp(params,"normal")) 921 if (!strcmp(params,"normal"))
1030 op->contr->petmode=pet_normal; 922 op->contr->petmode=pet_normal;
1031 else if (!strcmp(params,"sad")) 923 else if (!strcmp(params,"sad"))
1032 op->contr->petmode=pet_sad; 924 op->contr->petmode=pet_sad;
1033 else if (!strcmp(params,"defend")) 925 else if (!strcmp(params,"defend"))
1034 op->contr->petmode=pet_defend; 926 op->contr->petmode=pet_defend;
1035 else if (!strcmp(params,"arena")) 927 else if (!strcmp(params,"arena"))
1036 op->contr->petmode=pet_arena; 928 op->contr->petmode=pet_arena;
1037 else { 929 else {
1038 new_draw_info_format(NDI_UNIQUE, 0, op, 930 new_draw_info_format(NDI_UNIQUE, 0, op,
1039 "petmode: Unknown options %s, valid options are normal," 931 "petmode: Unknown options %s, valid options are normal,"
1040 "sad (seek and destroy), defend, arena", params); 932 "sad (seek and destroy), defend, arena", params);
1041 return 0; 933 return 0;
1042 } 934 }
1043 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode %s set to %s", 935 new_draw_info_format(NDI_UNIQUE, 0, op, "petmode %s set to %s",
1044 (oldtype==op->contr->petmode?"":"now"), 936 (oldtype==op->contr->petmode?"":"now"),
1045 types[op->contr->petmode]); 937 types[op->contr->petmode]);
1046 return 1; 938 return 1;
1047} 939}
1048 940
1049int command_showpets(object *op, char *params) 941int command_showpets(object *op, char *params)
1050{ 942{
… …
1054 if (params !=NULL) target= atoi(params); 946 if (params !=NULL) target= atoi(params);
1055 for (obl = first_friendly_object; obl != NULL; obl = next) { 947 for (obl = first_friendly_object; obl != NULL; obl = next) {
1056 object *ob = obl->ob; 948 object *ob = obl->ob;
1057 next = obl->next; 949 next = obl->next;
1058 if (get_owner(ob) == op) { 950 if (get_owner(ob) == op) {
1059 if (target ==0) { 951 if (target ==0) {
1060 if (counter==0) 952 if (counter==0)
1061 new_draw_info(NDI_UNIQUE, 0, op, "Pets:"); 953 new_draw_info(NDI_UNIQUE, 0, op, "Pets:");
1062 new_draw_info_format(NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, ob->name, ob->level ); 954 new_draw_info_format(NDI_UNIQUE, 0, op, "%d %s - level %d", ++counter, &ob->name, ob->level );
1063 } 955 }
1064 else if (!have_shown_pet && ++counter==target) { 956 else if (!have_shown_pet && ++counter==target) {
1065 new_draw_info_format(NDI_UNIQUE, 0, op, "level %d %s", ob->level, ob->name); 957 new_draw_info_format(NDI_UNIQUE, 0, op, "level %d %s", ob->level, &ob->name);
1066 new_draw_info_format(NDI_UNIQUE, 0, op, "%d/%d HP, %d/%d SP", 958 new_draw_info_format(NDI_UNIQUE, 0, op, "%d/%d HP, %d/%d SP",
1067 ob->stats.hp, ob->stats.maxhp, ob->stats.sp, ob->stats.maxsp); 959 ob->stats.hp, ob->stats.maxhp, ob->stats.sp, ob->stats.maxsp);
1068 /* this is not a nice way to do this, it should be made to be more like the statistics command */ 960 /* this is not a nice way to do this, it should be made to be more like the statistics command */
1069 new_draw_info_format(NDI_UNIQUE, 0, op, "Str %d", ob->stats.Str); 961 new_draw_info_format(NDI_UNIQUE, 0, op, "Str %d", ob->stats.Str);
1070 new_draw_info_format(NDI_UNIQUE, 0, op, "Dex %d", ob->stats.Dex); 962 new_draw_info_format(NDI_UNIQUE, 0, op, "Dex %d", ob->stats.Dex);
1071 new_draw_info_format(NDI_UNIQUE, 0, op, "Con %d", ob->stats.Con); 963 new_draw_info_format(NDI_UNIQUE, 0, op, "Con %d", ob->stats.Con);
1072 new_draw_info_format(NDI_UNIQUE, 0, op, "Int %d", ob->stats.Int); 964 new_draw_info_format(NDI_UNIQUE, 0, op, "Int %d", ob->stats.Int);
1073 new_draw_info_format(NDI_UNIQUE, 0, op, "Wis %d", ob->stats.Wis); 965 new_draw_info_format(NDI_UNIQUE, 0, op, "Wis %d", ob->stats.Wis);
1074 new_draw_info_format(NDI_UNIQUE, 0, op, "Cha %d", ob->stats.Cha); 966 new_draw_info_format(NDI_UNIQUE, 0, op, "Cha %d", ob->stats.Cha);
1075 new_draw_info_format(NDI_UNIQUE, 0, op, "Pow %d", ob->stats.Pow); 967 new_draw_info_format(NDI_UNIQUE, 0, op, "Pow %d", ob->stats.Pow);
1076 new_draw_info_format(NDI_UNIQUE, 0, op, "wc %d damage %d ac %d ", 968 new_draw_info_format(NDI_UNIQUE, 0, op, "wc %d damage %d ac %d ",
1077 ob->stats.wc, ob->stats.dam, ob->stats.ac); 969 ob->stats.wc, ob->stats.dam, ob->stats.ac);
1078 have_shown_pet=1; 970 have_shown_pet=1;
1079 } 971 }
1080 } 972 }
1081 } 973 }
1082 if (counter == 0) 974 if (counter == 0)
1083 new_draw_info(NDI_UNIQUE, 0, op, "you have no pets."); 975 new_draw_info(NDI_UNIQUE, 0, op, "you have no pets.");
1084 else if (target !=0 && have_shown_pet==0) 976 else if (target !=0 && have_shown_pet==0)
1085 new_draw_info(NDI_UNIQUE, 0, op, "no such pet."); 977 new_draw_info(NDI_UNIQUE, 0, op, "no such pet.");
… …
1090{ 982{
1091 usekeytype oldtype=op->contr->usekeys; 983 usekeytype oldtype=op->contr->usekeys;
1092 static const char* const types[]={"inventory", "keyrings", "containers"}; 984 static const char* const types[]={"inventory", "keyrings", "containers"};
1093 985
1094 if (!params) { 986 if (!params) {
1095 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys is set to %s", 987 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys is set to %s",
1096 types[op->contr->usekeys]); 988 types[op->contr->usekeys]);
1097 return 1; 989 return 1;
1098 } 990 }
1099 991
1100 if (!strcmp(params,"inventory")) 992 if (!strcmp(params,"inventory"))
1101 op->contr->usekeys=key_inventory; 993 op->contr->usekeys=key_inventory;
1102 else if (!strcmp(params,"keyrings")) 994 else if (!strcmp(params,"keyrings"))
1103 op->contr->usekeys=keyrings; 995 op->contr->usekeys=keyrings;
1104 else if (!strcmp(params,"containers")) 996 else if (!strcmp(params,"containers"))
1105 op->contr->usekeys=containers; 997 op->contr->usekeys=containers;
1106 else { 998 else {
1107 new_draw_info_format(NDI_UNIQUE, 0, op, 999 new_draw_info_format(NDI_UNIQUE, 0, op,
1108 "usekeys: Unknown options %s, valid options are inventory, keyrings, containers", 1000 "usekeys: Unknown options %s, valid options are inventory, keyrings, containers",
1109 params); 1001 params);
1110 return 0; 1002 return 0;
1111 } 1003 }
1112 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys %s set to %s", 1004 new_draw_info_format(NDI_UNIQUE, 0, op, "usekeys %s set to %s",
1113 (oldtype==op->contr->usekeys?"":"now"), 1005 (oldtype==op->contr->usekeys?"":"now"),
1114 types[op->contr->usekeys]); 1006 types[op->contr->usekeys]);
1115 return 1; 1007 return 1;
1116} 1008}
1117 1009
1118int command_resistances(object *op, char *params) 1010int command_resistances(object *op, char *params)
1119{ 1011{
1120 int i; 1012 int i;
1121 if (!op) 1013 if (!op)
1122 return 0; 1014 return 0;
1123 1015
1124 for (i=0; i<NROFATTACKS; i++) { 1016 for (i=0; i<NROFATTACKS; i++) {
1125 if (i==ATNR_INTERNAL) continue; 1017 if (i==ATNR_INTERNAL) continue;
1126 1018
1127 new_draw_info_format(NDI_UNIQUE, 0, op, "%-20s %+5d", 1019 new_draw_info_format(NDI_UNIQUE, 0, op, "%-20s %+5d",
1128 attacktype_desc[i], op->resist[i]); 1020 attacktype_desc[i], op->resist[i]);
1129 } 1021 }
1130 1022
1131 /* If dragon player, let's display natural resistances */ 1023 /* If dragon player, let's display natural resistances */
1132 if ( is_dragon_pl( op ) ) 1024 if ( is_dragon_pl( op ) )
1133 { 1025 {
… …
1164 struct dirent *de; 1056 struct dirent *de;
1165 char filename[MAX_BUF], line[80]; 1057 char filename[MAX_BUF], line[80];
1166 int namelen, linelen=0; 1058 int namelen, linelen=0;
1167 1059
1168 switch (what) { 1060 switch (what) {
1169 case 1: 1061 case 1:
1170 sprintf(filename, "%s/wizhelp", settings.datadir); 1062 sprintf(filename, "%s/wizhelp", settings.datadir);
1171 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:"); 1063 new_draw_info(NDI_UNIQUE, 0,op, " Wiz commands:");
1172 break; 1064 break;
1173 case 3: 1065 case 3:
1174 sprintf(filename, "%s/mischelp", settings.datadir); 1066 sprintf(filename, "%s/mischelp", settings.datadir);
1175 new_draw_info(NDI_UNIQUE, 0,op, " Misc help:"); 1067 new_draw_info(NDI_UNIQUE, 0,op, " Misc help:");
1176 break; 1068 break;
1177 default: 1069 default:
1178 sprintf(filename, "%s/help", settings.datadir); 1070 sprintf(filename, "%s/help", settings.datadir);
1179 new_draw_info(NDI_UNIQUE, 0,op, " Commands:"); 1071 new_draw_info(NDI_UNIQUE, 0,op, " Commands:");
1180 break; 1072 break;
1181 } 1073 }
1182 if (!(dirp=opendir(filename))) 1074 if (!(dirp=opendir(filename)))
1183 return; 1075 return;
1184 1076
1185 line[0] ='\0'; 1077 line[0] ='\0';
1186 for (de = readdir(dirp); de; de = readdir(dirp)) { 1078 for (de = readdir(dirp); de; de = readdir(dirp)) {
1187 namelen = NAMLEN(de); 1079 namelen = NAMLEN(de);
1188 if (namelen <= 2 && *de->d_name == '.' && 1080 if (namelen <= 2 && *de->d_name == '.' &&
1189 (namelen == 1 || de->d_name[1] == '.' ) ) 1081 (namelen == 1 || de->d_name[1] == '.' ) )
1190 continue; 1082 continue;
1191 linelen +=namelen+1; 1083 linelen +=namelen+1;
1192 if (linelen > 42) { 1084 if (linelen > 42) {
1193 new_draw_info(NDI_UNIQUE, 0,op, line); 1085 new_draw_info(NDI_UNIQUE, 0,op, line);
1194 sprintf(line, " %s", de->d_name); 1086 sprintf(line, " %s", de->d_name);
1195 linelen =namelen+1; 1087 linelen =namelen+1;
1196 continue; 1088 continue;
1197 } 1089 }
1198 strcat(line, " "); 1090 strcat(line, " ");
1199 strcat(line, de->d_name); 1091 strcat(line, de->d_name);
1200 } 1092 }
1201 new_draw_info(NDI_UNIQUE, 0,op, line); 1093 new_draw_info(NDI_UNIQUE, 0,op, line);
1202 closedir(dirp); 1094 closedir(dirp);
1203} 1095}
1204 1096
… …
1259 * Main help page? 1151 * Main help page?
1260 */ 1152 */
1261 if (!params) { 1153 if (!params) {
1262 sprintf(filename, "%s/def_help", settings.datadir); 1154 sprintf(filename, "%s/def_help", settings.datadir);
1263 if ((fp=fopen(filename, "r")) == NULL) { 1155 if ((fp=fopen(filename, "r")) == NULL) {
1264 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror_local(errno)); 1156 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror(errno));
1265 return 0; 1157 return 0;
1266 } 1158 }
1267 while (fgets(line, MAX_BUF, fp)) { 1159 while (fgets(line, MAX_BUF, fp)) {
1268 line[MAX_BUF-1] ='\0'; 1160 line[MAX_BUF-1] ='\0';
1269 len =strlen(line)-1; 1161 len =strlen(line)-1;
1270 if (line[len] == '\n') 1162 if (line[len] == '\n')
1271 line[len] ='\0'; 1163 line[len] ='\0';
1272 new_draw_info(NDI_UNIQUE, 0,op, line); 1164 new_draw_info(NDI_UNIQUE, 0,op, line);
1273 } 1165 }
1274 fclose(fp); 1166 fclose(fp);
1275 return 0; 1167 return 0;
1276 } 1168 }
… …
1309 sprintf(filename, "%s/mischelp/%s", settings.datadir, params); 1201 sprintf(filename, "%s/mischelp/%s", settings.datadir, params);
1310 if (stat(filename, &st) || !S_ISREG(st.st_mode)) { 1202 if (stat(filename, &st) || !S_ISREG(st.st_mode)) {
1311 if (op) { 1203 if (op) {
1312 sprintf(filename, "%s/help/%s", settings.datadir, params); 1204 sprintf(filename, "%s/help/%s", settings.datadir, params);
1313 if (stat(filename, &st) || !S_ISREG(st.st_mode)) { 1205 if (stat(filename, &st) || !S_ISREG(st.st_mode)) {
1314 if (QUERY_FLAG(op, FLAG_WIZ)) { 1206 if (QUERY_FLAG(op, FLAG_WIZ)) {
1315 sprintf(filename, "%s/wizhelp/%s", settings.datadir, params); 1207 sprintf(filename, "%s/wizhelp/%s", settings.datadir, params);
1316 if (stat(filename, &st) || !S_ISREG(st.st_mode)) 1208 if (stat(filename, &st) || !S_ISREG(st.st_mode))
1209 goto nohelp;
1210 } else
1317 goto nohelp; 1211 goto nohelp;
1318 } else
1319 goto nohelp;
1320 } 1212 }
1321 } 1213 }
1322 } 1214 }
1323 1215
1324 /* 1216 /*
1325 * Found that. Just cat it to screen. 1217 * Found that. Just cat it to screen.
1326 */ 1218 */
1327 if ((fp=fopen(filename, "r")) == NULL) { 1219 if ((fp=fopen(filename, "r")) == NULL) {
1328 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror_local(errno)); 1220 LOG(llevError, "Cannot open help file %s: %s\n", filename, strerror(errno));
1329 return 0; 1221 return 0;
1330 } 1222 }
1331 sprintf(line, "Help about '%s'", params); 1223 sprintf(line, "Help about '%s'", params);
1332 new_draw_info(NDI_UNIQUE, 0,op, line); 1224 new_draw_info(NDI_UNIQUE, 0,op, line);
1333 while (fgets(line, MAX_BUF, fp)) { 1225 while (fgets(line, MAX_BUF, fp)) {
… …
1382} 1274}
1383 1275
1384int command_real_quit (object *op, char *params) 1276int command_real_quit (object *op, char *params)
1385{ 1277{
1386 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR, 1278 send_query(&op->contr->socket,CS_QUERY_SINGLECHAR,
1387 "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):");
1388 1280
1389 op->contr->state = ST_CONFIRM_QUIT; 1281 op->contr->state = ST_CONFIRM_QUIT;
1390 return 1; 1282 return 1;
1391 } 1283 }
1392 1284
… …
1395 * really easy to abuse this. 1287 * really easy to abuse this.
1396 */ 1288 */
1397int command_explore (object *op, char *params) 1289int command_explore (object *op, char *params)
1398{ 1290{
1399 if (settings.explore_mode == FALSE) 1291 if (settings.explore_mode == FALSE)
1400 return 1; 1292 return 1;
1401 /* 1293 /*
1402 * I guess this is the best way to see if we are solo or not. Actually, 1294 * I guess this is the best way to see if we are solo or not. Actually,
1403 * are there any cases when first_player->next==NULL and we are not solo? 1295 * are there any cases when first_player->next==NULL and we are not solo?
1404 */ 1296 */
1405 if ((first_player!=op->contr) || (first_player->next!=NULL)) { 1297 if ((first_player!=op->contr) || (first_player->next!=NULL)) {
1406 new_draw_info(NDI_UNIQUE, 0,op,"You can not enter explore mode if you are in a party"); 1298 new_draw_info(NDI_UNIQUE, 0,op,"You can not enter explore mode if you are in a party");
1407 } else if (op->contr->explore) 1299 } else if (op->contr->explore)
1408 new_draw_info(NDI_UNIQUE, 0,op, "There is no return from explore mode"); 1300 new_draw_info(NDI_UNIQUE, 0,op, "There is no return from explore mode");
1409 else { 1301 else {
1410 op->contr->explore=1; 1302 op->contr->explore=1;
1411 new_draw_info(NDI_UNIQUE, 0,op, "You are now in explore mode"); 1303 new_draw_info(NDI_UNIQUE, 0,op, "You are now in explore mode");
1412 } 1304 }
1413 return 1; 1305 return 1;
1414} 1306}
1415 1307
1416int command_sound (object *op, char *params) 1308int command_sound (object *op, char *params)
… …
1431 */ 1323 */
1432 1324
1433void receive_player_name(object *op,char k) { 1325void receive_player_name(object *op,char k) {
1434 1326
1435 if(!check_name(op->contr,op->contr->write_buf+1)) { 1327 if(!check_name(op->contr,op->contr->write_buf+1)) {
1436 get_name(op); 1328 get_name(op);
1437 return; 1329 return;
1438 } 1330 }
1439 FREE_AND_COPY(op->name, op->contr->write_buf+1); 1331 op->name = op->contr->write_buf + 1;
1440 FREE_AND_COPY(op->name_pl, op->contr->write_buf+1); 1332 op->name_pl = op->contr->write_buf + 1;
1441 new_draw_info(NDI_UNIQUE, 0,op,op->contr->write_buf); 1333 new_draw_info(NDI_UNIQUE, 0,op,op->contr->write_buf);
1442 op->contr->name_changed=1; 1334 op->contr->name_changed=1;
1443 get_password(op); 1335 get_password(op);
1444} 1336}
1445 1337
… …
1451 return; 1343 return;
1452 } 1344 }
1453 new_draw_info(NDI_UNIQUE, 0,op," "); /* To hide the password better */ 1345 new_draw_info(NDI_UNIQUE, 0,op," "); /* To hide the password better */
1454 1346
1455 if (checkbanned(op->name, op->contr->socket.host)) { 1347 if (checkbanned(op->name, op->contr->socket.host)) {
1456 LOG(llevInfo, "Banned player tried to add: [%s@%s]\n", op->name, op->contr->socket.host); 1348 LOG(llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1457 new_draw_info(NDI_UNIQUE|NDI_RED, 0, op, "You are not allowed to play."); 1349 new_draw_info(NDI_UNIQUE|NDI_RED, 0, op, "You are not allowed to play.");
1458 get_name(op); 1350 get_name(op);
1459 return; 1351 return;
1460 } 1352 }
1461 1353
… …
1483 1375
1484int explore_mode(void) { 1376int explore_mode(void) {
1485 player *pl; 1377 player *pl;
1486 1378
1487 if (settings.explore_mode == TRUE) { 1379 if (settings.explore_mode == TRUE) {
1488 for (pl = first_player; pl != (player *) NULL; pl = pl->next) 1380 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1489 if (pl->explore) 1381 if (pl->explore)
1490 return 1; 1382 return 1;
1491 } 1383 }
1492 return 0; 1384 return 0;
1493} 1385}
1494 1386
1495 1387
1496int command_title (object *op, char *params) 1388int command_title (object *op, char *params)
1497{ 1389{
1498 char buf[MAX_BUF]; 1390 char buf[MAX_BUF];
1499 1391
1500 if (settings.set_title == FALSE) { 1392 if (settings.set_title == FALSE) {
1501 new_draw_info(NDI_UNIQUE, 0, op, "You cannot change your title."); 1393 new_draw_info(NDI_UNIQUE, 0, op, "You cannot change your title.");
1502 return 1; 1394 return 1;
1503 } 1395 }
1504 1396
1505 /* dragon players cannot change titles */ 1397 /* dragon players cannot change titles */
1506 if (is_dragon_pl(op)) { 1398 if (is_dragon_pl(op)) {
1507 new_draw_info(NDI_UNIQUE, 0, op, "Dragons cannot change titles."); 1399 new_draw_info(NDI_UNIQUE, 0, op, "Dragons cannot change titles.");
1508 return 1; 1400 return 1;
1509 } 1401 }
1510 1402
1511 if(params == NULL) { 1403 if(params == NULL) {
1512 if(op->contr->own_title[0]=='\0') 1404 if(op->contr->own_title[0]=='\0')
1513 sprintf(buf,"Your title is '%s'.", op->contr->title); 1405 sprintf(buf,"Your title is '%s'.", op->contr->title);
1514 else 1406 else
1515 sprintf(buf,"Your title is '%s'.", op->contr->own_title); 1407 sprintf(buf,"Your title is '%s'.", op->contr->own_title);
1516 new_draw_info(NDI_UNIQUE, 0,op,buf); 1408 new_draw_info(NDI_UNIQUE, 0,op,buf);
1517 return 1; 1409 return 1;
1518 } 1410 }
1519 if(strcmp(params, "clear")==0 || strcmp(params, "default")==0) { 1411 if(strcmp(params, "clear")==0 || strcmp(params, "default")==0) {
1520 if(op->contr->own_title[0]=='\0') 1412 if(op->contr->own_title[0]=='\0')
1521 new_draw_info(NDI_UNIQUE, 0,op,"Your title is the default title."); 1413 new_draw_info(NDI_UNIQUE, 0,op,"Your title is the default title.");
1522 else 1414 else
1523 new_draw_info(NDI_UNIQUE, 0,op,"Title set to default."); 1415 new_draw_info(NDI_UNIQUE, 0,op,"Title set to default.");
1524 op->contr->own_title[0]='\0'; 1416 op->contr->own_title[0]='\0';
1525 return 1; 1417 return 1;
1526 } 1418 }
1527 1419
1528 if((int)strlen(params) >= MAX_NAME) { 1420 if((int)strlen(params) >= MAX_NAME) {
1529 new_draw_info(NDI_UNIQUE, 0,op,"Title too long."); 1421 new_draw_info(NDI_UNIQUE, 0,op,"Title too long.");
1530 return 1; 1422 return 1;
1531 } 1423 }
1532 strcpy(op->contr->own_title, params); 1424 strcpy(op->contr->own_title, params);
1533 return 1; 1425 return 1;
1534} 1426}
1535 1427
… …
1537{ 1429{
1538// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) { 1430// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1539// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground"); 1431// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1540// } else 1432// } else
1541 if (!op->stats.exp) { 1433 if (!op->stats.exp) {
1542 new_draw_info(NDI_UNIQUE, 0, op, "You don't deserve to save yet."); 1434 new_draw_info(NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1543 } else { 1435 } else {
1544 if(save_player(op,1)) 1436 if(save_player(op,1))
1545 new_draw_info(NDI_UNIQUE, 0,op,"You have been saved."); 1437 new_draw_info(NDI_UNIQUE, 0,op,"You have been saved.");
1546 else 1438 else
1547 new_draw_info(NDI_UNIQUE, 0,op,"SAVE FAILED!"); 1439 new_draw_info(NDI_UNIQUE, 0,op,"SAVE FAILED!");
1548 } 1440 }
1549 return 1; 1441 return 1;
1550} 1442}
1551 1443
1552 1444
… …
1574{ 1466{
1575 int i; 1467 int i;
1576 char buf[MAX_BUF]; 1468 char buf[MAX_BUF];
1577 1469
1578 if (params==NULL || !sscanf(params, "%d", &i)) { 1470 if (params==NULL || !sscanf(params, "%d", &i)) {
1579 sprintf(buf, "Your current wimpy level is %d.", op->run_away); 1471 sprintf(buf, "Your current wimpy level is %d.", op->run_away);
1580 new_draw_info(NDI_UNIQUE, 0,op, buf); 1472 new_draw_info(NDI_UNIQUE, 0,op, buf);
1581 return 1; 1473 return 1;
1582 } 1474 }
1583 sprintf(buf, "Your new wimpy level is %d.", i); 1475 sprintf(buf, "Your new wimpy level is %d.", i);
1584 new_draw_info(NDI_UNIQUE, 0,op, buf); 1476 new_draw_info(NDI_UNIQUE, 0,op, buf);
1585 op->run_away = i; 1477 op->run_away = i;
1586 return 1; 1478 return 1;
… …
1609 mapstruct *mp; 1501 mapstruct *mp;
1610 int maps_used=0, mapmem=0, objects_used=0, x,y; 1502 int maps_used=0, mapmem=0, objects_used=0, x,y;
1611 object *tmp; 1503 object *tmp;
1612 1504
1613 for (mp = styles; mp!=NULL; mp=mp->next) { 1505 for (mp = styles; mp!=NULL; mp=mp->next) {
1614 maps_used++; 1506 maps_used++;
1615 mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct); 1507 mapmem += MAP_WIDTH(mp)*MAP_HEIGHT(mp)*(sizeof(object *)+sizeof(MapSpace)) + sizeof(mapstruct);
1616 for (x=0; x<MAP_WIDTH(mp); x++) { 1508 for (x=0; x<MAP_WIDTH(mp); x++) {
1617 for (y=0; y<MAP_HEIGHT(mp); y++) { 1509 for (y=0; y<MAP_HEIGHT(mp); y++) {
1618 for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above) 1510 for (tmp=get_map_ob(mp, x, y); tmp!=NULL; tmp=tmp->above)
1619 objects_used++; 1511 objects_used++;
1620 } 1512 }
1621 } 1513 }
1622 } 1514 }
1623 new_draw_info_format(NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used); 1515 new_draw_info_format(NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1624 new_draw_info(NDI_UNIQUE, 0, op, "Memory used, not"); 1516 new_draw_info(NDI_UNIQUE, 0, op, "Memory used, not");
1625 new_draw_info_format(NDI_UNIQUE, 0, op, "including objects: %d", mapmem); 1517 new_draw_info_format(NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1626 new_draw_info_format(NDI_UNIQUE, 0, op, "Style objects: %d", objects_used); 1518 new_draw_info_format(NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
… …
1632{ 1524{
1633 objectlink *obl, *next; 1525 objectlink *obl, *next;
1634 int counter=0, removecount=0; 1526 int counter=0, removecount=0;
1635 if (params == NULL) { 1527 if (params == NULL) {
1636 terminate_all_pets(op); 1528 terminate_all_pets(op);
1637 new_draw_info(NDI_UNIQUE, 0, op, "Your pets have been killed."); 1529 new_draw_info(NDI_UNIQUE, 0, op, "Your pets have been killed.");
1638 } 1530 }
1639 else { 1531 else {
1640 int target = atoi(params); 1532 int target = atoi(params);
1641 for(obl = first_friendly_object; obl != NULL; obl = next) { 1533 for(obl = first_friendly_object; obl != NULL; obl = next) {
1642 object *ob = obl->ob; 1534 object *ob = obl->ob;
1643 next = obl->next; 1535 next = obl->next;
1644 if (get_owner(ob) == op) 1536 if (get_owner(ob) == op)
1645 if (++counter==target || (target==0 && !strcasecmp(ob->name, params))) { 1537 if (++counter==target || (target==0 && !strcasecmp(ob->name, params))) {
1646 if (!QUERY_FLAG(ob, FLAG_REMOVED)) 1538 if (!QUERY_FLAG(ob, FLAG_REMOVED))
1647 remove_ob(ob); 1539 remove_ob(ob);
1648 remove_friendly_object(ob); 1540 remove_friendly_object(ob);
1649 free_object(ob); 1541 free_object(ob);
1650 removecount++; 1542 removecount++;
1651 }
1652 }
1653 if (removecount!=0)
1654 new_draw_info_format(NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);
1655 else
1656 new_draw_info(NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n");
1657 }
1658 return 0;
1659}
1660
1661/**
1662 * Displays all non start/end tags for specified quest.
1663 **/
1664static void display_quest_details( object* pl, object* quest )
1665 {
1666/* object* item; */
1667
1668 new_draw_info_format( NDI_WHITE, 0, pl, "Quest: %s\n%s\n",
1669 quest_get_name( quest ),
1670 quest->lore ? quest->lore : "(no description available)" );
1671/*
1672 for ( item = pl->inv; item; item = item->below )
1673 {
1674 if ( ( item != quest )
1675 && ( quest_is_quest_marker( item ) )
1676 && ( quest_is_same_quest( quest->slaying, item->slaying ) )
1677 && ( item->lore ) )
1678 {
1679 new_draw_info( NDI_WHITE, 0, pl, item->lore );
1680 new_draw_info( NDI_WHITE, 0, pl, "------\n" );
1681 } 1543 }
1682 } 1544 }
1683 */ 1545 if (removecount!=0)
1684 } 1546 new_draw_info_format(NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);
1685 1547 else
1686/** 1548 new_draw_info(NDI_UNIQUE, 0, op, "Couldn't find any suitable pets to kill.\n");
1687 * Displays quest information to player.
1688 * Acceptable parameters:
1689 * * finished => finished quests only
1690 * * <name> => only this particular quest, finished or not, with details
1691 * * nothing => all current quests
1692 *
1693 * For current quests, will display either the lore of the non start tags,
1694 * or the lore of start tag if no other tag.
1695 **/
1696int command_quests( object *pl, char *params )
1697 { 1549 }
1698 object* item;
1699
1700 if ( params && !strcmp( params, "finished" ) )
1701 {
1702 new_draw_info( NDI_WHITE, 0, pl, "Completed quests:\n" );
1703 for ( item = pl->inv; item; item = item->below )
1704 {
1705 if ( quest_is_quest_marker( item, 0 ) )
1706 {
1707 new_draw_info( NDI_WHITE, 0, pl, quest_get_name( item ) );
1708 new_draw_info( NDI_WHITE, 0, pl, "\n" );
1709 }
1710 }
1711 return 1;
1712 }
1713
1714 if ( params )
1715 {
1716 for ( item = pl->inv; item; item = item->below )
1717 {
1718 if ( quest_is_quest_marker( item, 0 )
1719 && !strcmp( quest_get_name( item ), params ) )
1720 {
1721 display_quest_details( pl, item );
1722 }
1723 }
1724 return 1;
1725 }
1726
1727 /*Display current quests */
1728 new_draw_info( NDI_WHITE, 0, pl, "Current quests:\n" );
1729 for ( item = pl->inv; item; item = item->below )
1730 {
1731 if ( quest_is_quest_marker( item, 0 )
1732 && quest_is_in_progress( item, 0 ) )
1733 {
1734 new_draw_info( NDI_WHITE, 0, pl, quest_get_name( item ) );
1735 new_draw_info( NDI_WHITE, 0, pl, "\n" );
1736 }
1737 }
1738 return 1; 1550 return 0;
1739 } 1551}
1552

Diff Legend

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