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.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)
… …
226} chars_names; 226} chars_names;
227 227
228int 228int
229command_afk (object *op, char *params) 229command_afk (object *op, char *params)
230{ 230{
231 if QUERY_FLAG 231 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"); 232 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
236 }
237 else 233 else
238 {
239 SET_FLAG (op, FLAG_AFK);
240 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 234 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
241 } 235
242 return 1; 236 return 1;
243} 237}
244 238
245int 239int
246command_mapinfo (object *op, char *params) 240command_mapinfo (object *op, char *params)
… …
610 604
611int 605int
612command_fix_me (object *op, char *params) 606command_fix_me (object *op, char *params)
613{ 607{
614 sum_weight (op); 608 sum_weight (op);
615 fix_player (op); 609 op->update_stats ();
616 return 1; 610 return 1;
617} 611}
618 612
619int 613int
620command_players (object *op, char *paramss) 614command_players (object *op, char *paramss)
… …
627 t = buf + strlen (buf); 621 t = buf + strlen (buf);
628 if ((Dir = opendir (buf)) != NULL) 622 if ((Dir = opendir (buf)) != NULL)
629 { 623 {
630 const struct dirent *Entry; 624 const struct dirent *Entry;
631 625
632 while ((Entry = readdir (Dir)) != NULL) 626 while ((Entry = readdir (Dir)))
633 { 627 {
634 /* skip '.' , '..' */ 628 /* skip '.' , '..' */
635 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 629 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
636 (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')))
637 { 631 {
… …
785 for (obl = first_friendly_object; obl != NULL; obl = next) 779 for (obl = first_friendly_object; obl != NULL; obl = next)
786 { 780 {
787 object *ob = obl->ob; 781 object *ob = obl->ob;
788 782
789 next = obl->next; 783 next = obl->next;
790 if (get_owner (ob) == op) 784 if (ob->owner == op)
791 { 785 {
792 if (target == 0) 786 if (target == 0)
793 { 787 {
794 if (counter == 0) 788 if (counter == 0)
795 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 789 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
902 char filename[MAX_BUF], line[80]; 896 char filename[MAX_BUF], line[80];
903 int namelen, linelen = 0; 897 int namelen, linelen = 0;
904 898
905 switch (what) 899 switch (what)
906 { 900 {
907 case 1: 901 case 1:
908 sprintf (filename, "%s/wizhelp", settings.datadir); 902 sprintf (filename, "%s/wizhelp", settings.datadir);
909 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 903 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
910 break; 904 break;
911 case 3: 905 case 3:
912 sprintf (filename, "%s/mischelp", settings.datadir); 906 sprintf (filename, "%s/mischelp", settings.datadir);
913 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 907 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
914 break; 908 break;
915 default: 909 default:
916 sprintf (filename, "%s/help", settings.datadir); 910 sprintf (filename, "%s/help", settings.datadir);
917 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 911 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
918 break; 912 break;
919 } 913 }
914
920 if (!(dirp = opendir (filename))) 915 if (!(dirp = opendir (filename)))
921 return; 916 return;
922 917
923 line[0] = '\0'; 918 line[0] = '\0';
924 for (de = readdir (dirp); de; de = readdir (dirp)) 919 while (de = readdir (dirp))
925 { 920 {
926 namelen = NAMLEN (de); 921 namelen = strlen (de->d_name);
927 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] == '.'))
928 continue; 923 continue;
929 linelen += namelen + 1; 924 linelen += namelen + 1;
930 if (linelen > 42) 925 if (linelen > 42)
931 { 926 {
… …
1146} 1141}
1147 1142
1148int 1143int
1149command_real_quit (object *op, char *params) 1144command_real_quit (object *op, char *params)
1150{ 1145{
1151 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):");
1152 1147
1153 op->contr->state = ST_CONFIRM_QUIT; 1148 op->contr->ns->state = ST_CONFIRM_QUIT;
1154 return 1; 1149 return 1;
1155} 1150}
1156 1151
1157/* 1152/*
1158 * don't allow people to exit explore mode. It otherwise becomes 1153 * don't allow people to exit explore mode. It otherwise becomes
… …
1182} 1177}
1183 1178
1184int 1179int
1185command_sound (object *op, char *params) 1180command_sound (object *op, char *params)
1186{ 1181{
1187 if (op->contr->socket.sound) 1182 if (op->contr->ns->sound)
1188 { 1183 {
1189 op->contr->socket.sound = 0; 1184 op->contr->ns->sound = 0;
1190 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1185 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1191 } 1186 }
1192 else 1187 else
1193 { 1188 {
1194 op->contr->socket.sound = 1; 1189 op->contr->ns->sound = 1;
1195 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1190 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1196 } 1191 }
1197 return 1;
1198}
1199 1192
1200/* Perhaps these should be in player.c, but that file is
1201 * already a bit big.
1202 */
1203
1204void
1205receive_player_name (object *op, char k)
1206{
1207
1208 if (!check_name (op->contr, op->contr->write_buf + 1))
1209 {
1210 get_name (op);
1211 return;
1212 }
1213 op->name = op->contr->write_buf + 1;
1214 op->name_pl = op->contr->write_buf + 1;
1215 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1216 op->contr->name_changed = 1;
1217 get_password (op);
1218}
1219
1220void
1221receive_player_password (object *op, char k)
1222{
1223
1224 unsigned int pwd_len = strlen (op->contr->write_buf);
1225
1226 if (pwd_len <= 1 || pwd_len > 17)
1227 {
1228 get_name (op);
1229 return;
1230 }
1231 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1232
1233 if (checkbanned (op->name, op->contr->socket.host))
1234 {
1235 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.");
1237 get_name (op);
1238 return;
1239 }
1240
1241 if (op->contr->state == ST_CONFIRM_PASSWORD)
1242 {
1243 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1244 {
1245 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1246 get_name (op);
1247 return;
1248 }
1249 clear_win_info (op);
1250 display_motd (op);
1251 new_draw_info (NDI_UNIQUE, 0, op, " ");
1252 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1253 new_draw_info (NDI_UNIQUE, 0, op, " ");
1254 Roll_Again (op);
1255 op->contr->state = ST_ROLL_STAT;
1256 return;
1257 }
1258 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1259 op->contr->state = ST_ROLL_STAT;
1260 check_login (op);
1261 return; 1193 return 1;
1262} 1194}
1263
1264 1195
1265int 1196int
1266explore_mode (void) 1197explore_mode (void)
1267{ 1198{
1268 player *pl; 1199 player *pl;
… …
1273 if (pl->explore) 1204 if (pl->explore)
1274 return 1; 1205 return 1;
1275 } 1206 }
1276 return 0; 1207 return 0;
1277} 1208}
1278
1279 1209
1280int 1210int
1281command_title (object *op, char *params) 1211command_title (object *op, char *params)
1282{ 1212{
1283 char buf[MAX_BUF]; 1213 char buf[MAX_BUF];
… …
1324} 1254}
1325 1255
1326int 1256int
1327command_save (object *op, char *params) 1257command_save (object *op, char *params)
1328{ 1258{
1329// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1330// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1331// } else
1332 if (!op->stats.exp) 1259 if (!op->stats.exp)
1333 {
1334 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
1335 } 1262 {
1336 else 1263 op->contr->save ();
1337 {
1338 if (save_player (op, 1))
1339 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); 1264 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1340 else
1341 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1342 } 1265 }
1343 return 1;
1344}
1345 1266
1267 return 1;
1268}
1346 1269
1347int 1270int
1348command_peaceful (object *op, char *params) 1271command_peaceful (object *op, char *params)
1349{ 1272{
1350 new_draw_info (NDI_UNIQUE, 0, op, 1273 new_draw_info (NDI_UNIQUE, 0, op,
… …
1359 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.");
1360*/ 1283*/
1361 return 1; 1284 return 1;
1362} 1285}
1363 1286
1364
1365
1366int 1287int
1367command_wimpy (object *op, char *params) 1288command_wimpy (object *op, char *params)
1368{ 1289{
1369 int i; 1290 int i;
1370 char buf[MAX_BUF]; 1291 char buf[MAX_BUF];
… …
1379 new_draw_info (NDI_UNIQUE, 0, op, buf); 1300 new_draw_info (NDI_UNIQUE, 0, op, buf);
1380 op->run_away = i; 1301 op->run_away = i;
1381 return 1; 1302 return 1;
1382} 1303}
1383 1304
1384
1385int 1305int
1386command_brace (object *op, char *params) 1306command_brace (object *op, char *params)
1387{ 1307{
1388 if (!params) 1308 if (!params)
1389 op->contr->braced = !op->contr->braced; 1309 op->contr->braced = !op->contr->braced;
… …
1393 if (op->contr->braced) 1313 if (op->contr->braced)
1394 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1314 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1395 else 1315 else
1396 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1316 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1397 1317
1398 fix_player (op); 1318 op->update_stats ();
1399 return 0; 1319 return 0;
1400} 1320}
1401 1321
1402int 1322int
1403command_style_map_info (object *op, char *params) 1323command_style_map_info (object *op, char *params)
… …
1408 object *tmp; 1328 object *tmp;
1409 1329
1410 for (mp = styles; mp != NULL; mp = mp->next) 1330 for (mp = styles; mp != NULL; mp = mp->next)
1411 { 1331 {
1412 maps_used++; 1332 maps_used++;
1413 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);
1414 for (x = 0; x < MAP_WIDTH (mp); x++) 1334 for (x = 0; x < mp->width; x++)
1415 { 1335 {
1416 for (y = 0; y < MAP_HEIGHT (mp); y++) 1336 for (y = 0; y < mp->height; y++)
1417 { 1337 {
1418 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)
1419 objects_used++; 1339 objects_used++;
1420 } 1340 }
1421 } 1341 }
1422 } 1342 }
1423 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);
… …
1446 for (obl = first_friendly_object; obl != NULL; obl = next) 1366 for (obl = first_friendly_object; obl != NULL; obl = next)
1447 { 1367 {
1448 object *ob = obl->ob; 1368 object *ob = obl->ob;
1449 1369
1450 next = obl->next; 1370 next = obl->next;
1451 if (get_owner (ob) == op) 1371 if (ob->owner == op)
1452 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1372 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1453 { 1373 {
1454 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1455 remove_ob (ob);
1456 remove_friendly_object (ob);
1457 free_object (ob); 1374 ob->destroy ();
1458 removecount++; 1375 removecount++;
1459 } 1376 }
1460 } 1377 }
1461 if (removecount != 0) 1378 if (removecount != 0)
1462 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