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.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 {
… …
627 t = buf + strlen (buf); 627 t = buf + strlen (buf);
628 if ((Dir = opendir (buf)) != NULL) 628 if ((Dir = opendir (buf)) != NULL)
629 { 629 {
630 const struct dirent *Entry; 630 const struct dirent *Entry;
631 631
632 while ((Entry = readdir (Dir)) != NULL) 632 while ((Entry = readdir (Dir)))
633 { 633 {
634 /* skip '.' , '..' */ 634 /* skip '.' , '..' */
635 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 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'))) 636 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
637 { 637 {
… …
785 for (obl = first_friendly_object; obl != NULL; obl = next) 785 for (obl = first_friendly_object; obl != NULL; obl = next)
786 { 786 {
787 object *ob = obl->ob; 787 object *ob = obl->ob;
788 788
789 next = obl->next; 789 next = obl->next;
790 if (get_owner (ob) == op) 790 if (ob->owner == op)
791 { 791 {
792 if (target == 0) 792 if (target == 0)
793 { 793 {
794 if (counter == 0) 794 if (counter == 0)
795 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 795 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
902 char filename[MAX_BUF], line[80]; 902 char filename[MAX_BUF], line[80];
903 int namelen, linelen = 0; 903 int namelen, linelen = 0;
904 904
905 switch (what) 905 switch (what)
906 { 906 {
907 case 1: 907 case 1:
908 sprintf (filename, "%s/wizhelp", settings.datadir); 908 sprintf (filename, "%s/wizhelp", settings.datadir);
909 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 909 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
910 break; 910 break;
911 case 3: 911 case 3:
912 sprintf (filename, "%s/mischelp", settings.datadir); 912 sprintf (filename, "%s/mischelp", settings.datadir);
913 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 913 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
914 break; 914 break;
915 default: 915 default:
916 sprintf (filename, "%s/help", settings.datadir); 916 sprintf (filename, "%s/help", settings.datadir);
917 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 917 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
918 break; 918 break;
919 } 919 }
920
920 if (!(dirp = opendir (filename))) 921 if (!(dirp = opendir (filename)))
921 return; 922 return;
922 923
923 line[0] = '\0'; 924 line[0] = '\0';
924 for (de = readdir (dirp); de; de = readdir (dirp)) 925 while (de = readdir (dirp))
925 { 926 {
926 namelen = NAMLEN (de); 927 namelen = strlen (de->d_name);
927 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] == '.'))
928 continue; 929 continue;
929 linelen += namelen + 1; 930 linelen += namelen + 1;
930 if (linelen > 42) 931 if (linelen > 42)
931 { 932 {
… …
1146} 1147}
1147 1148
1148int 1149int
1149command_real_quit (object *op, char *params) 1150command_real_quit (object *op, char *params)
1150{ 1151{
1151 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):");
1152 1153
1153 op->contr->state = ST_CONFIRM_QUIT; 1154 op->contr->state = ST_CONFIRM_QUIT;
1154 return 1; 1155 return 1;
1155} 1156}
1156 1157
… …
1182} 1183}
1183 1184
1184int 1185int
1185command_sound (object *op, char *params) 1186command_sound (object *op, char *params)
1186{ 1187{
1187 if (op->contr->socket.sound) 1188 if (op->contr->socket->sound)
1188 { 1189 {
1189 op->contr->socket.sound = 0; 1190 op->contr->socket->sound = 0;
1190 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1191 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1191 } 1192 }
1192 else 1193 else
1193 { 1194 {
1194 op->contr->socket.sound = 1; 1195 op->contr->socket->sound = 1;
1195 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1196 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1196 } 1197 }
1198
1197 return 1; 1199 return 1;
1198} 1200}
1199 1201
1200/* Perhaps these should be in player.c, but that file is 1202/* Perhaps these should be in player.c, but that file is
1201 * already a bit big. 1203 * already a bit big.
… …
1228 get_name (op); 1230 get_name (op);
1229 return; 1231 return;
1230 } 1232 }
1231 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 */
1232 1234
1233 if (checkbanned (op->name, op->contr->socket.host)) 1235 if (checkbanned (op->name, op->contr->socket->host))
1234 { 1236 {
1235 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);
1236 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.");
1237 get_name (op); 1239 get_name (op);
1238 return; 1240 return;
1239 } 1241 }
1240 1242
… …
1446 for (obl = first_friendly_object; obl != NULL; obl = next) 1448 for (obl = first_friendly_object; obl != NULL; obl = next)
1447 { 1449 {
1448 object *ob = obl->ob; 1450 object *ob = obl->ob;
1449 1451
1450 next = obl->next; 1452 next = obl->next;
1451 if (get_owner (ob) == op) 1453 if (ob->owner == op)
1452 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1454 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1453 { 1455 {
1454 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1455 remove_ob (ob);
1456 remove_friendly_object (ob);
1457 free_object (ob); 1456 ob->destroy ();
1458 removecount++; 1457 removecount++;
1459 } 1458 }
1460 } 1459 }
1461 if (removecount != 0) 1460 if (removecount != 0)
1462 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