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.11 by root, Fri Sep 29 19:28:43 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)
… …
223{ 225{
224 char namebuf[MAX_BUF]; 226 char namebuf[MAX_BUF];
225 int login_order; 227 int login_order;
226} chars_names; 228} chars_names;
227 229
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 230int
236command_afk (object *op, char *params) 231command_afk (object *op, char *params)
237{ 232{
238 if QUERY_FLAG 233 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"); 234 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer AFK");
243 }
244 else 235 else
245 {
246 SET_FLAG (op, FLAG_AFK);
247 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK"); 236 new_draw_info (NDI_UNIQUE, 0, op, "You are now AFK");
248 } 237
249 return 1; 238 return 1;
250} 239}
251 240
252int 241int
253command_mapinfo (object *op, char *params) 242command_mapinfo (object *op, char *params)
… …
453int 442int
454command_dumpbelow (object *op, char *params) 443command_dumpbelow (object *op, char *params)
455{ 444{
456 if (op && op->below) 445 if (op && op->below)
457 { 446 {
458 dump_object (op->below); 447 char *dump = dump_object (op->below);
459 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 448 new_draw_info (NDI_UNIQUE, 0, op, dump);
449 free (dump);
460 /* Let's push that item on the dm's stack */ 450 /* Let's push that item on the dm's stack */
461 dm_stack_push (op->contr, op->below->count); 451 dm_stack_push (op->contr, op->below->count);
462 } 452 }
463 return 0; 453 return 0;
464} 454}
465 455
466int 456int
467command_wizpass (object *op, char *params)
468{
469 int i;
470
471 if (!op)
472 return 0;
473
474 if (!params)
475 i = (QUERY_FLAG (op, FLAG_WIZPASS)) ? 0 : 1;
476 else
477 i = onoff_value (params);
478
479 if (i)
480 {
481 new_draw_info (NDI_UNIQUE, 0, op, "You will now walk through walls.\n");
482 SET_FLAG (op, FLAG_WIZPASS);
483 }
484 else
485 {
486 new_draw_info (NDI_UNIQUE, 0, op, "You will now be stopped by walls.\n");
487 CLEAR_FLAG (op, FLAG_WIZPASS);
488 }
489 return 0;
490}
491
492int
493command_wizcast (object *op, char *params)
494{
495 int i;
496
497 if (!op)
498 return 0;
499
500 if (!params)
501 i = (QUERY_FLAG (op, FLAG_WIZCAST)) ? 0 : 1;
502 else
503 i = onoff_value (params);
504
505 if (i)
506 {
507 new_draw_info (NDI_UNIQUE, 0, op, "You can now cast spells anywhere.");
508 SET_FLAG (op, FLAG_WIZCAST);
509 }
510 else
511 {
512 new_draw_info (NDI_UNIQUE, 0, op, "You now cannot cast spells in no-magic areas.");
513 CLEAR_FLAG (op, FLAG_WIZCAST);
514 }
515 return 0;
516}
517
518int
519command_dumpallobjects (object *op, char *params)
520{
521 dump_all_objects ();
522 return 0;
523}
524
525int
526command_dumpfriendlyobjects (object *op, char *params) 457command_dumpfriendlyobjects (object *op, char *params)
527{ 458{
528 dump_friendly_objects (); 459 dump_friendly_objects ();
529 return 0;
530}
531
532int
533command_dumpallarchetypes (object *op, char *params)
534{
535 dump_all_archetypes ();
536 return 0; 460 return 0;
537} 461}
538 462
539int 463int
540command_dumpmap (object *op, char *params) 464command_dumpmap (object *op, char *params)
… …
654int 578int
655command_statistics (object *pl, char *params) 579command_statistics (object *pl, char *params)
656{ 580{
657 if (!pl->contr) 581 if (!pl->contr)
658 return 1; 582 return 1;
659#ifndef WIN32
660 new_draw_info_format (NDI_UNIQUE, 0, pl, " Experience: %lld", pl->stats.exp);
661 new_draw_info_format (NDI_UNIQUE, 0, pl, " Next Level: %lld", level_exp (pl->level + 1, pl->expmul));
662#else
663 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);
664 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));
665#endif
666 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max"); 585 new_draw_info (NDI_UNIQUE, 0, pl, "\nStat Nat/Real/Max");
667 586
668 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",
669 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);
670 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",
… …
687 606
688int 607int
689command_fix_me (object *op, char *params) 608command_fix_me (object *op, char *params)
690{ 609{
691 sum_weight (op); 610 sum_weight (op);
692 fix_player (op); 611 op->update_stats ();
693 return 1; 612 return 1;
694} 613}
695 614
696int 615int
697command_players (object *op, char *paramss) 616command_players (object *op, char *paramss)
… …
704 t = buf + strlen (buf); 623 t = buf + strlen (buf);
705 if ((Dir = opendir (buf)) != NULL) 624 if ((Dir = opendir (buf)) != NULL)
706 { 625 {
707 const struct dirent *Entry; 626 const struct dirent *Entry;
708 627
709 while ((Entry = readdir (Dir)) != NULL) 628 while ((Entry = readdir (Dir)))
710 { 629 {
711 /* skip '.' , '..' */ 630 /* skip '.' , '..' */
712 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') || 631 if (!((Entry->d_name[0] == '.' && Entry->d_name[1] == '\0') ||
713 (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')))
714 { 633 {
… …
862 for (obl = first_friendly_object; obl != NULL; obl = next) 781 for (obl = first_friendly_object; obl != NULL; obl = next)
863 { 782 {
864 object *ob = obl->ob; 783 object *ob = obl->ob;
865 784
866 next = obl->next; 785 next = obl->next;
867 if (get_owner (ob) == op) 786 if (ob->owner == op)
868 { 787 {
869 if (target == 0) 788 if (target == 0)
870 { 789 {
871 if (counter == 0) 790 if (counter == 0)
872 new_draw_info (NDI_UNIQUE, 0, op, "Pets:"); 791 new_draw_info (NDI_UNIQUE, 0, op, "Pets:");
… …
979 char filename[MAX_BUF], line[80]; 898 char filename[MAX_BUF], line[80];
980 int namelen, linelen = 0; 899 int namelen, linelen = 0;
981 900
982 switch (what) 901 switch (what)
983 { 902 {
984 case 1: 903 case 1:
985 sprintf (filename, "%s/wizhelp", settings.datadir); 904 sprintf (filename, "%s/wizhelp", settings.datadir);
986 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:"); 905 new_draw_info (NDI_UNIQUE, 0, op, " Wiz commands:");
987 break; 906 break;
988 case 3: 907 case 3:
989 sprintf (filename, "%s/mischelp", settings.datadir); 908 sprintf (filename, "%s/mischelp", settings.datadir);
990 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:"); 909 new_draw_info (NDI_UNIQUE, 0, op, " Misc help:");
991 break; 910 break;
992 default: 911 default:
993 sprintf (filename, "%s/help", settings.datadir); 912 sprintf (filename, "%s/help", settings.datadir);
994 new_draw_info (NDI_UNIQUE, 0, op, " Commands:"); 913 new_draw_info (NDI_UNIQUE, 0, op, " Commands:");
995 break; 914 break;
996 } 915 }
916
997 if (!(dirp = opendir (filename))) 917 if (!(dirp = opendir (filename)))
998 return; 918 return;
999 919
1000 line[0] = '\0'; 920 line[0] = '\0';
1001 for (de = readdir (dirp); de; de = readdir (dirp)) 921 while (de = readdir (dirp))
1002 { 922 {
1003 namelen = NAMLEN (de); 923 namelen = strlen (de->d_name);
1004 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] == '.'))
1005 continue; 925 continue;
1006 linelen += namelen + 1; 926 linelen += namelen + 1;
1007 if (linelen > 42) 927 if (linelen > 42)
1008 { 928 {
… …
1223} 1143}
1224 1144
1225int 1145int
1226command_real_quit (object *op, char *params) 1146command_real_quit (object *op, char *params)
1227{ 1147{
1228 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):");
1229 1149
1230 op->contr->state = ST_CONFIRM_QUIT; 1150 op->contr->ns->state = ST_CONFIRM_QUIT;
1231 return 1; 1151 return 1;
1232} 1152}
1233 1153
1234/* 1154/*
1235 * don't allow people to exit explore mode. It otherwise becomes 1155 * don't allow people to exit explore mode. It otherwise becomes
… …
1259} 1179}
1260 1180
1261int 1181int
1262command_sound (object *op, char *params) 1182command_sound (object *op, char *params)
1263{ 1183{
1264 if (op->contr->socket.sound) 1184 if (op->contr->ns->sound)
1265 { 1185 {
1266 op->contr->socket.sound = 0; 1186 op->contr->ns->sound = 0;
1267 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden..."); 1187 new_draw_info (NDI_UNIQUE, 0, op, "Silence is golden...");
1268 } 1188 }
1269 else 1189 else
1270 { 1190 {
1271 op->contr->socket.sound = 1; 1191 op->contr->ns->sound = 1;
1272 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled."); 1192 new_draw_info (NDI_UNIQUE, 0, op, "The sounds are enabled.");
1273 } 1193 }
1274 return 1;
1275}
1276 1194
1277/* Perhaps these should be in player.c, but that file is
1278 * already a bit big.
1279 */
1280
1281void
1282receive_player_name (object *op, char k)
1283{
1284
1285 if (!check_name (op->contr, op->contr->write_buf + 1))
1286 {
1287 get_name (op);
1288 return;
1289 }
1290 op->name = op->contr->write_buf + 1;
1291 op->name_pl = op->contr->write_buf + 1;
1292 new_draw_info (NDI_UNIQUE, 0, op, op->contr->write_buf);
1293 op->contr->name_changed = 1;
1294 get_password (op);
1295}
1296
1297void
1298receive_player_password (object *op, char k)
1299{
1300
1301 unsigned int pwd_len = strlen (op->contr->write_buf);
1302
1303 if (pwd_len <= 1 || pwd_len > 17)
1304 {
1305 get_name (op);
1306 return;
1307 }
1308 new_draw_info (NDI_UNIQUE, 0, op, " "); /* To hide the password better */
1309
1310 if (checkbanned (op->name, op->contr->socket.host))
1311 {
1312 LOG (llevInfo, "Banned player tried to add: [%s@%s]\n", &op->name, op->contr->socket.host);
1313 new_draw_info (NDI_UNIQUE | NDI_RED, 0, op, "You are not allowed to play.");
1314 get_name (op);
1315 return;
1316 }
1317
1318 if (op->contr->state == ST_CONFIRM_PASSWORD)
1319 {
1320 if (!check_password (op->contr->write_buf + 1, op->contr->password))
1321 {
1322 new_draw_info (NDI_UNIQUE, 0, op, "The passwords did not match.");
1323 get_name (op);
1324 return;
1325 }
1326 clear_win_info (op);
1327 display_motd (op);
1328 new_draw_info (NDI_UNIQUE, 0, op, " ");
1329 new_draw_info (NDI_UNIQUE, 0, op, "Welcome, Brave New Warrior!");
1330 new_draw_info (NDI_UNIQUE, 0, op, " ");
1331 Roll_Again (op);
1332 op->contr->state = ST_ROLL_STAT;
1333 return;
1334 }
1335 strcpy (op->contr->password, crypt_string (op->contr->write_buf + 1, NULL));
1336 op->contr->state = ST_ROLL_STAT;
1337 check_login (op);
1338 return; 1195 return 1;
1339} 1196}
1340
1341 1197
1342int 1198int
1343explore_mode (void) 1199explore_mode (void)
1344{ 1200{
1345 player *pl; 1201 player *pl;
… …
1350 if (pl->explore) 1206 if (pl->explore)
1351 return 1; 1207 return 1;
1352 } 1208 }
1353 return 0; 1209 return 0;
1354} 1210}
1355
1356 1211
1357int 1212int
1358command_title (object *op, char *params) 1213command_title (object *op, char *params)
1359{ 1214{
1360 char buf[MAX_BUF]; 1215 char buf[MAX_BUF];
… …
1401} 1256}
1402 1257
1403int 1258int
1404command_save (object *op, char *params) 1259command_save (object *op, char *params)
1405{ 1260{
1406// if (get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_NO_CLERIC) {
1407// new_draw_info(NDI_UNIQUE, 0, op, "You can not save on unholy ground");
1408// } else
1409 if (!op->stats.exp) 1261 if (!op->stats.exp)
1410 {
1411 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
1412 } 1264 {
1413 else 1265 op->contr->save ();
1414 {
1415 if (save_player (op, 1))
1416 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved."); 1266 new_draw_info (NDI_UNIQUE, 0, op, "You have been saved.");
1417 else
1418 new_draw_info (NDI_UNIQUE, 0, op, "SAVE FAILED!");
1419 } 1267 }
1420 return 1;
1421}
1422 1268
1269 return 1;
1270}
1423 1271
1424int 1272int
1425command_peaceful (object *op, char *params) 1273command_peaceful (object *op, char *params)
1426{ 1274{
1427 new_draw_info (NDI_UNIQUE, 0, op, 1275 new_draw_info (NDI_UNIQUE, 0, op,
… …
1436 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.");
1437*/ 1285*/
1438 return 1; 1286 return 1;
1439} 1287}
1440 1288
1441
1442
1443int 1289int
1444command_wimpy (object *op, char *params) 1290command_wimpy (object *op, char *params)
1445{ 1291{
1446 int i; 1292 int i;
1447 char buf[MAX_BUF]; 1293 char buf[MAX_BUF];
… …
1456 new_draw_info (NDI_UNIQUE, 0, op, buf); 1302 new_draw_info (NDI_UNIQUE, 0, op, buf);
1457 op->run_away = i; 1303 op->run_away = i;
1458 return 1; 1304 return 1;
1459} 1305}
1460 1306
1461
1462int 1307int
1463command_brace (object *op, char *params) 1308command_brace (object *op, char *params)
1464{ 1309{
1465 if (!params) 1310 if (!params)
1466 op->contr->braced = !op->contr->braced; 1311 op->contr->braced = !op->contr->braced;
… …
1470 if (op->contr->braced) 1315 if (op->contr->braced)
1471 new_draw_info (NDI_UNIQUE, 0, op, "You are braced."); 1316 new_draw_info (NDI_UNIQUE, 0, op, "You are braced.");
1472 else 1317 else
1473 new_draw_info (NDI_UNIQUE, 0, op, "Not braced."); 1318 new_draw_info (NDI_UNIQUE, 0, op, "Not braced.");
1474 1319
1475 fix_player (op); 1320 op->update_stats ();
1476 return 0; 1321 return 0;
1477} 1322}
1478 1323
1479int 1324int
1480command_style_map_info (object *op, char *params) 1325command_style_map_info (object *op, char *params)
… …
1485 object *tmp; 1330 object *tmp;
1486 1331
1487 for (mp = styles; mp != NULL; mp = mp->next) 1332 for (mp = styles; mp != NULL; mp = mp->next)
1488 { 1333 {
1489 maps_used++; 1334 maps_used++;
1490 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);
1491 for (x = 0; x < MAP_WIDTH (mp); x++) 1336 for (x = 0; x < mp->width; x++)
1492 { 1337 {
1493 for (y = 0; y < MAP_HEIGHT (mp); y++) 1338 for (y = 0; y < mp->height; y++)
1494 { 1339 {
1495 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)
1496 objects_used++; 1341 objects_used++;
1497 } 1342 }
1498 } 1343 }
1499 } 1344 }
1500 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);
… …
1523 for (obl = first_friendly_object; obl != NULL; obl = next) 1368 for (obl = first_friendly_object; obl != NULL; obl = next)
1524 { 1369 {
1525 object *ob = obl->ob; 1370 object *ob = obl->ob;
1526 1371
1527 next = obl->next; 1372 next = obl->next;
1528 if (get_owner (ob) == op) 1373 if (ob->owner == op)
1529 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params))) 1374 if (++counter == target || (target == 0 && !strcasecmp (ob->name, params)))
1530 { 1375 {
1531 if (!QUERY_FLAG (ob, FLAG_REMOVED))
1532 remove_ob (ob);
1533 remove_friendly_object (ob);
1534 free_object (ob); 1376 ob->destroy ();
1535 removecount++; 1377 removecount++;
1536 } 1378 }
1537 } 1379 }
1538 if (removecount != 0) 1380 if (removecount != 0)
1539 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