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.15 by pippijn, Sat Dec 9 17:28:37 2006 UTC vs.
Revision 1.31 by root, Wed Dec 27 09:28:02 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)
46 {
47 45
46 for_all_maps (m)
47 {
48 if (search && strstr (m->path, search) == NULL) 48 if (search && !strstr (m->path, search))
49 continue; /* Skip unwanted maps */ 49 continue; /* Skip unwanted maps */
50
50 /* Print out the last 18 characters of the map name... */ 51 /* Print out the last 18 characters of the map name... */
51 if (strlen (m->path) <= 18) 52 if (strlen (m->path) <= 18)
52 strcpy (map_path, m->path); 53 strcpy (map_path, m->path);
53 else 54 else
54 strcpy (map_path, m->path + strlen (m->path) - 18); 55 strcpy (map_path, m->path + strlen (m->path) - 18);
56
55 sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d", 57 sprintf (buf, "%-18.18s %2d %2d %1d %4d %2d %02d:%02d:%02d",
56 map_path, m->players, players_on_map (m, FALSE), 58 map_path, m->players, players_on_map (m, FALSE),
57 m->in_memory, m->timeout, m->difficulty, 59 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); 60 (m->reset_time % 86400) / 3600, (m->reset_time % 3600) / 60, m->reset_time % 60);
59 new_draw_info (NDI_UNIQUE, 0, op, buf); 61 new_draw_info (NDI_UNIQUE, 0, op, buf);
60 } 62 }
61} 63}
62 64
63/* This command dumps the body information for object *op. 65/* This command dumps the body information for object *op.
… …
155 157
156 if (QUERY_FLAG (op, FLAG_WIZ)) 158 if (QUERY_FLAG (op, FLAG_WIZ))
157 { 159 {
158 new_draw_info_format (NDI_UNIQUE, 0, op, 160 new_draw_info_format (NDI_UNIQUE, 0, op,
159 "players:%d difficulty:%d size:%dx%d start:%dx%d timeout %ld", 161 "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)); 162 m->players, m->difficulty, m->width, m->height, m->enter_x, m->enter_y, m->timeout);
161 163
162 } 164 }
163 if (m->msg) 165 if (m->msg)
164 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg); 166 new_draw_info (NDI_UNIQUE, NDI_NAVY, op, m->msg);
165} 167}
… …
192 */ 194 */
193 for (reg = first_region; reg != NULL; reg = reg->next) 195 for (reg = first_region; reg != NULL; reg = reg->next)
194 { 196 {
195 reg->counter = 0; 197 reg->counter = 0;
196 } 198 }
197 for (pl = first_player; pl != NULL; pl = pl->next) 199 for_all_players (pl)
198 if (pl->ob->map != NULL) 200 if (pl->ob->map != NULL)
199 get_region_by_map (pl->ob->map)->counter++; 201 get_region_by_map (pl->ob->map)->counter++;
200 202
201 /* we only want to print out by places with a 'longname' field... */ 203 /* we only want to print out by places with a 'longname' field... */
202 for (reg = first_region; reg != NULL; reg = reg->next) 204 for (reg = first_region; reg != NULL; reg = reg->next)
… …
226} chars_names; 228} chars_names;
227 229
228int 230int
229command_afk (object *op, char *params) 231command_afk (object *op, char *params)
230{ 232{
231 if QUERY_FLAG 233 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"); 234 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
236 }
237 else 235 else
238 {
239 SET_FLAG (op, FLAG_AFK);
240 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 236 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
241 } 237
242 return 1; 238 return 1;
243} 239}
244 240
245int 241int
246command_mapinfo (object *op, char *params) 242command_mapinfo (object *op, char *params)
… …
582int 578int
583command_statistics (object *pl, char *params) 579command_statistics (object *pl, char *params)
584{ 580{
585 if (!pl->contr) 581 if (!pl->contr)
586 return 1; 582 return 1;
587#ifndef WIN32
588 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
589 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
590#else
591 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %I64d", pl->stats.exp); 583 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %" PRId64, pl->stats.exp);
592 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %I64d", level_exp (pl->level + 1, pl->expmul)); 584 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %" PRId64, level_exp (pl->level + 1, pl->expmul));
593#endif
594 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 585 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
595 586
596 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d", 587 new_draw_info_format (NDI_UNIQUE, 0, pl, "Str %2d/ %3d/%3d",
597 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str); 588 pl->contr->orig_stats.Str, pl->stats.Str, 20 + pl->arch->clone.stats.Str);
598 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d", 589 new_draw_info_format (NDI_UNIQUE, 0, pl, "Dex %2d/ %3d/%3d",
… …
615 606
616int 607int
617command_fix_me (object *op, char *params) 608command_fix_me (object *op, char *params)
618{ 609{
619 sum_weight (op); 610 sum_weight (op);
620 fix_player (op); 611 op->update_stats ();
621 return 1; 612 return 1;
622} 613}
623 614
624int 615int
625command_players (object *op, char *paramss) 616command_players (object *op, char *paramss)
… …
632 t = buf + strlen (buf); 623 t = buf + strlen (buf);
633 if ((Dir = opendir (buf)) != NULL) 624 if ((Dir = opendir (buf)) != NULL)
634 { 625 {
635 const struct dirent *Entry; 626 const struct dirent *Entry;
636 627
637 while ((Entry = readdir (Dir)) != NULL) 628 while ((Entry = readdir (Dir)))
638 { 629 {
639 /* skip '.' , '..' */ 630 /* skip '.' , '..' */
640 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 631 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
641 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0'))) 632 (Entry->d_name[0] == '.' && Entry->d_name[1] == '.' && Entry->d_name[2] == '\0')))
642 { 633 {
… …
790 for (obl = first_friendly_object; obl != NULL; obl = next) 781 for (obl = first_friendly_object; obl != NULL; obl = next)
791 { 782 {
792 object *ob = obl->ob; 783 object *ob = obl->ob;
793 784
794 next = obl->next; 785 next = obl->next;
795 if (get_owner (ob) == op) 786 if (ob->owner == op)
796 { 787 {
797 if (target == 0) 788 if (target == 0)
798 { 789 {
799 if (counter == 0) 790 if (counter == 0)
800 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 791 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
907 char filename[MAX_BUF], line[80]; 898 char filename[MAX_BUF], line[80];
908 int namelen, linelen = 0; 899 int namelen, linelen = 0;
909 900
910 switch (what) 901 switch (what)
911 { 902 {
912 case 1: 903 case 1:
913 sprintf (filename, "%s/wizhelp", settings.datadir); 904 sprintf (filename, "%s/wizhelp", settings.datadir);
914 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 905 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
915 break; 906 break;
916 case 3: 907 case 3:
917 sprintf (filename, "%s/mischelp", settings.datadir); 908 sprintf (filename, "%s/mischelp", settings.datadir);
918 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 909 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
919 break; 910 break;
920 default: 911 default:
921 sprintf (filename, "%s/help", settings.datadir); 912 sprintf (filename, "%s/help", settings.datadir);
922 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 913 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
923 break; 914 break;
924 } 915 }
916
925 if (!(dirp = opendir (filename))) 917 if (!(dirp = opendir (filename)))
926 return; 918 return;
927 919
928 line[0] = '\0'; 920 line[0] = '\0';
929 for (de = readdir (dirp); de; de = readdir (dirp)) 921 while (de = readdir (dirp))
930 { 922 {
931 namelen = NAMLEN (de); 923 namelen = strlen (de->d_name);
932 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.')) 924 if (namelen <= 2 && *de->d_name == '.' && (namelen == 1 || de->d_name[1] == '.'))
933 continue; 925 continue;
934 linelen += namelen + 1; 926 linelen += namelen + 1;
935 if (linelen > 42) 927 if (linelen > 42)
936 { 928 {
… …
1151} 1143}
1152 1144
1153int 1145int
1154command_real_quit (object *op, char *params) 1146command_real_quit (object *op, char *params)
1155{ 1147{
1156 send_query (&op->contr->socket, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):"); 1148 send_query (op->contr->ns, CS_QUERY_SINGLECHAR, "Quitting will delete your character.\nAre you sure you want to quit (y/n):");
1157 1149
1158 op->contr->state = ST_CONFIRM_QUIT; 1150 op->contr->ns->state = ST_CONFIRM_QUIT;
1159 return 1; 1151 return 1;
1160} 1152}
1161 1153
1162/* 1154/*
1163 * don't allow people to exit explore mode. It otherwise becomes 1155 * don't allow people to exit explore mode. It otherwise becomes
… …
1187} 1179}
1188 1180
1189int 1181int
1190command_sound (object *op, char *params) 1182command_sound (object *op, char *params)
1191{ 1183{
1192 if (op->contr->socket.sound) 1184 if (op->contr->ns->sound)
1193 { 1185 {
1194 op->contr->socket.sound = 0; 1186 op->contr->ns->sound = 0;
1195 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1196 } 1188 }
1197 else 1189 else
1198 { 1190 {
1199 op->contr->socket.sound = 1; 1191 op->contr->ns->sound = 1;
1200 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1192 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1201 } 1193 }
1202 return 1;
1203}
1204 1194
1205/* Perhaps these should be in player.c, but that file is
1206 * already a bit big.
1207 */
1208
1209void
1210receive_player_name (object *op, char k)
1211{
1212
1213 if (!check_name (op->contr, op->contr->write_buf + 1))
1214 {
1215 get_name (op);
1216 return;
1217 }
1218 op->name = op->contr->write_buf + 1;
1219 op->name_pl = op->contr->write_buf + 1;
1220 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1221 op->contr->name_changed = 1;
1222 get_password (op);
1223}
1224
1225void
1226receive_player_password (object *op, char k)
1227{
1228
1229 unsigned int pwd_len = strlen (op->contr->write_buf);
1230
1231 if (pwd_len <= 1 || pwd_len > 17)
1232 {
1233 get_name (op);
1234 return;
1235 }
1236 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1237
1238 if (checkbanned (op->name, op->contr->socket.host))
1239 {
1240 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1241 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1242 get_name (op);
1243 return;
1244 }
1245
1246 if (op->contr->state == ST_CONFIRM_PASSWORD)
1247 {
1248 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1249 {
1250 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1251 get_name (op);
1252 return;
1253 }
1254 clear_win_info (op);
1255 display_motd (op);
1256 new_draw_info (NDI_UNIQUE, 0, op, " ");
1257 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1258 new_draw_info (NDI_UNIQUE, 0, op, " ");
1259 Roll_Again (op);
1260 op->contr->state = ST_ROLL_STAT;
1261 return;
1262 }
1263 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1264 op->contr->state = ST_ROLL_STAT;
1265 check_login (op);
1266 return; 1195 return 1;
1267} 1196}
1268
1269 1197
1270int 1198int
1271explore_mode (void) 1199explore_mode (void)
1272{ 1200{
1273 player *pl; 1201 player *pl;
… …
1278 if (pl->explore) 1206 if (pl->explore)
1279 return 1; 1207 return 1;
1280 } 1208 }
1281 return 0; 1209 return 0;
1282} 1210}
1283
1284 1211
1285int 1212int
1286command_title (object *op, char *params) 1213command_title (object *op, char *params)
1287{ 1214{
1288 char buf[MAX_BUF]; 1215 char buf[MAX_BUF];
… …
1329} 1256}
1330 1257
1331int 1258int
1332command_save (object *op, char *params) 1259command_save (object *op, char *params)
1333{ 1260{
1334// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1335// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1336// } else
1337 if (!op->stats.exp) 1261 if (!op->stats.exp)
1338 {
1339 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet."); 1262 new_draw_info (NDI_UNIQUE, 0, op, "You don't deserve to save yet.");
1263 else
1340 } 1264 {
1341 else 1265 op->contr->save ();
1342 {
1343 if (save_player (op, 1))
1344 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); 1266 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1345 else
1346 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1347 } 1267 }
1348 return 1;
1349}
1350 1268
1269 return 1;
1270}
1351 1271
1352int 1272int
1353command_peaceful (object *op, char *params) 1273command_peaceful (object *op, char *params)
1354{ 1274{
1355 new_draw_info (NDI_UNIQUE, 0, op, 1275 new_draw_info (NDI_UNIQUE, 0, op,
… …
1364 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players."); 1284 new_draw_info(NDI_UNIQUE, 0,op,"You will attack other players.");
1365*/ 1285*/
1366 return 1; 1286 return 1;
1367} 1287}
1368 1288
1369
1370
1371int 1289int
1372command_wimpy (object *op, char *params) 1290command_wimpy (object *op, char *params)
1373{ 1291{
1374 int i; 1292 int i;
1375 char buf[MAX_BUF]; 1293 char buf[MAX_BUF];
… …
1384 new_draw_info (NDI_UNIQUE, 0, op, buf); 1302 new_draw_info (NDI_UNIQUE, 0, op, buf);
1385 op->run_away = i; 1303 op->run_away = i;
1386 return 1; 1304 return 1;
1387} 1305}
1388 1306
1389
1390int 1307int
1391command_brace (object *op, char *params) 1308command_brace (object *op, char *params)
1392{ 1309{
1393 if (!params) 1310 if (!params)
1394 op->contr->braced = !op->contr->braced; 1311 op->contr->braced = !op->contr->braced;
… …
1398 if (op->contr->braced) 1315 if (op->contr->braced)
1399 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1316 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1400 else 1317 else
1401 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1318 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1402 1319
1403 fix_player (op); 1320 op->update_stats ();
1404 return 0; 1321 return 0;
1405} 1322}
1406 1323
1407int 1324int
1408command_style_map_info (object *op, char *params) 1325command_style_map_info (object *op, char *params)
… …
1413 object *tmp; 1330 object *tmp;
1414 1331
1415 for (mp = styles; mp != NULL; mp = mp->next) 1332 for (mp = styles; mp != NULL; mp = mp->next)
1416 { 1333 {
1417 maps_used++; 1334 maps_used++;
1418 mapmem += MAP_WIDTH (mp) * MAP_HEIGHT (mp) * (sizeof (object *) + sizeof (MapSpace)) + sizeof (maptile); 1335 mapmem += mp->width * mp->height * (sizeof (object *) + sizeof (mapspace)) + sizeof (maptile);
1419 for (x = 0; x < MAP_WIDTH (mp); x++) 1336 for (x = 0; x < mp->width; x++)
1420 { 1337 {
1421 for (y = 0; y < MAP_HEIGHT (mp); y++) 1338 for (y = 0; y < mp->height; y++)
1422 { 1339 {
1423 for (tmp = get_map_ob (mp, x, y); tmp != NULL; tmp = tmp->above) 1340 for (tmp = GET_MAP_OB (mp, x, y); tmp != NULL; tmp = tmp->above)
1424 objects_used++; 1341 objects_used++;
1425 } 1342 }
1426 } 1343 }
1427 } 1344 }
1428 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used); 1345 new_draw_info_format (NDI_UNIQUE, 0, op, "Style maps loaded: %d", maps_used);
… …
1451 for (obl = first_friendly_object; obl != NULL; obl = next) 1368 for (obl = first_friendly_object; obl != NULL; obl = next)
1452 { 1369 {
1453 object *ob = obl->ob; 1370 object *ob = obl->ob;
1454 1371
1455 next = obl->next; 1372 next = obl->next;
1456 if (get_owner (ob) == op) 1373 if (ob->owner == op)
1457 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1374 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1458 { 1375 {
1459 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1460 remove_ob (ob);
1461 remove_friendly_object (ob);
1462 free_object (ob); 1376 ob->destroy ();
1463 removecount++; 1377 removecount++;
1464 } 1378 }
1465 } 1379 }
1466 if (removecount != 0) 1380 if (removecount != 0)
1467 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount); 1381 new_draw_info_format (NDI_UNIQUE, 0, op, "killed %d pets.\n", removecount);

Diff Legend

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