diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-02-23 02:49:57 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-02-23 02:49:57 +0200 |
| commit | 9778347c7f118f6b74153f1d2c8070920352eb68 (patch) | |
| tree | 6be9dccbc2882645aa5430281b1a7e34cbcc2717 /src/client.cpp | |
| parent | eef7bc35705611e3060fe1e6b7c2f8bbebb2ba8b (diff) | |
| download | minetest-9778347c7f118f6b74153f1d2c8070920352eb68.tar.gz minetest-9778347c7f118f6b74153f1d2c8070920352eb68.tar.bz2 minetest-9778347c7f118f6b74153f1d2c8070920352eb68.zip | |
mainly work on object scripting api
Diffstat (limited to 'src/client.cpp')
| -rw-r--r-- | src/client.cpp | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/src/client.cpp b/src/client.cpp index 4c3992e6a..3f0457e6e 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -989,27 +989,14 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) 12000 = midday */ { - const s32 daylength = 16; - const s32 nightlength = 6; - const s32 daytimelength = 8; - s32 d = daylength; - s32 t = (((m_time_of_day.get())%24000)/(24000/d)); - u32 dr; - if(t < nightlength/2 || t >= d - nightlength/2) - dr = 300; - else if(t >= d/2 - daytimelength/2 && t < d/2 + daytimelength/2) - dr = 1000; - else - dr = 750; - - dstream<<"time_of_day="<<m_time_of_day.get() - <<", t="<<t + u32 dr = time_to_daynight_ratio(m_time_of_day.get()); + + dstream<<"Client: time_of_day="<<m_time_of_day.get() <<", dr="<<dr <<std::endl; if(dr != m_env.getDayNightRatio()) { - //dstream<<"dr="<<dr<<std::endl; dout_client<<DTIME<<"Client: changing day-night ratio"<<std::endl; m_env.setDayNightRatio(dr); m_env.expireMeshes(true); @@ -1595,7 +1582,7 @@ void Client::addNode(v3s16 p, MapNode n) void Client::updateCamera(v3f pos, v3f dir) { - m_env.getMap().updateCamera(pos, dir); + m_env.getClientMap().updateCamera(pos, dir); camera_position = pos; camera_direction = dir; } |