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.18 by root, Mon Dec 11 21:32:17 2006 UTC vs.
Revision 1.43 by root, Mon Feb 5 01:24:45 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
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
30extern weathermap_t **weathermap;
31 28
32/* Handles misc. input request - things like hash table, malloc, maps, 29/* Handles misc. input request - things like hash table, malloc, maps,
33 * who, etc. 30 * who, etc.
34 */ 31 */
35
36void
37map_info (object *op, char *search)
38{
39 maptile *m;
40 char buf[MAX_BUF], map_path[MAX_BUF];
41 long sec = seconds ();
42
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 (NDI_UNIQUE, 0, op, "Path Pl PlM IM TO Dif Reset");
45 for (m = first_map; m != NULL; m = m->next)
46 {
47
48 if (search && strstr (m->path, search) == NULL)
49 continue; /* Skip unwanted maps */
50 /* Print out the last 18 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 sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56 map_path, m->players, players_on_map (m, FALSE),
57 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);
59 new_draw_info (NDI_UNIQUE, 0, op, buf);
60 }
61}
62 32
63/* This command dumps the body information for object *op. 33/* This command dumps the body information for object *op.
64 * it doesn't care what the params are. 34 * it doesn't care what the params are.
65 * This is mostly meant as a debug command. 35 * This is mostly meant as a debug command.
66 */ 36 */
… …
109 if (params == NULL) 79 if (params == NULL)
110 { 80 {
111 new_draw_info (NDI_UNIQUE, 0, op, "what bugs?"); 81 new_draw_info (NDI_UNIQUE, 0, op, "what bugs?");
112 return 1; 82 return 1;
113 } 83 }
114 strcpy (buf, op->name); 84 assign (buf, op->name);
115 strcat (buf, " bug-reports: "); 85 strcat (buf, " bug-reports: ");
116 strncat (buf, ++params, MAX_BUF - strlen (buf)); 86 strncat (buf, ++params, MAX_BUF - strlen (buf));
117 buf[MAX_BUF - 1] = '\0'; 87 buf[MAX_BUF - 1] = '\0';
118 bug_report (buf); 88 bug_report (buf);
119 LOG (llevError, "%s\n", buf); 89 LOG (llevError, "%s\n", buf);
… …
128 * a description of it. It is there merely for flavour text. 98 * a description of it. It is there merely for flavour text.
129 */ 99 */
130void 100void
131current_region_info (object *op) 101current_region_info (object *op)
132{ 102{
133 /* 103 if (region *reg = op->region ())
134 * Ok I /suppose/ I should write a seperate function for this, but it isn't
135 * going to be /that/ slow, and won't get called much
136 */
137 region *r = get_region_by_name (get_name_of_region_for_map (op->map));
138
139 if (!r)
140 return;
141 /* This should only be possible if regions are not operating on this server. */
142
143 new_draw_info_format (NDI_UNIQUE, 0, op, "You are in %s. \n %s", get_region_longname (r), get_region_msg (r)); 104 new_draw_info_format (NDI_UNIQUE, 0, op, "You are in %s.\n%s", &reg->longname, &reg->msg);
144} 105}
145 106
146void 107void
147current_map_info (object *op) 108current_map_info (object *op)
148{ 109{
149 maptile *m = op->map; 110 maptile *m = op->map;
150 111
151 if (!m) 112 if (!m)
152 return; 113 return;
153 114
154 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map (m)); 115 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", &m->name, &m->path, &op->region ()->name);
155 116
156 if (QUERY_FLAG (op, FLAG_WIZ)) 117 if (QUERY_FLAG (op, FLAG_WIZ))
157 {
158 new_draw_info_format (NDI_UNIQUE, 0, op, 118 new_draw_info_format (NDI_UNIQUE, 0, op,
159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 119 "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)); 120 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161 121
162 }
163 if (m->msg) 122 if (m->msg)
164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); 123 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165} 124}
166 125
167#ifdef DEBUG_MALLOC_LEVEL 126#ifdef DEBUG_MALLOC_LEVEL
… …
179#endif 138#endif
180 139
181int 140int
182command_whereabouts (object *op, char *params) 141command_whereabouts (object *op, char *params)
183{ 142{
184 143 //TODO: should obviously not waste space in struct region for this.
185 region *reg;
186 player *pl;
187
188 /* 144 /*
189 * reset the counter on the region, then use it to store the number of 145 * reset the counter on the region, then use it to store the number of
190 * players there. 146 * players there.
191 * I don't know how thread-safe this would be, I suspect not very.... 147 * I don't know how thread-safe this would be, I suspect not very....
192 */ 148 */
193 for (reg = first_region; reg != NULL; reg = reg->next) 149 for_all_regions (rgn)
194 {
195 reg->counter = 0; 150 rgn->counter = 0;
196 } 151
197 for (pl = first_player; pl != NULL; pl = pl->next) 152 for_all_players (pl)
198 if (pl->ob->map != NULL) 153 if (pl->ob->map)
199 get_region_by_map (pl->ob->map)->counter++; 154 ++pl->ob->region ()->counter;
200 155
201 /* we only want to print out by places with a 'longname' field... */ 156 /* we only want to print out by places with a 'longname' field... */
202 for (reg = first_region; reg != NULL; reg = reg->next) 157 for_all_regions (rgn)
203 { 158 {
204 if (reg->longname == NULL && reg->counter > 0) 159 if (!rgn->longname && rgn->counter > 0)
205 { 160 {
206 if (reg->parent != NULL) 161 if (rgn->parent)
207 { 162 {
208 reg->parent->counter += reg->counter; 163 rgn->parent->counter += rgn->counter;
209 reg->counter = 0; 164 rgn->counter = 0;
210 } 165 }
211 else /*uh oh, we shouldn't be here. */ 166 else /*uh oh, we shouldn't be here. */
212 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", reg->name); 167 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", &rgn->name);
213 } 168 }
214 } 169 }
170
215 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:"); 171 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:");
216 for (reg = first_region; reg != NULL; reg = reg->next) 172
173 for_all_regions (rgn)
217 if (reg->counter > 0) 174 if (rgn->counter)
218 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players in %s", reg->counter, get_region_longname (reg)); 175 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players in %s", rgn->counter, &rgn->longname);
176
219 return 1; 177 return 1;
220} 178}
221 179
222typedef struct 180typedef struct
223{ 181{
… …
226} chars_names; 184} chars_names;
227 185
228int 186int
229command_afk (object *op, char *params) 187command_afk (object *op, char *params)
230{ 188{
231 if QUERY_FLAG 189 if ((op->contr->ns->afk = !op->contr->ns->afk))
232 (op, FLAG_AFK)
233 {
234 CLEAR_FLAG (op, FLAG_AFK);
235 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK"); 190 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
236 }
237 else 191 else
238 {
239 SET_FLAG (op, FLAG_AFK);
240 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 192 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
241 } 193
242 return 1; 194 return 1;
243} 195}
244 196
245int 197int
246command_mapinfo (object *op, char *params) 198command_mapinfo (object *op, char *params)
… …
255 current_region_info (op); 207 current_region_info (op);
256 return 1; 208 return 1;
257} 209}
258 210
259int 211int
260command_maps (object *op, char *params)
261{
262 map_info (op, params);
263 return 1;
264}
265
266int
267command_time (object *op, char *params) 212command_time (object *op, char *params)
268{ 213{
269 print_tod (op); 214 print_tod (op);
270 return 1; 215 return 1;
271} 216}
272 217
273int 218int
274command_weather (object *op, char *params) 219command_weather (object *op, char *params)
275{ 220{
221#if 0
276 int wx, wy, temp, sky; 222 int wx, wy, temp, sky;
277 char buf[MAX_BUF]; 223 char buf[MAX_BUF];
278 224
279 if (settings.dynamiclevel < 1) 225 if (settings.dynamiclevel < 1)
280 return 1; 226 return 1;
… …
396 break; 342 break;
397 case SKY_BLIZZARD: 343 case SKY_BLIZZARD:
398 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!"); 344 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!");
399 break; 345 break;
400 } 346 }
401 return 1; 347#endif
402}
403
404int
405command_archs (object *op, char *params)
406{
407 arch_info (op);
408 return 1; 348 return 1;
409} 349}
410 350
411int 351int
412command_hiscore (object *op, char *params) 352command_hiscore (object *op, char *params)
… …
463 dump_friendly_objects (); 403 dump_friendly_objects ();
464 return 0; 404 return 0;
465} 405}
466 406
467int 407int
468command_dumpmap (object *op, char *params)
469{
470 if (op)
471 dump_map (op->map);
472 return 0;
473}
474
475int
476command_dumpallmaps (object *op, char *params)
477{
478 dump_all_maps ();
479 return 0;
480}
481
482int
483command_printlos (object *op, char *params) 408command_printlos (object *op, char *params)
484{ 409{
485 if (op) 410 if (op)
486 print_los (op); 411 print_los (op);
487 return 0; 412 return 0;
… …
492command_version (object *op, char *params) 417command_version (object *op, char *params)
493{ 418{
494 version (op); 419 version (op);
495 return 0; 420 return 0;
496} 421}
497
498 422
499#ifndef BUG_LOG 423#ifndef BUG_LOG
500# define BUG_LOG "bug_log" 424# define BUG_LOG "bug_log"
501#endif 425#endif
502void 426void
… …
610 534
611int 535int
612command_fix_me (object *op, char *params) 536command_fix_me (object *op, char *params)
613{ 537{
614 sum_weight (op); 538 sum_weight (op);
615 fix_player (op); 539 op->update_stats ();
616 return 1;
617}
618
619int
620command_players (object *op, char *paramss)
621{
622 char buf[MAX_BUF];
623 char *t;
624 DIR *Dir;
625
626 sprintf (buf, "%s/%s/", settings.localdir, settings.playerdir);
627 t = buf + strlen (buf);
628 if ((Dir = opendir (buf)) != NULL)
629 {
630 const struct dirent *Entry;
631
632 while ((Entry = readdir (Dir)) != NULL)
633 {
634 /* skip '.' , '..' */
635 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
636 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
637 {
638 struct stat Stat;
639
640 strcpy (t, Entry->d_name);
641 if (stat (buf, &Stat) == 0)
642 {
643 /* This was not posix compatible
644 * if ((Stat.st_mode & S_IFMT)==S_IFDIR) {
645 */
646 if (S_ISDIR (Stat.st_mode))
647 {
648 char buf2[MAX_BUF];
649 struct tm *tm = localtime (&Stat.st_mtime);
650
651 sprintf (buf2, "%s\t%04d %02d %02d %02d %02d %02d",
652 Entry->d_name, 1900 + tm->tm_year, 1 + tm->tm_mon, tm->tm_mday, tm->tm_hour, tm->tm_min, tm->tm_sec);
653 new_draw_info (NDI_UNIQUE, 0, op, buf2);
654 }
655 }
656 }
657 }
658 }
659 closedir (Dir);
660 return 0; 540 return 1;
661} 541}
662
663
664 542
665int 543int
666command_logs (object *op, char *params) 544command_logs (object *op, char *params)
667{ 545{
668 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills."); 546 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills.");
… …
691 else 569 else
692 { 570 {
693 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params); 571 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params);
694 return 0; 572 return 0;
695 } 573 }
574
696 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s", 575 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s",
697 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]); 576 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]);
698 return 1; 577 return 1;
699} 578}
700 579
… …
722 found++; 601 found++;
723 op->contr->bowtype = (bowtype_t) i; 602 op->contr->bowtype = (bowtype_t) i;
724 break; 603 break;
725 } 604 }
726 } 605 }
606
727 if (!found) 607 if (!found)
728 { 608 {
729 sprintf (buf, "bowmode: Unknown options %s, valid options are:", params); 609 sprintf (buf, "bowmode: Unknown options %s, valid options are:", params);
730 for (i = 0; i <= bow_bestarrow; i++) 610 for (i = 0; i <= bow_bestarrow; i++)
731 { 611 {
… …
737 strcat (buf, "."); 617 strcat (buf, ".");
738 } 618 }
739 new_draw_info_format (NDI_UNIQUE, 0, op, buf); 619 new_draw_info_format (NDI_UNIQUE, 0, op, buf);
740 return 0; 620 return 0;
741 } 621 }
622
742 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]); 623 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]);
743 return 1; 624 return 1;
744} 625}
745 626
746int 627int
… …
785 for (obl = first_friendly_object; obl != NULL; obl = next) 666 for (obl = first_friendly_object; obl != NULL; obl = next)
786 { 667 {
787 object *ob = obl->ob; 668 object *ob = obl->ob;
788 669
789 next = obl->next; 670 next = obl->next;
790 if (get_owner (ob) == op) 671 if (ob->owner == op)
791 { 672 {
792 if (target == 0) 673 if (target == 0)
793 { 674 {
794 if (counter == 0) 675 if (counter == 0)
795 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 676 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
902 char filename[MAX_BUF], line[80]; 783 char filename[MAX_BUF], line[80];
903 int namelen, linelen = 0; 784 int namelen, linelen = 0;
904 785
905 switch (what) 786 switch (what)
906 { 787 {
907 case 1: 788 case 1:
908 sprintf (filename, "%s/wizhelp", settings.datadir); 789 sprintf (filename, "%s/wizhelp", settings.datadir);
909 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 790 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
910 break; 791 break;
911 case 3: 792 case 3:
912 sprintf (filename, "%s/mischelp", settings.datadir); 793 sprintf (filename, "%s/mischelp", settings.datadir);
913 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 794 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
914 break; 795 break;
915 default: 796 default:
916 sprintf (filename, "%s/help", settings.datadir); 797 sprintf (filename, "%s/help", settings.datadir);
917 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 798 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
918 break; 799 break;
919 } 800 }
801
920 if (!(dirp = opendir (filename))) 802 if (!(dirp = opendir (filename)))
921 return; 803 return;
922 804
923 line[0] = '\0'; 805 line[0] = '\0';
924 for (de = readdir (dirp); de; de = readdir (dirp)) 806 while (de = readdir (dirp))
925 { 807 {
926 namelen = NAMLEN (de); 808 namelen = strlen (de->d_name);
927 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.')) 809 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
928 continue; 810 continue;
929 linelen += namelen + 1; 811 linelen += namelen + 1;
930 if (linelen > 42) 812 if (linelen > 42)
931 { 813 {
… …
1136 return 0; 1018 return 0;
1137 } 1019 }
1138} 1020}
1139 1021
1140int 1022int
1141command_quit (object *op, char *params)
1142{
1143 new_draw_info (NDI_UNIQUE, 0, op,
1144 "Quitting will delete your character PERMANENTLY. If you are sure you want to do this, then use the quit_character command instead of quit.");
1145 return 1;
1146}
1147
1148int
1149command_real_quit (object *op, char *params)
1150{
1151 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1152
1153 op->contr->state = ST_CONFIRM_QUIT;
1154 return 1;
1155}
1156
1157/*
1158 * don't allow people to exit explore mode. It otherwise becomes
1159 * really easy to abuse this.
1160 */
1161int
1162command_explore (object *op, char *params)
1163{
1164 if (settings.explore_mode == FALSE)
1165 return 1;
1166 /*
1167 * I guess this is the best way to see if we are solo or not. Actually,
1168 * are there any cases when first_player->next==NULL and we are not solo?
1169 */
1170 if ((first_player != op->contr) || (first_player->next != NULL))
1171 {
1172 new_draw_info (NDI_UNIQUE, 0, op, "You can not enter explore mode if you are in a party");
1173 }
1174 else if (op->contr->explore)
1175 new_draw_info (NDI_UNIQUE, 0, op, "There is no return from explore mode");
1176 else
1177 {
1178 op->contr->explore = 1;
1179 new_draw_info (NDI_UNIQUE, 0, op, "You are now in explore mode");
1180 }
1181 return 1;
1182}
1183
1184int
1185command_sound (object *op, char *params) 1023command_sound (object *op, char *params)
1186{ 1024{
1187 if (op->contr->socket.sound) 1025 if (op->contr->ns->sound)
1188 { 1026 {
1189 op->contr->socket.sound = 0; 1027 op->contr->ns->sound = 0;
1190 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1028 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1191 } 1029 }
1192 else 1030 else
1193 { 1031 {
1194 op->contr->socket.sound = 1; 1032 op->contr->ns->sound = 1;
1195 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1033 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1196 } 1034 }
1197 return 1;
1198}
1199 1035
1200/* Perhaps these should be in player.c, but that file is
1201 * already a bit big.
1202 */
1203
1204void
1205receive_player_name (object *op, char k)
1206{
1207
1208 if (!check_name (op->contr, op->contr->write_buf + 1))
1209 {
1210 get_name (op);
1211 return;
1212 }
1213 op->name = op->contr->write_buf + 1;
1214 op->name_pl = op->contr->write_buf + 1;
1215 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1216 op->contr->name_changed = 1;
1217 get_password (op);
1218}
1219
1220void
1221receive_player_password (object *op, char k)
1222{
1223
1224 unsigned int pwd_len = strlen (op->contr->write_buf);
1225
1226 if (pwd_len <= 1 || pwd_len > 17)
1227 {
1228 get_name (op);
1229 return;
1230 }
1231 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1232
1233 if (checkbanned (op->name, op->contr->socket.host))
1234 {
1235 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1236 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1237 get_name (op);
1238 return;
1239 }
1240
1241 if (op->contr->state == ST_CONFIRM_PASSWORD)
1242 {
1243 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1244 {
1245 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1246 get_name (op);
1247 return;
1248 }
1249 clear_win_info (op);
1250 display_motd (op);
1251 new_draw_info (NDI_UNIQUE, 0, op, " ");
1252 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1253 new_draw_info (NDI_UNIQUE, 0, op, " ");
1254 Roll_Again (op);
1255 op->contr->state = ST_ROLL_STAT;
1256 return;
1257 }
1258 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1259 op->contr->state = ST_ROLL_STAT;
1260 check_login (op);
1261 return;
1262}
1263
1264
1265int
1266explore_mode (void)
1267{
1268 player *pl;
1269
1270 if (settings.explore_mode == TRUE)
1271 {
1272 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1273 if (pl->explore)
1274 return 1;
1275 }
1276 return 0; 1036 return 1;
1277} 1037}
1278
1279 1038
1280int 1039int
1281command_title (object *op, char *params) 1040command_title (object *op, char *params)
1282{ 1041{
1283 char buf[MAX_BUF]; 1042 char buf[MAX_BUF];
… …
1322 strcpy (op->contr->own_title, params); 1081 strcpy (op->contr->own_title, params);
1323 return 1; 1082 return 1;
1324} 1083}
1325 1084
1326int 1085int
1327command_save (object *op, char *params)
1328{
1329// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1330// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1331// } else
1332 if (!op->stats.exp)
1333 {
1334 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1335 }
1336 else
1337 {
1338 if (save_player (op, 1))
1339 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1340 else
1341 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1342 }
1343 return 1;
1344}
1345
1346
1347int
1348command_peaceful (object *op, char *params) 1086command_peaceful (object *op, char *params)
1349{ 1087{
1350 new_draw_info (NDI_UNIQUE, 0, op, 1088 new_draw_info (NDI_UNIQUE, 0, op,
1351 "You cannot change your peaceful setting with this command." 1089 "You cannot change your peaceful setting with this command."
1352 " Please speak to the priest in the temple of Gorokh" 1090 " Please speak to the priest in the temple of Gorokh"
… …
1359 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1097 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1360*/ 1098*/
1361 return 1; 1099 return 1;
1362} 1100}
1363 1101
1364
1365
1366int 1102int
1367command_wimpy (object *op, char *params) 1103command_wimpy (object *op, char *params)
1368{ 1104{
1369 int i; 1105 int i;
1370 char buf[MAX_BUF]; 1106 char buf[MAX_BUF];
… …
1379 new_draw_info (NDI_UNIQUE, 0, op, buf); 1115 new_draw_info (NDI_UNIQUE, 0, op, buf);
1380 op->run_away = i; 1116 op->run_away = i;
1381 return 1; 1117 return 1;
1382} 1118}
1383 1119
1384
1385int 1120int
1386command_brace (object *op, char *params) 1121command_brace (object *op, char *params)
1387{ 1122{
1388 if (!params) 1123 if (!params)
1389 op->contr->braced = !op->contr->braced; 1124 op->contr->braced = !op->contr->braced;
… …
1393 if (op->contr->braced) 1128 if (op->contr->braced)
1394 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1129 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1395 else 1130 else
1396 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1131 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1397 1132
1398 fix_player (op); 1133 op->update_stats ();
1399 return 0;
1400}
1401
1402int
1403command_style_map_info (object *op, char *params)
1404{
1405 extern maptile *styles;
1406 maptile *mp;
1407 int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
1408 object *tmp;
1409
1410 for (mp = styles; mp != NULL; mp = mp->next)
1411 {
1412 maps_used++;
1413 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile);
1414 for (x = 0; x < MAP_WIDTH (mp); x++)
1415 {
1416 for (y = 0; y < MAP_HEIGHT (mp); y++)
1417 {
1418 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)
1419 objects_used++;
1420 }
1421 }
1422 }
1423 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1424 new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
1425 new_draw_info_format (NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1426 new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
1427 new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
1428 return 0; 1134 return 0;
1429} 1135}
1430 1136
1431int 1137int
1432command_kill_pets (object *op, char *params) 1138command_kill_pets (object *op, char *params)
… …
1446 for (obl = first_friendly_object; obl != NULL; obl = next) 1152 for (obl = first_friendly_object; obl != NULL; obl = next)
1447 { 1153 {
1448 object *ob = obl->ob; 1154 object *ob = obl->ob;
1449 1155
1450 next = obl->next; 1156 next = obl->next;
1451 if (get_owner (ob) == op) 1157 if (ob->owner == op)
1452 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1158 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1453 { 1159 {
1454 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1455 remove_ob (ob);
1456 remove_friendly_object (ob);
1457 free_object (ob); 1160 ob->destroy ();
1458 removecount++; 1161 removecount++;
1459 } 1162 }
1460 } 1163 }
1461 if (removecount != 0) 1164 if (removecount != 0)
1462 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1165 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);

Diff Legend

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