ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_wiz.C
(Generate patch)

Comparing deliantra/server/server/c_wiz.C (file contents):
Revision 1.14 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.25 by root, Thu Dec 21 23:37:06 2006 UTC

… …
67 if (pl->ob == op) 67 if (pl->ob == op)
68 { 68 {
69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself."); 69 new_draw_info (NDI_UNIQUE, 0, op, "You can't do that to yourself.");
70 return NULL; 70 return NULL;
71 } 71 }
72
72 if (pl->state != ST_PLAYING) 73 if (pl->ns->state != ST_PLAYING)
73 { 74 {
74 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now."); 75 new_draw_info (NDI_UNIQUE, 0, op, "That player is in no state for that right now.");
75 return NULL; 76 return NULL;
76 } 77 }
78
77 return pl; 79 return pl;
78}
79
80/**
81 * This command will stress server.
82 */
83int
84command_loadtest (object *op, char *params)
85{
86 uint32 x, y;
87 char buf[1024];
88
89 new_draw_info (NDI_UNIQUE, 0, op, "loadtest will stress server through teleporting");
90 new_draw_info (NDI_UNIQUE, 0, op, "at different map places.");
91 new_draw_info (NDI_UNIQUE, 0, op, "use at your own risks.");
92 new_draw_info (NDI_UNIQUE, 0, op, "Very long loop used so server may have to be reset.");
93 new_draw_info (NDI_UNIQUE, 0, op, "type loadtest TRUE to run");
94 new_draw_info_format (NDI_UNIQUE, 0, op, "{%s}", params);
95
96 if (!params)
97 return 0;
98
99 if (strncmp (params, "TRUE", 4))
100 return 0;
101
102 new_draw_info_format (NDI_UNIQUE, 0, op, "gogogo");
103
104 for (x = 0; x < settings.worldmaptilesx; x++)
105 {
106 for (y = 0; y < settings.worldmaptilesy; y++)
107 {
108 sprintf (buf, "/world/world_%d_%d", x + settings.worldmapstartx, y + settings.worldmapstarty);
109 command_goto (op, buf);
110 }
111 }
112
113 return 0;
114} 80}
115 81
116/** 82/**
117 * Actually hides specified player (obviously a DM). 83 * Actually hides specified player (obviously a DM).
118 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving, 84 * If 'silent_dm' is non zero, other players are informed of DM entering/leaving,
… …
252 now = time (NULL); 218 now = time (NULL);
253 /* 219 /*
254 * Record this as a comment - then we don't have to worry about changing 220 * Record this as a comment - then we don't have to worry about changing
255 * the parsing code. 221 * the parsing code.
256 */ 222 */
257 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->socket.host, &op->name, ctime (&now)); 223 fprintf (banishfile, "# %s (%s) banned by %s at %s\n", &pl->ob->name, pl->ns->host, &op->name, ctime (&now));
258 fprintf (banishfile, "*@%s\n", pl->socket.host); 224 fprintf (banishfile, "*@%s\n", pl->ns->host);
259 fclose (banishfile); 225 fclose (banishfile);
260 226
261 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->socket.host); 227 LOG (llevDebug, "! %s banned %s from IP: %s.\n", &op->name, &pl->ob->name, pl->ns->host);
262 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name); 228 new_draw_info_format (NDI_UNIQUE | NDI_RED, 0, op, "You banish %s", &pl->ob->name);
263 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name); 229 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s banishes %s from the land!", &op->name, &pl->ob->name);
264 command_kick (op, (char *) &pl->ob->name); 230 command_kick (op, (char *) &pl->ob->name);
265 return 1; 231 return 1;
266} 232}
… …
277 { 243 {
278 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 244 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name);
279 strcpy (op->contr->killer, "kicked"); 245 strcpy (op->contr->killer, "kicked");
280 } 246 }
281 247
282 pl->socket.status = Ns_Dead; 248 pl->ns->destroy ();
283 } 249 }
284 250
285 return 1; 251 return 1;
286} 252}
287 253
… …
307} 273}
308 274
309int 275int
310command_shutdown (object *op, char *params) 276command_shutdown (object *op, char *params)
311{ 277{
312 struct pl *pl;
313
314 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ)) 278 if (op != NULL && !QUERY_FLAG (op, FLAG_WIZ))
315 { 279 {
316 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server."); 280 new_draw_info (NDI_UNIQUE, 0, op, "Sorry, you can't shutdown the server.");
317 return 1; 281 return 1;
318 } 282 }
319 283
320 cleanup (); 284 cleanup ();
321 /* not reached */ 285 /* not reached */
322 return 1;
323}
324
325int
326command_goto (object *op, char *params)
327{
328 char *name;
329 object *dummy;
330
331 if (!op)
332 return 0;
333
334 if (params == NULL)
335 {
336 new_draw_info (NDI_UNIQUE, 0, op, "Go to what level?");
337 return 1;
338 }
339
340 name = params;
341 dummy = get_object ();
342 dummy->map = op->map;
343 EXIT_PATH (dummy) = name;
344 dummy->name = name;
345
346 enter_exit (op, dummy);
347 free_object (dummy);
348 if (op->contr->loading == NULL)
349 {
350 new_draw_info_format (NDI_UNIQUE, 0, op, "Difficulty: %d.", op->map->difficulty);
351 }
352
353 return 1;
354}
355
356/* is this function called from somewhere ? -Tero */
357int
358command_generate (object *op, char *params)
359{
360 object *tmp;
361 int nr = 1, i, retry;
362
363 if (!op)
364 return 0;
365
366 if (params != NULL)
367 sscanf (params, "%d", &nr);
368 for (i = 0; i < nr; i++)
369 {
370 retry = 50;
371 while ((tmp = generate_treasure (0, op->map->difficulty)) == NULL && --retry)
372 ;
373 if (tmp != NULL)
374 {
375 tmp = insert_ob_in_ob (tmp, op);
376 if (op->type == PLAYER)
377 esrv_send_item (op, tmp);
378 }
379 }
380
381 return 1; 286 return 1;
382} 287}
383 288
384int 289int
385command_freeze (object *op, char *params) 290command_freeze (object *op, char *params)
… …
439 /* we have nowhere to send the prisoner.... */ 344 /* we have nowhere to send the prisoner.... */
440 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 345 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
441 return 0; 346 return 0;
442 } 347 }
443 enter_exit (pl->ob, dummy); 348 enter_exit (pl->ob, dummy);
444 free_object (dummy); 349 dummy->destroy ();
445 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 350 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
446 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 351 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
447 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 352 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
448 return 1; 353 return 1;
449} 354}
… …
473 { 378 {
474 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 379 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
475 return 1; 380 return 1;
476 } 381 }
477 382
478 dummy = get_object (); 383 dummy = object::create ();
479 EXIT_PATH (dummy) = op->map->path; 384 EXIT_PATH (dummy) = op->map->path;
480 EXIT_X (dummy) = op->x + freearr_x[i]; 385 EXIT_X (dummy) = op->x + freearr_x[i];
481 EXIT_Y (dummy) = op->y + freearr_y[i]; 386 EXIT_Y (dummy) = op->y + freearr_y[i];
482 enter_exit (pl->ob, dummy); 387 enter_exit (pl->ob, dummy);
483 free_object (dummy); 388 dummy->destroy ();
484 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 389 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
485 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 390 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
486 391
487 return 1; 392 return 1;
488} 393}
… …
517 { 422 {
518 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to."); 423 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to teleport to.");
519 return 1; 424 return 1;
520 } 425 }
521 426
522 dummy = get_object (); 427 dummy = object::create ();
523 EXIT_PATH (dummy) = pl->ob->map->path; 428 EXIT_PATH (dummy) = pl->ob->map->path;
524 EXIT_X (dummy) = pl->ob->x + freearr_x[i]; 429 EXIT_X (dummy) = pl->ob->x + freearr_x[i];
525 EXIT_Y (dummy) = pl->ob->y + freearr_y[i]; 430 EXIT_Y (dummy) = pl->ob->y + freearr_y[i];
526 enter_exit (op, dummy); 431 enter_exit (op, dummy);
527 free_object (dummy); 432 dummy->destroy ();
528 if (!op->contr->hidden) 433 if (!op->contr->hidden)
529 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open."); 434 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You see a portal open.");
530 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 435 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
531 return 1; 436 return 1;
532} 437}
… …
819 * so just copying it over should be fine. 724 * so just copying it over should be fine.
820 */ 725 */
821 if (!head) 726 if (!head)
822 { 727 {
823 head = dup; 728 head = dup;
824 copy_object (tmp, dup); 729 tmp->copy_to (dup);
825 } 730 }
826 731
827 if (settings.real_wiz == FALSE) 732 if (settings.real_wiz == FALSE)
828 SET_FLAG (dup, FLAG_WAS_WIZ); 733 SET_FLAG (dup, FLAG_WAS_WIZ);
829 734
… …
856 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 761 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
857 { 762 {
858 if (head->x < size_x || head->y < size_y) 763 if (head->x < size_x || head->y < size_y)
859 { 764 {
860 dm_stack_pop (op->contr); 765 dm_stack_pop (op->contr);
861 free_object (head); 766 head->destroy ();
862 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 767 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
863 free_object (tmp); 768 tmp->destroy ();
864 return 1; 769 return 1;
865 } 770 }
866 771
867 check = head; 772 check = head;
868 773
… …
890 795
891 esrv_send_item (op, head); 796 esrv_send_item (op, head);
892 } 797 }
893 798
894 /* free the one we used to copy */ 799 /* free the one we used to copy */
895 free_object (tmp); 800 tmp->destroy ();
896 } 801 }
897 802
898 return 1; 803 return 1;
899} 804}
900 805
… …
942 847
943 tmp = get_dm_object (op->contr, &params, NULL); 848 tmp = get_dm_object (op->contr, &params, NULL);
944 if (!tmp) 849 if (!tmp)
945 return 1; 850 return 1;
946 851
947 dump_object (tmp); 852 char *dump = dump_object (tmp);
948 new_draw_info (NDI_UNIQUE, 0, op, errmsg); 853 new_draw_info (NDI_UNIQUE, 0, op, dump);
854 free (dump);
855
949 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 856 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL))
950 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 857 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
858
951 return 1; 859 return 1;
952} 860}
953 861
954/** 862/**
955 * When DM is possessing a monster, flip aggression on and off, to allow 863 * When DM is possessing a monster, flip aggression on and off, to allow
… …
1117 dm_stack_pop (op->contr); 1025 dm_stack_pop (op->contr);
1118 1026
1119 /* Always work on the head - otherwise object will get in odd state */ 1027 /* Always work on the head - otherwise object will get in odd state */
1120 if (tmp->head) 1028 if (tmp->head)
1121 tmp = tmp->head; 1029 tmp = tmp->head;
1122 remove_ob (tmp); 1030 tmp->remove ();
1123 return 1; 1031 return 1;
1124} 1032}
1125 1033
1126int 1034int
1127command_free (object *op, char *params) 1035command_free (object *op, char *params)
… …
1142 dm_stack_pop (op->contr); 1050 dm_stack_pop (op->contr);
1143 1051
1144 if (!QUERY_FLAG (tmp, FLAG_REMOVED)) 1052 if (!QUERY_FLAG (tmp, FLAG_REMOVED))
1145 { 1053 {
1146 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed."); 1054 new_draw_info (NDI_UNIQUE, 0, op, "Warning, item wasn't removed.");
1147 remove_ob (tmp); 1055 tmp->remove ();
1148 } 1056 }
1149 1057
1150 if (tmp->head) 1058 if (tmp->head)
1151 tmp = tmp->head; 1059 tmp = tmp->head;
1152 free_object (tmp); 1060
1061 tmp->destroy ();
1153 return 1; 1062 return 1;
1154} 1063}
1155 1064
1156/** 1065/**
1157 * This adds exp to a player. We now allow adding to a specific skill. 1066 * This adds exp to a player. We now allow adding to a specific skill.
… …
1236 new_draw_info (NDI_UNIQUE, 0, op, buf); 1145 new_draw_info (NDI_UNIQUE, 0, op, buf);
1237 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc); 1146 sprintf (buf, "Con : %-2d AC : %-4d WC : %d", pl->ob->stats.Con, pl->ob->stats.ac, pl->ob->stats.wc);
1238 new_draw_info (NDI_UNIQUE, 0, op, buf); 1147 new_draw_info (NDI_UNIQUE, 0, op, buf);
1239 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam); 1148 sprintf (buf, "Int : %-2d Damage : %d", pl->ob->stats.Int, pl->ob->stats.dam);
1240 new_draw_info (NDI_UNIQUE, 0, op, buf); 1149 new_draw_info (NDI_UNIQUE, 0, op, buf);
1241 sprintf (buf, "Wis : %-2d EXP : %lld", pl->ob->stats.Wis, (long long) pl->ob->stats.exp); 1150 sprintf (buf, "Wis : %-2d EXP : %" PRId64, pl->ob->stats.Wis, pl->ob->stats.exp);
1242 new_draw_info (NDI_UNIQUE, 0, op, buf); 1151 new_draw_info (NDI_UNIQUE, 0, op, buf);
1243 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace); 1152 sprintf (buf, "Pow : %-2d Grace : %d", pl->ob->stats.Pow, pl->ob->stats.grace);
1244 new_draw_info (NDI_UNIQUE, 0, op, buf); 1153 new_draw_info (NDI_UNIQUE, 0, op, buf);
1245 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food); 1154 sprintf (buf, "Cha : %-2d Food : %d", pl->ob->stats.Cha, pl->ob->stats.food);
1246 new_draw_info (NDI_UNIQUE, 0, op, buf); 1155 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
1323 return 1; 1232 return 1;
1324 } 1233 }
1325 1234
1326 if (strcmp (params, ".") == 0) 1235 if (strcmp (params, ".") == 0)
1327 params = op->map->path; 1236 params = op->map->path;
1237
1328 m = has_been_loaded (params); 1238 m = has_been_loaded (params);
1329 if (m == NULL) 1239 if (m == NULL)
1330 { 1240 {
1331 new_draw_info (NDI_UNIQUE, 0, op, "No such map."); 1241 new_draw_info (NDI_UNIQUE, 0, op, "No such map.");
1332 return 1; 1242 return 1;
… …
1344 * Only attempt to remove the player that is doing the reset, and not other 1254 * Only attempt to remove the player that is doing the reset, and not other
1345 * players or wiz's. 1255 * players or wiz's.
1346 */ 1256 */
1347 if (op->map == m) 1257 if (op->map == m)
1348 { 1258 {
1349 dummy = get_object (); 1259 dummy = object::create ();
1350 dummy->map = NULL; 1260 dummy->map = NULL;
1351 EXIT_X (dummy) = op->x; 1261 EXIT_X (dummy) = op->x;
1352 EXIT_Y (dummy) = op->y; 1262 EXIT_Y (dummy) = op->y;
1353 EXIT_PATH (dummy) = op->map->path; 1263 EXIT_PATH (dummy) = op->map->path;
1354 remove_ob (op); 1264 op->remove ();
1355 op->map = NULL; 1265 op->map = NULL;
1356 tmp = op; 1266 tmp = op;
1357 } 1267 }
1358 swap_map (m); 1268 swap_map (m);
1359 } 1269 }
… …
1364 1274
1365 /* setting this effectively causes an immediate reload */ 1275 /* setting this effectively causes an immediate reload */
1366 m->reset_time = 1; 1276 m->reset_time = 1;
1367 flush_old_maps (); 1277 flush_old_maps ();
1368 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 1278 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
1279
1369 if (tmp) 1280 if (tmp)
1370 { 1281 {
1371 enter_exit (tmp, dummy); 1282 enter_exit (tmp, dummy);
1372 free_object (dummy); 1283 dummy->destroy ();
1373 } 1284 }
1285
1374 return 1; 1286 return 1;
1375 } 1287 }
1376 else 1288 else
1377 { 1289 {
1378 player *pl; 1290 player *pl;
… …
1380 1292
1381 /* Need to re-insert player if swap failed for some reason */ 1293 /* Need to re-insert player if swap failed for some reason */
1382 if (tmp) 1294 if (tmp)
1383 { 1295 {
1384 insert_ob_in_map (op, m, NULL, 0); 1296 insert_ob_in_map (op, m, NULL, 0);
1385 free_object (dummy); 1297 dummy->destroy ();
1386 } 1298 }
1387 1299
1388 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:"); 1300 new_draw_info (NDI_UNIQUE, 0, op, "Reset failed, couldn't swap map, the following players are on it:");
1389 for (pl = first_player; pl != NULL; pl = pl->next) 1301 for (pl = first_player; pl != NULL; pl = pl->next)
1390 { 1302 {
… …
1475 { 1387 {
1476 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1388 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1477 return 0; 1389 return 0;
1478 } 1390 }
1479 1391
1480 if (checkdm (op, op->name, (params ? params : "*"), op->contr->socket.host)) 1392 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1481 { 1393 {
1482 SET_FLAG (op, FLAG_WIZ); 1394 SET_FLAG (op, FLAG_WIZ);
1483 SET_FLAG (op, FLAG_WAS_WIZ); 1395 SET_FLAG (op, FLAG_WAS_WIZ);
1484 SET_FLAG (op, FLAG_WIZPASS); 1396 SET_FLAG (op, FLAG_WIZPASS);
1485 SET_FLAG (op, FLAG_WIZCAST); 1397 SET_FLAG (op, FLAG_WIZCAST);
… …
1656 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1568 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1657 return 0; 1569 return 0;
1658 } 1570 }
1659 1571
1660 do_learn_spell (op, tmp, special_prayer); 1572 do_learn_spell (op, tmp, special_prayer);
1661 free_object (tmp); 1573 tmp->destroy ();
1662 return 1; 1574 return 1;
1663} 1575}
1664 1576
1665int 1577int
1666command_learn_spell (object *op, char *params) 1578command_learn_spell (object *op, char *params)
… …
2078 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1990 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
2079 return 0; 1991 return 0;
2080 } 1992 }
2081 1993
2082 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1994 if (!QUERY_FLAG (right, FLAG_REMOVED))
2083 remove_ob (right); 1995 right->remove ();
2084 inserted = insert_ob_in_ob (right, left); 1996 inserted = insert_ob_in_ob (right, left);
2085 if (left->type == PLAYER) 1997 if (left->type == PLAYER)
2086 if (inserted == right) 1998 if (inserted == right)
2087 esrv_send_item (left, right); 1999 esrv_send_item (left, right);
2088 else 2000 else

Diff Legend

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