diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-11-14 00:19:48 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-11-29 19:13:41 +0200 |
| commit | abceeee92f99b84ebb79968269835a4f509bfb90 (patch) | |
| tree | 669edeca68fae4eb086ac4e4c1846b55d3aa779d /src/player.h | |
| parent | 5fc791ac9a15ea6f234ca2d23041c83679255746 (diff) | |
| download | minetest-abceeee92f99b84ebb79968269835a4f509bfb90.tar.gz minetest-abceeee92f99b84ebb79968269835a4f509bfb90.tar.bz2 minetest-abceeee92f99b84ebb79968269835a4f509bfb90.zip | |
Create framework for getting rid of global definitions of node/tool/item/whatever types
Diffstat (limited to 'src/player.h')
| -rw-r--r-- | src/player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/player.h b/src/player.h index e6dfb8199..d6147b208 100644 --- a/src/player.h +++ b/src/player.h @@ -141,7 +141,7 @@ public: deSerialize stops reading exactly at the right point. */ void serialize(std::ostream &os); - void deSerialize(std::istream &is); + void deSerialize(std::istream &is, IGameDef *gamedef); bool touching_ground; // This oscillates so that the player jumps a bit above the surface @@ -185,8 +185,8 @@ public: class ServerRemotePlayer : public Player, public ServerActiveObject { public: - ServerRemotePlayer(): - ServerActiveObject(NULL, v3f(0,0,0)) + ServerRemotePlayer(ServerEnvironment *env): + ServerActiveObject(env, v3f(0,0,0)) { } ServerRemotePlayer(ServerEnvironment *env, v3f pos_, u16 peer_id_, |