--- deliantra/server/include/player.h 2006/09/03 00:18:41 1.11 +++ deliantra/server/include/player.h 2006/09/04 11:07:59 1.12 @@ -102,7 +102,7 @@ } partylist; // memsettable part of player -struct player_memset : zero_initialised +struct player_pod { object *ob; /* The object representing the player */ mapstruct *loading; /* When entering a map in progress of loading, not really used */ @@ -207,10 +207,8 @@ int stack_position; /* Current stack position, 0 for no item */ }; -typedef struct pl : player_memset, attachable +typedef struct pl : zero_initialised, attachable, player_pod { - static data_type get_dt () { return DT_PLAYER; } - struct pl *next; /* Pointer to next player, NULL if this is last */ NewSocket socket; /* Socket information for this player */ } player;