diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-05 14:55:16 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-05 14:55:16 +0200 |
| commit | ea6740e9002839f79053cf9d8cd78eb3fcae1b47 (patch) | |
| tree | dc8a6c8c0df0ef2d50a0874a74549ccd2022e874 /src/server.cpp | |
| parent | 7f2aa30bf29ed1c8b363bd948916d4c027b0192f (diff) | |
| download | minetest-ea6740e9002839f79053cf9d8cd78eb3fcae1b47.tar.gz minetest-ea6740e9002839f79053cf9d8cd78eb3fcae1b47.tar.bz2 minetest-ea6740e9002839f79053cf9d8cd78eb3fcae1b47.zip | |
mapgen stuff
Diffstat (limited to 'src/server.cpp')
| -rw-r--r-- | src/server.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/server.cpp b/src/server.cpp index abf48df9a..a3baaf1a3 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -1022,11 +1022,9 @@ u32 PIChecksum(core::list<PlayerInfo> &l) */ Server::Server( - std::string mapsavedir, - HMParams hm_params, - MapParams map_params + std::string mapsavedir ): - m_env(new ServerMap(mapsavedir, hm_params, map_params), dout_server), + m_env(new ServerMap(mapsavedir), dout_server), m_con(PROTOCOL_ID, 512, CONNECTION_TIMEOUT, this), m_thread(this), m_emergethread(this), @@ -1406,8 +1404,10 @@ void Server::AsyncRunStep() } } - // Trigger emergethread (it gets somehow gets to a - // non-triggered but bysy state sometimes) + /* + Trigger emergethread (it somehow gets to a non-triggered but + bysy state sometimes) + */ { float &counter = m_emergethread_trigger_timer; counter += dtime; |