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.59 by root, Mon Sep 29 10:20:49 2008 UTC vs.
Revision 1.62 by root, Fri Dec 26 10:14:01 2008 UTC

… …
280 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");
281 return 0; 281 return 0;
282 } 282 }
283 283
284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO 284 pl->ob->player_goto (dummy->slaying, dummy->stats.hp, dummy->stats.sp);//TODO
285 dummy->destroy (true); 285 dummy->destroy ();
286 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;
… …
640 if (out_of_map (op->map, head->x + size_x, head->y + size_y)) 640 if (out_of_map (op->map, head->x + size_x, head->y + size_y))
641 { 641 {
642 if (head->x < size_x || head->y < size_y) 642 if (head->x < size_x || head->y < size_y)
643 { 643 {
644 dm_stack_pop (op->contr); 644 dm_stack_pop (op->contr);
645 head->destroy (true); 645 head->destroy ();
646 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position."); 646 new_draw_info (NDI_UNIQUE, 0, op, "Object too big to insert in map, or wrong position.");
647 tmp->destroy (true); 647 tmp->destroy ();
648 return 1; 648 return 1;
649 } 649 }
650 650
651 check = head; 651 check = head;
652 652
… …
672 if (at->randomitems && !at_spell) 672 if (at->randomitems && !at_spell)
673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0); 673 create_treasure (at->randomitems, head, GT_APPLY, op->map->difficulty, 0);
674 } 674 }
675 675
676 /* free the one we used to copy */ 676 /* free the one we used to copy */
677 tmp->destroy (true); 677 tmp->destroy ();
678 } 678 }
679 679
680 return 1; 680 return 1;
681} 681}
682 682
… …
816 dm_stack_pop (op->contr); 816 dm_stack_pop (op->contr);
817 817
818 if (tmp->head) 818 if (tmp->head)
819 tmp = tmp->head; 819 tmp = tmp->head;
820 820
821 tmp->destroy (true); 821 tmp->destroy ();
822 return 1; 822 return 1;
823} 823}
824 824
825/** 825/**
826 * This adds exp to a player. We now allow adding to a specific skill. 826 * This adds exp to a player. We now allow adding to a specific skill.
… …
1043 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1043 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1044 { 1044 {
1045 SET_FLAG (op, FLAG_WIZ); 1045 SET_FLAG (op, FLAG_WIZ);
1046 SET_FLAG (op, FLAG_WIZPASS); 1046 SET_FLAG (op, FLAG_WIZPASS);
1047 SET_FLAG (op, FLAG_WIZCAST); 1047 SET_FLAG (op, FLAG_WIZCAST);
1048 SET_FLAG (op, FLAG_WIZLOOK);
1048 1049
1049 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1050 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1050 /*
1051 * Remove setting flying here - that won't work, because next
1052 * fix_player() is called that will get cleared - proper solution
1053 * is probably something like a wiz_force which gives that and any
1054 * other desired abilities.
1055 */
1056 clear_los (op->contr);
1057 op->contr->write_buf[0] = '\0'; 1051 op->contr->write_buf[0] = '\0';
1058 1052
1059 if (!silent) 1053 if (!silent)
1060 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!"); 1054 new_draw_info (NDI_UNIQUE | NDI_ALL | NDI_LT_GREEN, 1, NULL, "The Dungeon Master has arrived!");
1061 1055
… …
1220 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name); 1214 new_draw_info_format (NDI_UNIQUE, 0, op, "You already know the spell %s.", &tmp->name);
1221 return 0; 1215 return 0;
1222 } 1216 }
1223 1217
1224 do_learn_spell (op, tmp, special_prayer); 1218 do_learn_spell (op, tmp, special_prayer);
1225 tmp->destroy (true); 1219 tmp->destroy ();
1226 return 1; 1220 return 1;
1227} 1221}
1228 1222
1229int 1223int
1230command_learn_spell (object *op, char *params) 1224command_learn_spell (object *op, char *params)

Diff Legend

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