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.14 by root, Tue Nov 7 16:30:55 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 228int
236command_afk (object *op, char *params) 229command_afk (object *op, char *params)
237{ 230{
238 if QUERY_FLAG 231 if ((op->contr->ns->afk = !op->contr->ns->afk))
239 (op, FLAG_AFK)
240 {
241 CLEAR_FLAG (op, FLAG_AFK);
242 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");
243 }
244 else 233 else
245 {
246 SET_FLAG (op, FLAG_AFK);
247 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 234 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
248 } 235
249 return 1; 236 return 1;
250} 237}
251 238
252int 239int
253command_mapinfo (object *op, char *params) 240command_mapinfo (object *op, char *params)
… …
589int 576int
590command_statistics (object *pl, char *params) 577command_statistics (object *pl, char *params)
591{ 578{
592 if (!pl->contr) 579 if (!pl->contr)
593 return 1; 580 return 1;
594#ifndef WIN32
595 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
596 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
597#else
598 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);
599 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));
600#endif
601 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 583 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
602 584
603 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",
604 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);
605 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",
… …
622 604
623int 605int
624command_fix_me (object *op, char *params) 606command_fix_me (object *op, char *params)
625{ 607{
626 sum_weight (op); 608 sum_weight (op);
627 fix_player (op); 609 op->update_stats ();
628 return 1; 610 return 1;
629} 611}
630 612
631int 613int
632command_players (object *op, char *paramss) 614command_players (object *op, char *paramss)
… …
639 t = buf + strlen (buf); 621 t = buf + strlen (buf);
640 if ((Dir = opendir (buf)) != NULL) 622 if ((Dir = opendir (buf)) != NULL)
641 { 623 {
642 const struct dirent *Entry; 624 const struct dirent *Entry;
643 625
644 while ((Entry = readdir (Dir)) != NULL) 626 while ((Entry = readdir (Dir)))
645 { 627 {
646 /* skip '.' , '..' */ 628 /* skip '.' , '..' */
647 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 629 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
648 (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')))
649 { 631 {
… …
797 for (obl = first_friendly_object; obl != NULL; obl = next) 779 for (obl = first_friendly_object; obl != NULL; obl = next)
798 { 780 {
799 object *ob = obl->ob; 781 object *ob = obl->ob;
800 782
801 next = obl->next; 783 next = obl->next;
802 if (get_owner (ob) == op) 784 if (ob->owner == op)
803 { 785 {
804 if (target == 0) 786 if (target == 0)
805 { 787 {
806 if (counter == 0) 788 if (counter == 0)
807 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 789 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
914 char filename[MAX_BUF], line[80]; 896 char filename[MAX_BUF], line[80];
915 int namelen, linelen = 0; 897 int namelen, linelen = 0;
916 898
917 switch (what) 899 switch (what)
918 { 900 {
919 case 1: 901 case 1:
920 sprintf (filename, "%s/wizhelp", settings.datadir); 902 sprintf (filename, "%s/wizhelp", settings.datadir);
921 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 903 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
922 break; 904 break;
923 case 3: 905 case 3:
924 sprintf (filename, "%s/mischelp", settings.datadir); 906 sprintf (filename, "%s/mischelp", settings.datadir);
925 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 907 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
926 break; 908 break;
927 default: 909 default:
928 sprintf (filename, "%s/help", settings.datadir); 910 sprintf (filename, "%s/help", settings.datadir);
929 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 911 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
930 break; 912 break;
931 } 913 }
914
932 if (!(dirp = opendir (filename))) 915 if (!(dirp = opendir (filename)))
933 return; 916 return;
934 917
935 line[0] = '\0'; 918 line[0] = '\0';
936 for (de = readdir (dirp); de; de = readdir (dirp)) 919 while (de = readdir (dirp))
937 { 920 {
938 namelen = NAMLEN (de); 921 namelen = strlen (de->d_name);
939 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] == '.'))
940 continue; 923 continue;
941 linelen += namelen + 1; 924 linelen += namelen + 1;
942 if (linelen > 42) 925 if (linelen > 42)
943 { 926 {
… …
1158} 1141}
1159 1142
1160int 1143int
1161command_real_quit (object *op, char *params) 1144command_real_quit (object *op, char *params)
1162{ 1145{
1163 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):");
1164 1147
1165 op->contr->state = ST_CONFIRM_QUIT; 1148 op->contr->ns->state = ST_CONFIRM_QUIT;
1166 return 1; 1149 return 1;
1167} 1150}
1168 1151
1169/* 1152/*
1170 * don't allow people to exit explore mode. It otherwise becomes 1153 * don't allow people to exit explore mode. It otherwise becomes
… …
1194} 1177}
1195 1178
1196int 1179int
1197command_sound (object *op, char *params) 1180command_sound (object *op, char *params)
1198{ 1181{
1199 if (op->contr->socket.sound) 1182 if (op->contr->ns->sound)
1200 { 1183 {
1201 op->contr->socket.sound = 0; 1184 op->contr->ns->sound = 0;
1202 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1185 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1203 } 1186 }
1204 else 1187 else
1205 { 1188 {
1206 op->contr->socket.sound = 1; 1189 op->contr->ns->sound = 1;
1207 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1208 } 1191 }
1209 return 1;
1210}
1211 1192
1212/* Perhaps these should be in player.c, but that file is
1213 * already a bit big.
1214 */
1215
1216void
1217receive_player_name (object *op, char k)
1218{
1219
1220 if (!check_name (op->contr, op->contr->write_buf + 1))
1221 {
1222 get_name (op);
1223 return;
1224 }
1225 op->name = op->contr->write_buf + 1;
1226 op->name_pl = op->contr->write_buf + 1;
1227 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1228 op->contr->name_changed = 1;
1229 get_password (op);
1230}
1231
1232void
1233receive_player_password (object *op, char k)
1234{
1235
1236 unsigned int pwd_len = strlen (op->contr->write_buf);
1237
1238 if (pwd_len <= 1 || pwd_len > 17)
1239 {
1240 get_name (op);
1241 return;
1242 }
1243 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1244
1245 if (checkbanned (op->name, op->contr->socket.host))
1246 {
1247 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1248 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1249 get_name (op);
1250 return;
1251 }
1252
1253 if (op->contr->state == ST_CONFIRM_PASSWORD)
1254 {
1255 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1256 {
1257 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1258 get_name (op);
1259 return;
1260 }
1261 clear_win_info (op);
1262 display_motd (op);
1263 new_draw_info (NDI_UNIQUE, 0, op, " ");
1264 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1265 new_draw_info (NDI_UNIQUE, 0, op, " ");
1266 Roll_Again (op);
1267 op->contr->state = ST_ROLL_STAT;
1268 return;
1269 }
1270 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1271 op->contr->state = ST_ROLL_STAT;
1272 check_login (op);
1273 return; 1193 return 1;
1274} 1194}
1275
1276 1195
1277int 1196int
1278explore_mode (void) 1197explore_mode (void)
1279{ 1198{
1280 player *pl; 1199 player *pl;
… …
1285 if (pl->explore) 1204 if (pl->explore)
1286 return 1; 1205 return 1;
1287 } 1206 }
1288 return 0; 1207 return 0;
1289} 1208}
1290
1291 1209
1292int 1210int
1293command_title (object *op, char *params) 1211command_title (object *op, char *params)
1294{ 1212{
1295 char buf[MAX_BUF]; 1213 char buf[MAX_BUF];
… …
1336} 1254}
1337 1255
1338int 1256int
1339command_save (object *op, char *params) 1257command_save (object *op, char *params)
1340{ 1258{
1341// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1342// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1343// } else
1344 if (!op->stats.exp) 1259 if (!op->stats.exp)
1345 {
1346 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
1347 } 1262 {
1348 else 1263 op->contr->save ();
1349 {
1350 if (save_player (op, 1))
1351 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); 1264 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1352 else
1353 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1354 } 1265 }
1355 return 1;
1356}
1357 1266
1267 return 1;
1268}
1358 1269
1359int 1270int
1360command_peaceful (object *op, char *params) 1271command_peaceful (object *op, char *params)
1361{ 1272{
1362 new_draw_info (NDI_UNIQUE, 0, op, 1273 new_draw_info (NDI_UNIQUE, 0, op,
… …
1371 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.");
1372*/ 1283*/
1373 return 1; 1284 return 1;
1374} 1285}
1375 1286
1376
1377
1378int 1287int
1379command_wimpy (object *op, char *params) 1288command_wimpy (object *op, char *params)
1380{ 1289{
1381 int i; 1290 int i;
1382 char buf[MAX_BUF]; 1291 char buf[MAX_BUF];
… …
1391 new_draw_info (NDI_UNIQUE, 0, op, buf); 1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1392 op->run_away = i; 1301 op->run_away = i;
1393 return 1; 1302 return 1;
1394} 1303}
1395 1304
1396
1397int 1305int
1398command_brace (object *op, char *params) 1306command_brace (object *op, char *params)
1399{ 1307{
1400 if (!params) 1308 if (!params)
1401 op->contr->braced = !op->contr->braced; 1309 op->contr->braced = !op->contr->braced;
… …
1405 if (op->contr->braced) 1313 if (op->contr->braced)
1406 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1314 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1407 else 1315 else
1408 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1316 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1409 1317
1410 fix_player (op); 1318 op->update_stats ();
1411 return 0; 1319 return 0;
1412} 1320}
1413 1321
1414int 1322int
1415command_style_map_info (object *op, char *params) 1323command_style_map_info (object *op, char *params)
… …
1420 object *tmp; 1328 object *tmp;
1421 1329
1422 for (mp = styles; mp != NULL; mp = mp->next) 1330 for (mp = styles; mp != NULL; mp = mp->next)
1423 { 1331 {
1424 maps_used++; 1332 maps_used++;
1425 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);
1426 for (x = 0; x < MAP_WIDTH (mp); x++) 1334 for (x = 0; x < mp->width; x++)
1427 { 1335 {
1428 for (y = 0; y < MAP_HEIGHT (mp); y++) 1336 for (y = 0; y < mp->height; y++)
1429 { 1337 {
1430 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)
1431 objects_used++; 1339 objects_used++;
1432 } 1340 }
1433 } 1341 }
1434 } 1342 }
1435 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);
… …
1458 for (obl = first_friendly_object; obl != NULL; obl = next) 1366 for (obl = first_friendly_object; obl != NULL; obl = next)
1459 { 1367 {
1460 object *ob = obl->ob; 1368 object *ob = obl->ob;
1461 1369
1462 next = obl->next; 1370 next = obl->next;
1463 if (get_owner (ob) == op) 1371 if (ob->owner == op)
1464 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1372 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1465 { 1373 {
1466 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1467 remove_ob (ob);
1468 remove_friendly_object (ob);
1469 free_object (ob); 1374 ob->destroy ();
1470 removecount++; 1375 removecount++;
1471 } 1376 }
1472 } 1377 }
1473 if (removecount != 0) 1378 if (removecount != 0)
1474 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