… | |
… | |
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 | |
30 | extern weathermap_t **weathermap; |
30 | extern 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. |
… | |
… | |
36 | void |
36 | void |
37 | map_info (object *op, char *search) |
37 | map_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*/ |
|
|
229 | static int |
|
|
230 | name_cmp (const chars_names * c1, const chars_names * c2) |
|
|
231 | { |
|
|
232 | return strcasecmp (c1->namebuf, c2->namebuf); |
|
|
233 | } |
|
|
234 | |
|
|
235 | int |
228 | int |
236 | command_afk (object *op, char *params) |
229 | command_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 | |
252 | int |
239 | int |
253 | command_mapinfo (object *op, char *params) |
240 | command_mapinfo (object *op, char *params) |
… | |
… | |
453 | int |
440 | int |
454 | command_dumpbelow (object *op, char *params) |
441 | command_dumpbelow (object *op, char *params) |
455 | { |
442 | { |
456 | if (op && op->below) |
443 | if (op && op->below) |
457 | { |
444 | { |
458 | dump_object (op->below); |
445 | char *dump = dump_object (op->below); |
459 | new_draw_info (NDI_UNIQUE, 0, op, errmsg); |
446 | new_draw_info (NDI_UNIQUE, 0, op, dump); |
|
|
447 | free (dump); |
460 | /* Let's push that item on the dm's stack */ |
448 | /* Let's push that item on the dm's stack */ |
461 | dm_stack_push (op->contr, op->below->count); |
449 | dm_stack_push (op->contr, op->below->count); |
462 | } |
450 | } |
463 | return 0; |
451 | return 0; |
464 | } |
452 | } |
465 | |
453 | |
466 | int |
454 | int |
467 | command_dumpallobjects (object *op, char *params) |
|
|
468 | { |
|
|
469 | dump_all_objects (); |
|
|
470 | return 0; |
|
|
471 | } |
|
|
472 | |
|
|
473 | int |
|
|
474 | command_dumpfriendlyobjects (object *op, char *params) |
455 | command_dumpfriendlyobjects (object *op, char *params) |
475 | { |
456 | { |
476 | dump_friendly_objects (); |
457 | dump_friendly_objects (); |
477 | return 0; |
|
|
478 | } |
|
|
479 | |
|
|
480 | int |
|
|
481 | command_dumpallarchetypes (object *op, char *params) |
|
|
482 | { |
|
|
483 | dump_all_archetypes (); |
|
|
484 | return 0; |
458 | return 0; |
485 | } |
459 | } |
486 | |
460 | |
487 | int |
461 | int |
488 | command_dumpmap (object *op, char *params) |
462 | command_dumpmap (object *op, char *params) |
… | |
… | |
602 | int |
576 | int |
603 | command_statistics (object *pl, char *params) |
577 | command_statistics (object *pl, char *params) |
604 | { |
578 | { |
605 | if (!pl->contr) |
579 | if (!pl->contr) |
606 | return 1; |
580 | 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); |
581 | 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)); |
582 | 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"); |
583 | new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); |
615 | |
584 | |
616 | 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", |
617 | 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); |
618 | 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", |
… | |
… | |
635 | |
604 | |
636 | int |
605 | int |
637 | command_fix_me (object *op, char *params) |
606 | command_fix_me (object *op, char *params) |
638 | { |
607 | { |
639 | sum_weight (op); |
608 | sum_weight (op); |
640 | fix_player (op); |
609 | op->update_stats (); |
641 | return 1; |
610 | return 1; |
642 | } |
611 | } |
643 | |
612 | |
644 | int |
613 | int |
645 | command_players (object *op, char *paramss) |
614 | command_players (object *op, char *paramss) |
… | |
… | |
652 | t = buf + strlen (buf); |
621 | t = buf + strlen (buf); |
653 | if ((Dir = opendir (buf)) != NULL) |
622 | if ((Dir = opendir (buf)) != NULL) |
654 | { |
623 | { |
655 | const struct dirent *Entry; |
624 | const struct dirent *Entry; |
656 | |
625 | |
657 | while ((Entry = readdir (Dir)) != NULL) |
626 | while ((Entry = readdir (Dir))) |
658 | { |
627 | { |
659 | /* skip '.' , '..' */ |
628 | /* skip '.' , '..' */ |
660 | if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || |
629 | if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || |
661 | (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'))) |
662 | { |
631 | { |
… | |
… | |
810 | for (obl = first_friendly_object; obl != NULL; obl = next) |
779 | for (obl = first_friendly_object; obl != NULL; obl = next) |
811 | { |
780 | { |
812 | object *ob = obl->ob; |
781 | object *ob = obl->ob; |
813 | |
782 | |
814 | next = obl->next; |
783 | next = obl->next; |
815 | if (get_owner (ob) == op) |
784 | if (ob->owner == op) |
816 | { |
785 | { |
817 | if (target == 0) |
786 | if (target == 0) |
818 | { |
787 | { |
819 | if (counter == 0) |
788 | if (counter == 0) |
820 | new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); |
789 | new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); |
… | |
… | |
927 | char filename[MAX_BUF], line[80]; |
896 | char filename[MAX_BUF], line[80]; |
928 | int namelen, linelen = 0; |
897 | int namelen, linelen = 0; |
929 | |
898 | |
930 | switch (what) |
899 | switch (what) |
931 | { |
900 | { |
932 | case 1: |
901 | case 1: |
933 | sprintf (filename, "%s/wizhelp", settings.datadir); |
902 | sprintf (filename, "%s/wizhelp", settings.datadir); |
934 | new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); |
903 | new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); |
935 | break; |
904 | break; |
936 | case 3: |
905 | case 3: |
937 | sprintf (filename, "%s/mischelp", settings.datadir); |
906 | sprintf (filename, "%s/mischelp", settings.datadir); |
938 | new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); |
907 | new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); |
939 | break; |
908 | break; |
940 | default: |
909 | default: |
941 | sprintf (filename, "%s/help", settings.datadir); |
910 | sprintf (filename, "%s/help", settings.datadir); |
942 | new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); |
911 | new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); |
943 | break; |
912 | break; |
944 | } |
913 | } |
|
|
914 | |
945 | if (!(dirp = opendir (filename))) |
915 | if (!(dirp = opendir (filename))) |
946 | return; |
916 | return; |
947 | |
917 | |
948 | line[0] = '\0'; |
918 | line[0] = '\0'; |
949 | for (de = readdir (dirp); de; de = readdir (dirp)) |
919 | while (de = readdir (dirp)) |
950 | { |
920 | { |
951 | namelen = NAMLEN (de); |
921 | namelen = strlen (de->d_name); |
952 | 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] == '.')) |
953 | continue; |
923 | continue; |
954 | linelen += namelen + 1; |
924 | linelen += namelen + 1; |
955 | if (linelen > 42) |
925 | if (linelen > 42) |
956 | { |
926 | { |
… | |
… | |
1171 | } |
1141 | } |
1172 | |
1142 | |
1173 | int |
1143 | int |
1174 | command_real_quit (object *op, char *params) |
1144 | command_real_quit (object *op, char *params) |
1175 | { |
1145 | { |
1176 | 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):"); |
1177 | |
1147 | |
1178 | op->contr->state = ST_CONFIRM_QUIT; |
1148 | op->contr->ns->state = ST_CONFIRM_QUIT; |
1179 | return 1; |
1149 | return 1; |
1180 | } |
1150 | } |
1181 | |
1151 | |
1182 | /* |
1152 | /* |
1183 | * don't allow people to exit explore mode. It otherwise becomes |
1153 | * don't allow people to exit explore mode. It otherwise becomes |
… | |
… | |
1207 | } |
1177 | } |
1208 | |
1178 | |
1209 | int |
1179 | int |
1210 | command_sound (object *op, char *params) |
1180 | command_sound (object *op, char *params) |
1211 | { |
1181 | { |
1212 | if (op->contr->socket.sound) |
1182 | if (op->contr->ns->sound) |
1213 | { |
1183 | { |
1214 | op->contr->socket.sound = 0; |
1184 | op->contr->ns->sound = 0; |
1215 | new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); |
1185 | new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); |
1216 | } |
1186 | } |
1217 | else |
1187 | else |
1218 | { |
1188 | { |
1219 | op->contr->socket.sound = 1; |
1189 | op->contr->ns->sound = 1; |
1220 | new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); |
1190 | new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); |
1221 | } |
1191 | } |
1222 | return 1; |
|
|
1223 | } |
|
|
1224 | |
1192 | |
1225 | /* Perhaps these should be in player.c, but that file is |
|
|
1226 | * already a bit big. |
|
|
1227 | */ |
|
|
1228 | |
|
|
1229 | void |
|
|
1230 | receive_player_name (object *op, char k) |
|
|
1231 | { |
|
|
1232 | |
|
|
1233 | if (!check_name (op->contr, op->contr->write_buf + 1)) |
|
|
1234 | { |
|
|
1235 | get_name (op); |
|
|
1236 | return; |
|
|
1237 | } |
|
|
1238 | op->name = op->contr->write_buf + 1; |
|
|
1239 | op->name_pl = op->contr->write_buf + 1; |
|
|
1240 | new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf); |
|
|
1241 | op->contr->name_changed = 1; |
|
|
1242 | get_password (op); |
|
|
1243 | } |
|
|
1244 | |
|
|
1245 | void |
|
|
1246 | receive_player_password (object *op, char k) |
|
|
1247 | { |
|
|
1248 | |
|
|
1249 | unsigned int pwd_len = strlen (op->contr->write_buf); |
|
|
1250 | |
|
|
1251 | if (pwd_len <= 1 || pwd_len > 17) |
|
|
1252 | { |
|
|
1253 | get_name (op); |
|
|
1254 | return; |
|
|
1255 | } |
|
|
1256 | new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */ |
|
|
1257 | |
|
|
1258 | if (checkbanned (op->name, op->contr->socket.host)) |
|
|
1259 | { |
|
|
1260 | 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."); |
|
|
1262 | get_name (op); |
|
|
1263 | return; |
|
|
1264 | } |
|
|
1265 | |
|
|
1266 | if (op->contr->state == ST_CONFIRM_PASSWORD) |
|
|
1267 | { |
|
|
1268 | if (!check_password (op->contr->write_buf + 1, op->contr->password)) |
|
|
1269 | { |
|
|
1270 | new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match."); |
|
|
1271 | get_name (op); |
|
|
1272 | return; |
|
|
1273 | } |
|
|
1274 | clear_win_info (op); |
|
|
1275 | display_motd (op); |
|
|
1276 | new_draw_info (NDI_UNIQUE, 0, op, " "); |
|
|
1277 | new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!"); |
|
|
1278 | new_draw_info (NDI_UNIQUE, 0, op, " "); |
|
|
1279 | Roll_Again (op); |
|
|
1280 | op->contr->state = ST_ROLL_STAT; |
|
|
1281 | return; |
|
|
1282 | } |
|
|
1283 | strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL)); |
|
|
1284 | op->contr->state = ST_ROLL_STAT; |
|
|
1285 | check_login (op); |
|
|
1286 | return; |
1193 | return 1; |
1287 | } |
1194 | } |
1288 | |
|
|
1289 | |
1195 | |
1290 | int |
1196 | int |
1291 | explore_mode (void) |
1197 | explore_mode (void) |
1292 | { |
1198 | { |
1293 | player *pl; |
1199 | player *pl; |
… | |
… | |
1298 | if (pl->explore) |
1204 | if (pl->explore) |
1299 | return 1; |
1205 | return 1; |
1300 | } |
1206 | } |
1301 | return 0; |
1207 | return 0; |
1302 | } |
1208 | } |
1303 | |
|
|
1304 | |
1209 | |
1305 | int |
1210 | int |
1306 | command_title (object *op, char *params) |
1211 | command_title (object *op, char *params) |
1307 | { |
1212 | { |
1308 | char buf[MAX_BUF]; |
1213 | char buf[MAX_BUF]; |
… | |
… | |
1349 | } |
1254 | } |
1350 | |
1255 | |
1351 | int |
1256 | int |
1352 | command_save (object *op, char *params) |
1257 | command_save (object *op, char *params) |
1353 | { |
1258 | { |
1354 | // if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) { |
|
|
1355 | // new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground"); |
|
|
1356 | // } else |
|
|
1357 | if (!op->stats.exp) |
1259 | if (!op->stats.exp) |
1358 | { |
|
|
1359 | 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 |
1360 | } |
1262 | { |
1361 | else |
1263 | op->contr->save (); |
1362 | { |
|
|
1363 | if (save_player (op, 1)) |
|
|
1364 | new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); |
1264 | new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); |
1365 | else |
|
|
1366 | new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!"); |
|
|
1367 | } |
1265 | } |
1368 | return 1; |
|
|
1369 | } |
|
|
1370 | |
1266 | |
|
|
1267 | return 1; |
|
|
1268 | } |
1371 | |
1269 | |
1372 | int |
1270 | int |
1373 | command_peaceful (object *op, char *params) |
1271 | command_peaceful (object *op, char *params) |
1374 | { |
1272 | { |
1375 | new_draw_info (NDI_UNIQUE, 0, op, |
1273 | new_draw_info (NDI_UNIQUE, 0, op, |
… | |
… | |
1384 | 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."); |
1385 | */ |
1283 | */ |
1386 | return 1; |
1284 | return 1; |
1387 | } |
1285 | } |
1388 | |
1286 | |
1389 | |
|
|
1390 | |
|
|
1391 | int |
1287 | int |
1392 | command_wimpy (object *op, char *params) |
1288 | command_wimpy (object *op, char *params) |
1393 | { |
1289 | { |
1394 | int i; |
1290 | int i; |
1395 | char buf[MAX_BUF]; |
1291 | char buf[MAX_BUF]; |
… | |
… | |
1404 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1300 | new_draw_info (NDI_UNIQUE, 0, op, buf); |
1405 | op->run_away = i; |
1301 | op->run_away = i; |
1406 | return 1; |
1302 | return 1; |
1407 | } |
1303 | } |
1408 | |
1304 | |
1409 | |
|
|
1410 | int |
1305 | int |
1411 | command_brace (object *op, char *params) |
1306 | command_brace (object *op, char *params) |
1412 | { |
1307 | { |
1413 | if (!params) |
1308 | if (!params) |
1414 | op->contr->braced = !op->contr->braced; |
1309 | op->contr->braced = !op->contr->braced; |
… | |
… | |
1418 | if (op->contr->braced) |
1313 | if (op->contr->braced) |
1419 | new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); |
1314 | new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); |
1420 | else |
1315 | else |
1421 | new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); |
1316 | new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); |
1422 | |
1317 | |
1423 | fix_player (op); |
1318 | op->update_stats (); |
1424 | return 0; |
1319 | return 0; |
1425 | } |
1320 | } |
1426 | |
1321 | |
1427 | int |
1322 | int |
1428 | command_style_map_info (object *op, char *params) |
1323 | command_style_map_info (object *op, char *params) |
… | |
… | |
1433 | object *tmp; |
1328 | object *tmp; |
1434 | |
1329 | |
1435 | for (mp = styles; mp != NULL; mp = mp->next) |
1330 | for (mp = styles; mp != NULL; mp = mp->next) |
1436 | { |
1331 | { |
1437 | maps_used++; |
1332 | maps_used++; |
1438 | 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); |
1439 | for (x = 0; x < MAP_WIDTH (mp); x++) |
1334 | for (x = 0; x < mp->width; x++) |
1440 | { |
1335 | { |
1441 | for (y = 0; y < MAP_HEIGHT (mp); y++) |
1336 | for (y = 0; y < mp->height; y++) |
1442 | { |
1337 | { |
1443 | 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) |
1444 | objects_used++; |
1339 | objects_used++; |
1445 | } |
1340 | } |
1446 | } |
1341 | } |
1447 | } |
1342 | } |
1448 | 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); |
… | |
… | |
1471 | for (obl = first_friendly_object; obl != NULL; obl = next) |
1366 | for (obl = first_friendly_object; obl != NULL; obl = next) |
1472 | { |
1367 | { |
1473 | object *ob = obl->ob; |
1368 | object *ob = obl->ob; |
1474 | |
1369 | |
1475 | next = obl->next; |
1370 | next = obl->next; |
1476 | if (get_owner (ob) == op) |
1371 | if (ob->owner == op) |
1477 | if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) |
1372 | if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) |
1478 | { |
1373 | { |
1479 | if (!QUERY_FLAG (ob, FLAG_REMOVED)) |
|
|
1480 | remove_ob (ob); |
|
|
1481 | remove_friendly_object (ob); |
|
|
1482 | free_object (ob); |
1374 | ob->destroy (); |
1483 | removecount++; |
1375 | removecount++; |
1484 | } |
1376 | } |
1485 | } |
1377 | } |
1486 | if (removecount != 0) |
1378 | if (removecount != 0) |
1487 | 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); |