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

Comparing deliantra/server/server/apply.C (file contents):
Revision 1.34 by root, Sun Dec 3 20:38:08 2006 UTC vs.
Revision 1.35 by root, Mon Dec 4 01:55:46 2006 UTC

1027 if (op->type != PLAYER) 1027 if (op->type != PLAYER)
1028 return 0; /* This might change */ 1028 return 0; /* This might change */
1029 1029
1030 if (sack == NULL || sack->type != CONTAINER) 1030 if (sack == NULL || sack->type != CONTAINER)
1031 { 1031 {
1032 LOG (llevError, "apply_container: %s is not container!\n", &sack->name); 1032 LOG (llevError, "apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1033 return 0; 1033 return 0;
1034 } 1034 }
1035 op->contr->last_used = NULL; 1035 op->contr->last_used = NULL;
1036 op->contr->last_used_id = 0; 1036 op->contr->last_used_id = 0;
1037 1037
1176 if (op->type != PLAYER) 1176 if (op->type != PLAYER)
1177 return 0; /* This might change */ 1177 return 0; /* This might change */
1178 1178
1179 if (sack == NULL || sack->type != CONTAINER) 1179 if (sack == NULL || sack->type != CONTAINER)
1180 { 1180 {
1181 LOG (llevError, "esrv_apply_container: %s is not container!\n", &sack->name); 1181 LOG (llevError, "esrv_apply_container: %s is not container!\n", sack ? &sack->name : "[nullobject]");
1182 return 0; 1182 return 0;
1183 } 1183 }
1184 1184
1185 /* If we have a currently open container, then it needs to be closed in all cases 1185 /* If we have a currently open container, then it needs to be closed in all cases
1186 * if we are opening this one up. We then fall through if appropriate for 1186 * if we are opening this one up. We then fall through if appropriate for

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines