--- deliantra/server/common/player.C 2006/09/03 08:05:39 1.3 +++ deliantra/server/common/player.C 2006/09/10 16:00:23 1.4 @@ -1,6 +1,7 @@ + /* * static char *rcsid_player_c = - * "$Id: player.C,v 1.3 2006/09/03 08:05:39 root Exp $"; + * "$Id: player.C,v 1.4 2006/09/10 16:00:23 root Exp $"; */ /* @@ -29,29 +30,39 @@ #include #include -void free_player(player *pl) { - - if (first_player!=pl) { - player *prev=first_player; - while(prev!=NULL&&prev->next!=NULL&&prev->next!=pl) - prev=prev->next; - if(prev->next!=pl) { - LOG(llevError,"Free_player: Can't find previous player.\n"); - exit(1); +void +free_player (player *pl) +{ + + if (first_player != pl) + { + player *prev = first_player; + + while (prev != NULL && prev->next != NULL && prev->next != pl) + prev = prev->next; + if (prev->next != pl) + { + LOG (llevError, "Free_player: Can't find previous player.\n"); + exit (1); } - prev->next=pl->next; - } else first_player=pl->next; + prev->next = pl->next; + } + else + first_player = pl->next; - if(pl->ob != NULL) { - if (!QUERY_FLAG(pl->ob, FLAG_REMOVED)) remove_ob(pl->ob); - free_object(pl->ob); + if (pl->ob != NULL) + { + if (!QUERY_FLAG (pl->ob, FLAG_REMOVED)) + remove_ob (pl->ob); + free_object (pl->ob); } - /* Clear item stack */ - if (pl->stack_items) free( pl->stack_items ); + /* Clear item stack */ + if (pl->stack_items) + free (pl->stack_items); - free(pl->socket.faces_sent); + free (pl->socket.faces_sent); - delete pl; + delete pl; } @@ -60,10 +71,11 @@ * A dragon player (quetzal) can gain resistances for * all enabled attacktypes. */ -int atnr_is_dragon_enabled(int attacknr) { +int +atnr_is_dragon_enabled (int attacknr) +{ if (attacknr == ATNR_MAGIC || attacknr == ATNR_FIRE || - attacknr == ATNR_ELECTRICITY || attacknr == ATNR_COLD || - attacknr == ATNR_ACID || attacknr == ATNR_POISON) + attacknr == ATNR_ELECTRICITY || attacknr == ATNR_COLD || attacknr == ATNR_ACID || attacknr == ATNR_POISON) return 1; return 0; } @@ -72,10 +84,10 @@ * returns true if the adressed object 'ob' is a player * of the dragon race. */ -int is_dragon_pl(const object* op) { - if (op != NULL && op->type == PLAYER && op->arch != NULL - && op->arch->clone.race != NULL && - strcmp(op->arch->clone.race, "dragon")==0) +int +is_dragon_pl (const object *op) +{ + if (op != NULL && op->type == PLAYER && op->arch != NULL && op->arch->clone.race != NULL && strcmp (op->arch->clone.race, "dragon") == 0) return 1; return 0; }