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.10 by root, Wed Sep 20 21:53:50 2006 UTC vs.
Revision 1.30 by root, Mon Dec 25 14:54:44 2006 UTC

… …
21 The authors can be reached via e-mail at <crossfire@schmorp.de> 21 The authors can be reached via e-mail at <crossfire@schmorp.de>
22*/ 22*/
23 23
24#include <global.h> 24#include <global.h>
25#include <loader.h> 25#include <loader.h>
26#ifndef __CEXTRACT__
27# include <sproto.h> 26#include <sproto.h>
28#endif 27
28#include <dirent.h>
29 29
30extern weathermap_t **weathermap; 30extern weathermap_t **weathermap;
31 31
32/* Handles misc. input request - things like hash table, malloc, maps, 32/* Handles misc. input request - things like hash table, malloc, maps,
33 * who, etc. 33 * who, etc.
… …
36void 36void
37map_info (object *op, char *search) 37map_info (object *op, char *search)
38{ 38{
39 maptile *m; 39 maptile *m;
40 char buf[MAX_BUF], map_path[MAX_BUF]; 40 char buf[MAX_BUF], map_path[MAX_BUF];
41 long sec = seconds (); 41 long sec = time (0);
42 42
43 new_draw_info_format (NDI_UNIQUE, 0, op, "Current time is: %02ld:%02ld:%02ld.", (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60); 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"); 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) 45 for (m = first_map; m != NULL; m = m->next)
46 { 46 {
… …
53 else 53 else
54 strcpy (map_path, m->path + strlen (m->path) - 18); 54 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, MAP_WHEN_RESET (m) % 60); 58 (m->reset_time % 86400) / 3600, (m->reset_time % 3600) / 60, m->reset_time % 60);
59 new_draw_info (NDI_UNIQUE, 0, op, buf); 59 new_draw_info (NDI_UNIQUE, 0, op, buf);
60 } 60 }
61} 61}
62 62
63/* This command dumps the body information for object *op. 63/* This command dumps the body information for object *op.
… …
155 155
156 if (QUERY_FLAG (op, FLAG_WIZ)) 156 if (QUERY_FLAG (op, FLAG_WIZ))
157 { 157 {
158 new_draw_info_format (NDI_UNIQUE, 0, op, 158 new_draw_info_format (NDI_UNIQUE, 0, op,
159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 159 "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)); 160 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161 161
162 } 162 }
163 if (m->msg) 163 if (m->msg)
164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); 164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165} 165}
… …
192 */ 192 */
193 for (reg = first_region; reg != NULL; reg = reg->next) 193 for (reg = first_region; reg != NULL; reg = reg->next)
194 { 194 {
195 reg->counter = 0; 195 reg->counter = 0;
196 } 196 }
197 for (pl = first_player; pl != NULL; pl = pl->next) 197 for_all_players (pl)
198 if (pl->ob->map != NULL) 198 if (pl->ob->map != NULL)
199 get_region_by_map (pl->ob->map)->counter++; 199 get_region_by_map (pl->ob->map)->counter++;
200 200
201 /* we only want to print out by places with a 'longname' field... */ 201 /* we only want to print out by places with a 'longname' field... */
202 for (reg = first_region; reg != NULL; reg = reg->next) 202 for (reg = first_region; reg != NULL; reg = reg->next)
… …
223{ 223{
224 char namebuf[MAX_BUF]; 224 char namebuf[MAX_BUF];
225 int login_order; 225 int login_order;
226} chars_names; 226} chars_names;
227 227
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
236command_who (object *op, char *params)
237{
238 player *pl;
239 uint16 i;
240 region *reg;
241 char *format;
242 int num_players = 0;
243 int num_wiz = 0;
244 int num_afk = 0;
245 chars_names *chars = NULL;
246
247 /*
248 * The who formats are defined in config to be blank. They should have been
249 * overridden by the settings file, if there are no entries however, it will
250 * have stayed blank. Since this probably isn't what is wanted, we will check if
251 * new formats have been specified, and if not we will use the old defaults.
252 */
253 if (!strcmp (settings.who_format, ""))
254 strcpy (settings.who_format, "%N_%T%t%h%d%n[%m]");
255 if (!strcmp (settings.who_wiz_format, ""))
256 strcpy (settings.who_wiz_format, "%N_%T%t%h%d%nLevel %l [%m](@%i)(%c)");
257 if (op == NULL || QUERY_FLAG (op, FLAG_WIZ))
258 format = settings.who_wiz_format;
259 else
260 format = settings.who_format;
261
262 reg = get_region_from_string (params);
263
264 for (pl = first_player; pl != NULL; pl = pl->next)
265 {
266 if (pl->ob->map == NULL)
267 continue;
268 if (pl->hidden && !QUERY_FLAG (op, FLAG_WIZ))
269 continue;
270
271 if (!region_is_child_of_region (get_region_by_map (pl->ob->map), reg))
272 continue;
273
274 if (pl->state == ST_PLAYING || pl->state == ST_GET_PARTY_PASSWORD)
275 {
276
277 num_players++;
278 chars = (chars_names *) realloc (chars, num_players * sizeof (chars_names));
279 if (chars == NULL)
280 {
281 new_draw_info (NDI_UNIQUE, 0, op, "who failed - out of memory!");
282 return 0;
283 }
284 sprintf (chars[num_players - 1].namebuf, "%s", &pl->ob->name);
285 chars[num_players - 1].login_order = num_players;
286 /*Check for WIZ's & AFK's */
287 if (QUERY_FLAG (pl->ob, FLAG_WIZ))
288 num_wiz++;
289 if (QUERY_FLAG (pl->ob, FLAG_AFK))
290 num_afk++;
291 }
292 }
293 if (first_player != (player *) NULL)
294 {
295 if (reg == NULL)
296 new_draw_info_format (NDI_UNIQUE, 0, op, "Total Players (%d) -- WIZ(%d) AFK(%d)", num_players, num_wiz, num_afk);
297 else if (reg->longname == NULL)
298 new_draw_info_format (NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)", reg->name, num_players, num_wiz, num_afk);
299 else
300 new_draw_info_format (NDI_UNIQUE, 0, op, "Total Players in %s (%d) -- WIZ(%d) AFK(%d)",
301 reg->longname, num_players, num_wiz, num_afk);
302 }
303 qsort (chars, num_players, sizeof (chars_names), (int (*)(const void *, const void *)) name_cmp);
304 for (i = 0; i < num_players; i++)
305 display_who_entry (op, find_player (chars[i].namebuf), format);
306 free (chars);
307 return 1;
308}
309
310/* Display a line of 'who' to op, about pl, using the formatting specified by format */
311void
312display_who_entry (object *op, player *pl, const char *format)
313{
314 char tmpbuf[MAX_BUF];
315 char outbuf[MAX_BUF];
316 size_t i;
317
318 outbuf[0] = '\0'; /* we strcat to this, so reset it here. */
319 if (pl == NULL)
320 {
321 LOG (llevError, "display_who_entry(): I was passed a null player");
322 return;
323 }
324 for (i = 0; i <= strlen (format); i++)
325 {
326 if (format[i] == '%')
327 {
328 i++;
329 get_who_escape_code_value (tmpbuf, format[i], pl);
330 strcat (outbuf, tmpbuf);
331 }
332 else if (format[i] == '_')
333 strcat (outbuf, " "); /* allow '_' to be used in place of spaces */
334 else
335 {
336 sprintf (tmpbuf, "%c", format[i]);
337 strcat (outbuf, tmpbuf);
338 }
339 }
340 new_draw_info (NDI_UNIQUE, 0, op, outbuf);
341}
342
343/* Returns the value of the escape code used in the who format specifier
344 * the values are:
345 * N Name of character
346 * t title of character
347 * T the optional "the " sequence value (depend if player has own_title or not)
348 * c count
349 * n newline
350 * h [Hostile] if character is hostile, nothing otherwise
351 * d [WIZ] if character is a dm, nothing otherwise
352 * a [AFK] if character is afk, nothing otherwise
353 * l the level of the character
354 * m the map path the character is currently on
355 * M the map name of the map the character is currently on
356 * r the region name (eg scorn, wolfsburg)
357 * R the regional title (eg The Kingdom of Scorn, The Port of Wolfsburg)
358 * i player's ip adress
359 * % a literal %
360 * _ a literal underscore
361 */
362
363void
364get_who_escape_code_value (char *return_val, const char letter, player *pl)
365{
366
367 switch (letter)
368 {
369 case 'N':
370 strcpy (return_val, pl->ob->name);
371 break;
372 case 't':
373 strcpy (return_val, (pl->own_title[0] == '\0' ? pl->title : pl->own_title));
374 break;
375 case 'T':
376 if (pl->own_title[0] == '\0')
377 strcpy (return_val, "the ");
378 else
379 *return_val = '\0';
380 break;
381 case 'c':
382 sprintf (return_val, "%d", pl->ob->count);
383 break;
384 case 'n':
385 strcpy (return_val, "\n");
386 break;
387 case 'h':
388 strcpy (return_val, pl->peaceful ? "" : " [Hostile]");
389 break;
390 case 'l':
391 sprintf (return_val, "%d", pl->ob->level);
392 break;
393 case 'd':
394 strcpy (return_val, (QUERY_FLAG (pl->ob, FLAG_WIZ) ? " [WIZ]" : ""));
395 break;
396 case 'a':
397 strcpy (return_val, (QUERY_FLAG (pl->ob, FLAG_AFK) ? " [AFK]" : ""));
398 break;
399 case 'm':
400 strcpy (return_val, pl->ob->map->path);
401 break;
402 case 'M':
403 strcpy (return_val, pl->ob->map->name ? pl->ob->map->name : "Untitled");
404 break;
405 case 'r':
406 strcpy (return_val, get_name_of_region_for_map (pl->ob->map));
407 break;
408 case 'R':
409 strcpy (return_val, get_region_longname (get_region_by_map (pl->ob->map)));
410 break;
411 case 'i':
412 strcpy (return_val, pl->socket.host);
413 break;
414 case '%':
415 strcpy (return_val, "%");
416 break;
417 case '_':
418 strcpy (return_val, "_");
419 break;
420 }
421
422}
423
424
425int 228int
426command_afk (object *op, char *params) 229command_afk (object *op, char *params)
427{ 230{
428 if QUERY_FLAG 231 if ((op->contr->ns->afk = !op->contr->ns->afk))
429 (op, FLAG_AFK)
430 {
431 CLEAR_FLAG (op, FLAG_AFK);
432 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK"); 232 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
433 }
434 else 233 else
435 {
436 SET_FLAG (op, FLAG_AFK);
437 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 234 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
438 } 235
439 return 1; 236 return 1;
440} 237}
441 238
442int 239int
443command_mapinfo (object *op, char *params) 240command_mapinfo (object *op, char *params)
… …
643int 440int
644command_dumpbelow (object *op, char *params) 441command_dumpbelow (object *op, char *params)
645{ 442{
646 if (op && op->below) 443 if (op && op->below)
647 { 444 {
648 dump_object (op->below); 445 char *dump = dump_object (op->below);
649 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 446 new_draw_info (NDI_UNIQUE, 0, op, dump);
447 free (dump);
650 /* Let's push that item on the dm's stack */ 448 /* Let's push that item on the dm's stack */
651 dm_stack_push (op->contr, op->below->count); 449 dm_stack_push (op->contr, op->below->count);
652 } 450 }
653 return 0; 451 return 0;
654} 452}
655 453
656int 454int
657command_wizpass (object *op, char *params)
658{
659 int i;
660
661 if (!op)
662 return 0;
663
664 if (!params)
665 i = (QUERY_FLAG (op, FLAG_WIZPASS)) ? 0 : 1;
666 else
667 i = onoff_value (params);
668
669 if (i)
670 {
671 new_draw_info (NDI_UNIQUE, 0, op, "You will now walk through walls.\n");
672 SET_FLAG (op, FLAG_WIZPASS);
673 }
674 else
675 {
676 new_draw_info (NDI_UNIQUE, 0, op, "You will now be stopped by walls.\n");
677 CLEAR_FLAG (op, FLAG_WIZPASS);
678 }
679 return 0;
680}
681
682int
683command_wizcast (object *op, char *params)
684{
685 int i;
686
687 if (!op)
688 return 0;
689
690 if (!params)
691 i = (QUERY_FLAG (op, FLAG_WIZCAST)) ? 0 : 1;
692 else
693 i = onoff_value (params);
694
695 if (i)
696 {
697 new_draw_info (NDI_UNIQUE, 0, op, "You can now cast spells anywhere.");
698 SET_FLAG (op, FLAG_WIZCAST);
699 }
700 else
701 {
702 new_draw_info (NDI_UNIQUE, 0, op, "You now cannot cast spells in no-magic areas.");
703 CLEAR_FLAG (op, FLAG_WIZCAST);
704 }
705 return 0;
706}
707
708int
709command_dumpallobjects (object *op, char *params)
710{
711 dump_all_objects ();
712 return 0;
713}
714
715int
716command_dumpfriendlyobjects (object *op, char *params) 455command_dumpfriendlyobjects (object *op, char *params)
717{ 456{
718 dump_friendly_objects (); 457 dump_friendly_objects ();
719 return 0;
720}
721
722int
723command_dumpallarchetypes (object *op, char *params)
724{
725 dump_all_archetypes ();
726 return 0; 458 return 0;
727} 459}
728 460
729int 461int
730command_dumpmap (object *op, char *params) 462command_dumpmap (object *op, char *params)
… …
844int 576int
845command_statistics (object *pl, char *params) 577command_statistics (object *pl, char *params)
846{ 578{
847 if (!pl->contr) 579 if (!pl->contr)
848 return 1; 580 return 1;
849#ifndef WIN32
850 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
851 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
852#else
853 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %I64d", pl->stats.exp); 581 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %" PRId64, pl->stats.exp);
854 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %I64d", level_exp (pl->level + 1, pl->expmul)); 582 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %" PRId64, level_exp (pl->level + 1, pl->expmul));
855#endif
856 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 583 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
857 584
858 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 585 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
859 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str); 586 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);
860 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d", 587 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
… …
877 604
878int 605int
879command_fix_me (object *op, char *params) 606command_fix_me (object *op, char *params)
880{ 607{
881 sum_weight (op); 608 sum_weight (op);
882 fix_player (op); 609 op->update_stats ();
883 return 1; 610 return 1;
884} 611}
885 612
886int 613int
887command_players (object *op, char *paramss) 614command_players (object *op, char *paramss)
… …
894 t = buf + strlen (buf); 621 t = buf + strlen (buf);
895 if ((Dir = opendir (buf)) != NULL) 622 if ((Dir = opendir (buf)) != NULL)
896 { 623 {
897 const struct dirent *Entry; 624 const struct dirent *Entry;
898 625
899 while ((Entry = readdir (Dir)) != NULL) 626 while ((Entry = readdir (Dir)))
900 { 627 {
901 /* skip '.' , '..' */ 628 /* skip '.' , '..' */
902 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 629 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
903 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0'))) 630 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
904 { 631 {
… …
1052 for (obl = first_friendly_object; obl != NULL; obl = next) 779 for (obl = first_friendly_object; obl != NULL; obl = next)
1053 { 780 {
1054 object *ob = obl->ob; 781 object *ob = obl->ob;
1055 782
1056 next = obl->next; 783 next = obl->next;
1057 if (get_owner (ob) == op) 784 if (ob->owner == op)
1058 { 785 {
1059 if (target == 0) 786 if (target == 0)
1060 { 787 {
1061 if (counter == 0) 788 if (counter == 0)
1062 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 789 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
1169 char filename[MAX_BUF], line[80]; 896 char filename[MAX_BUF], line[80];
1170 int namelen, linelen = 0; 897 int namelen, linelen = 0;
1171 898
1172 switch (what) 899 switch (what)
1173 { 900 {
1174 case 1: 901 case 1:
1175 sprintf (filename, "%s/wizhelp", settings.datadir); 902 sprintf (filename, "%s/wizhelp", settings.datadir);
1176 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 903 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
1177 break; 904 break;
1178 case 3: 905 case 3:
1179 sprintf (filename, "%s/mischelp", settings.datadir); 906 sprintf (filename, "%s/mischelp", settings.datadir);
1180 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 907 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
1181 break; 908 break;
1182 default: 909 default:
1183 sprintf (filename, "%s/help", settings.datadir); 910 sprintf (filename, "%s/help", settings.datadir);
1184 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 911 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
1185 break; 912 break;
1186 } 913 }
914
1187 if (!(dirp = opendir (filename))) 915 if (!(dirp = opendir (filename)))
1188 return; 916 return;
1189 917
1190 line[0] = '\0'; 918 line[0] = '\0';
1191 for (de = readdir (dirp); de; de = readdir (dirp)) 919 while (de = readdir (dirp))
1192 { 920 {
1193 namelen = NAMLEN (de); 921 namelen = strlen (de->d_name);
1194 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.')) 922 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
1195 continue; 923 continue;
1196 linelen += namelen + 1; 924 linelen += namelen + 1;
1197 if (linelen > 42) 925 if (linelen > 42)
1198 { 926 {
… …
1413} 1141}
1414 1142
1415int 1143int
1416command_real_quit (object *op, char *params) 1144command_real_quit (object *op, char *params)
1417{ 1145{
1418 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):"); 1146 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1419 1147
1420 op->contr->state = ST_CONFIRM_QUIT; 1148 op->contr->ns->state = ST_CONFIRM_QUIT;
1421 return 1; 1149 return 1;
1422} 1150}
1423 1151
1424/* 1152/*
1425 * don't allow people to exit explore mode. It otherwise becomes 1153 * don't allow people to exit explore mode. It otherwise becomes
… …
1449} 1177}
1450 1178
1451int 1179int
1452command_sound (object *op, char *params) 1180command_sound (object *op, char *params)
1453{ 1181{
1454 if (op->contr->socket.sound) 1182 if (op->contr->ns->sound)
1455 { 1183 {
1456 op->contr->socket.sound = 0; 1184 op->contr->ns->sound = 0;
1457 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1185 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1458 } 1186 }
1459 else 1187 else
1460 { 1188 {
1461 op->contr->socket.sound = 1; 1189 op->contr->ns->sound = 1;
1462 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1463 } 1191 }
1464 return 1;
1465}
1466 1192
1467/* Perhaps these should be in player.c, but that file is
1468 * already a bit big.
1469 */
1470
1471void
1472receive_player_name (object *op, char k)
1473{
1474
1475 if (!check_name (op->contr, op->contr->write_buf + 1))
1476 {
1477 get_name (op);
1478 return;
1479 }
1480 op->name = op->contr->write_buf + 1;
1481 op->name_pl = op->contr->write_buf + 1;
1482 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1483 op->contr->name_changed = 1;
1484 get_password (op);
1485}
1486
1487void
1488receive_player_password (object *op, char k)
1489{
1490
1491 unsigned int pwd_len = strlen (op->contr->write_buf);
1492
1493 if (pwd_len <= 1 || pwd_len > 17)
1494 {
1495 get_name (op);
1496 return;
1497 }
1498 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1499
1500 if (checkbanned (op->name, op->contr->socket.host))
1501 {
1502 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1503 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1504 get_name (op);
1505 return;
1506 }
1507
1508 if (op->contr->state == ST_CONFIRM_PASSWORD)
1509 {
1510 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1511 {
1512 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1513 get_name (op);
1514 return;
1515 }
1516 clear_win_info (op);
1517 display_motd (op);
1518 new_draw_info (NDI_UNIQUE, 0, op, " ");
1519 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1520 new_draw_info (NDI_UNIQUE, 0, op, " ");
1521 Roll_Again (op);
1522 op->contr->state = ST_ROLL_STAT;
1523 return;
1524 }
1525 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1526 op->contr->state = ST_ROLL_STAT;
1527 check_login (op);
1528 return; 1193 return 1;
1529} 1194}
1530
1531 1195
1532int 1196int
1533explore_mode (void) 1197explore_mode (void)
1534{ 1198{
1535 player *pl; 1199 player *pl;
… …
1540 if (pl->explore) 1204 if (pl->explore)
1541 return 1; 1205 return 1;
1542 } 1206 }
1543 return 0; 1207 return 0;
1544} 1208}
1545
1546 1209
1547int 1210int
1548command_title (object *op, char *params) 1211command_title (object *op, char *params)
1549{ 1212{
1550 char buf[MAX_BUF]; 1213 char buf[MAX_BUF];
… …
1591} 1254}
1592 1255
1593int 1256int
1594command_save (object *op, char *params) 1257command_save (object *op, char *params)
1595{ 1258{
1596// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1597// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1598// } else
1599 if (!op->stats.exp) 1259 if (!op->stats.exp)
1600 {
1601 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet."); 1260 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1261 else
1602 } 1262 {
1603 else 1263 op->contr->save ();
1604 {
1605 if (save_player (op, 1))
1606 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); 1264 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1607 else
1608 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1609 } 1265 }
1610 return 1;
1611}
1612 1266
1267 return 1;
1268}
1613 1269
1614int 1270int
1615command_peaceful (object *op, char *params) 1271command_peaceful (object *op, char *params)
1616{ 1272{
1617 new_draw_info (NDI_UNIQUE, 0, op, 1273 new_draw_info (NDI_UNIQUE, 0, op,
… …
1626 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1282 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1627*/ 1283*/
1628 return 1; 1284 return 1;
1629} 1285}
1630 1286
1631
1632
1633int 1287int
1634command_wimpy (object *op, char *params) 1288command_wimpy (object *op, char *params)
1635{ 1289{
1636 int i; 1290 int i;
1637 char buf[MAX_BUF]; 1291 char buf[MAX_BUF];
… …
1646 new_draw_info (NDI_UNIQUE, 0, op, buf); 1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1647 op->run_away = i; 1301 op->run_away = i;
1648 return 1; 1302 return 1;
1649} 1303}
1650 1304
1651
1652int 1305int
1653command_brace (object *op, char *params) 1306command_brace (object *op, char *params)
1654{ 1307{
1655 if (!params) 1308 if (!params)
1656 op->contr->braced = !op->contr->braced; 1309 op->contr->braced = !op->contr->braced;
… …
1660 if (op->contr->braced) 1313 if (op->contr->braced)
1661 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1314 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1662 else 1315 else
1663 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1316 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1664 1317
1665 fix_player (op); 1318 op->update_stats ();
1666 return 0; 1319 return 0;
1667} 1320}
1668 1321
1669int 1322int
1670command_style_map_info (object *op, char *params) 1323command_style_map_info (object *op, char *params)
… …
1675 object *tmp; 1328 object *tmp;
1676 1329
1677 for (mp = styles; mp != NULL; mp = mp->next) 1330 for (mp = styles; mp != NULL; mp = mp->next)
1678 { 1331 {
1679 maps_used++; 1332 maps_used++;
1680 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile); 1333 mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
1681 for (x = 0; x < MAP_WIDTH (mp); x++) 1334 for (x = 0; x < mp->width; x++)
1682 { 1335 {
1683 for (y = 0; y < MAP_HEIGHT (mp); y++) 1336 for (y = 0; y < mp->height; y++)
1684 { 1337 {
1685 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) 1338 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
1686 objects_used++; 1339 objects_used++;
1687 } 1340 }
1688 } 1341 }
1689 } 1342 }
1690 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used); 1343 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
… …
1713 for (obl = first_friendly_object; obl != NULL; obl = next) 1366 for (obl = first_friendly_object; obl != NULL; obl = next)
1714 { 1367 {
1715 object *ob = obl->ob; 1368 object *ob = obl->ob;
1716 1369
1717 next = obl->next; 1370 next = obl->next;
1718 if (get_owner (ob) == op) 1371 if (ob->owner == op)
1719 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1372 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1720 { 1373 {
1721 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1722 remove_ob (ob);
1723 remove_friendly_object (ob);
1724 free_object (ob); 1374 ob->destroy ();
1725 removecount++; 1375 removecount++;
1726 } 1376 }
1727 } 1377 }
1728 if (removecount != 0) 1378 if (removecount != 0)
1729 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1379 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);

Diff Legend

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