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.11 by root, Fri Sep 29 19:28:43 2006 UTC vs.
Revision 1.35 by root, Sun Jan 7 02:39:14 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 22 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 23*/
23 24
24#include <global.h> 25#include <global.h>
25#include <loader.h> 26#include <loader.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 27#include <sproto.h>
28#endif
29 28
30extern weathermap_t **weathermap; 29#include <dirent.h>
31 30
32/* Handles misc. input request - things like hash table, malloc, maps, 31/* Handles misc. input request - things like hash table, malloc, maps,
33 * who, etc. 32 * who, etc.
34 */ 33 */
35 34
35//TODO
36#if 0
36void 37void
37map_info (object *op, char *search) 38map_info (object *op, char *search)
38{ 39{
39 maptile *m; 40 maptile *m;
40 char buf[MAX_BUF], map_path[MAX_BUF]; 41 char buf[MAX_BUF], map_path[31];
41 long sec = seconds (); 42 long sec = time (0);
42 43
43 new_draw_info_format (NDI_UNIQUE, 0, op, "Current time is: %02ld:%02ld:%02ld.", (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60); 44 new_draw_info_format (NDI_UNIQUE, 0, op, "Current time is: %02ld:%02ld:%02ld.", (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60);
44 new_draw_info (NDI_UNIQUE, 0, op, "Path Pl PlM IM TO Dif Reset"); 45 new_draw_info (NDI_UNIQUE, 0, op, "Path Pl PlM IM TO Dif Reset");
45 for (m = first_map; m != NULL; m = m->next)
46 {
47 46
47 for (maps_container::iterator i = maps.begin (); i != maps.end (); ++i)
48 {
49 maptile *m = i->second;
50
48 if (search && strstr (m->path, search) == NULL) 51 if (search && !strstr (m->path, search))
49 continue; /* Skip unwanted maps */ 52 continue; /* Skip unwanted maps */
53
50 /* Print out the last 18 characters of the map name... */ 54 /* Print out the last 30 characters of the map name... */
51 if (strlen (m->path) <= 18)
52 strcpy (map_path, m->path);
53 else
54 strcpy (map_path, m->path + strlen (m->path) - 18); 55 strcpy (map_path, m->path + max (0, (int)strlen (m->path) - 30));
56
55 sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d", 57 sprintf (buf, "%-30.30s %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, MAP_WHEN_RESET (m) % 60); 60 (m->reset_time % 86400) / 3600, (m->reset_time % 3600) / 60, m->reset_time % 60);
59 new_draw_info (NDI_UNIQUE, 0, op, buf); 61 new_draw_info (NDI_UNIQUE, 0, op, buf);
60 } 62 }
61} 63}
64
65int
66command_style_map_info (object *op, char *params)
67{
68 extern maptile *styles;
69 maptile *mp;
70 int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
71 object *tmp;
72
73 for (mp = styles; mp != NULL; mp = mp->next)
74 {
75 maps_used++;
76 mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
77 for (x = 0; x < mp->width; x++)
78 {
79 for (y = 0; y < mp->height; y++)
80 {
81 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
82 objects_used++;
83 }
84 }
85 }
86 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
87 new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
88 new_draw_info_format (NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
89 new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
90 new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
91 return 0;
92}
93#endif
62 94
63/* This command dumps the body information for object *op. 95/* This command dumps the body information for object *op.
64 * it doesn't care what the params are. 96 * it doesn't care what the params are.
65 * This is mostly meant as a debug command. 97 * This is mostly meant as a debug command.
66 */ 98 */
… …
149 maptile *m = op->map; 181 maptile *m = op->map;
150 182
151 if (!m) 183 if (!m)
152 return; 184 return;
153 185
154 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map (m)); 186 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", &m->name, &m->path, get_name_of_region_for_map (m));
155 187
156 if (QUERY_FLAG (op, FLAG_WIZ)) 188 if (QUERY_FLAG (op, FLAG_WIZ))
157 { 189 {
158 new_draw_info_format (NDI_UNIQUE, 0, op, 190 new_draw_info_format (NDI_UNIQUE, 0, op,
159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 191 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld",
160 m->players, m->difficulty, MAP_WIDTH (m), MAP_HEIGHT (m), MAP_ENTER_X (m), MAP_ENTER_Y (m), MAP_TIMEOUT (m)); 192 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161 193
162 } 194 }
163 if (m->msg) 195 if (m->msg)
164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); 196 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165} 197}
… …
192 */ 224 */
193 for (reg = first_region; reg != NULL; reg = reg->next) 225 for (reg = first_region; reg != NULL; reg = reg->next)
194 { 226 {
195 reg->counter = 0; 227 reg->counter = 0;
196 } 228 }
197 for (pl = first_player; pl != NULL; pl = pl->next) 229 for_all_players (pl)
198 if (pl->ob->map != NULL) 230 if (pl->ob->map != NULL)
199 get_region_by_map (pl->ob->map)->counter++; 231 get_region_by_map (pl->ob->map)->counter++;
200 232
201 /* we only want to print out by places with a 'longname' field... */ 233 /* we only want to print out by places with a 'longname' field... */
202 for (reg = first_region; reg != NULL; reg = reg->next) 234 for (reg = first_region; reg != NULL; reg = reg->next)
… …
223{ 255{
224 char namebuf[MAX_BUF]; 256 char namebuf[MAX_BUF];
225 int login_order; 257 int login_order;
226} chars_names; 258} chars_names;
227 259
228/*local functon for qsort comparison*/
229static int
230name_cmp (const chars_names * c1, const chars_names * c2)
231{
232 return strcasecmp (c1->namebuf, c2->namebuf);
233}
234
235int 260int
236command_afk (object *op, char *params) 261command_afk (object *op, char *params)
237{ 262{
238 if QUERY_FLAG 263 if ((op->contr->ns->afk = !op->contr->ns->afk))
239 (op, FLAG_AFK)
240 {
241 CLEAR_FLAG (op, FLAG_AFK);
242 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK"); 264 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
243 }
244 else 265 else
245 {
246 SET_FLAG (op, FLAG_AFK);
247 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 266 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
248 } 267
249 return 1; 268 return 1;
250} 269}
251 270
252int 271int
253command_mapinfo (object *op, char *params) 272command_mapinfo (object *op, char *params)
… …
262 current_region_info (op); 281 current_region_info (op);
263 return 1; 282 return 1;
264} 283}
265 284
266int 285int
267command_maps (object *op, char *params)
268{
269 map_info (op, params);
270 return 1;
271}
272
273int
274command_time (object *op, char *params) 286command_time (object *op, char *params)
275{ 287{
276 print_tod (op); 288 print_tod (op);
277 return 1; 289 return 1;
278} 290}
279 291
280int 292int
281command_weather (object *op, char *params) 293command_weather (object *op, char *params)
282{ 294{
295#if 0
283 int wx, wy, temp, sky; 296 int wx, wy, temp, sky;
284 char buf[MAX_BUF]; 297 char buf[MAX_BUF];
285 298
286 if (settings.dynamiclevel < 1) 299 if (settings.dynamiclevel < 1)
287 return 1; 300 return 1;
… …
403 break; 416 break;
404 case SKY_BLIZZARD: 417 case SKY_BLIZZARD:
405 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!"); 418 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!");
406 break; 419 break;
407 } 420 }
421#endif
408 return 1; 422 return 1;
409} 423}
410 424
411int 425int
412command_archs (object *op, char *params) 426command_archs (object *op, char *params)
… …
453int 467int
454command_dumpbelow (object *op, char *params) 468command_dumpbelow (object *op, char *params)
455{ 469{
456 if (op && op->below) 470 if (op && op->below)
457 { 471 {
458 dump_object (op->below); 472 char *dump = dump_object (op->below);
459 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 473 new_draw_info (NDI_UNIQUE, 0, op, dump);
474 free (dump);
460 /* Let's push that item on the dm's stack */ 475 /* Let's push that item on the dm's stack */
461 dm_stack_push (op->contr, op->below->count); 476 dm_stack_push (op->contr, op->below->count);
462 } 477 }
463 return 0; 478 return 0;
464} 479}
465 480
466int 481int
467command_wizpass (object *op, char *params)
468{
469 int i;
470
471 if (!op)
472 return 0;
473
474 if (!params)
475 i = (QUERY_FLAG (op, FLAG_WIZPASS)) ? 0 : 1;
476 else
477 i = onoff_value (params);
478
479 if (i)
480 {
481 new_draw_info (NDI_UNIQUE, 0, op, "You will now walk through walls.\n");
482 SET_FLAG (op, FLAG_WIZPASS);
483 }
484 else
485 {
486 new_draw_info (NDI_UNIQUE, 0, op, "You will now be stopped by walls.\n");
487 CLEAR_FLAG (op, FLAG_WIZPASS);
488 }
489 return 0;
490}
491
492int
493command_wizcast (object *op, char *params)
494{
495 int i;
496
497 if (!op)
498 return 0;
499
500 if (!params)
501 i = (QUERY_FLAG (op, FLAG_WIZCAST)) ? 0 : 1;
502 else
503 i = onoff_value (params);
504
505 if (i)
506 {
507 new_draw_info (NDI_UNIQUE, 0, op, "You can now cast spells anywhere.");
508 SET_FLAG (op, FLAG_WIZCAST);
509 }
510 else
511 {
512 new_draw_info (NDI_UNIQUE, 0, op, "You now cannot cast spells in no-magic areas.");
513 CLEAR_FLAG (op, FLAG_WIZCAST);
514 }
515 return 0;
516}
517
518int
519command_dumpallobjects (object *op, char *params)
520{
521 dump_all_objects ();
522 return 0;
523}
524
525int
526command_dumpfriendlyobjects (object *op, char *params) 482command_dumpfriendlyobjects (object *op, char *params)
527{ 483{
528 dump_friendly_objects (); 484 dump_friendly_objects ();
529 return 0;
530}
531
532int
533command_dumpallarchetypes (object *op, char *params)
534{
535 dump_all_archetypes ();
536 return 0;
537}
538
539int
540command_dumpmap (object *op, char *params)
541{
542 if (op)
543 dump_map (op->map);
544 return 0;
545}
546
547int
548command_dumpallmaps (object *op, char *params)
549{
550 dump_all_maps ();
551 return 0; 485 return 0;
552} 486}
553 487
554int 488int
555command_printlos (object *op, char *params) 489command_printlos (object *op, char *params)
… …
564command_version (object *op, char *params) 498command_version (object *op, char *params)
565{ 499{
566 version (op); 500 version (op);
567 return 0; 501 return 0;
568} 502}
569
570 503
571#ifndef BUG_LOG 504#ifndef BUG_LOG
572# define BUG_LOG "bug_log" 505# define BUG_LOG "bug_log"
573#endif 506#endif
574void 507void
… …
654int 587int
655command_statistics (object *pl, char *params) 588command_statistics (object *pl, char *params)
656{ 589{
657 if (!pl->contr) 590 if (!pl->contr)
658 return 1; 591 return 1;
659#ifndef WIN32
660 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
661 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
662#else
663 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %I64d", pl->stats.exp); 592 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %" PRId64, pl->stats.exp);
664 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %I64d", level_exp (pl->level + 1, pl->expmul)); 593 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %" PRId64, level_exp (pl->level + 1, pl->expmul));
665#endif
666 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 594 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
667 595
668 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 596 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
669 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str); 597 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);
670 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d", 598 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
… …
687 615
688int 616int
689command_fix_me (object *op, char *params) 617command_fix_me (object *op, char *params)
690{ 618{
691 sum_weight (op); 619 sum_weight (op);
692 fix_player (op); 620 op->update_stats ();
693 return 1; 621 return 1;
694} 622}
695 623
696int 624int
697command_players (object *op, char *paramss) 625command_players (object *op, char *paramss)
… …
704 t = buf + strlen (buf); 632 t = buf + strlen (buf);
705 if ((Dir = opendir (buf)) != NULL) 633 if ((Dir = opendir (buf)) != NULL)
706 { 634 {
707 const struct dirent *Entry; 635 const struct dirent *Entry;
708 636
709 while ((Entry = readdir (Dir)) != NULL) 637 while ((Entry = readdir (Dir)))
710 { 638 {
711 /* skip '.' , '..' */ 639 /* skip '.' , '..' */
712 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 640 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
713 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0'))) 641 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
714 { 642 {
… …
862 for (obl = first_friendly_object; obl != NULL; obl = next) 790 for (obl = first_friendly_object; obl != NULL; obl = next)
863 { 791 {
864 object *ob = obl->ob; 792 object *ob = obl->ob;
865 793
866 next = obl->next; 794 next = obl->next;
867 if (get_owner (ob) == op) 795 if (ob->owner == op)
868 { 796 {
869 if (target == 0) 797 if (target == 0)
870 { 798 {
871 if (counter == 0) 799 if (counter == 0)
872 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 800 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
979 char filename[MAX_BUF], line[80]; 907 char filename[MAX_BUF], line[80];
980 int namelen, linelen = 0; 908 int namelen, linelen = 0;
981 909
982 switch (what) 910 switch (what)
983 { 911 {
984 case 1: 912 case 1:
985 sprintf (filename, "%s/wizhelp", settings.datadir); 913 sprintf (filename, "%s/wizhelp", settings.datadir);
986 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 914 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
987 break; 915 break;
988 case 3: 916 case 3:
989 sprintf (filename, "%s/mischelp", settings.datadir); 917 sprintf (filename, "%s/mischelp", settings.datadir);
990 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 918 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
991 break; 919 break;
992 default: 920 default:
993 sprintf (filename, "%s/help", settings.datadir); 921 sprintf (filename, "%s/help", settings.datadir);
994 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 922 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
995 break; 923 break;
996 } 924 }
925
997 if (!(dirp = opendir (filename))) 926 if (!(dirp = opendir (filename)))
998 return; 927 return;
999 928
1000 line[0] = '\0'; 929 line[0] = '\0';
1001 for (de = readdir (dirp); de; de = readdir (dirp)) 930 while (de = readdir (dirp))
1002 { 931 {
1003 namelen = NAMLEN (de); 932 namelen = strlen (de->d_name);
1004 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.')) 933 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
1005 continue; 934 continue;
1006 linelen += namelen + 1; 935 linelen += namelen + 1;
1007 if (linelen > 42) 936 if (linelen > 42)
1008 { 937 {
… …
1213 return 0; 1142 return 0;
1214 } 1143 }
1215} 1144}
1216 1145
1217int 1146int
1218command_quit (object *op, char *params)
1219{
1220 new_draw_info (NDI_UNIQUE, 0, op,
1221 "Quitting will delete your character PERMANENTLY. If you are sure you want to do this, then use the quit_character command instead of quit.");
1222 return 1;
1223}
1224
1225int
1226command_real_quit (object *op, char *params)
1227{
1228 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1229
1230 op->contr->state = ST_CONFIRM_QUIT;
1231 return 1;
1232}
1233
1234/*
1235 * don't allow people to exit explore mode. It otherwise becomes
1236 * really easy to abuse this.
1237 */
1238int
1239command_explore (object *op, char *params)
1240{
1241 if (settings.explore_mode == FALSE)
1242 return 1;
1243 /*
1244 * I guess this is the best way to see if we are solo or not. Actually,
1245 * are there any cases when first_player->next==NULL and we are not solo?
1246 */
1247 if ((first_player != op->contr) || (first_player->next != NULL))
1248 {
1249 new_draw_info (NDI_UNIQUE, 0, op, "You can not enter explore mode if you are in a party");
1250 }
1251 else if (op->contr->explore)
1252 new_draw_info (NDI_UNIQUE, 0, op, "There is no return from explore mode");
1253 else
1254 {
1255 op->contr->explore = 1;
1256 new_draw_info (NDI_UNIQUE, 0, op, "You are now in explore mode");
1257 }
1258 return 1;
1259}
1260
1261int
1262command_sound (object *op, char *params) 1147command_sound (object *op, char *params)
1263{ 1148{
1264 if (op->contr->socket.sound) 1149 if (op->contr->ns->sound)
1265 { 1150 {
1266 op->contr->socket.sound = 0; 1151 op->contr->ns->sound = 0;
1267 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1152 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1268 } 1153 }
1269 else 1154 else
1270 { 1155 {
1271 op->contr->socket.sound = 1; 1156 op->contr->ns->sound = 1;
1272 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1157 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1273 } 1158 }
1274 return 1;
1275}
1276 1159
1277/* Perhaps these should be in player.c, but that file is
1278 * already a bit big.
1279 */
1280
1281void
1282receive_player_name (object *op, char k)
1283{
1284
1285 if (!check_name (op->contr, op->contr->write_buf + 1))
1286 {
1287 get_name (op);
1288 return;
1289 }
1290 op->name = op->contr->write_buf + 1;
1291 op->name_pl = op->contr->write_buf + 1;
1292 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1293 op->contr->name_changed = 1;
1294 get_password (op);
1295}
1296
1297void
1298receive_player_password (object *op, char k)
1299{
1300
1301 unsigned int pwd_len = strlen (op->contr->write_buf);
1302
1303 if (pwd_len <= 1 || pwd_len > 17)
1304 {
1305 get_name (op);
1306 return;
1307 }
1308 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1309
1310 if (checkbanned (op->name, op->contr->socket.host))
1311 {
1312 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1313 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1314 get_name (op);
1315 return;
1316 }
1317
1318 if (op->contr->state == ST_CONFIRM_PASSWORD)
1319 {
1320 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1321 {
1322 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1323 get_name (op);
1324 return;
1325 }
1326 clear_win_info (op);
1327 display_motd (op);
1328 new_draw_info (NDI_UNIQUE, 0, op, " ");
1329 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1330 new_draw_info (NDI_UNIQUE, 0, op, " ");
1331 Roll_Again (op);
1332 op->contr->state = ST_ROLL_STAT;
1333 return;
1334 }
1335 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1336 op->contr->state = ST_ROLL_STAT;
1337 check_login (op);
1338 return;
1339}
1340
1341
1342int
1343explore_mode (void)
1344{
1345 player *pl;
1346
1347 if (settings.explore_mode == TRUE)
1348 {
1349 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1350 if (pl->explore)
1351 return 1;
1352 }
1353 return 0; 1160 return 1;
1354} 1161}
1355
1356 1162
1357int 1163int
1358command_title (object *op, char *params) 1164command_title (object *op, char *params)
1359{ 1165{
1360 char buf[MAX_BUF]; 1166 char buf[MAX_BUF];
… …
1399 strcpy (op->contr->own_title, params); 1205 strcpy (op->contr->own_title, params);
1400 return 1; 1206 return 1;
1401} 1207}
1402 1208
1403int 1209int
1404command_save (object *op, char *params)
1405{
1406// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1407// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1408// } else
1409 if (!op->stats.exp)
1410 {
1411 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1412 }
1413 else
1414 {
1415 if (save_player (op, 1))
1416 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1417 else
1418 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1419 }
1420 return 1;
1421}
1422
1423
1424int
1425command_peaceful (object *op, char *params) 1210command_peaceful (object *op, char *params)
1426{ 1211{
1427 new_draw_info (NDI_UNIQUE, 0, op, 1212 new_draw_info (NDI_UNIQUE, 0, op,
1428 "You cannot change your peaceful setting with this command." 1213 "You cannot change your peaceful setting with this command."
1429 " Please speak to the priest in the temple of Gorokh" 1214 " Please speak to the priest in the temple of Gorokh"
… …
1436 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1221 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1437*/ 1222*/
1438 return 1; 1223 return 1;
1439} 1224}
1440 1225
1441
1442
1443int 1226int
1444command_wimpy (object *op, char *params) 1227command_wimpy (object *op, char *params)
1445{ 1228{
1446 int i; 1229 int i;
1447 char buf[MAX_BUF]; 1230 char buf[MAX_BUF];
… …
1456 new_draw_info (NDI_UNIQUE, 0, op, buf); 1239 new_draw_info (NDI_UNIQUE, 0, op, buf);
1457 op->run_away = i; 1240 op->run_away = i;
1458 return 1; 1241 return 1;
1459} 1242}
1460 1243
1461
1462int 1244int
1463command_brace (object *op, char *params) 1245command_brace (object *op, char *params)
1464{ 1246{
1465 if (!params) 1247 if (!params)
1466 op->contr->braced = !op->contr->braced; 1248 op->contr->braced = !op->contr->braced;
… …
1470 if (op->contr->braced) 1252 if (op->contr->braced)
1471 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1253 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1472 else 1254 else
1473 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1255 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1474 1256
1475 fix_player (op); 1257 op->update_stats ();
1476 return 0;
1477}
1478
1479int
1480command_style_map_info (object *op, char *params)
1481{
1482 extern maptile *styles;
1483 maptile *mp;
1484 int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
1485 object *tmp;
1486
1487 for (mp = styles; mp != NULL; mp = mp->next)
1488 {
1489 maps_used++;
1490 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile);
1491 for (x = 0; x < MAP_WIDTH (mp); x++)
1492 {
1493 for (y = 0; y < MAP_HEIGHT (mp); y++)
1494 {
1495 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)
1496 objects_used++;
1497 }
1498 }
1499 }
1500 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1501 new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
1502 new_draw_info_format (NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1503 new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
1504 new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
1505 return 0; 1258 return 0;
1506} 1259}
1507 1260
1508int 1261int
1509command_kill_pets (object *op, char *params) 1262command_kill_pets (object *op, char *params)
… …
1523 for (obl = first_friendly_object; obl != NULL; obl = next) 1276 for (obl = first_friendly_object; obl != NULL; obl = next)
1524 { 1277 {
1525 object *ob = obl->ob; 1278 object *ob = obl->ob;
1526 1279
1527 next = obl->next; 1280 next = obl->next;
1528 if (get_owner (ob) == op) 1281 if (ob->owner == op)
1529 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1282 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1530 { 1283 {
1531 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1532 remove_ob (ob);
1533 remove_friendly_object (ob);
1534 free_object (ob); 1284 ob->destroy ();
1535 removecount++; 1285 removecount++;
1536 } 1286 }
1537 } 1287 }
1538 if (removecount != 0) 1288 if (removecount != 0)
1539 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1289 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);

Diff Legend

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