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.81 by root, Fri Mar 26 01:04:44 2010 UTC vs.
Revision 1.82 by root, Sun Apr 11 00:34:06 2010 UTC

631 if (art) 631 if (art)
632 give_artifact_abilities (tmp, art->item); 632 give_artifact_abilities (tmp, art->item);
633 633
634 if (need_identify (tmp)) 634 if (need_identify (tmp))
635 { 635 {
636 SET_FLAG (tmp, FLAG_IDENTIFIED); 636 tmp->set_flag (FLAG_IDENTIFIED);
637 CLEAR_FLAG (tmp, FLAG_KNOWN_MAGICAL); 637 tmp->clr_flag (FLAG_KNOWN_MAGICAL);
638 } 638 }
639 639
640 /* 640 /*
641 * This entire block here tries to find variable pairings, 641 * This entire block here tries to find variable pairings,
642 * eg, 'hp 4' or the like. The mess here is that values 642 * eg, 'hp 4' or the like. The mess here is that values
766 } 766 }
767 767
768 prev = dup; 768 prev = dup;
769 } 769 }
770 770
771 if (QUERY_FLAG (head, FLAG_ALIVE)) 771 if (head->flag [FLAG_ALIVE])
772 { 772 {
773 object *check = head; 773 object *check = head;
774 int size_x = 0; 774 int size_x = 0;
775 int size_y = 0; 775 int size_y = 0;
776 776
867 867
868 char *dump = dump_object (tmp); 868 char *dump = dump_object (tmp);
869 new_draw_info (NDI_UNIQUE, 0, op, dump); 869 new_draw_info (NDI_UNIQUE, 0, op, dump);
870 free (dump); 870 free (dump);
871 871
872 if (QUERY_FLAG (tmp, FLAG_OBJ_ORIGINAL)) 872 if (tmp->flag [FLAG_OBJ_ORIGINAL])
873 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original"); 873 new_draw_info (NDI_UNIQUE, 0, op, "Object is marked original");
874 874
875 return 1; 875 return 1;
876} 876}
877 877
922 { 922 {
923 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!"); 923 new_draw_info (NDI_UNIQUE, 0, op, "Unable to remove a player!");
924 return 1; 924 return 1;
925 } 925 }
926 926
927 if (QUERY_FLAG (tmp, FLAG_REMOVED)) 927 if (tmp->flag [FLAG_REMOVED])
928 { 928 {
929 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp)); 929 new_draw_info_format (NDI_UNIQUE, 0, op, "%s is already removed!", query_name (tmp));
930 return 1; 930 return 1;
931 } 931 }
932 932
1110} 1110}
1111 1111
1112int 1112int
1113command_nowiz (object *op, char *params) 1113command_nowiz (object *op, char *params)
1114{ /* 'nodm' is alias */ 1114{ /* 'nodm' is alias */
1115 CLEAR_FLAG (op, FLAG_WIZ); 1115 op->clr_flag (FLAG_WIZ);
1116 CLEAR_FLAG (op, FLAG_WIZPASS); 1116 op->clr_flag (FLAG_WIZPASS);
1117 CLEAR_FLAG (op, FLAG_WIZCAST); 1117 op->clr_flag (FLAG_WIZCAST);
1118 CLEAR_FLAG (op, FLAG_WIZLOOK); 1118 op->clr_flag (FLAG_WIZLOOK);
1119 op->contr->do_los = 1; 1119 op->contr->do_los = 1;
1120 1120
1121 if (op->contr->hidden) 1121 if (op->contr->hidden)
1122 { 1122 {
1123 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players"); 1123 new_draw_info (NDI_UNIQUE, 0, op, "You are no longer hidden from other players");
1179do_wizard_dm (object *op, char *params, int silent) 1179do_wizard_dm (object *op, char *params, int silent)
1180{ 1180{
1181 if (!op->contr) 1181 if (!op->contr)
1182 return 0; 1182 return 0;
1183 1183
1184 if (QUERY_FLAG (op, FLAG_WIZ)) 1184 if (op->flag [FLAG_WIZ])
1185 { 1185 {
1186 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!"); 1186 new_draw_info (NDI_UNIQUE, 0, op, "You are already the Dungeon Master!");
1187 return 0; 1187 return 0;
1188 } 1188 }
1189 1189
1190 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host)) 1190 if (checkdm (op, op->name, (params ? params : "*"), op->contr->ns->host))
1191 { 1191 {
1192 SET_FLAG (op, FLAG_WIZ); 1192 op->set_flag (FLAG_WIZ);
1193 SET_FLAG (op, FLAG_WIZPASS); 1193 op->set_flag (FLAG_WIZPASS);
1194 SET_FLAG (op, FLAG_WIZCAST); 1194 op->set_flag (FLAG_WIZCAST);
1195 SET_FLAG (op, FLAG_WIZLOOK); 1195 op->set_flag (FLAG_WIZLOOK);
1196 op->contr->do_los = 1; 1196 op->contr->do_los = 1;
1197 1197
1198 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!"); 1198 new_draw_info (NDI_UNIQUE, 0, op, "Ok, you are the Dungeon Master!");
1199 op->contr->write_buf[0] = '\0'; 1199 op->contr->write_buf[0] = '\0';
1200 1200
1483 { 1483 {
1484 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!"); 1484 new_draw_info (NDI_UNIQUE, 0, op, "Can't insert a player into something!");
1485 return 0; 1485 return 0;
1486 } 1486 }
1487 1487
1488 if (!QUERY_FLAG (right, FLAG_REMOVED)) 1488 if (!right->flag [FLAG_REMOVED])
1489 right->remove (); 1489 right->remove ();
1490 1490
1491 object *inserted = insert_ob_in_ob (right, left); 1491 object *inserted = insert_ob_in_ob (right, left);
1492 1492
1493 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left)); 1493 new_draw_info_format (NDI_UNIQUE, 0, op, "Inserted %s in %s", query_name (inserted), query_name (left));

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines