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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.104 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.106 by pippijn, Fri Mar 2 10:15:40 2007 UTC

291 ns->reset_stats (); 291 ns->reset_stats ();
292 ns->pl = 0; 292 ns->pl = 0;
293 this->ns = 0; 293 this->ns = 0;
294 } 294 }
295 295
296 if (ob)
296 ob->close_container (); //TODO: client-specific 297 ob->close_container (); //TODO: client-specific
298
297 deactivate (); 299 deactivate ();
298} 300}
299 301
300// the need for this function can be explained 302// the need for this function can be explained
301// by load_object not returning the object 303// by load_object not returning the object
1028int 1030int
1029check_pick (object *op) 1031check_pick (object *op)
1030{ 1032{
1031 object *tmp, *next; 1033 object *tmp, *next;
1032 int stop = 0; 1034 int stop = 0;
1033 int j, k, wvratio; 1035 int wvratio;
1034 char putstring[128], tmpstr[16]; 1036 char putstring[128];
1035 1037
1036 /* if you're flying, you cna't pick up anything */ 1038 /* if you're flying, you cna't pick up anything */
1037 if (op->move_type & MOVE_FLYING) 1039 if (op->move_type & MOVE_FLYING)
1038 return 1; 1040 return 1;
1039 1041
3075} 3077}
3076 3078
3077int 3079int
3078is_true_undead (object *op) 3080is_true_undead (object *op)
3079{ 3081{
3080 object *tmp = NULL;
3081
3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD)) 3082 if (QUERY_FLAG (&op->arch->clone, FLAG_UNDEAD))
3083 return 1; 3083 return 1;
3084 3084
3085 return 0; 3085 return 0;
3086} 3086}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines