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.24 by root, Mon Dec 18 02:35:01 2006 UTC vs.
Revision 1.46 by pippijn, Thu Mar 1 13:18:37 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#include <sproto.h> 27#include <sproto.h>
27 28
28#include <dirent.h>
29
30extern weathermap_t **weathermap;
31
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 = time (0);
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 */
99{ 69{
100 display_motd (op); 70 display_motd (op);
101 return 1; 71 return 1;
102} 72}
103 73
104int
105command_bug (object *op, char *params)
106{
107 char buf[MAX_BUF];
108
109 if (params == NULL)
110 {
111 new_draw_info (NDI_UNIQUE, 0, op, "what bugs?");
112 return 1;
113 }
114 strcpy (buf, op->name);
115 strcat (buf, " bug-reports: ");
116 strncat (buf, ++params, MAX_BUF - strlen (buf));
117 buf[MAX_BUF - 1] = '\0';
118 bug_report (buf);
119 LOG (llevError, "%s\n", buf);
120 new_draw_info (NDI_ALL | NDI_UNIQUE, 1, NULL, buf);
121 new_draw_info (NDI_UNIQUE, 0, op, "OK, thanks!");
122 return 1;
123}
124
125/* 74/*
126 * Pretty much identical to current map_info, but on a bigger scale 75 * Pretty much identical to current map_info, but on a bigger scale
127 * This function returns the name of the players current region, and 76 * This function returns the name of the players current region, and
128 * a description of it. It is there merely for flavour text. 77 * a description of it. It is there merely for flavour text.
129 */ 78 */
130void 79void
131current_region_info (object *op) 80current_region_info (object *op)
132{ 81{
133 /* 82 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)); 83 new_draw_info_format (NDI_UNIQUE, 0, op, "You are %s.\n%s", &reg->longname, &reg->msg);
144} 84}
145 85
146void 86void
147current_map_info (object *op) 87current_map_info (object *op)
148{ 88{
149 maptile *m = op->map; 89 maptile *m = op->map;
150 90
151 if (!m) 91 if (!m)
152 return; 92 return;
153 93
154 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) in %s", m->name, m->path, get_name_of_region_for_map (m)); 94 new_draw_info_format (NDI_UNIQUE, 0, op, "%s (%s) %s", &m->name, &m->path, &op->region ()->longname);
155 95
156 if (QUERY_FLAG (op, FLAG_WIZ)) 96 if (QUERY_FLAG (op, FLAG_WIZ))
157 {
158 new_draw_info_format (NDI_UNIQUE, 0, op, 97 new_draw_info_format (NDI_UNIQUE, 0, op,
159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 98 "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)); 99 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161 100
162 }
163 if (m->msg) 101 if (m->msg)
164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); 102 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165} 103}
166 104
167#ifdef DEBUG_MALLOC_LEVEL 105#ifdef DEBUG_MALLOC_LEVEL
179#endif 117#endif
180 118
181int 119int
182command_whereabouts (object *op, char *params) 120command_whereabouts (object *op, char *params)
183{ 121{
184 122 //TODO: should obviously not waste space in struct region for this.
185 region *reg;
186 player *pl;
187
188 /* 123 /*
189 * reset the counter on the region, then use it to store the number of 124 * reset the counter on the region, then use it to store the number of
190 * players there. 125 * players there.
191 * I don't know how thread-safe this would be, I suspect not very.... 126 * I don't know how thread-safe this would be, I suspect not very....
192 */ 127 */
193 for (reg = first_region; reg != NULL; reg = reg->next) 128 for_all_regions (rgn)
194 {
195 reg->counter = 0; 129 rgn->counter = 0;
196 } 130
197 for (pl = first_player; pl != NULL; pl = pl->next) 131 for_all_players (pl)
198 if (pl->ob->map != NULL) 132 if (pl->ob->map)
199 get_region_by_map (pl->ob->map)->counter++; 133 ++pl->ob->region ()->counter;
200 134
201 /* we only want to print out by places with a 'longname' field... */ 135 /* we only want to print out by places with a 'longname' field... */
202 for (reg = first_region; reg != NULL; reg = reg->next) 136 for_all_regions (rgn)
203 { 137 {
204 if (reg->longname == NULL && reg->counter > 0) 138 if (!rgn->longname && rgn->counter > 0)
205 { 139 {
206 if (reg->parent != NULL) 140 if (rgn->parent)
207 { 141 {
208 reg->parent->counter += reg->counter; 142 rgn->parent->counter += rgn->counter;
209 reg->counter = 0; 143 rgn->counter = 0;
210 } 144 }
211 else /*uh oh, we shouldn't be here. */ 145 else /*uh oh, we shouldn't be here. */
212 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", reg->name); 146 LOG (llevError, "command_whereabouts() Region %s with no longname has no parent", &rgn->name);
213 } 147 }
214 } 148 }
149
215 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:"); 150 new_draw_info_format (NDI_UNIQUE, 0, op, "In the world currently there are:");
216 for (reg = first_region; reg != NULL; reg = reg->next) 151
152 for_all_regions (rgn)
217 if (reg->counter > 0) 153 if (rgn->counter)
218 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players in %s", reg->counter, get_region_longname (reg)); 154 new_draw_info_format (NDI_UNIQUE, 0, op, "%u players %s", rgn->counter, &rgn->longname);
155
219 return 1; 156 return 1;
220} 157}
221 158
222typedef struct 159typedef struct
223{ 160{
226} chars_names; 163} chars_names;
227 164
228int 165int
229command_afk (object *op, char *params) 166command_afk (object *op, char *params)
230{ 167{
231 if (QUERY_FLAG (op, FLAG_AFK)) 168 if ((op->contr->ns->afk = !op->contr->ns->afk))
232 {
233 CLEAR_FLAG (op, FLAG_AFK);
234 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK"); 169 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
235 }
236 else 170 else
237 {
238 SET_FLAG (op, FLAG_AFK);
239 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 171 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
240 }
241 172
242 return 1; 173 return 1;
243} 174}
244 175
245int 176int
255 current_region_info (op); 186 current_region_info (op);
256 return 1; 187 return 1;
257} 188}
258 189
259int 190int
260command_maps (object *op, char *params)
261{
262 map_info (op, params);
263 return 1;
264}
265
266int
267command_time (object *op, char *params) 191command_time (object *op, char *params)
268{ 192{
269 print_tod (op); 193 print_tod (op);
270 return 1; 194 return 1;
271} 195}
272 196
273int 197int
274command_weather (object *op, char *params) 198command_weather (object *op, char *params)
275{ 199{
200#if 0
276 int wx, wy, temp, sky; 201 int wx, wy, temp, sky;
277 char buf[MAX_BUF]; 202 char buf[MAX_BUF];
278 203
279 if (settings.dynamiclevel < 1) 204 if (settings.dynamiclevel < 1)
280 return 1; 205 return 1;
396 break; 321 break;
397 case SKY_BLIZZARD: 322 case SKY_BLIZZARD:
398 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!"); 323 new_draw_info (NDI_UNIQUE, 0, op, "A full blown blizzard is in effect. You might want to take cover!");
399 break; 324 break;
400 } 325 }
401 return 1; 326#endif
402}
403
404int
405command_archs (object *op, char *params)
406{
407 arch_info (op);
408 return 1; 327 return 1;
409} 328}
410 329
411int 330int
412command_hiscore (object *op, char *params) 331command_hiscore (object *op, char *params)
463 dump_friendly_objects (); 382 dump_friendly_objects ();
464 return 0; 383 return 0;
465} 384}
466 385
467int 386int
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) 387command_printlos (object *op, char *params)
484{ 388{
485 if (op) 389 if (op)
486 print_los (op); 390 print_los (op);
487 return 0; 391 return 0;
492command_version (object *op, char *params) 396command_version (object *op, char *params)
493{ 397{
494 version (op); 398 version (op);
495 return 0; 399 return 0;
496} 400}
497
498 401
499#ifndef BUG_LOG 402#ifndef BUG_LOG
500# define BUG_LOG "bug_log" 403# define BUG_LOG "bug_log"
501#endif 404#endif
502void 405void
610 513
611int 514int
612command_fix_me (object *op, char *params) 515command_fix_me (object *op, char *params)
613{ 516{
614 sum_weight (op); 517 sum_weight (op);
615 fix_player (op); 518 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)))
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; 519 return 1;
661} 520}
662
663
664 521
665int 522int
666command_logs (object *op, char *params) 523command_logs (object *op, char *params)
667{ 524{
668 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills."); 525 new_draw_info (NDI_UNIQUE, 0, op, "Nobody is currently logging kills.");
691 else 548 else
692 { 549 {
693 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params); 550 new_draw_info_format (NDI_UNIQUE, 0, op, "applymode: Unknown options %s, valid options are nochoice, never, always", params);
694 return 0; 551 return 0;
695 } 552 }
553
696 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s", 554 new_draw_info_format (NDI_UNIQUE, 0, op, "Applymode %s set to %s",
697 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]); 555 (unapply == op->contr->unapply ? "" : " now"), types[op->contr->unapply]);
698 return 1; 556 return 1;
699} 557}
700 558
722 found++; 580 found++;
723 op->contr->bowtype = (bowtype_t) i; 581 op->contr->bowtype = (bowtype_t) i;
724 break; 582 break;
725 } 583 }
726 } 584 }
585
727 if (!found) 586 if (!found)
728 { 587 {
729 sprintf (buf, "bowmode: Unknown options %s, valid options are:", params); 588 sprintf (buf, "bowmode: Unknown options %s, valid options are:", params);
730 for (i = 0; i <= bow_bestarrow; i++) 589 for (i = 0; i <= bow_bestarrow; i++)
731 { 590 {
737 strcat (buf, "."); 596 strcat (buf, ".");
738 } 597 }
739 new_draw_info_format (NDI_UNIQUE, 0, op, buf); 598 new_draw_info_format (NDI_UNIQUE, 0, op, buf);
740 return 0; 599 return 0;
741 } 600 }
601
742 new_draw_info_format (NDI_UNIQUE, 0, op, "bowmode %s set to %s", (oldtype == op->contr->bowtype ? "" : "now"), types[op->contr->bowtype]); 602 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; 603 return 1;
744} 604}
745 605
746int 606int
920 780
921 if (!(dirp = opendir (filename))) 781 if (!(dirp = opendir (filename)))
922 return; 782 return;
923 783
924 line[0] = '\0'; 784 line[0] = '\0';
925 while (de = readdir (dirp)) 785 while ((de = readdir (dirp)))
926 { 786 {
927 namelen = strlen (de->d_name); 787 namelen = strlen (de->d_name);
928 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.')) 788 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
929 continue; 789 continue;
930 linelen += namelen + 1; 790 linelen += namelen + 1;
1137 return 0; 997 return 0;
1138 } 998 }
1139} 999}
1140 1000
1141int 1001int
1142command_quit (object *op, char *params)
1143{
1144 new_draw_info (NDI_UNIQUE, 0, op,
1145 "Quitting will delete your character PERMANENTLY. If you are sure you want to do this, then use the quit_character command instead of quit.");
1146 return 1;
1147}
1148
1149int
1150command_real_quit (object *op, char *params)
1151{
1152 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1153
1154 op->contr->state = ST_CONFIRM_QUIT;
1155 return 1;
1156}
1157
1158/*
1159 * don't allow people to exit explore mode. It otherwise becomes
1160 * really easy to abuse this.
1161 */
1162int
1163command_explore (object *op, char *params)
1164{
1165 if (settings.explore_mode == FALSE)
1166 return 1;
1167 /*
1168 * I guess this is the best way to see if we are solo or not. Actually,
1169 * are there any cases when first_player->next==NULL and we are not solo?
1170 */
1171 if ((first_player != op->contr) || (first_player->next != NULL))
1172 {
1173 new_draw_info (NDI_UNIQUE, 0, op, "You can not enter explore mode if you are in a party");
1174 }
1175 else if (op->contr->explore)
1176 new_draw_info (NDI_UNIQUE, 0, op, "There is no return from explore mode");
1177 else
1178 {
1179 op->contr->explore = 1;
1180 new_draw_info (NDI_UNIQUE, 0, op, "You are now in explore mode");
1181 }
1182 return 1;
1183}
1184
1185int
1186command_sound (object *op, char *params) 1002command_sound (object *op, char *params)
1187{ 1003{
1188 if (op->contr->socket->sound) 1004 if (op->contr->ns->sound)
1189 { 1005 {
1190 op->contr->socket->sound = 0; 1006 op->contr->ns->sound = 0;
1191 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1007 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1192 } 1008 }
1193 else 1009 else
1194 { 1010 {
1195 op->contr->socket->sound = 1; 1011 op->contr->ns->sound = 1;
1196 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1012 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1197 } 1013 }
1198 1014
1199 return 1; 1015 return 1;
1200} 1016}
1201
1202/* Perhaps these should be in player.c, but that file is
1203 * already a bit big.
1204 */
1205
1206void
1207receive_player_name (object *op, char k)
1208{
1209
1210 if (!check_name (op->contr, op->contr->write_buf + 1))
1211 {
1212 get_name (op);
1213 return;
1214 }
1215 op->name = op->contr->write_buf + 1;
1216 op->name_pl = op->contr->write_buf + 1;
1217 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1218 op->contr->name_changed = 1;
1219 get_password (op);
1220}
1221
1222void
1223receive_player_password (object *op, char k)
1224{
1225
1226 unsigned int pwd_len = strlen (op->contr->write_buf);
1227
1228 if (pwd_len <= 1 || pwd_len > 17)
1229 {
1230 get_name (op);
1231 return;
1232 }
1233 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1234
1235 if (checkbanned (op->name, op->contr->socket->host))
1236 {
1237 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket->host);
1238 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1239 get_name (op);
1240 return;
1241 }
1242
1243 if (op->contr->state == ST_CONFIRM_PASSWORD)
1244 {
1245 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1246 {
1247 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1248 get_name (op);
1249 return;
1250 }
1251 clear_win_info (op);
1252 display_motd (op);
1253 new_draw_info (NDI_UNIQUE, 0, op, " ");
1254 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1255 new_draw_info (NDI_UNIQUE, 0, op, " ");
1256 Roll_Again (op);
1257 op->contr->state = ST_ROLL_STAT;
1258 return;
1259 }
1260 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1261 op->contr->state = ST_ROLL_STAT;
1262 check_login (op);
1263 return;
1264}
1265
1266
1267int
1268explore_mode (void)
1269{
1270 player *pl;
1271
1272 if (settings.explore_mode == TRUE)
1273 {
1274 for (pl = first_player; pl != (player *) NULL; pl = pl->next)
1275 if (pl->explore)
1276 return 1;
1277 }
1278 return 0;
1279}
1280
1281 1017
1282int 1018int
1283command_title (object *op, char *params) 1019command_title (object *op, char *params)
1284{ 1020{
1285 char buf[MAX_BUF]; 1021 char buf[MAX_BUF];
1324 strcpy (op->contr->own_title, params); 1060 strcpy (op->contr->own_title, params);
1325 return 1; 1061 return 1;
1326} 1062}
1327 1063
1328int 1064int
1329command_save (object *op, char *params)
1330{
1331// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1332// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1333// } else
1334 if (!op->stats.exp)
1335 {
1336 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1337 }
1338 else
1339 {
1340 if (save_player (op, 1))
1341 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1342 else
1343 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1344 }
1345 return 1;
1346}
1347
1348
1349int
1350command_peaceful (object *op, char *params) 1065command_peaceful (object *op, char *params)
1351{ 1066{
1352 new_draw_info (NDI_UNIQUE, 0, op, 1067 new_draw_info (NDI_UNIQUE, 0, op,
1353 "You cannot change your peaceful setting with this command." 1068 "You cannot change your peaceful setting with this command."
1354 " Please speak to the priest in the temple of Gorokh" 1069 " Please speak to the priest in the temple of Gorokh"
1361 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1076 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1362*/ 1077*/
1363 return 1; 1078 return 1;
1364} 1079}
1365 1080
1366
1367
1368int 1081int
1369command_wimpy (object *op, char *params) 1082command_wimpy (object *op, char *params)
1370{ 1083{
1371 int i; 1084 int i;
1372 char buf[MAX_BUF]; 1085 char buf[MAX_BUF];
1381 new_draw_info (NDI_UNIQUE, 0, op, buf); 1094 new_draw_info (NDI_UNIQUE, 0, op, buf);
1382 op->run_away = i; 1095 op->run_away = i;
1383 return 1; 1096 return 1;
1384} 1097}
1385 1098
1386
1387int 1099int
1388command_brace (object *op, char *params) 1100command_brace (object *op, char *params)
1389{ 1101{
1390 if (!params) 1102 if (!params)
1391 op->contr->braced = !op->contr->braced; 1103 op->contr->braced = !op->contr->braced;
1395 if (op->contr->braced) 1107 if (op->contr->braced)
1396 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1108 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1397 else 1109 else
1398 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1110 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1399 1111
1400 fix_player (op); 1112 op->update_stats ();
1401 return 0;
1402}
1403
1404int
1405command_style_map_info (object *op, char *params)
1406{
1407 extern maptile *styles;
1408 maptile *mp;
1409 int maps_used = 0, mapmem = 0, objects_used = 0, x, y;
1410 object *tmp;
1411
1412 for (mp = styles; mp != NULL; mp = mp->next)
1413 {
1414 maps_used++;
1415 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile);
1416 for (x = 0; x < MAP_WIDTH (mp); x++)
1417 {
1418 for (y = 0; y < MAP_HEIGHT (mp); y++)
1419 {
1420 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above)
1421 objects_used++;
1422 }
1423 }
1424 }
1425 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
1426 new_draw_info (NDI_UNIQUE, 0, op, "Memory used, not");
1427 new_draw_info_format (NDI_UNIQUE, 0, op, "including objects: %d", mapmem);
1428 new_draw_info_format (NDI_UNIQUE, 0, op, "Style objects: %d", objects_used);
1429 new_draw_info_format (NDI_UNIQUE, 0, op, "Mem for objects: %d", objects_used * sizeof (object));
1430 return 0; 1113 return 0;
1431} 1114}
1432 1115
1433int 1116int
1434command_kill_pets (object *op, char *params) 1117command_kill_pets (object *op, char *params)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines