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.13 by root, Mon Oct 2 00:22:01 2006 UTC vs.
Revision 1.23 by root, Thu Dec 14 04:30:32 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 {
… …
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 228int
236command_afk (object *op, char *params) 229command_afk (object *op, char *params)
237{ 230{
238 if QUERY_FLAG 231 if QUERY_FLAG
239 (op, FLAG_AFK) 232 (op, FLAG_AFK)
… …
453int 446int
454command_dumpbelow (object *op, char *params) 447command_dumpbelow (object *op, char *params)
455{ 448{
456 if (op && op->below) 449 if (op && op->below)
457 { 450 {
458 dump_object (op->below); 451 char *dump = dump_object (op->below);
459 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 452 new_draw_info (NDI_UNIQUE, 0, op, dump);
453 free (dump);
460 /* Let's push that item on the dm's stack */ 454 /* Let's push that item on the dm's stack */
461 dm_stack_push (op->contr, op->below->count); 455 dm_stack_push (op->contr, op->below->count);
462 } 456 }
463 return 0; 457 return 0;
464} 458}
465 459
466int 460int
467command_dumpallobjects (object *op, char *params)
468{
469 dump_all_objects ();
470 return 0;
471}
472
473int
474command_dumpfriendlyobjects (object *op, char *params) 461command_dumpfriendlyobjects (object *op, char *params)
475{ 462{
476 dump_friendly_objects (); 463 dump_friendly_objects ();
477 return 0;
478}
479
480int
481command_dumpallarchetypes (object *op, char *params)
482{
483 dump_all_archetypes ();
484 return 0; 464 return 0;
485} 465}
486 466
487int 467int
488command_dumpmap (object *op, char *params) 468command_dumpmap (object *op, char *params)
… …
602int 582int
603command_statistics (object *pl, char *params) 583command_statistics (object *pl, char *params)
604{ 584{
605 if (!pl->contr) 585 if (!pl->contr)
606 return 1; 586 return 1;
607#ifndef WIN32
608 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
609 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
610#else
611 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %I64d", pl->stats.exp); 587 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %" PRId64, pl->stats.exp);
612 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %I64d", level_exp (pl->level + 1, pl->expmul)); 588 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %" PRId64, level_exp (pl->level + 1, pl->expmul));
613#endif
614 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 589 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
615 590
616 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 591 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
617 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str); 592 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);
618 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d", 593 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
… …
652 t = buf + strlen (buf); 627 t = buf + strlen (buf);
653 if ((Dir = opendir (buf)) != NULL) 628 if ((Dir = opendir (buf)) != NULL)
654 { 629 {
655 const struct dirent *Entry; 630 const struct dirent *Entry;
656 631
657 while ((Entry = readdir (Dir)) != NULL) 632 while ((Entry = readdir (Dir)))
658 { 633 {
659 /* skip '.' , '..' */ 634 /* skip '.' , '..' */
660 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 635 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
661 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0'))) 636 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
662 { 637 {
… …
810 for (obl = first_friendly_object; obl != NULL; obl = next) 785 for (obl = first_friendly_object; obl != NULL; obl = next)
811 { 786 {
812 object *ob = obl->ob; 787 object *ob = obl->ob;
813 788
814 next = obl->next; 789 next = obl->next;
815 if (get_owner (ob) == op) 790 if (ob->owner == op)
816 { 791 {
817 if (target == 0) 792 if (target == 0)
818 { 793 {
819 if (counter == 0) 794 if (counter == 0)
820 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 795 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
927 char filename[MAX_BUF], line[80]; 902 char filename[MAX_BUF], line[80];
928 int namelen, linelen = 0; 903 int namelen, linelen = 0;
929 904
930 switch (what) 905 switch (what)
931 { 906 {
932 case 1: 907 case 1:
933 sprintf (filename, "%s/wizhelp", settings.datadir); 908 sprintf (filename, "%s/wizhelp", settings.datadir);
934 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 909 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
935 break; 910 break;
936 case 3: 911 case 3:
937 sprintf (filename, "%s/mischelp", settings.datadir); 912 sprintf (filename, "%s/mischelp", settings.datadir);
938 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 913 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
939 break; 914 break;
940 default: 915 default:
941 sprintf (filename, "%s/help", settings.datadir); 916 sprintf (filename, "%s/help", settings.datadir);
942 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 917 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
943 break; 918 break;
944 } 919 }
920
945 if (!(dirp = opendir (filename))) 921 if (!(dirp = opendir (filename)))
946 return; 922 return;
947 923
948 line[0] = '\0'; 924 line[0] = '\0';
949 for (de = readdir (dirp); de; de = readdir (dirp)) 925 while (de = readdir (dirp))
950 { 926 {
951 namelen = NAMLEN (de); 927 namelen = strlen (de->d_name);
952 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.')) 928 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
953 continue; 929 continue;
954 linelen += namelen + 1; 930 linelen += namelen + 1;
955 if (linelen > 42) 931 if (linelen > 42)
956 { 932 {
… …
1171} 1147}
1172 1148
1173int 1149int
1174command_real_quit (object *op, char *params) 1150command_real_quit (object *op, char *params)
1175{ 1151{
1176 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):"); 1152 send_query (op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1177 1153
1178 op->contr->state = ST_CONFIRM_QUIT; 1154 op->contr->state = ST_CONFIRM_QUIT;
1179 return 1; 1155 return 1;
1180} 1156}
1181 1157
… …
1207} 1183}
1208 1184
1209int 1185int
1210command_sound (object *op, char *params) 1186command_sound (object *op, char *params)
1211{ 1187{
1212 if (op->contr->socket.sound) 1188 if (op->contr->socket->sound)
1213 { 1189 {
1214 op->contr->socket.sound = 0; 1190 op->contr->socket->sound = 0;
1215 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1191 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1216 } 1192 }
1217 else 1193 else
1218 { 1194 {
1219 op->contr->socket.sound = 1; 1195 op->contr->socket->sound = 1;
1220 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1196 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1221 } 1197 }
1198
1222 return 1; 1199 return 1;
1223} 1200}
1224 1201
1225/* Perhaps these should be in player.c, but that file is 1202/* Perhaps these should be in player.c, but that file is
1226 * already a bit big. 1203 * already a bit big.
… …
1253 get_name (op); 1230 get_name (op);
1254 return; 1231 return;
1255 } 1232 }
1256 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */ 1233 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1257 1234
1258 if (checkbanned (op->name, op->contr->socket.host)) 1235 if (checkbanned (op->name, op->contr->socket->host))
1259 { 1236 {
1260 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host); 1237 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket->host);
1261 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play."); 1238 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1262 get_name (op); 1239 get_name (op);
1263 return; 1240 return;
1264 } 1241 }
1265 1242
… …
1471 for (obl = first_friendly_object; obl != NULL; obl = next) 1448 for (obl = first_friendly_object; obl != NULL; obl = next)
1472 { 1449 {
1473 object *ob = obl->ob; 1450 object *ob = obl->ob;
1474 1451
1475 next = obl->next; 1452 next = obl->next;
1476 if (get_owner (ob) == op) 1453 if (ob->owner == op)
1477 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1454 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1478 { 1455 {
1479 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1480 remove_ob (ob);
1481 remove_friendly_object (ob);
1482 free_object (ob); 1456 ob->destroy ();
1483 removecount++; 1457 removecount++;
1484 } 1458 }
1485 } 1459 }
1486 if (removecount != 0) 1460 if (removecount != 0)
1487 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1461 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);

Diff Legend

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