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.48 by root, Tue Jun 5 13:05:02 2007 UTC vs.
Revision 1.66 by root, Thu Jan 1 11:41:17 2009 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * any later version. 11 * (at your option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25#include <global.h> 24#include <global.h>
26#include <sproto.h> 25#include <sproto.h>
27#include <spells.h> 26#include <spells.h>
… …
179command_kick (object *op, char *params) 178command_kick (object *op, char *params)
180{ 179{
181 for_all_players (pl) 180 for_all_players (pl)
182 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params))) 181 if ((params == NULL || !strcmp (&pl->ob->name, params)) && !INVOKE_PLAYER (KICK, pl, ARG_STRING (params)))
183 { 182 {
184 object *op = pl->ob; 183 object *plop = pl->ob;
185 184
186 if (!QUERY_FLAG (op, FLAG_REMOVED) && !QUERY_FLAG (op, FLAG_FREED)) 185 if (!QUERY_FLAG (plop, FLAG_REMOVED) && !QUERY_FLAG (plop, FLAG_FREED))
187 { 186 {
188 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &op->name); 187 new_draw_info_format (NDI_UNIQUE | NDI_ALL | NDI_RED, 5, op, "%s is kicked out of the game.", &plop->name);
189 strcpy (op->contr->killer, "kicked"); 188 plop->contr->killer = op;
190 } 189 }
191 190
192 pl->ns->destroy (); 191 pl->ns->destroy ();
193 } 192 }
194 193
… …
280 /* we have nowhere to send the prisoner.... */ 279 /* we have nowhere to send the prisoner.... */
281 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them"); 280 new_draw_info (NDI_UNIQUE, 0, op, "can't jail player, there is no map to hold them");
282 return 0; 281 return 0;
283 } 282 }
284 283
285 pl->ob->enter_exit (dummy); 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
286 dummy->destroy (); 285 dummy->destroy ();
286
287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested."); 287 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You have been arrested.");
288 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 288 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name); 289 LOG (llevInfo, "Player %s arrested by %s\n", &pl->ob->name, &op->name);
290 return 1; 290 return 1;
291} 291}
… …
315 { 315 {
316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player."); 316 new_draw_info (NDI_UNIQUE, 0, op, "Can not find a free spot to place summoned player.");
317 return 1; 317 return 1;
318 } 318 }
319 319
320 dummy = object::create (); 320 pl->ob->player_goto (op->map->path, op->x + freearr_x[i], op->y + freearr_y[i]);
321 EXIT_PATH (dummy) = op->map->path;
322 EXIT_X (dummy) = op->x + freearr_x[i];
323 EXIT_Y (dummy) = op->y + freearr_y[i];
324 pl->ob->enter_exit (dummy);
325 dummy->destroy ();
326 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned."); 321 new_draw_info (NDI_UNIQUE, 0, pl->ob, "You are summoned.");
327 new_draw_info (NDI_UNIQUE, 0, op, "OK."); 322 new_draw_info (NDI_UNIQUE, 0, op, "OK.");
328 323
329 return 1; 324 return 1;
330} 325}
… …
456 { 451 {
457 art = find_artifactlist (at->type)->items; 452 art = find_artifactlist (at->type)->items;
458 453
459 while (art) 454 while (art)
460 { 455 {
461 if (!strcmp (art->item->name, cp)) 456 if (!strcmp (&art->item->name, cp))
462 break; 457 break;
463 458
464 art = art->next; 459 art = art->next;
465 } 460 }
466 461
… …
575 } 570 }
576 571
577 if (at->nrof) 572 if (at->nrof)
578 { 573 {
579 if (at_spell) 574 if (at_spell)
580 insert_ob_in_ob (arch_to_object (at_spell), tmp); 575 tmp->insert (arch_to_object (at_spell));
581 576
582 tmp->x = op->x; 577 tmp->x = op->x;
583 tmp->y = op->y; 578 tmp->y = op->y;
579 tmp->map = op->map;
584 580
585 if (set_nrof) 581 if (set_nrof)
586 tmp->nrof = nrof; 582 tmp->nrof = nrof;
587 583
588 tmp->map = op->map; 584 op->insert (tmp);
589
590 tmp = insert_ob_in_ob (tmp, op);
591 esrv_send_item (op, tmp);
592 585
593 /* Let's put this created item on stack so dm can access it easily. */ 586 /* Let's put this created item on stack so dm can access it easily. */
594 dm_stack_push (op->contr, tmp->count); 587 dm_stack_push (op->contr, tmp->count);
595 588
596 return 1; 589 return 1;
… …
674 /* Wonder if we really want to push all of these, but since 667 /* Wonder if we really want to push all of these, but since
675 * things like rods have nrof 0, we want to cover those. 668 * things like rods have nrof 0, we want to cover those.
676 */ 669 */
677 dm_stack_push (op->contr, head->count); 670 dm_stack_push (op->contr, head->count);
678 671
679 if (at->randomitems != NULL && !at_spell) 672 if (at->randomitems && !at_spell)
680 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
681
682 esrv_send_item (op, head);
683 } 674 }
684 675
685 /* free the one we used to copy */ 676 /* free the one we used to copy */
686 tmp->destroy (); 677 tmp->destroy ();
687 } 678 }
… …
694 */ 685 */
695 686
696int 687int
697command_inventory (object *op, char *params) 688command_inventory (object *op, char *params)
698{ 689{
690 int i;
699 object *tmp; 691 object *tmp;
700 int i;
701 692
702 if (!params) 693 if (!params || !sscanf (params, "%d", &i) || !(tmp = find_object (i)))
703 { 694 {
704 inventory (op, NULL); 695 op->contr->failmsg ("Inventory of what object (nr)?");
705 return 0; 696 return 1;
706 }
707
708 if (!sscanf (params, "%d", &i) || (tmp = find_object (i)) == NULL)
709 { 697 }
710 new_draw_info (NDI_UNIQUE, 0, op, "Inventory of what object (nr)?");
711 return 1;
712 }
713 698
714 inventory (op, tmp); 699 op->contr->infobox (MSG_CHANNEL ("examine"), tmp->query_inventory (op));
700
715 return 1; 701 return 1;
716} 702}
717 703
718/* just show player's their skills for now. Dm's can 704/* just show player's their skills for now. Dm's can
719 * already see skills w/ inventory command - b.t. 705 * already see skills w/ inventory command - b.t.
… …
841 */ 827 */
842int 828int
843command_addexp (object *op, char *params) 829command_addexp (object *op, char *params)
844{ 830{
845 char buf[MAX_BUF], skill[MAX_BUF]; 831 char buf[MAX_BUF], skill[MAX_BUF];
846 int i, q; 832 int q;
833 long long i; // use sint64 and finally provide format specifiers for sint64 etc. via configure
847 object *skillob = NULL; 834 object *skillob = NULL;
848 835
849 skill[0] = '\0'; 836 skill[0] = '\0';
850 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %d %s", buf, &i, skill)) < 2)) 837 if ((params == NULL) || (strlen (params) > MAX_BUF) || ((q = sscanf (params, "%s %lld %s", buf, &i, skill)) < 2))
851 { 838 {
852 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>]."); 839 new_draw_info (NDI_UNIQUE, 0, op, "Usage: addexp <who> <how much> [<skill>].");
853 return 1; 840 return 1;
854 } 841 }
855 842
… …
902 new_draw_info (NDI_UNIQUE, 0, op, "Who?"); 889 new_draw_info (NDI_UNIQUE, 0, op, "Who?");
903 return 1; 890 return 1;
904 } 891 }
905 892
906 for_all_players (pl) 893 for_all_players (pl)
907 if (!strcmp (pl->ob->name, thing)) 894 if (!strcmp (&pl->ob->name, thing))
908 { 895 {
909 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp); 896 sprintf (buf, "Str : %-2d H.P. : %-4d MAX : %d", pl->ob->stats.Str, pl->ob->stats.hp, pl->ob->stats.maxhp);
910 new_draw_info (NDI_UNIQUE, 0, op, buf); 897 new_draw_info (NDI_UNIQUE, 0, op, buf);
911 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp); 898 sprintf (buf, "Dex : %-2d S.P. : %-4d MAX : %d", pl->ob->stats.Dex, pl->ob->stats.sp, pl->ob->stats.maxsp);
912 new_draw_info (NDI_UNIQUE, 0, op, buf); 899 new_draw_info (NDI_UNIQUE, 0, op, buf);
… …
955 return 1; 942 return 1;
956 } 943 }
957 944
958 for_all_players (pl) 945 for_all_players (pl)
959 { 946 {
960 if (!strcmp (pl->ob->name, thing)) 947 if (!strcmp (&pl->ob->name, thing))
961 { 948 {
962 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii; 949 if (!strcmp ("str", thing2)) pl->ob->stats.Str = iii, pl->orig_stats.Str = iii;
963 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii; 950 if (!strcmp ("dex", thing2)) pl->ob->stats.Dex = iii, pl->orig_stats.Dex = iii;
964 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii; 951 if (!strcmp ("con", thing2)) pl->ob->stats.Con = iii, pl->orig_stats.Con = iii;
965 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii; 952 if (!strcmp ("wis", thing2)) pl->ob->stats.Wis = iii, pl->orig_stats.Wis = iii;
… …
982command_nowiz (object *op, char *params) 969command_nowiz (object *op, char *params)
983{ /* 'nodm' is alias */ 970{ /* 'nodm' is alias */
984 CLEAR_FLAG (op, FLAG_WIZ); 971 CLEAR_FLAG (op, FLAG_WIZ);
985 CLEAR_FLAG (op, FLAG_WIZPASS); 972 CLEAR_FLAG (op, FLAG_WIZPASS);
986 CLEAR_FLAG (op, FLAG_WIZCAST); 973 CLEAR_FLAG (op, FLAG_WIZCAST);
974 CLEAR_FLAG (op, FLAG_WIZLOOK);
975 op->contr->do_los = 1;
987 976
988 if (op->contr->hidden) 977 if (op->contr->hidden)
989 { 978 {
990 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 979 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
991 op->map->players++; 980 op->map->players++;
… …
993 op->contr->hidden = 0; 982 op->contr->hidden = 0;
994 op->invisible = 1; 983 op->invisible = 1;
995 } 984 }
996 else 985 else
997 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone.."); 986 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master is gone..");
987
998 return 1; 988 return 1;
999} 989}
1000 990
1001/** 991/**
1002 * object *op is trying to become dm. 992 * object *op is trying to become dm.
… …
1056 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1046 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1057 { 1047 {
1058 SET_FLAG (op, FLAG_WIZ); 1048 SET_FLAG (op, FLAG_WIZ);
1059 SET_FLAG (op, FLAG_WIZPASS); 1049 SET_FLAG (op, FLAG_WIZPASS);
1060 SET_FLAG (op, FLAG_WIZCAST); 1050 SET_FLAG (op, FLAG_WIZCAST);
1051 SET_FLAG (op, FLAG_WIZLOOK);
1052 op->contr->do_los = 1;
1061 1053
1062 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1054 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1063 /*
1064 * Remove setting flying here - that won't work, because next
1065 * fix_player() is called that will get cleared - proper solution
1066 * is probably something like a wiz_force which gives that and any
1067 * other desired abilities.
1068 */
1069 clear_los (op->contr);
1070 op->contr->write_buf[0] = '\0'; 1055 op->contr->write_buf[0] = '\0';
1071 1056
1072 if (!silent) 1057 if (!silent)
1073 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1058 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1074 1059
… …
1114 * Returns spell object (from archetypes) by name. 1099 * Returns spell object (from archetypes) by name.
1115 * Returns NULL if 0 or more than one spell matches. 1100 * Returns NULL if 0 or more than one spell matches.
1116 * Used for wizard's learn spell/prayer. 1101 * Used for wizard's learn spell/prayer.
1117 * 1102 *
1118 * op is the player issuing the command. 1103 * op is the player issuing the command.
1119 *
1120 * Ignores archetypes "spelldirect_xxx" since these archetypes are not used
1121 * anymore (but may still be present in some player's inventories and thus
1122 * cannot be removed). We have to ignore them here since they have the same
1123 * name than other "spell_xxx" archetypes and would always conflict.
1124 */ 1104 */
1125static object * 1105static object *
1126get_spell_by_name (object *op, const char *spell_name) 1106get_spell_by_name (object *op, shstr_cmp spell_name)
1127{ 1107{
1128 archetype *at; 1108 archetype *at;
1129 archetype *found; 1109 archetype *found;
1130 int conflict_found; 1110 int conflict_found;
1131 size_t spell_name_length; 1111 size_t spell_name_length;
… …
1136 for_all_archetypes (at) 1116 for_all_archetypes (at)
1137 { 1117 {
1138 if (at->type != SPELL) 1118 if (at->type != SPELL)
1139 continue; 1119 continue;
1140 1120
1141 if (strncmp (at->archname, "spelldirect_", 12) == 0) 1121 if (at->object::name != spell_name)
1142 continue; 1122 continue;
1143 1123
1144 if (strcmp (at->object::name, spell_name) != 0)
1145 continue;
1146
1147 if (found != NULL) 1124 if (found)
1148 { 1125 {
1149 if (!conflict_found) 1126 if (!conflict_found)
1150 { 1127 {
1151 conflict_found = 1; 1128 conflict_found = 1;
1152 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name); 1129 new_draw_info_format (NDI_UNIQUE, 0, op, "More than one archetype matches the spell name %s:", spell_name);
… …
1268 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params); 1245 new_draw_info_format (NDI_UNIQUE, 0, op, "You do not know the spell %s.", params);
1269 return 0; 1246 return 0;
1270 } 1247 }
1271 1248
1272 do_forget_spell (op, spell->name); 1249 do_forget_spell (op, spell->name);
1273 return 1;
1274}
1275
1276/**
1277 * Lists all plugins currently loaded with their IDs and full names.
1278 */
1279int
1280command_listplugins (object *op, char *params)
1281{
1282 plugins_display_list (op);
1283 return 1;
1284}
1285
1286/**
1287 * Loads the given plugin. The DM specifies the name of the library to load (no
1288 * pathname is needed). Do not ever attempt to load the same plugin more than
1289 * once at a time, or bad things could happen.
1290 */
1291int
1292command_loadplugin (object *op, char *params)
1293{
1294 char buf[MAX_BUF];
1295
1296 if (params == NULL)
1297 {
1298 new_draw_info (NDI_UNIQUE, 0, op, "Load which plugin?");
1299 return 1;
1300 }
1301
1302 strcpy (buf, LIBDIR);
1303 strcat (buf, "/plugins/");
1304 strcat (buf, params);
1305 LOG (llevDebug, "Requested plugin file is %s\n", buf);
1306 if (plugins_init_plugin (buf) == 0)
1307 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully loaded.");
1308 else
1309 new_draw_info (NDI_UNIQUE, 0, op, "Could not load plugin.");
1310 return 1;
1311}
1312
1313/**
1314 * Unloads the given plugin. The DM specified the ID of the library to unload.
1315 * Note that some things may behave strangely if the correct plugins are not
1316 * loaded.
1317 */
1318int
1319command_unloadplugin (object *op, char *params)
1320{
1321 if (params == NULL)
1322 {
1323 new_draw_info (NDI_UNIQUE, 0, op, "Remove which plugin?");
1324 return 1;
1325 }
1326
1327 if (plugins_remove_plugin (params) == 0)
1328 new_draw_info (NDI_UNIQUE, 0, op, "Plugin successfully removed.");
1329 else
1330 new_draw_info (NDI_UNIQUE, 0, op, "Could not remove plugin.");
1331 return 1; 1250 return 1;
1332} 1251}
1333 1252
1334/** 1253/**
1335 * A players wants to become DM and hide. 1254 * A players wants to become DM and hide.
… …
1656 return 0; 1575 return 0;
1657 } 1576 }
1658 1577
1659 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1578 if (!QUERY_FLAG (right, FLAG_REMOVED))
1660 right->remove (); 1579 right->remove ();
1580
1661 inserted = insert_ob_in_ob (right, left); 1581 insert_ob_in_ob (right, left);
1662 if (left->type == PLAYER)
1663 if (inserted == right)
1664 esrv_send_item (left, right);
1665 else
1666 esrv_update_item (UPD_WEIGHT | UPD_NAME | UPD_NROF, left, inserted);
1667 1582
1668 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1583 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));
1669 1584
1670 return 0; 1585 return 0;
1671 1586

Diff Legend

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