From 1995b59320fe0fdced55c4605635f38cc42768f1 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 23 Apr 2011 18:31:31 +0300 Subject: [PATCH] Code refactoring; split half of main.cpp to game.cpp. --- src/CMakeLists.txt | 1 + src/client.cpp | 4 +- src/environment.cpp | 4 +- src/game.cpp | 1975 +++++++++++++++++++++++++++++++++ src/game.h | 76 ++ src/main.cpp | 2560 +++++-------------------------------------- src/main.h | 93 ++ src/player.cpp | 6 +- src/player.h | 6 +- 9 files changed, 2424 insertions(+), 2301 deletions(-) create mode 100644 src/game.cpp create mode 100644 src/game.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index aea98e19..9d9524ea 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -90,6 +90,7 @@ set(minetest_SRCS guiPauseMenu.cpp client.cpp tile.cpp + game.cpp main.cpp ) diff --git a/src/client.cpp b/src/client.cpp index 702247f6..ec2504bc 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -621,7 +621,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) p.Y = readS16(&data[4]); p.Z = readS16(&data[6]); - //TimeTaker t1("TOCLIENT_REMOVENODE", g_device); + //TimeTaker t1("TOCLIENT_REMOVENODE"); // This will clear the cracking animation after digging ((ClientMap&)m_env.getMap()).clearTempMod(p); @@ -638,7 +638,7 @@ void Client::ProcessData(u8 *data, u32 datasize, u16 sender_peer_id) p.Y = readS16(&data[4]); p.Z = readS16(&data[6]); - //TimeTaker t1("TOCLIENT_ADDNODE", g_device); + //TimeTaker t1("TOCLIENT_ADDNODE"); MapNode n; n.deSerialize(&data[8], ser_version); diff --git a/src/environment.cpp b/src/environment.cpp index b3055ca6..2b781126 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -438,7 +438,7 @@ void ServerEnvironment::step(float dtime) bool footprints = g_settings.getBool("footprints"); { - //TimeTaker timer("Server m_map->timerUpdate()", g_device); + //TimeTaker timer("Server m_map->timerUpdate()"); m_map->timerUpdate(dtime); } @@ -1027,7 +1027,7 @@ void ClientEnvironment::step(float dtime) bool footprints = g_settings.getBool("footprints"); { - //TimeTaker timer("Client m_map->timerUpdate()", g_device); + //TimeTaker timer("Client m_map->timerUpdate()"); m_map->timerUpdate(dtime); } diff --git a/src/game.cpp b/src/game.cpp new file mode 100644 index 00000000..9a0fd312 --- /dev/null +++ b/src/game.cpp @@ -0,0 +1,1975 @@ +/* +Minetest-c55 +Copyright (C) 2011 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#include "common_irrlicht.h" +#include "game.h" +#include "client.h" +#include "server.h" +#include "guiPauseMenu.h" +#include "guiInventoryMenu.h" +#include "guiTextInputMenu.h" +#include "guiFurnaceMenu.h" +#include "materials.h" + +/* + Setting this to 1 enables a special camera mode that forces + the renderers to think that the camera statically points from + the starting place to a static direction. + + This allows one to move around with the player and see what + is actually drawn behind solid things and behind the player. +*/ +#define FIELD_OF_VIEW_TEST 0 + + +MapDrawControl draw_control; + +// Chat data +struct ChatLine +{ + ChatLine(): + age(0.0) + { + } + ChatLine(const std::wstring &a_text): + age(0.0), + text(a_text) + { + } + float age; + std::wstring text; +}; + +/* + Inventory stuff +*/ + +// Inventory actions from the menu are buffered here before sending +Queue inventory_action_queue; +// This is a copy of the inventory that the client's environment has +Inventory local_inventory; + +u16 g_selected_item = 0; + +/* + Text input system +*/ + +struct TextDestSign : public TextDest +{ + TextDestSign(v3s16 blockpos, s16 id, Client *client) + { + m_blockpos = blockpos; + m_id = id; + m_client = client; + } + void gotText(std::wstring text) + { + std::string ntext = wide_to_narrow(text); + dstream<<"Changing text of a sign object: " + <sendSignText(m_blockpos, m_id, ntext); + } + + v3s16 m_blockpos; + s16 m_id; + Client *m_client; +}; + +struct TextDestChat : public TextDest +{ + TextDestChat(Client *client) + { + m_client = client; + } + void gotText(std::wstring text) + { + // Discard empty line + if(text == L"") + return; + + // Parse command (server command starts with "/#") + if(text[0] == L'/' && text[1] != L'#') + { + std::wstring reply = L"Local: "; + + reply += L"Local commands not yet supported. " + L"Server prefix is \"/#\"."; + + m_client->addChatMessage(reply); + return; + } + + // Send to others + m_client->sendChatMessage(text); + // Show locally + m_client->addChatMessage(text); + } + + Client *m_client; +}; + +struct TextDestSignNode : public TextDest +{ + TextDestSignNode(v3s16 p, Client *client) + { + m_p = p; + m_client = client; + } + void gotText(std::wstring text) + { + std::string ntext = wide_to_narrow(text); + dstream<<"Changing text of a sign node: " + <sendSignNodeText(m_p, ntext); + } + + v3s16 m_p; + Client *m_client; +}; + +/* + Render distance feedback loop +*/ +void updateViewingRange(f32 frametime_in, Client *client) +{ + if(draw_control.range_all == true) + return; + + static f32 added_frametime = 0; + static s16 added_frames = 0; + + added_frametime += frametime_in; + added_frames += 1; + + // Actually this counter kind of sucks because frametime is busytime + static f32 counter = 0; + counter -= frametime_in; + if(counter > 0) + return; + //counter = 0.1; + counter = 0.2; + + /*dstream<<__FUNCTION_NAME + <<": Collected "<getList("main"); + if(mainlist == NULL) + { + dstream<<"WARNING: draw_hotbar(): mainlist == NULL"< barrect(0,0,width,height); + barrect += pos; + video::SColor bgcolor(255,128,128,128); + driver->draw2DRectangle(bgcolor, barrect, NULL);*/ + + core::rect imgrect(0,0,imgsize,imgsize); + + for(s32 i=0; igetItem(i); + + core::rect rect = imgrect + pos + + v2s32(padding+i*(imgsize+padding*2), padding); + + if(g_selected_item == i) + { + driver->draw2DRectangle(video::SColor(255,255,0,0), + core::rect(rect.UpperLeftCorner - v2s32(1,1)*padding, + rect.LowerRightCorner + v2s32(1,1)*padding), + NULL); + } + else + { + video::SColor bgcolor2(128,0,0,0); + driver->draw2DRectangle(bgcolor2, rect, NULL); + } + + if(item != NULL) + { + drawInventoryItem(driver, font, item, rect, NULL); + } + } + + /* + Draw hearts + */ + { + video::ITexture *heart_texture = + driver->getTexture(porting::getDataPath("heart.png").c_str()); + v2s32 p = pos + v2s32(0, -20); + for(s32 i=0; i rect(0,0,16,16); + rect += p; + driver->draw2DImage(heart_texture, rect, + core::rect(core::position2d(0,0), + core::dimension2di(heart_texture->getOriginalSize())), + NULL, colors, true); + p += v2s32(20,0); + } + if(halfheartcount % 2 == 1) + { + const video::SColor color(255,255,255,255); + const video::SColor colors[] = {color,color,color,color}; + core::rect rect(0,0,16/2,16); + rect += p; + core::dimension2di srcd(heart_texture->getOriginalSize()); + srcd.Width /= 2; + driver->draw2DImage(heart_texture, rect, + core::rect(core::position2d(0,0), srcd), + NULL, colors, true); + p += v2s32(20,0); + } + } +} + +/* + Find what the player is pointing at +*/ +void getPointedNode(Client *client, v3f player_position, + v3f camera_direction, v3f camera_position, + bool &nodefound, core::line3d shootline, + v3s16 &nodepos, v3s16 &neighbourpos, + core::aabbox3d &nodehilightbox, + f32 d) +{ + f32 mindistance = BS * 1001; + + v3s16 pos_i = floatToInt(player_position, BS); + + /*std::cout<<"pos_i=("<0 ? a : 1); + s16 zend = pos_i.Z + (camera_direction.Z>0 ? a : 1); + s16 xend = pos_i.X + (camera_direction.X>0 ? a : 1); + + for(s16 y = ystart; y <= yend; y++) + for(s16 z = zstart; z <= zend; z++) + for(s16 x = xstart; x <= xend; x++) + { + MapNode n; + try + { + n = client->getNode(v3s16(x,y,z)); + if(content_pointable(n.d) == false) + continue; + } + catch(InvalidPositionException &e) + { + continue; + } + + v3s16 np(x,y,z); + v3f npf = intToFloat(np, BS); + + f32 d = 0.01; + + v3s16 dirs[6] = { + v3s16(0,0,1), // back + v3s16(0,1,0), // top + v3s16(1,0,0), // right + v3s16(0,0,-1), // front + v3s16(0,-1,0), // bottom + v3s16(-1,0,0), // left + }; + + /* + Meta-objects + */ + if(n.d == CONTENT_TORCH) + { + v3s16 dir = unpackDir(n.dir); + v3f dir_f = v3f(dir.X, dir.Y, dir.Z); + dir_f *= BS/2 - BS/6 - BS/20; + v3f cpf = npf + dir_f; + f32 distance = (cpf - camera_position).getLength(); + + core::aabbox3d box; + + // bottom + if(dir == v3s16(0,-1,0)) + { + box = core::aabbox3d( + npf - v3f(BS/6, BS/2, BS/6), + npf + v3f(BS/6, -BS/2+BS/3*2, BS/6) + ); + } + // top + else if(dir == v3s16(0,1,0)) + { + box = core::aabbox3d( + npf - v3f(BS/6, -BS/2+BS/3*2, BS/6), + npf + v3f(BS/6, BS/2, BS/6) + ); + } + // side + else + { + box = core::aabbox3d( + cpf - v3f(BS/6, BS/3, BS/6), + cpf + v3f(BS/6, BS/3, BS/6) + ); + } + + if(distance < mindistance) + { + if(box.intersectsWithLine(shootline)) + { + nodefound = true; + nodepos = np; + neighbourpos = np; + mindistance = distance; + nodehilightbox = box; + } + } + } + else if(n.d == CONTENT_SIGN_WALL) + { + v3s16 dir = unpackDir(n.dir); + v3f dir_f = v3f(dir.X, dir.Y, dir.Z); + dir_f *= BS/2 - BS/6 - BS/20; + v3f cpf = npf + dir_f; + f32 distance = (cpf - camera_position).getLength(); + + v3f vertices[4] = + { + v3f(BS*0.42,-BS*0.35,-BS*0.4), + v3f(BS*0.49, BS*0.35, BS*0.4), + }; + + for(s32 i=0; i<2; i++) + { + if(dir == v3s16(1,0,0)) + vertices[i].rotateXZBy(0); + if(dir == v3s16(-1,0,0)) + vertices[i].rotateXZBy(180); + if(dir == v3s16(0,0,1)) + vertices[i].rotateXZBy(90); + if(dir == v3s16(0,0,-1)) + vertices[i].rotateXZBy(-90); + if(dir == v3s16(0,-1,0)) + vertices[i].rotateXYBy(-90); + if(dir == v3s16(0,1,0)) + vertices[i].rotateXYBy(90); + + vertices[i] += npf; + } + + core::aabbox3d box; + + box = core::aabbox3d(vertices[0]); + box.addInternalPoint(vertices[1]); + + if(distance < mindistance) + { + if(box.intersectsWithLine(shootline)) + { + nodefound = true; + nodepos = np; + neighbourpos = np; + mindistance = distance; + nodehilightbox = box; + } + } + } + /* + Regular blocks + */ + else + { + for(u16 i=0; i<6; i++) + { + v3f dir_f = v3f(dirs[i].X, + dirs[i].Y, dirs[i].Z); + v3f centerpoint = npf + dir_f * BS/2; + f32 distance = + (centerpoint - camera_position).getLength(); + + if(distance < mindistance) + { + core::CMatrix4 m; + m.buildRotateFromTo(v3f(0,0,1), dir_f); + + // This is the back face + v3f corners[2] = { + v3f(BS/2, BS/2, BS/2), + v3f(-BS/2, -BS/2, BS/2+d) + }; + + for(u16 j=0; j<2; j++) + { + m.rotateVect(corners[j]); + corners[j] += npf; + } + + core::aabbox3d facebox(corners[0]); + facebox.addInternalPoint(corners[1]); + + if(facebox.intersectsWithLine(shootline)) + { + nodefound = true; + nodepos = np; + neighbourpos = np + dirs[i]; + mindistance = distance; + + //nodehilightbox = facebox; + + const float d = 0.502; + core::aabbox3d nodebox + (-BS*d, -BS*d, -BS*d, BS*d, BS*d, BS*d); + v3f nodepos_f = intToFloat(nodepos, BS); + nodebox.MinEdge += nodepos_f; + nodebox.MaxEdge += nodepos_f; + nodehilightbox = nodebox; + } + } // if distance < mindistance + } // for dirs + } // regular block + } // for coords +} + +void the_game( + bool &kill, + bool random_input, + InputHandler *input, + IrrlichtDevice *device, + gui::IGUIFont* font, + std::string map_dir, + std::string playername, + std::string address, + u16 port, + std::wstring &error_message +) +{ + video::IVideoDriver* driver = device->getVideoDriver(); + scene::ISceneManager* smgr = device->getSceneManager(); + + v2u32 screensize(0,0); + v2u32 last_screensize(0,0); + screensize = driver->getScreenSize(); + + const s32 hotbar_itemcount = 8; + const s32 hotbar_imagesize = 36; + + /* + Draw "Loading" screen + */ + const wchar_t *text = L"Loading and connecting..."; + u32 text_height = font->getDimension(text).Height; + core::vector2d center(screensize.X/2, screensize.Y/2); + core::vector2d textsize(300, text_height); + core::rect textrect(center - textsize/2, center + textsize/2); + + gui::IGUIStaticText *gui_loadingtext = guienv->addStaticText( + text, textrect, false, false); + gui_loadingtext->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT); + + driver->beginScene(true, true, video::SColor(255,0,0,0)); + guienv->drawAll(); + driver->endScene(); + + std::cout< server; + if(address == ""){ + server = new Server(map_dir); + server->start(port); + } + + /* + Create client + */ + + Client client(device, playername.c_str(), draw_control); + + Address connect_address(0,0,0,0, port); + try{ + if(address == "") + //connect_address.Resolve("localhost"); + connect_address.setAddress(127,0,0,1); + else + connect_address.Resolve(address.c_str()); + } + catch(ResolveError &e) + { + std::cout<remove(); + return; + } + + dstream<beginScene(true, true, video::SColor(255,0,0,0)); + guienv->drawAll(); + driver->endScene(); + + // Update client and server + + client.step(0.1); + + if(server != NULL) + server->step(0.1); + + // Delay a bit + sleep_ms(100); + } + } + catch(con::PeerNotFoundException &e) + { + std::cout<remove(); + return; + } + + /* + Create skybox + */ + /*scene::ISceneNode* skybox; + skybox = smgr->addSkyBoxSceneNode( + driver->getTexture(porting::getDataPath("skybox2.png").c_str()), + driver->getTexture(porting::getDataPath("skybox3.png").c_str()), + driver->getTexture(porting::getDataPath("skybox1.png").c_str()), + driver->getTexture(porting::getDataPath("skybox1.png").c_str()), + driver->getTexture(porting::getDataPath("skybox1.png").c_str()), + driver->getTexture(porting::getDataPath("skybox1.png").c_str()));*/ + + /* + Create the camera node + */ + + scene::ICameraSceneNode* camera = smgr->addCameraSceneNode( + 0, // Camera parent + v3f(BS*100, BS*2, BS*100), // Look from + v3f(BS*100+1, BS*2, BS*100), // Look to + -1 // Camera ID + ); + + if(camera == NULL) + { + error_message = L"Failed to create the camera node"; + return; + } + + //video::SColor skycolor = video::SColor(255,90,140,200); + //video::SColor skycolor = video::SColor(255,166,202,244); + //video::SColor skycolor = video::SColor(255,120,185,244); + video::SColor skycolor = video::SColor(255,140,186,250); + + camera->setFOV(FOV_ANGLE); + + // Just so big a value that everything rendered is visible + camera->setFarValue(100000*BS); + + f32 camera_yaw = 0; // "right/left" + f32 camera_pitch = 0; // "up/down" + + /* + Move into game + */ + + gui_loadingtext->remove(); + + /* + Add some gui stuff + */ + + // First line of debug text + gui::IGUIStaticText *guitext = guienv->addStaticText( + L"Minetest-c55", + core::rect(5, 5, 795, 5+text_height), + false, false); + // Second line of debug text + gui::IGUIStaticText *guitext2 = guienv->addStaticText( + L"", + core::rect(5, 5+(text_height+5)*1, 795, (5+text_height)*2), + false, false); + + // At the middle of the screen + // Object infos are shown in this + gui::IGUIStaticText *guitext_info = guienv->addStaticText( + L"", + core::rect(0,0,400,text_height+5) + v2s32(100,200), + false, false); + + // Chat text + gui::IGUIStaticText *guitext_chat = guienv->addStaticText( + L"", + core::rect(0,0,0,0), + false, false); // Disable word wrap as of now + //false, true); + //guitext_chat->setBackgroundColor(video::SColor(96,0,0,0)); + core::list chat_lines; + + /*GUIQuickInventory *quick_inventory = new GUIQuickInventory + (guienv, NULL, v2s32(10, 70), 5, &local_inventory);*/ + /*GUIQuickInventory *quick_inventory = new GUIQuickInventory + (guienv, NULL, v2s32(0, 0), quickinv_itemcount, &local_inventory);*/ + + // Test the text input system + /*(new GUITextInputMenu(guienv, guiroot, -1, &g_menumgr, + NULL))->drop();*/ + /*GUIMessageMenu *menu = + new GUIMessageMenu(guienv, guiroot, -1, + &g_menumgr, + L"Asd"); + menu->drop();*/ + + // Launch pause menu + (new GUIPauseMenu(guienv, guiroot, -1, g_gamecallback, + &g_menumgr))->drop(); + + // Enable texts + /*guitext2->setVisible(true); + guitext_info->setVisible(true); + guitext_chat->setVisible(true);*/ + + //s32 guitext_chat_pad_bottom = 70; + + /* + Some statistics are collected in these + */ + u32 drawtime = 0; + u32 beginscenetime = 0; + u32 scenetime = 0; + u32 endscenetime = 0; + + // A test + //throw con::PeerNotFoundException("lol"); + + core::list frametime_log; + + float damage_flash_timer = 0; + + /* + Main loop + */ + + bool first_loop_after_window_activation = true; + + // Time is in milliseconds + // NOTE: getRealTime() causes strange problems in wine (imprecision?) + // NOTE: So we have to use getTime() and call run()s between them + u32 lasttime = device->getTimer()->getTime(); + + while(device->run() && kill == false) + { + if(g_gamecallback->disconnect_requested) + { + g_gamecallback->disconnect_requested = false; + break; + } + + /* + Process TextureSource's queue + */ + ((TextureSource*)g_texturesource)->processQueue(); + + /* + Random calculations + */ + last_screensize = screensize; + screensize = driver->getScreenSize(); + v2s32 displaycenter(screensize.X/2,screensize.Y/2); + //bool screensize_changed = screensize != last_screensize; + + // Hilight boxes collected during the loop and displayed + core::list< core::aabbox3d > hilightboxes; + + // Info text + std::wstring infotext; + + // When screen size changes, update positions and sizes of stuff + /*if(screensize_changed) + { + v2s32 pos(displaycenter.X-((quickinv_itemcount-1)*quickinv_spacing+quickinv_size)/2, screensize.Y-quickinv_spacing); + quick_inventory->updatePosition(pos); + }*/ + + //TimeTaker //timer1("//timer1"); + + // Time of frame without fps limit + float busytime; + u32 busytime_u32; + { + // not using getRealTime is necessary for wine + u32 time = device->getTimer()->getTime(); + if(time > lasttime) + busytime_u32 = time - lasttime; + else + busytime_u32 = 0; + busytime = busytime_u32 / 1000.0; + } + + //std::cout<<"busytime_u32="<getTimer()->getTime() + device->run(); + + /* + Viewing range + */ + + updateViewingRange(busytime, &client); + + /* + FPS limiter + */ + + { + float fps_max = g_settings.getFloat("fps_max"); + u32 frametime_min = 1000./fps_max; + + if(busytime_u32 < frametime_min) + { + u32 sleeptime = frametime_min - busytime_u32; + device->sleep(sleeptime); + } + } + + // Necessary for device->getTimer()->getTime() + device->run(); + + /* + Time difference calculation + */ + f32 dtime; // in seconds + + u32 time = device->getTimer()->getTime(); + if(time > lasttime) + dtime = (time - lasttime) / 1000.0; + else + dtime = 0; + lasttime = time; + + /* + Log frametime for visualization + */ + frametime_log.push_back(dtime); + if(frametime_log.size() > 100) + { + core::list::Iterator i = frametime_log.begin(); + frametime_log.erase(i); + } + + /* + Visualize frametime in terminal + */ + /*for(u32 i=0; i jitter1_max) + jitter1_max = dtime_jitter1; + counter += dtime; + if(counter > 0.0) + { + counter -= 3.0; + dtime_jitter1_max_sample = jitter1_max; + dtime_jitter1_max_fraction + = dtime_jitter1_max_sample / (dtime_avg1+0.001); + jitter1_max = 0.0; + } + } + + /* + Busytime average and jitter calculation + */ + + static f32 busytime_avg1 = 0.0; + busytime_avg1 = busytime_avg1 * 0.98 + busytime * 0.02; + f32 busytime_jitter1 = busytime - busytime_avg1; + + static f32 busytime_jitter1_max_sample = 0.0; + static f32 busytime_jitter1_min_sample = 0.0; + { + static f32 jitter1_max = 0.0; + static f32 jitter1_min = 0.0; + static f32 counter = 0.0; + if(busytime_jitter1 > jitter1_max) + jitter1_max = busytime_jitter1; + if(busytime_jitter1 < jitter1_min) + jitter1_min = busytime_jitter1; + counter += dtime; + if(counter > 0.0){ + counter -= 3.0; + busytime_jitter1_max_sample = jitter1_max; + busytime_jitter1_min_sample = jitter1_min; + jitter1_max = 0.0; + jitter1_min = 0.0; + } + } + + /* + Debug info for client + */ + { + static float counter = 0.0; + counter -= dtime; + if(counter < 0) + { + counter = 30.0; + client.printDebugInfo(std::cout); + } + } + + /* + Direct handling of user input + */ + + // Reset input if window not active or some menu is active + if(device->isWindowActive() == false || noMenuActive() == false) + { + input->clear(); + } + + // Input handler step() (used by the random input generator) + input->step(dtime); + + /* + Launch menus according to keys + */ + if(input->wasKeyDown(irr::KEY_KEY_I)) + { + dstream< draw_spec; + draw_spec.push_back(GUIInventoryMenu::DrawSpec( + "list", "current_player", "main", + v2s32(0, 3), v2s32(8, 4))); + draw_spec.push_back(GUIInventoryMenu::DrawSpec( + "list", "current_player", "craft", + v2s32(3, 0), v2s32(3, 3))); + draw_spec.push_back(GUIInventoryMenu::DrawSpec( + "list", "current_player", "craftresult", + v2s32(7, 1), v2s32(1, 1))); + + menu->setDrawSpec(draw_spec); + + menu->drop(); + } + else if(input->wasKeyDown(irr::KEY_ESCAPE)) + { + dstream<drop(); + } + else if(input->wasKeyDown(irr::KEY_KEY_T)) + { + TextDest *dest = new TextDestChat(&client); + + (new GUITextInputMenu(guienv, guiroot, -1, + &g_menumgr, dest, + L""))->drop(); + } + + // Item selection with mouse wheel + { + s32 wheel = input->getMouseWheel(); + u16 max_item = MYMIN(PLAYER_INVENTORY_SIZE-1, + hotbar_itemcount-1); + + if(wheel < 0) + { + if(g_selected_item < max_item) + g_selected_item++; + else + g_selected_item = 0; + } + else if(wheel > 0) + { + if(g_selected_item > 0) + g_selected_item--; + else + g_selected_item = max_item; + } + } + + // Item selection + for(u16 i=0; i<10; i++) + { + s32 keycode = irr::KEY_KEY_1 + i; + if(i == 9) + keycode = irr::KEY_KEY_0; + if(input->wasKeyDown((irr::EKEY_CODE)keycode)) + { + if(i < PLAYER_INVENTORY_SIZE && i < hotbar_itemcount) + { + g_selected_item = i; + + dstream<wasKeyDown(irr::KEY_KEY_R)) + { + if(draw_control.range_all) + { + draw_control.range_all = false; + dstream<wasKeyDown(irr::KEY_KEY_P)) + { + dstream<<"-----------------------------------------" + <isKeyDown(irr::KEY_KEY_W), + input->isKeyDown(irr::KEY_KEY_S), + input->isKeyDown(irr::KEY_KEY_A), + input->isKeyDown(irr::KEY_KEY_D), + input->isKeyDown(irr::KEY_SPACE), + input->isKeyDown(irr::KEY_KEY_E), + input->isKeyDown(irr::KEY_LSHIFT) + || input->isKeyDown(irr::KEY_RSHIFT), + camera_pitch, + camera_yaw + ); + client.setPlayerControl(control); + } + + /* + Run server + */ + + if(server != NULL) + { + //TimeTaker timer("server->step(dtime)"); + server->step(dtime); + } + + /* + Process environment + */ + + { + //TimeTaker timer("client.step(dtime)"); + client.step(dtime); + //client.step(dtime_avg1); + } + + // Read client events + for(;;) + { + ClientEvent event = client.getClientEvent(); + if(event.type == CE_NONE) + { + break; + } + else if(event.type == CE_PLAYER_DAMAGE) + { + //u16 damage = event.player_damage.amount; + //dstream<<"Player damage: "<isWindowActive() && noMenuActive()) || random_input) + { + if(!random_input) + device->getCursorControl()->setVisible(false); + + if(first_loop_after_window_activation){ + //std::cout<<"window active, first loop"<getMousePos().X - displaycenter.X; + s32 dy = input->getMousePos().Y - displaycenter.Y; + //std::cout<<"window active, pos difference "< 89.5) camera_pitch = 89.5; + } + input->setMousePos(displaycenter.X, displaycenter.Y); + } + else{ + device->getCursorControl()->setVisible(true); + + //std::cout<<"window inactive"<setPosition(camera_position); + // *100.0 helps in large map coordinates + camera->setTarget(camera_position + camera_direction * 100.0); + + if(FIELD_OF_VIEW_TEST){ + client.updateCamera(v3f(0,0,0), v3f(0,0,1)); + } + else{ + //TimeTaker timer("client.updateCamera"); + client.updateCamera(camera_position, camera_direction); + } + + //timer2.stop(); + //TimeTaker //timer3("//timer3"); + + /* + Calculate what block is the crosshair pointing to + */ + + //u32 t1 = device->getTimer()->getRealTime(); + + //f32 d = 4; // max. distance + f32 d = 4; // max. distance + core::line3d shootline(camera_position, + camera_position + camera_direction * BS * (d+1)); + + MapBlockObject *selected_object = client.getSelectedObject + (d*BS, camera_position, shootline); + + ClientActiveObject *selected_active_object + = client.getSelectedActiveObject + (d*BS, camera_position, shootline); + + if(selected_object != NULL) + { + //dstream<<"Client returned selected_object != NULL"< box_on_map + = selected_object->getSelectionBoxOnMap(); + + hilightboxes.push_back(box_on_map); + + infotext = narrow_to_wide(selected_object->infoText()); + + if(input->getLeftClicked()) + { + std::cout<getBlock()->getPos(), + selected_object->getId(), g_selected_item); + } + else if(input->getRightClicked()) + { + std::cout<getTypeId() == MAPBLOCKOBJECT_TYPE_SIGN) + { + dstream<<"Sign object right-clicked"<getBlock()->getPos(), + selected_object->getId(), + &client); + + SignObject *sign_object = (SignObject*)selected_object; + + std::wstring wtext = + narrow_to_wide(sign_object->getText()); + + (new GUITextInputMenu(guienv, guiroot, -1, + &g_menumgr, dest, + wtext))->drop(); + } + } + /* + Otherwise pass the event to the server as-is + */ + else + { + client.clickObject(1, selected_object->getBlock()->getPos(), + selected_object->getId(), g_selected_item); + } + } + } + else if(selected_active_object != NULL) + { + //dstream<<"Client returned selected_active_object != NULL"< *selection_box + = selected_active_object->getSelectionBox(); + // Box should exist because object was returned in the + // first place + assert(selection_box); + + v3f pos = selected_active_object->getPosition(); + + core::aabbox3d box_on_map( + selection_box->MinEdge + pos, + selection_box->MaxEdge + pos + ); + + hilightboxes.push_back(box_on_map); + + //infotext = narrow_to_wide("A ClientActiveObject"); + infotext = narrow_to_wide(selected_active_object->infoText()); + + if(input->getLeftClicked()) + { + std::cout<getId(), g_selected_item); + } + else if(input->getRightClicked()) + { + std::cout< nodehilightbox; + + getPointedNode(&client, player_position, + camera_direction, camera_position, + nodefound, shootline, + nodepos, neighbourpos, + nodehilightbox, d); + + static float nodig_delay_counter = 0.0; + + if(nodefound) + { + static v3s16 nodepos_old(-32768,-32768,-32768); + + static float dig_time = 0.0; + static u16 dig_index = 0; + + /* + Visualize selection + */ + + hilightboxes.push_back(nodehilightbox); + + /* + Check information text of node + */ + + NodeMetadata *meta = client.getNodeMetadata(nodepos); + if(meta) + { + infotext = narrow_to_wide(meta->infoText()); + } + + //MapNode node = client.getNode(nodepos); + + /* + Handle digging + */ + + if(input->getLeftReleased()) + { + client.clearTempMod(nodepos); + dig_time = 0.0; + } + + if(nodig_delay_counter > 0.0) + { + nodig_delay_counter -= dtime; + } + else + { + if(nodepos != nodepos_old) + { + std::cout<getLeftClicked() || + (input->getLeftState() && nodepos != nodepos_old)) + { + dstream<getLeftClicked()) + { + client.setTempMod(nodepos, NodeMod(NODEMOD_CRACK, 0)); + } + if(input->getLeftState()) + { + MapNode n = client.getNode(nodepos); + + // Get tool name. Default is "" = bare hands + std::string toolname = ""; + InventoryList *mlist = local_inventory.getList("main"); + if(mlist != NULL) + { + InventoryItem *item = mlist->getItem(g_selected_item); + if(item && (std::string)item->getName() == "ToolItem") + { + ToolItem *titem = (ToolItem*)item; + toolname = titem->getToolName(); + } + } + + // Get digging properties for material and tool + u8 material = n.d; + DiggingProperties prop = + getDiggingProperties(material, toolname); + + float dig_time_complete = 0.0; + + if(prop.diggable == false) + { + /*dstream<<"Material "<<(int)material + <<" not diggable with \"" + <= 0.001) + { + dig_index = (u16)((float)CRACK_ANIMATION_LENGTH + * dig_time/dig_time_complete); + } + // This is for torches + else + { + dig_index = CRACK_ANIMATION_LENGTH; + } + + if(dig_index < CRACK_ANIMATION_LENGTH) + { + //TimeTaker timer("client.setTempMod"); + //dstream<<"dig_index="< 0.5) + { + nodig_delay_counter = 0.5; + } + // We want a slight delay to very little + // time consuming nodes + float mindelay = 0.15; + if(nodig_delay_counter < mindelay) + { + nodig_delay_counter = mindelay; + } + } + + dig_time += dtime; + } + } + + if(input->getRightClicked()) + { + std::cout<typeId() == CONTENT_SIGN_WALL && !random_input) + { + dstream<<"Sign node right-clicked"<getText()); + + (new GUITextInputMenu(guienv, guiroot, -1, + &g_menumgr, dest, + wtext))->drop(); + } + else if(meta && meta->typeId() == CONTENT_CHEST && !random_input) + { + dstream<<"Chest node right-clicked"< draw_spec; + + draw_spec.push_back(GUIInventoryMenu::DrawSpec( + "list", chest_inv_id, "0", + v2s32(0, 0), v2s32(8, 4))); + draw_spec.push_back(GUIInventoryMenu::DrawSpec( + "list", "current_player", "main", + v2s32(0, 5), v2s32(8, 4))); + + menu->setDrawSpec(draw_spec); + + menu->drop(); + + } + else if(meta && meta->typeId() == CONTENT_FURNACE && !random_input) + { + dstream<<"Furnace node right-clicked"<drop(); + + } + else + { + client.groundAction(1, nodepos, neighbourpos, g_selected_item); + } + } + + nodepos_old = nodepos; + } + else{ + } + + } // selected_object == NULL + + input->resetLeftClicked(); + input->resetRightClicked(); + + if(input->getLeftReleased()) + { + std::cout<getRightReleased()) + { + //std::cout<resetLeftReleased(); + input->resetRightReleased(); + + /* + Calculate stuff for drawing + */ + + camera->setAspectRatio((f32)screensize.X / (f32)screensize.Y); + + u32 daynight_ratio = client.getDayNightRatio(); + u8 l = decode_light((daynight_ratio * LIGHT_SUN) / 1000); + video::SColor bgcolor = video::SColor( + 255, + skycolor.getRed() * l / 255, + skycolor.getGreen() * l / 255, + skycolor.getBlue() * l / 255); + + /* + Fog + */ + + if(g_settings.getBool("enable_fog") == true) + { + //f32 range = draw_control.wanted_range * BS + MAP_BLOCKSIZE/2*BS; + f32 range = draw_control.wanted_range * BS + 0.8*MAP_BLOCKSIZE*BS; + //f32 range = draw_control.wanted_range * BS + 0.0*MAP_BLOCKSIZE*BS; + if(draw_control.range_all) + range = 100000*BS; + + driver->setFog( + bgcolor, + video::EFT_FOG_LINEAR, + range*0.4, + range*1.0, + 0.01, + false, // pixel fog + false // range fog + ); + } + else + { + driver->setFog( + bgcolor, + video::EFT_FOG_LINEAR, + 100000*BS, + 110000*BS, + 0.01, + false, // pixel fog + false // range fog + ); + } + + + /* + Update gui stuff (0ms) + */ + + //TimeTaker guiupdatetimer("Gui updating"); + + { + static float drawtime_avg = 0; + drawtime_avg = drawtime_avg * 0.95 + (float)drawtime*0.05; + static float beginscenetime_avg = 0; + beginscenetime_avg = beginscenetime_avg * 0.95 + (float)beginscenetime*0.05; + static float scenetime_avg = 0; + scenetime_avg = scenetime_avg * 0.95 + (float)scenetime*0.05; + static float endscenetime_avg = 0; + endscenetime_avg = endscenetime_avg * 0.95 + (float)endscenetime*0.05; + + char temptext[300]; + snprintf(temptext, 300, "Minetest-c55 (" + "F: item=%i" + ", R: range_all=%i" + ")" + " drawtime=%.0f, beginscenetime=%.0f" + ", scenetime=%.0f, endscenetime=%.0f", + g_selected_item, + draw_control.range_all, + drawtime_avg, + beginscenetime_avg, + scenetime_avg, + endscenetime_avg + ); + + guitext->setText(narrow_to_wide(temptext).c_str()); + } + + { + char temptext[300]; + snprintf(temptext, 300, + "(% .1f, % .1f, % .1f)" + " (% .3f < btime_jitter < % .3f" + ", dtime_jitter = % .1f %%" + ", v_range = %.1f)", + player_position.X/BS, + player_position.Y/BS, + player_position.Z/BS, + busytime_jitter1_min_sample, + busytime_jitter1_max_sample, + dtime_jitter1_max_fraction * 100.0, + draw_control.wanted_range + ); + + guitext2->setText(narrow_to_wide(temptext).c_str()); + } + + { + guitext_info->setText(infotext.c_str()); + } + + /* + Get chat messages from client + */ + { + // Get new messages + std::wstring message; + while(client.getChatMessage(message)) + { + chat_lines.push_back(ChatLine(message)); + /*if(chat_lines.size() > 6) + { + core::list::Iterator + i = chat_lines.begin(); + chat_lines.erase(i); + }*/ + } + // Append them to form the whole static text and throw + // it to the gui element + std::wstring whole; + // This will correspond to the line number counted from + // top to bottom, from size-1 to 0 + s16 line_number = chat_lines.size(); + // Count of messages to be removed from the top + u16 to_be_removed_count = 0; + for(core::list::Iterator + i = chat_lines.begin(); + i != chat_lines.end(); i++) + { + // After this, line number is valid for this loop + line_number--; + // Increment age + (*i).age += dtime; + /* + This results in a maximum age of 60*6 to the + lowermost line and a maximum of 6 lines + */ + float allowed_age = (6-line_number) * 60.0; + + if((*i).age > allowed_age) + { + to_be_removed_count++; + continue; + } + whole += (*i).text + L'\n'; + } + for(u16 i=0; i::Iterator + it = chat_lines.begin(); + chat_lines.erase(it); + } + guitext_chat->setText(whole.c_str()); + + // Update gui element size and position + + /*core::rect rect( + 10, + screensize.Y - guitext_chat_pad_bottom + - text_height*chat_lines.size(), + screensize.X - 10, + screensize.Y - guitext_chat_pad_bottom + );*/ + core::rect rect( + 10, + 50, + screensize.X - 10, + 50 + text_height*chat_lines.size() + ); + + guitext_chat->setRelativePosition(rect); + + if(chat_lines.size() == 0) + guitext_chat->setVisible(false); + else + guitext_chat->setVisible(true); + } + + /* + Inventory + */ + + static u16 old_selected_item = 65535; + if(client.getLocalInventoryUpdated() + || g_selected_item != old_selected_item) + { + old_selected_item = g_selected_item; + //std::cout<<"Updating local inventory"<beginScene(true, true, bgcolor); + //driver->beginScene(false, true, bgcolor); + beginscenetime = timer.stop(true); + } + + //timer3.stop(); + + //std::cout<drawAll()"<drawAll(); + scenetime = timer.stop(true); + } + + { + //TimeTaker timer9("auxiliary drawings"); + // 0ms + + //timer9.stop(); + //TimeTaker //timer10("//timer10"); + + video::SMaterial m; + //m.Thickness = 10; + m.Thickness = 3; + m.Lighting = false; + driver->setMaterial(m); + + driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); + + for(core::list< core::aabbox3d >::Iterator i=hilightboxes.begin(); + i != hilightboxes.end(); i++) + { + /*std::cout<<"hilightbox min=" + <<"("<MinEdge.X<<","<MinEdge.Y<<","<MinEdge.Z<<")" + <<" max=" + <<"("<MaxEdge.X<<","<MaxEdge.Y<<","<MaxEdge.Z<<")" + <draw3DBox(*i, video::SColor(255,0,0,0)); + } + + /* + Frametime log + */ + if(g_settings.getBool("frametime_graph") == true) + { + s32 x = 10; + for(core::list::Iterator + i = frametime_log.begin(); + i != frametime_log.end(); + i++) + { + driver->draw2DLine(v2s32(x,50), + v2s32(x,50+(*i)*1000), + video::SColor(255,255,255,255)); + x++; + } + } + + /* + Draw crosshair + */ + driver->draw2DLine(displaycenter - core::vector2d(10,0), + displaycenter + core::vector2d(10,0), + video::SColor(255,255,255,255)); + driver->draw2DLine(displaycenter - core::vector2d(0,10), + displaycenter + core::vector2d(0,10), + video::SColor(255,255,255,255)); + + } // timer + + //timer10.stop(); + //TimeTaker //timer11("//timer11"); + + /* + Draw gui + */ + // 0-1ms + guienv->drawAll(); + + /* + Draw hotbar + */ + { + draw_hotbar(driver, font, v2s32(displaycenter.X, screensize.Y), + hotbar_imagesize, hotbar_itemcount, &local_inventory, + client.getHP()); + } + + /* + Damage flash + */ + if(damage_flash_timer > 0.0) + { + damage_flash_timer -= dtime; + + video::SColor color(128,255,0,0); + driver->draw2DRectangle(color, + core::rect(0,0,screensize.X,screensize.Y), + NULL); + } + + /* + End scene + */ + { + TimeTaker timer("endScene"); + driver->endScene(); + endscenetime = timer.stop(true); + } + + drawtime = drawtimer.stop(true); + + /* + End of drawing + */ + + static s16 lastFPS = 0; + //u16 fps = driver->getFPS(); + u16 fps = (1.0/dtime_avg1); + + if (lastFPS != fps) + { + core::stringw str = L"Minetest ["; + str += driver->getName(); + str += "] FPS:"; + str += fps; + + device->setWindowCaption(str.c_str()); + lastFPS = fps; + } + } +} + + diff --git a/src/game.h b/src/game.h new file mode 100644 index 00000000..7cba1299 --- /dev/null +++ b/src/game.h @@ -0,0 +1,76 @@ +/* +Minetest-c55 +Copyright (C) 2011 celeron55, Perttu Ahola + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License along +with this program; if not, write to the Free Software Foundation, Inc., +51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ + +#ifndef GAME_HEADER +#define GAME_HEADER + +#include "common_irrlicht.h" +#include + +class InputHandler +{ +public: + InputHandler() + { + } + virtual ~InputHandler() + { + } + + virtual bool isKeyDown(EKEY_CODE keyCode) = 0; + virtual bool wasKeyDown(EKEY_CODE keyCode) = 0; + + virtual v2s32 getMousePos() = 0; + virtual void setMousePos(s32 x, s32 y) = 0; + + virtual bool getLeftState() = 0; + virtual bool getRightState() = 0; + + virtual bool getLeftClicked() = 0; + virtual bool getRightClicked() = 0; + virtual void resetLeftClicked() = 0; + virtual void resetRightClicked() = 0; + + virtual bool getLeftReleased() = 0; + virtual bool getRightReleased() = 0; + virtual void resetLeftReleased() = 0; + virtual void resetRightReleased() = 0; + + virtual s32 getMouseWheel() = 0; + + virtual void step(float dtime) {}; + + virtual void clear() {}; +}; + +void the_game( + bool &kill, + bool random_input, + InputHandler *input, + IrrlichtDevice *device, + gui::IGUIFont* font, + std::string map_dir, + std::string playername, + std::string address, + u16 port, + std::wstring &error_message +); + +#endif + diff --git a/src/main.cpp b/src/main.cpp index af94387f..ffe877eb 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -261,16 +261,6 @@ Making it more portable: */ -/* - Setting this to 1 enables a special camera mode that forces - the renderers to think that the camera statically points from - the starting place to a static direction. - - This allows one to move around with the player and see what - is actually drawn behind solid things and behind the player. -*/ -#define FIELD_OF_VIEW_TEST 0 - #ifdef NDEBUG #ifdef _WIN32 #pragma message ("Disabling unit tests") @@ -295,41 +285,32 @@ Making it more portable: #include #include -#include +//#include #include #include "main.h" #include "common_irrlicht.h" #include "debug.h" -#include "map.h" -#include "player.h" +//#include "map.h" +//#include "player.h" #include "test.h" -//#include "environment.h" #include "server.h" -#include "client.h" -//#include "serialization.h" +//#include "client.h" #include "constants.h" -//#include "strfnd.h" #include "porting.h" #include "gettime.h" -#include "porting.h" -#include "guiPauseMenu.h" -#include "guiInventoryMenu.h" -#include "guiTextInputMenu.h" -#include "materials.h" #include "guiMessageMenu.h" #include "filesys.h" #include "config.h" #include "guiMainMenu.h" #include "mineral.h" -#include "noise.h" -#include "tile.h" -#include "guiFurnaceMenu.h" +//#include "noise.h" +//#include "tile.h" +#include "materials.h" +#include "game.h" // This makes textures ITextureSource *g_texturesource = NULL; -MapDrawControl draw_control; - /* Settings. These are loaded from the config file. @@ -343,12 +324,6 @@ extern void set_default_settings(); Random stuff */ -IrrlichtDevice *g_device = NULL; -Client *g_client = NULL; - -const s32 hotbar_itemcount = 8; -const s32 hotbar_imagesize = 36; - /* GUI Stuff */ @@ -356,60 +331,6 @@ const s32 hotbar_imagesize = 36; gui::IGUIEnvironment* guienv = NULL; gui::IGUIStaticText *guiroot = NULL; -// Handler for the modal menus - -class MainMenuManager : public IMenuManager -{ -public: - virtual void createdMenu(GUIModalMenu *menu) - { - for(core::list::Iterator - i = m_stack.begin(); - i != m_stack.end(); i++) - { - assert(*i != menu); - } - - if(m_stack.size() != 0) - (*m_stack.getLast())->setVisible(false); - m_stack.push_back(menu); - } - - virtual void deletingMenu(GUIModalMenu *menu) - { - // Remove all entries if there are duplicates - bool removed_entry; - do{ - removed_entry = false; - for(core::list::Iterator - i = m_stack.begin(); - i != m_stack.end(); i++) - { - if(*i == menu) - { - m_stack.erase(i); - removed_entry = true; - break; - } - } - }while(removed_entry); - - /*core::list::Iterator i = m_stack.getLast(); - assert(*i == menu); - m_stack.erase(i);*/ - - if(m_stack.size() != 0) - (*m_stack.getLast())->setVisible(true); - } - - u32 menuCount() - { - return m_stack.size(); - } - - core::list m_stack; -}; - MainMenuManager g_menumgr; bool noMenuActive() @@ -419,39 +340,7 @@ bool noMenuActive() // Passed to menus to allow disconnecting and exiting -class MainGameCallback : public IGameCallback -{ -public: - MainGameCallback(): - disconnect_requested(false) - { - } - - virtual void exitToOS() - { - g_device->closeDevice(); - } - - virtual void disconnect() - { - disconnect_requested = true; - } - - bool disconnect_requested; -}; - -MainGameCallback g_gamecallback; - -/* - Inventory stuff -*/ - -// Inventory actions from the menu are buffered here before sending -Queue inventory_action_queue; -// This is a copy of the inventory that the client's environment has -Inventory local_inventory; - -u16 g_selected_item = 0; +MainGameCallback *g_gamecallback = NULL; /* Debug streams @@ -477,96 +366,38 @@ std::ostream *derr_client_ptr = &dstream; gettime.h implementation */ -u32 getTimeMs() -{ - /* - Use irrlicht because it is more precise than porting.h's - getTimeMs() - */ - if(g_device == NULL) - return 0; - return g_device->getTimer()->getRealTime(); -} - -/* - Text input system -*/ - -struct TextDestSign : public TextDest +// A small helper class +class TimeGetter { - TextDestSign(v3s16 blockpos, s16 id, Client *client) - { - m_blockpos = blockpos; - m_id = id; - m_client = client; - } - void gotText(std::wstring text) +public: + TimeGetter(IrrlichtDevice *device): + m_device(device) + {} + u32 getTime() { - std::string ntext = wide_to_narrow(text); - dstream<<"Changing text of a sign object: " - <sendSignText(m_blockpos, m_id, ntext); + if(m_device == NULL) + return 0; + return m_device->getTimer()->getRealTime(); } - - v3s16 m_blockpos; - s16 m_id; - Client *m_client; +private: + IrrlichtDevice *m_device; }; -struct TextDestChat : public TextDest -{ - TextDestChat(Client *client) - { - m_client = client; - } - void gotText(std::wstring text) - { - // Discard empty line - if(text == L"") - return; - - // Parse command (server command starts with "/#") - if(text[0] == L'/' && text[1] != L'#') - { - std::wstring reply = L"Local: "; - - reply += L"Local commands not yet supported. " - L"Server prefix is \"/#\"."; - - m_client->addChatMessage(reply); - return; - } - - // Send to others - m_client->sendChatMessage(text); - // Show locally - m_client->addChatMessage(text); - } - - Client *m_client; -}; +// A pointer to a global instance of the time getter +TimeGetter *g_timegetter = NULL; -struct TextDestSignNode : public TextDest +u32 getTimeMs() { - TextDestSignNode(v3s16 p, Client *client) - { - m_p = p; - m_client = client; - } - void gotText(std::wstring text) - { - std::string ntext = wide_to_narrow(text); - dstream<<"Changing text of a sign node: " - <sendSignNodeText(m_p, ntext); - } - - v3s16 m_p; - Client *m_client; -}; + if(g_timegetter == NULL) + return 0; + return g_timegetter->getTime(); +} /* Event handler for Irrlicht + + NOTE: Everything possible should be moved out from here, + probably to InputHandler and the_game */ class MyEventReceiver : public IEventReceiver @@ -580,7 +411,6 @@ public: */ if(noMenuActive() == false) { - clearInput(); return false; } @@ -590,120 +420,7 @@ public: keyIsDown[event.KeyInput.Key] = event.KeyInput.PressedDown; if(event.KeyInput.PressedDown) - { - //dstream<<"Pressed key: "<<(char)event.KeyInput.Key<drop(); - return true; - } - if(event.KeyInput.Key == irr::KEY_KEY_I) - { - dstream<getInventoryContext(), - g_client); - - core::array draw_spec; - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", "current_player", "main", - v2s32(0, 3), v2s32(8, 4))); - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", "current_player", "craft", - v2s32(3, 0), v2s32(3, 3))); - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", "current_player", "craftresult", - v2s32(7, 1), v2s32(1, 1))); - - menu->setDrawSpec(draw_spec); - - menu->drop(); - - return true; - } - if(event.KeyInput.Key == irr::KEY_KEY_T) - { - TextDest *dest = new TextDestChat(g_client); - - (new GUITextInputMenu(guienv, guiroot, -1, - &g_menumgr, dest, - L""))->drop(); - } - } - - // Item selection - if(event.KeyInput.Key >= irr::KEY_KEY_0 - && event.KeyInput.Key <= irr::KEY_KEY_9) - { - u16 s1 = event.KeyInput.Key - irr::KEY_KEY_0; - if(event.KeyInput.Key == irr::KEY_KEY_0) - s1 = 10; - if(s1 < PLAYER_INVENTORY_SIZE && s1 < hotbar_itemcount) - g_selected_item = s1-1; - dstream<getList("main"); - if(mainlist == NULL) - { - dstream<<"WARNING: draw_hotbar(): mainlist == NULL"< barrect(0,0,width,height); - barrect += pos; - video::SColor bgcolor(255,128,128,128); - driver->draw2DRectangle(bgcolor, barrect, NULL);*/ - - core::rect imgrect(0,0,imgsize,imgsize); - - for(s32 i=0; igetItem(i); - - core::rect rect = imgrect + pos - + v2s32(padding+i*(imgsize+padding*2), padding); - - if(g_selected_item == i) - { - driver->draw2DRectangle(video::SColor(255,255,0,0), - core::rect(rect.UpperLeftCorner - v2s32(1,1)*padding, - rect.LowerRightCorner + v2s32(1,1)*padding), - NULL); - } - else - { - video::SColor bgcolor2(128,0,0,0); - driver->draw2DRectangle(bgcolor2, rect, NULL); - } - - if(item != NULL) - { - drawInventoryItem(driver, font, item, rect, NULL); - } - } - - /* - Draw hearts - */ - { - video::ITexture *heart_texture = - driver->getTexture(porting::getDataPath("heart.png").c_str()); - v2s32 p = pos + v2s32(0, -20); - for(s32 i=0; i rect(0,0,16,16); - rect += p; - driver->draw2DImage(heart_texture, rect, - core::rect(core::position2d(0,0), - core::dimension2di(heart_texture->getOriginalSize())), - NULL, colors, true); - p += v2s32(20,0); - } - if(halfheartcount % 2 == 1) - { - const video::SColor color(255,255,255,255); - const video::SColor colors[] = {color,color,color,color}; - core::rect rect(0,0,16/2,16); - rect += p; - core::dimension2di srcd(heart_texture->getOriginalSize()); - srcd.Width /= 2; - driver->draw2DImage(heart_texture, rect, - core::rect(core::position2d(0,0), srcd), - NULL, colors, true); - p += v2s32(20,0); - } - } -} - -// Chat data -struct ChatLine -{ - ChatLine(): - age(0.0) - { - } - ChatLine(const std::wstring &a_text): - age(0.0), - text(a_text) - { - } - float age; - std::wstring text; -}; - // These are defined global so that they're not optimized too much. // Can't change them to volatile. s16 temp16; @@ -1423,240 +884,31 @@ void SpeedTests() } } -void getPointedNode(v3f player_position, - v3f camera_direction, v3f camera_position, - bool &nodefound, core::line3d shootline, - v3s16 &nodepos, v3s16 &neighbourpos, - core::aabbox3d &nodehilightbox, - f32 d) +int main(int argc, char *argv[]) { - assert(g_client); + /* + Parse command line + */ + + // List all allowed options + core::map allowed_options; + allowed_options.insert("help", ValueSpec(VALUETYPE_FLAG)); + allowed_options.insert("server", ValueSpec(VALUETYPE_FLAG, + "Run server directly")); + allowed_options.insert("config", ValueSpec(VALUETYPE_STRING, + "Load configuration from specified file")); + allowed_options.insert("port", ValueSpec(VALUETYPE_STRING)); + allowed_options.insert("address", ValueSpec(VALUETYPE_STRING)); + allowed_options.insert("random-input", ValueSpec(VALUETYPE_FLAG)); + allowed_options.insert("disable-unittests", ValueSpec(VALUETYPE_FLAG)); + allowed_options.insert("enable-unittests", ValueSpec(VALUETYPE_FLAG)); + allowed_options.insert("map-dir", ValueSpec(VALUETYPE_STRING)); +#ifdef _WIN32 + allowed_options.insert("dstream-on-stderr", ValueSpec(VALUETYPE_FLAG)); +#endif + allowed_options.insert("speedtests", ValueSpec(VALUETYPE_FLAG)); - f32 mindistance = BS * 1001; - - v3s16 pos_i = floatToInt(player_position, BS); - - /*std::cout<<"pos_i=("<0 ? a : 1); - s16 zend = pos_i.Z + (camera_direction.Z>0 ? a : 1); - s16 xend = pos_i.X + (camera_direction.X>0 ? a : 1); - - for(s16 y = ystart; y <= yend; y++) - for(s16 z = zstart; z <= zend; z++) - for(s16 x = xstart; x <= xend; x++) - { - MapNode n; - try - { - n = g_client->getNode(v3s16(x,y,z)); - if(content_pointable(n.d) == false) - continue; - } - catch(InvalidPositionException &e) - { - continue; - } - - v3s16 np(x,y,z); - v3f npf = intToFloat(np, BS); - - f32 d = 0.01; - - v3s16 dirs[6] = { - v3s16(0,0,1), // back - v3s16(0,1,0), // top - v3s16(1,0,0), // right - v3s16(0,0,-1), // front - v3s16(0,-1,0), // bottom - v3s16(-1,0,0), // left - }; - - /* - Meta-objects - */ - if(n.d == CONTENT_TORCH) - { - v3s16 dir = unpackDir(n.dir); - v3f dir_f = v3f(dir.X, dir.Y, dir.Z); - dir_f *= BS/2 - BS/6 - BS/20; - v3f cpf = npf + dir_f; - f32 distance = (cpf - camera_position).getLength(); - - core::aabbox3d box; - - // bottom - if(dir == v3s16(0,-1,0)) - { - box = core::aabbox3d( - npf - v3f(BS/6, BS/2, BS/6), - npf + v3f(BS/6, -BS/2+BS/3*2, BS/6) - ); - } - // top - else if(dir == v3s16(0,1,0)) - { - box = core::aabbox3d( - npf - v3f(BS/6, -BS/2+BS/3*2, BS/6), - npf + v3f(BS/6, BS/2, BS/6) - ); - } - // side - else - { - box = core::aabbox3d( - cpf - v3f(BS/6, BS/3, BS/6), - cpf + v3f(BS/6, BS/3, BS/6) - ); - } - - if(distance < mindistance) - { - if(box.intersectsWithLine(shootline)) - { - nodefound = true; - nodepos = np; - neighbourpos = np; - mindistance = distance; - nodehilightbox = box; - } - } - } - else if(n.d == CONTENT_SIGN_WALL) - { - v3s16 dir = unpackDir(n.dir); - v3f dir_f = v3f(dir.X, dir.Y, dir.Z); - dir_f *= BS/2 - BS/6 - BS/20; - v3f cpf = npf + dir_f; - f32 distance = (cpf - camera_position).getLength(); - - v3f vertices[4] = - { - v3f(BS*0.42,-BS*0.35,-BS*0.4), - v3f(BS*0.49, BS*0.35, BS*0.4), - }; - - for(s32 i=0; i<2; i++) - { - if(dir == v3s16(1,0,0)) - vertices[i].rotateXZBy(0); - if(dir == v3s16(-1,0,0)) - vertices[i].rotateXZBy(180); - if(dir == v3s16(0,0,1)) - vertices[i].rotateXZBy(90); - if(dir == v3s16(0,0,-1)) - vertices[i].rotateXZBy(-90); - if(dir == v3s16(0,-1,0)) - vertices[i].rotateXYBy(-90); - if(dir == v3s16(0,1,0)) - vertices[i].rotateXYBy(90); - - vertices[i] += npf; - } - - core::aabbox3d box; - - box = core::aabbox3d(vertices[0]); - box.addInternalPoint(vertices[1]); - - if(distance < mindistance) - { - if(box.intersectsWithLine(shootline)) - { - nodefound = true; - nodepos = np; - neighbourpos = np; - mindistance = distance; - nodehilightbox = box; - } - } - } - /* - Regular blocks - */ - else - { - for(u16 i=0; i<6; i++) - { - v3f dir_f = v3f(dirs[i].X, - dirs[i].Y, dirs[i].Z); - v3f centerpoint = npf + dir_f * BS/2; - f32 distance = - (centerpoint - camera_position).getLength(); - - if(distance < mindistance) - { - core::CMatrix4 m; - m.buildRotateFromTo(v3f(0,0,1), dir_f); - - // This is the back face - v3f corners[2] = { - v3f(BS/2, BS/2, BS/2), - v3f(-BS/2, -BS/2, BS/2+d) - }; - - for(u16 j=0; j<2; j++) - { - m.rotateVect(corners[j]); - corners[j] += npf; - } - - core::aabbox3d facebox(corners[0]); - facebox.addInternalPoint(corners[1]); - - if(facebox.intersectsWithLine(shootline)) - { - nodefound = true; - nodepos = np; - neighbourpos = np + dirs[i]; - mindistance = distance; - - //nodehilightbox = facebox; - - const float d = 0.502; - core::aabbox3d nodebox - (-BS*d, -BS*d, -BS*d, BS*d, BS*d, BS*d); - v3f nodepos_f = intToFloat(nodepos, BS); - nodebox.MinEdge += nodepos_f; - nodebox.MaxEdge += nodepos_f; - nodehilightbox = nodebox; - } - } // if distance < mindistance - } // for dirs - } // regular block - } // for coords -} - -int main(int argc, char *argv[]) -{ - /* - Parse command line - */ - - // List all allowed options - core::map allowed_options; - allowed_options.insert("help", ValueSpec(VALUETYPE_FLAG)); - allowed_options.insert("server", ValueSpec(VALUETYPE_FLAG, - "Run server directly")); - allowed_options.insert("config", ValueSpec(VALUETYPE_STRING, - "Load configuration from specified file")); - allowed_options.insert("port", ValueSpec(VALUETYPE_STRING)); - allowed_options.insert("address", ValueSpec(VALUETYPE_STRING)); - allowed_options.insert("random-input", ValueSpec(VALUETYPE_FLAG)); - allowed_options.insert("disable-unittests", ValueSpec(VALUETYPE_FLAG)); - allowed_options.insert("enable-unittests", ValueSpec(VALUETYPE_FLAG)); - allowed_options.insert("map-dir", ValueSpec(VALUETYPE_STRING)); -#ifdef _WIN32 - allowed_options.insert("dstream-on-stderr", ValueSpec(VALUETYPE_FLAG)); -#endif - allowed_options.insert("speedtests", ValueSpec(VALUETYPE_FLAG)); - - Settings cmd_args; + Settings cmd_args; bool ret = cmd_args.parseCommandLine(argc, argv, allowed_options); @@ -1815,7 +1067,7 @@ int main(int argc, char *argv[]) return 0;*/ /* - Some parameters + Game parameters */ // Port @@ -1865,6 +1117,10 @@ int main(int argc, char *argv[]) std::string playername = g_settings.get("name"); + /* + Device initialization + */ + // Resolution selection bool fullscreen = false; @@ -1896,7 +1152,9 @@ int main(int argc, char *argv[]) driverType = video::EDT_OPENGL; } - // create device and exit if creation failed + /* + Create device and exit if creation failed + */ MyEventReceiver receiver; @@ -1908,9 +1166,17 @@ int main(int argc, char *argv[]) if (device == 0) return 1; // could not create selected driver. - g_device = device; - TextureSource *texturesource = new TextureSource(device); - g_texturesource = texturesource; + // Set device in game parameters + device = device; + + // Create time getter + g_timegetter = new TimeGetter(device); + + // Create game callback for menus + g_gamecallback = new MainGameCallback(device); + + // Create texture source + g_texturesource = new TextureSource(device); /* Speed tests (done after irrlicht is loaded to get timer) @@ -1926,16 +1192,17 @@ int main(int argc, char *argv[]) bool random_input = g_settings.getBool("random_input") || cmd_args.getFlag("random-input"); + InputHandler *input = NULL; if(random_input) - g_input = new RandomInputHandler(); + input = new RandomInputHandler(); else - g_input = new RealInputHandler(device, &receiver); + input = new RealInputHandler(device, &receiver); /* Continue initialization */ - video::IVideoDriver* driver = device->getVideoDriver(); + //video::IVideoDriver* driver = device->getVideoDriver(); /* This changes the minimum allowed number of vertices in a VBO. @@ -1956,7 +1223,7 @@ int main(int argc, char *argv[]) // If font was not found, this will get us one font = skin->getFont(); assert(font); - + u32 text_height = font->getDimension(L"Hello, world!").Height; dstream<<"text_height="<addStaticText(L"", - core::rect(0, 0, 10000, 10000)); - - // First line of debug text - gui::IGUIStaticText *guitext = guienv->addStaticText( - L"", - core::rect(5, 5, 795, 5+text_height), - false, false); - // Second line of debug text - gui::IGUIStaticText *guitext2 = guienv->addStaticText( - L"", - core::rect(5, 5+(text_height+5)*1, 795, (5+text_height)*2), - false, false); - - // At the middle of the screen - // Object infos are shown in this - gui::IGUIStaticText *guitext_info = guienv->addStaticText( - L"", - core::rect(0,0,400,text_height+5) + v2s32(100,200), - false, false); - - // Chat text - gui::IGUIStaticText *guitext_chat = guienv->addStaticText( - L"", - core::rect(0,0,0,0), - false, false); // Disable word wrap as of now - //false, true); - //guitext_chat->setBackgroundColor(video::SColor(96,0,0,0)); - core::list chat_lines; - - /* - If an error occurs, this is set to something and the - menu-game loop is restarted. It is then displayed before - the menu. - */ - std::wstring error_message = L""; - /* Menu-game loop */ - while(g_device->run() && kill == false) - { - - // This is used for catching disconnects - try - { - - /* - Out-of-game menu loop. - - Loop quits when menu returns proper parameters. - */ - while(kill == false) + while(device->run() && kill == false) { - // Cursor can be non-visible when coming from the game - device->getCursorControl()->setVisible(true); - // Some stuff are left to scene manager when coming from the game - // (map at least?) - smgr->clear(); - // Reset or hide the debug gui texts - guitext->setText(L"Minetest-c55"); - guitext2->setVisible(false); - guitext_info->setVisible(false); - guitext_chat->setVisible(false); - - // Initialize menu data - MainMenuData menudata; - menudata.address = narrow_to_wide(address); - menudata.name = narrow_to_wide(playername); - menudata.port = narrow_to_wide(itos(port)); - menudata.creative_mode = g_settings.getBool("creative_mode"); - - GUIMainMenu *menu = - new GUIMainMenu(guienv, guiroot, -1, - &g_menumgr, &menudata, &g_gamecallback); - menu->allowFocusRemoval(true); - - if(error_message != L"") - { - GUIMessageMenu *menu2 = - new GUIMessageMenu(guienv, guiroot, -1, - &g_menumgr, error_message.c_str()); - menu2->drop(); - error_message = L""; - } - - video::IVideoDriver* driver = g_device->getVideoDriver(); - - dstream<<"Created main menu"<run() && kill == false) - { - if(menu->getStatus() == true) - break; - - //driver->beginScene(true, true, video::SColor(255,0,0,0)); - driver->beginScene(true, true, video::SColor(255,128,128,128)); - guienv->drawAll(); - driver->endScene(); - } - - // Break out of menu-game loop to shut down cleanly - if(g_device->run() == false || kill == true) - break; - - dstream<<"Dropping main menu"<drop(); - - // Delete map if requested - if(menudata.delete_map) - { - bool r = fs::RecursiveDeleteContent(map_dir); - if(r == false) - error_message = L"Delete failed"; - continue; - } + /* + If an error occurs, this is set to something and the + menu-game loop is restarted. It is then displayed before + the menu. + */ + std::wstring error_message = L""; - playername = wide_to_narrow(menudata.name); - address = wide_to_narrow(menudata.address); - int newport = stoi(wide_to_narrow(menudata.port)); - if(newport != 0) - port = newport; - //port = stoi(wide_to_narrow(menudata.port)); - g_settings.set("creative_mode", itos(menudata.creative_mode)); - - // Check for valid parameters, restart menu if invalid. - if(playername == "") + // This is used for catching disconnects + try { - error_message = L"Name required."; - continue; - } - - // Save settings - g_settings.set("name", playername); - g_settings.set("address", address); - g_settings.set("port", itos(port)); - // Update configuration file - if(configpath != "") - g_settings.updateConfigFile(configpath.c_str()); - - // Continue to game - break; - } - - // Break out of menu-game loop to shut down cleanly - if(g_device->run() == false) - break; - - /* - Make a scope here so that the client and the server and other - stuff gets removed when disconnected or the irrlicht device - is removed. - */ - { - - /* - Draw "Loading" screen - */ - const wchar_t *text = L"Loading and connecting..."; - core::vector2d center(screenW/2, screenH/2); - core::vector2d textsize(300, text_height); - core::rect textrect(center - textsize/2, center + textsize/2); - - gui::IGUIStaticText *gui_loadingtext = guienv->addStaticText( - text, textrect, false, false); - gui_loadingtext->setTextAlignment(gui::EGUIA_CENTER, gui::EGUIA_UPPERLEFT); - - driver->beginScene(true, true, video::SColor(255,0,0,0)); - guienv->drawAll(); - driver->endScene(); - - std::cout< server; - if(address == ""){ - server = new Server(map_dir); - server->start(port); - } - - /* - Create client - */ - Client client(device, playername.c_str(), draw_control); + /* + Clear everything from the GUIEnvironment + */ + guienv->clear(); - g_client = &client; - - Address connect_address(0,0,0,0, port); - try{ - if(address == "") - //connect_address.Resolve("localhost"); - connect_address.setAddress(127,0,0,1); - else - connect_address.Resolve(address.c_str()); - } - catch(ResolveError &e) - { - std::cout<remove(); - continue; - } - - dstream<beginScene(true, true, video::SColor(255,0,0,0)); - guienv->drawAll(); - driver->endScene(); - - // Update client and server - - client.step(0.1); - - if(server != NULL) - server->step(0.1); + /* + We need some kind of a root node to be able to add + custom gui elements directly on the screen. + Otherwise they won't be automatically drawn. + */ + guiroot = guienv->addStaticText(L"", + core::rect(0, 0, 10000, 10000)); - // Delay a bit - sleep_ms(100); - } - } - catch(con::PeerNotFoundException &e) - { - std::cout<remove(); - continue; - } - - /* - Create skybox - */ - /*scene::ISceneNode* skybox; - skybox = smgr->addSkyBoxSceneNode( - driver->getTexture(porting::getDataPath("skybox2.png").c_str()), - driver->getTexture(porting::getDataPath("skybox3.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()));*/ - - /* - Create the camera node - */ - - scene::ICameraSceneNode* camera = smgr->addCameraSceneNode( - 0, // Camera parent - v3f(BS*100, BS*2, BS*100), // Look from - v3f(BS*100+1, BS*2, BS*100), // Look to - -1 // Camera ID - ); - - if(camera == NULL) - return 1; + /* + Out-of-game menu loop. - //video::SColor skycolor = video::SColor(255,90,140,200); - //video::SColor skycolor = video::SColor(255,166,202,244); - //video::SColor skycolor = video::SColor(255,120,185,244); - video::SColor skycolor = video::SColor(255,140,186,250); + Loop quits when menu returns proper parameters. + */ + while(kill == false) + { + // Cursor can be non-visible when coming from the game + device->getCursorControl()->setVisible(true); + // Some stuff are left to scene manager when coming from the game + // (map at least?) + smgr->clear(); + // Reset or hide the debug gui texts + /*guitext->setText(L"Minetest-c55"); + guitext2->setVisible(false); + guitext_info->setVisible(false); + guitext_chat->setVisible(false);*/ + + // Initialize menu data + MainMenuData menudata; + menudata.address = narrow_to_wide(address); + menudata.name = narrow_to_wide(playername); + menudata.port = narrow_to_wide(itos(port)); + menudata.creative_mode = g_settings.getBool("creative_mode"); + + GUIMainMenu *menu = + new GUIMainMenu(guienv, guiroot, -1, + &g_menumgr, &menudata, g_gamecallback); + menu->allowFocusRemoval(true); + + if(error_message != L"") + { + dstream<<"WARNING: error_message = " + <drop(); + error_message = L""; + } - camera->setFOV(FOV_ANGLE); + video::IVideoDriver* driver = device->getVideoDriver(); + + dstream<<"Created main menu"<setFarValue(100000*BS); - - f32 camera_yaw = 0; // "right/left" - f32 camera_pitch = 0; // "up/down" + while(device->run() && kill == false) + { + if(menu->getStatus() == true) + break; - /* - Move into game - */ - - gui_loadingtext->remove(); + //driver->beginScene(true, true, video::SColor(255,0,0,0)); + driver->beginScene(true, true, video::SColor(255,128,128,128)); + guienv->drawAll(); + driver->endScene(); + } + + // Break out of menu-game loop to shut down cleanly + if(device->run() == false || kill == true) + break; + + dstream<<"Dropping main menu"<drop(); + + // Delete map if requested + if(menudata.delete_map) + { + bool r = fs::RecursiveDeleteContent(map_dir); + if(r == false) + error_message = L"Delete failed"; + continue; + } - /*GUIQuickInventory *quick_inventory = new GUIQuickInventory - (guienv, NULL, v2s32(10, 70), 5, &local_inventory);*/ - /*GUIQuickInventory *quick_inventory = new GUIQuickInventory - (guienv, NULL, v2s32(0, 0), quickinv_itemcount, &local_inventory);*/ - - // Test the text input system - /*(new GUITextInputMenu(guienv, guiroot, -1, &g_menumgr, - NULL))->drop();*/ - /*GUIMessageMenu *menu = - new GUIMessageMenu(guienv, guiroot, -1, - &g_menumgr, - L"Asd"); - menu->drop();*/ - - // Launch pause menu - (new GUIPauseMenu(guienv, guiroot, -1, &g_gamecallback, - &g_menumgr))->drop(); - - // Enable texts - guitext2->setVisible(true); - guitext_info->setVisible(true); - guitext_chat->setVisible(true); + playername = wide_to_narrow(menudata.name); + address = wide_to_narrow(menudata.address); + int newport = stoi(wide_to_narrow(menudata.port)); + if(newport != 0) + port = newport; + //port = stoi(wide_to_narrow(menudata.port)); + g_settings.set("creative_mode", itos(menudata.creative_mode)); + + // Check for valid parameters, restart menu if invalid. + if(playername == "") + { + error_message = L"Name required."; + continue; + } + + // Save settings + g_settings.set("name", playername); + g_settings.set("address", address); + g_settings.set("port", itos(port)); + // Update configuration file + if(configpath != "") + g_settings.updateConfigFile(configpath.c_str()); + + // Continue to game + break; + } + + // Break out of menu-game loop to shut down cleanly + if(device->run() == false) + break; + + /* + Run game + */ + the_game( + kill, + random_input, + input, + device, + font, + map_dir, + playername, + address, + port, + error_message + ); - //s32 guitext_chat_pad_bottom = 70; + } //try + catch(con::PeerNotFoundException &e) + { + dstream< frametime_log; - - float damage_flash_timer = 0; + delete input; /* - Main loop + In the end, delete the Irrlicht device. */ - - bool first_loop_after_window_activation = true; - - // Time is in milliseconds - // NOTE: getRealTime() causes strange problems in wine (imprecision?) - // NOTE: So we have to use getTime() and call run()s between them - u32 lasttime = device->getTimer()->getTime(); - - while(device->run() && kill == false) - { - if(g_gamecallback.disconnect_requested) - { - g_gamecallback.disconnect_requested = false; - break; - } - - /* - Process TextureSource's queue - */ - texturesource->processQueue(); - - /* - Random calculations - */ - last_screensize = screensize; - screensize = driver->getScreenSize(); - v2s32 displaycenter(screensize.X/2,screensize.Y/2); - //bool screensize_changed = screensize != last_screensize; - - // Hilight boxes collected during the loop and displayed - core::list< core::aabbox3d > hilightboxes; - - // Info text - std::wstring infotext; - - // When screen size changes, update positions and sizes of stuff - /*if(screensize_changed) - { - v2s32 pos(displaycenter.X-((quickinv_itemcount-1)*quickinv_spacing+quickinv_size)/2, screensize.Y-quickinv_spacing); - quick_inventory->updatePosition(pos); - }*/ - - //TimeTaker //timer1("//timer1"); - - // Time of frame without fps limit - float busytime; - u32 busytime_u32; - { - // not using getRealTime is necessary for wine - u32 time = device->getTimer()->getTime(); - if(time > lasttime) - busytime_u32 = time - lasttime; - else - busytime_u32 = 0; - busytime = busytime_u32 / 1000.0; - } - - //std::cout<<"busytime_u32="<drop(); - // Necessary for device->getTimer()->getTime() - device->run(); - - /* - Viewing range - */ - - updateViewingRange(busytime, &client); - - /* - FPS limiter - */ - - { - float fps_max = g_settings.getFloat("fps_max"); - u32 frametime_min = 1000./fps_max; - - if(busytime_u32 < frametime_min) - { - u32 sleeptime = frametime_min - busytime_u32; - device->sleep(sleeptime); - } - } - - // Necessary for device->getTimer()->getTime() - device->run(); - - /* - Time difference calculation - */ - f32 dtime; // in seconds - - u32 time = device->getTimer()->getTime(); - if(time > lasttime) - dtime = (time - lasttime) / 1000.0; - else - dtime = 0; - lasttime = time; - - /* - Log frametime for visualization - */ - frametime_log.push_back(dtime); - if(frametime_log.size() > 100) - { - core::list::Iterator i = frametime_log.begin(); - frametime_log.erase(i); - } - - /* - Visualize frametime in terminal - */ - /*for(u32 i=0; i jitter1_max) - jitter1_max = dtime_jitter1; - counter += dtime; - if(counter > 0.0) - { - counter -= 3.0; - dtime_jitter1_max_sample = jitter1_max; - dtime_jitter1_max_fraction - = dtime_jitter1_max_sample / (dtime_avg1+0.001); - jitter1_max = 0.0; - } - } - - /* - Busytime average and jitter calculation - */ - - static f32 busytime_avg1 = 0.0; - busytime_avg1 = busytime_avg1 * 0.98 + busytime * 0.02; - f32 busytime_jitter1 = busytime - busytime_avg1; - - static f32 busytime_jitter1_max_sample = 0.0; - static f32 busytime_jitter1_min_sample = 0.0; - { - static f32 jitter1_max = 0.0; - static f32 jitter1_min = 0.0; - static f32 counter = 0.0; - if(busytime_jitter1 > jitter1_max) - jitter1_max = busytime_jitter1; - if(busytime_jitter1 < jitter1_min) - jitter1_min = busytime_jitter1; - counter += dtime; - if(counter > 0.0){ - counter -= 3.0; - busytime_jitter1_max_sample = jitter1_max; - busytime_jitter1_min_sample = jitter1_min; - jitter1_max = 0.0; - jitter1_min = 0.0; - } - } - - /* - Debug info for client - */ - { - static float counter = 0.0; - counter -= dtime; - if(counter < 0) - { - counter = 30.0; - client.printDebugInfo(std::cout); - } - } - - /* - Input handler step() - */ - g_input->step(dtime); - - /* - Misc. stuff - */ - - /* - Player speed control - */ - - { - /*bool a_up, - bool a_down, - bool a_left, - bool a_right, - bool a_jump, - bool a_superspeed, - bool a_sneak, - float a_pitch, - float a_yaw*/ - PlayerControl control( - g_input->isKeyDown(irr::KEY_KEY_W), - g_input->isKeyDown(irr::KEY_KEY_S), - g_input->isKeyDown(irr::KEY_KEY_A), - g_input->isKeyDown(irr::KEY_KEY_D), - g_input->isKeyDown(irr::KEY_SPACE), - g_input->isKeyDown(irr::KEY_KEY_E), - g_input->isKeyDown(irr::KEY_LSHIFT) - || g_input->isKeyDown(irr::KEY_RSHIFT), - camera_pitch, - camera_yaw - ); - client.setPlayerControl(control); - } - - /* - Run server - */ - - if(server != NULL) - { - //TimeTaker timer("server->step(dtime)"); - server->step(dtime); - } - - /* - Process environment - */ - - { - //TimeTaker timer("client.step(dtime)"); - client.step(dtime); - //client.step(dtime_avg1); - } - - // Read client events - for(;;) - { - ClientEvent event = client.getClientEvent(); - if(event.type == CE_NONE) - { - break; - } - else if(event.type == CE_PLAYER_DAMAGE) - { - //u16 damage = event.player_damage.amount; - //dstream<<"Player damage: "<isWindowActive() && noMenuActive()) || random_input) - { - if(!random_input) - device->getCursorControl()->setVisible(false); - - if(first_loop_after_window_activation){ - //std::cout<<"window active, first loop"<getMousePos().X - displaycenter.X; - s32 dy = g_input->getMousePos().Y - displaycenter.Y; - //std::cout<<"window active, pos difference "< 89.5) camera_pitch = 89.5; - } - g_input->setMousePos(displaycenter.X, displaycenter.Y); - } - else{ - device->getCursorControl()->setVisible(true); - - //std::cout<<"window inactive"<setPosition(camera_position); - // *100.0 helps in large map coordinates - camera->setTarget(camera_position + camera_direction * 100.0); - - if(FIELD_OF_VIEW_TEST){ - client.updateCamera(v3f(0,0,0), v3f(0,0,1)); - } - else{ - //TimeTaker timer("client.updateCamera"); - client.updateCamera(camera_position, camera_direction); - } - - //timer2.stop(); - //TimeTaker //timer3("//timer3"); - - /* - Calculate what block is the crosshair pointing to - */ - - //u32 t1 = device->getTimer()->getRealTime(); - - //f32 d = 4; // max. distance - f32 d = 4; // max. distance - core::line3d shootline(camera_position, - camera_position + camera_direction * BS * (d+1)); - - MapBlockObject *selected_object = client.getSelectedObject - (d*BS, camera_position, shootline); - - ClientActiveObject *selected_active_object - = client.getSelectedActiveObject - (d*BS, camera_position, shootline); - - if(selected_object != NULL) - { - //dstream<<"Client returned selected_object != NULL"< box_on_map - = selected_object->getSelectionBoxOnMap(); - - hilightboxes.push_back(box_on_map); - - infotext = narrow_to_wide(selected_object->infoText()); - - if(g_input->getLeftClicked()) - { - std::cout<getBlock()->getPos(), - selected_object->getId(), g_selected_item); - } - else if(g_input->getRightClicked()) - { - std::cout<getTypeId() == MAPBLOCKOBJECT_TYPE_SIGN) - { - dstream<<"Sign object right-clicked"<getBlock()->getPos(), - selected_object->getId(), - &client); - - SignObject *sign_object = (SignObject*)selected_object; - - std::wstring wtext = - narrow_to_wide(sign_object->getText()); - - (new GUITextInputMenu(guienv, guiroot, -1, - &g_menumgr, dest, - wtext))->drop(); - } - } - /* - Otherwise pass the event to the server as-is - */ - else - { - client.clickObject(1, selected_object->getBlock()->getPos(), - selected_object->getId(), g_selected_item); - } - } - } - else if(selected_active_object != NULL) - { - //dstream<<"Client returned selected_active_object != NULL"< *selection_box - = selected_active_object->getSelectionBox(); - // Box should exist because object was returned in the - // first place - assert(selection_box); - - v3f pos = selected_active_object->getPosition(); - - core::aabbox3d box_on_map( - selection_box->MinEdge + pos, - selection_box->MaxEdge + pos - ); - - hilightboxes.push_back(box_on_map); - - //infotext = narrow_to_wide("A ClientActiveObject"); - infotext = narrow_to_wide(selected_active_object->infoText()); - - if(g_input->getLeftClicked()) - { - std::cout<getId(), g_selected_item); - } - else if(g_input->getRightClicked()) - { - std::cout< nodehilightbox; - - getPointedNode(player_position, - camera_direction, camera_position, - nodefound, shootline, - nodepos, neighbourpos, - nodehilightbox, d); - - static float nodig_delay_counter = 0.0; - - if(nodefound) - { - static v3s16 nodepos_old(-32768,-32768,-32768); - - static float dig_time = 0.0; - static u16 dig_index = 0; - - /* - Visualize selection - */ - - hilightboxes.push_back(nodehilightbox); - - /* - Check information text of node - */ - - NodeMetadata *meta = client.getNodeMetadata(nodepos); - if(meta) - { - infotext = narrow_to_wide(meta->infoText()); - } - - //MapNode node = client.getNode(nodepos); - - /* - Handle digging - */ - - if(g_input->getLeftReleased()) - { - client.clearTempMod(nodepos); - dig_time = 0.0; - } - - if(nodig_delay_counter > 0.0) - { - nodig_delay_counter -= dtime; - } - else - { - if(nodepos != nodepos_old) - { - std::cout<getLeftClicked() || - (g_input->getLeftState() && nodepos != nodepos_old)) - { - dstream<getLeftClicked()) - { - client.setTempMod(nodepos, NodeMod(NODEMOD_CRACK, 0)); - } - if(g_input->getLeftState()) - { - MapNode n = client.getNode(nodepos); - - // Get tool name. Default is "" = bare hands - std::string toolname = ""; - InventoryList *mlist = local_inventory.getList("main"); - if(mlist != NULL) - { - InventoryItem *item = mlist->getItem(g_selected_item); - if(item && (std::string)item->getName() == "ToolItem") - { - ToolItem *titem = (ToolItem*)item; - toolname = titem->getToolName(); - } - } - - // Get digging properties for material and tool - u8 material = n.d; - DiggingProperties prop = - getDiggingProperties(material, toolname); - - float dig_time_complete = 0.0; - - if(prop.diggable == false) - { - /*dstream<<"Material "<<(int)material - <<" not diggable with \"" - <= 0.001) - { - dig_index = (u16)((float)CRACK_ANIMATION_LENGTH - * dig_time/dig_time_complete); - } - // This is for torches - else - { - dig_index = CRACK_ANIMATION_LENGTH; - } - - if(dig_index < CRACK_ANIMATION_LENGTH) - { - //TimeTaker timer("client.setTempMod"); - //dstream<<"dig_index="< 0.5) - { - nodig_delay_counter = 0.5; - } - // We want a slight delay to very little - // time consuming nodes - float mindelay = 0.15; - if(nodig_delay_counter < mindelay) - { - nodig_delay_counter = mindelay; - } - } - - dig_time += dtime; - } - } - - if(g_input->getRightClicked()) - { - std::cout<typeId() == CONTENT_SIGN_WALL && !random_input) - { - dstream<<"Sign node right-clicked"<getText()); - - (new GUITextInputMenu(guienv, guiroot, -1, - &g_menumgr, dest, - wtext))->drop(); - } - else if(meta && meta->typeId() == CONTENT_CHEST && !random_input) - { - dstream<<"Chest node right-clicked"<getInventoryContext(), - g_client); - - core::array draw_spec; - - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", chest_inv_id, "0", - v2s32(0, 0), v2s32(8, 4))); - draw_spec.push_back(GUIInventoryMenu::DrawSpec( - "list", "current_player", "main", - v2s32(0, 5), v2s32(8, 4))); - - menu->setDrawSpec(draw_spec); - - menu->drop(); - - } - else if(meta && meta->typeId() == CONTENT_FURNACE && !random_input) - { - dstream<<"Furnace node right-clicked"<drop(); - - } - else - { - client.groundAction(1, nodepos, neighbourpos, g_selected_item); - } - } - - nodepos_old = nodepos; - } - else{ - } - - } // selected_object == NULL - - g_input->resetLeftClicked(); - g_input->resetRightClicked(); - - if(g_input->getLeftReleased()) - { - std::cout<getRightReleased()) - { - //std::cout<resetLeftReleased(); - g_input->resetRightReleased(); - - /* - Calculate stuff for drawing - */ - - camera->setAspectRatio((f32)screensize.X / (f32)screensize.Y); - - u32 daynight_ratio = client.getDayNightRatio(); - u8 l = decode_light((daynight_ratio * LIGHT_SUN) / 1000); - video::SColor bgcolor = video::SColor( - 255, - skycolor.getRed() * l / 255, - skycolor.getGreen() * l / 255, - skycolor.getBlue() * l / 255); - - /* - Fog - */ - - if(g_settings.getBool("enable_fog") == true) - { - //f32 range = draw_control.wanted_range * BS + MAP_BLOCKSIZE/2*BS; - f32 range = draw_control.wanted_range * BS + 0.8*MAP_BLOCKSIZE*BS; - //f32 range = draw_control.wanted_range * BS + 0.0*MAP_BLOCKSIZE*BS; - if(draw_control.range_all) - range = 100000*BS; - - driver->setFog( - bgcolor, - video::EFT_FOG_LINEAR, - range*0.4, - range*1.0, - 0.01, - false, // pixel fog - false // range fog - ); - } - else - { - driver->setFog( - bgcolor, - video::EFT_FOG_LINEAR, - 100000*BS, - 110000*BS, - 0.01, - false, // pixel fog - false // range fog - ); - } - - - /* - Update gui stuff (0ms) - */ - - //TimeTaker guiupdatetimer("Gui updating"); - - { - static float drawtime_avg = 0; - drawtime_avg = drawtime_avg * 0.95 + (float)drawtime*0.05; - static float beginscenetime_avg = 0; - beginscenetime_avg = beginscenetime_avg * 0.95 + (float)beginscenetime*0.05; - static float scenetime_avg = 0; - scenetime_avg = scenetime_avg * 0.95 + (float)scenetime*0.05; - static float endscenetime_avg = 0; - endscenetime_avg = endscenetime_avg * 0.95 + (float)endscenetime*0.05; - - char temptext[300]; - snprintf(temptext, 300, "Minetest-c55 (" - "F: item=%i" - ", R: range_all=%i" - ")" - " drawtime=%.0f, beginscenetime=%.0f" - ", scenetime=%.0f, endscenetime=%.0f", - g_selected_item, - draw_control.range_all, - drawtime_avg, - beginscenetime_avg, - scenetime_avg, - endscenetime_avg - ); - - guitext->setText(narrow_to_wide(temptext).c_str()); - } - - { - char temptext[300]; - snprintf(temptext, 300, - "(% .1f, % .1f, % .1f)" - " (% .3f < btime_jitter < % .3f" - ", dtime_jitter = % .1f %%" - ", v_range = %.1f)", - player_position.X/BS, - player_position.Y/BS, - player_position.Z/BS, - busytime_jitter1_min_sample, - busytime_jitter1_max_sample, - dtime_jitter1_max_fraction * 100.0, - draw_control.wanted_range - ); - - guitext2->setText(narrow_to_wide(temptext).c_str()); - } - - { - guitext_info->setText(infotext.c_str()); - } - - /* - Get chat messages from client - */ - { - // Get new messages - std::wstring message; - while(client.getChatMessage(message)) - { - chat_lines.push_back(ChatLine(message)); - /*if(chat_lines.size() > 6) - { - core::list::Iterator - i = chat_lines.begin(); - chat_lines.erase(i); - }*/ - } - // Append them to form the whole static text and throw - // it to the gui element - std::wstring whole; - // This will correspond to the line number counted from - // top to bottom, from size-1 to 0 - s16 line_number = chat_lines.size(); - // Count of messages to be removed from the top - u16 to_be_removed_count = 0; - for(core::list::Iterator - i = chat_lines.begin(); - i != chat_lines.end(); i++) - { - // After this, line number is valid for this loop - line_number--; - // Increment age - (*i).age += dtime; - /* - This results in a maximum age of 60*6 to the - lowermost line and a maximum of 6 lines - */ - float allowed_age = (6-line_number) * 60.0; - - if((*i).age > allowed_age) - { - to_be_removed_count++; - continue; - } - whole += (*i).text + L'\n'; - } - for(u16 i=0; i::Iterator - it = chat_lines.begin(); - chat_lines.erase(it); - } - guitext_chat->setText(whole.c_str()); - - // Update gui element size and position - - /*core::rect rect( - 10, - screensize.Y - guitext_chat_pad_bottom - - text_height*chat_lines.size(), - screensize.X - 10, - screensize.Y - guitext_chat_pad_bottom - );*/ - core::rect rect( - 10, - 50, - screensize.X - 10, - 50 + text_height*chat_lines.size() - ); - - guitext_chat->setRelativePosition(rect); - - if(chat_lines.size() == 0) - guitext_chat->setVisible(false); - else - guitext_chat->setVisible(true); - } - - /* - Inventory - */ - - static u16 old_selected_item = 65535; - if(client.getLocalInventoryUpdated() - || g_selected_item != old_selected_item) - { - old_selected_item = g_selected_item; - //std::cout<<"Updating local inventory"<beginScene(true, true, bgcolor); - //driver->beginScene(false, true, bgcolor); - beginscenetime = timer.stop(true); - } - - //timer3.stop(); - - //std::cout<drawAll()"<drawAll(); - scenetime = timer.stop(true); - } - - { - //TimeTaker timer9("auxiliary drawings"); - // 0ms - - //timer9.stop(); - //TimeTaker //timer10("//timer10"); - - video::SMaterial m; - //m.Thickness = 10; - m.Thickness = 3; - m.Lighting = false; - driver->setMaterial(m); - - driver->setTransform(video::ETS_WORLD, core::IdentityMatrix); - - for(core::list< core::aabbox3d >::Iterator i=hilightboxes.begin(); - i != hilightboxes.end(); i++) - { - /*std::cout<<"hilightbox min=" - <<"("<MinEdge.X<<","<MinEdge.Y<<","<MinEdge.Z<<")" - <<" max=" - <<"("<MaxEdge.X<<","<MaxEdge.Y<<","<MaxEdge.Z<<")" - <draw3DBox(*i, video::SColor(255,0,0,0)); - } - - /* - Frametime log - */ - if(g_settings.getBool("frametime_graph") == true) - { - s32 x = 10; - for(core::list::Iterator - i = frametime_log.begin(); - i != frametime_log.end(); - i++) - { - driver->draw2DLine(v2s32(x,50), - v2s32(x,50+(*i)*1000), - video::SColor(255,255,255,255)); - x++; - } - } -#if 0 - /* - Draw map plot - */ - if(g_show_map_plot && g_map_plot_texture) - { - core::dimension2d drawdim(640,480); - core::rect dest(v2s32(0,0), drawdim); - dest += v2s32( - (screensize.X-drawdim.Width)/2, - (screensize.Y-drawdim.Height)/2 - ); - core::rect source(v2s32(0,0), g_map_plot_texture->getSize()); - driver->draw2DImage(g_map_plot_texture, dest, source); - } -#endif - /* - Draw crosshair - */ - driver->draw2DLine(displaycenter - core::vector2d(10,0), - displaycenter + core::vector2d(10,0), - video::SColor(255,255,255,255)); - driver->draw2DLine(displaycenter - core::vector2d(0,10), - displaycenter + core::vector2d(0,10), - video::SColor(255,255,255,255)); - - } // timer - - //timer10.stop(); - //TimeTaker //timer11("//timer11"); - - /* - Draw gui - */ - // 0-1ms - guienv->drawAll(); - - /* - Draw hotbar - */ - { - draw_hotbar(driver, font, v2s32(displaycenter.X, screensize.Y), - hotbar_imagesize, hotbar_itemcount, &local_inventory, - client.getHP()); - } - - /* - Damage flash - */ - if(damage_flash_timer > 0.0) - { - damage_flash_timer -= dtime; - - video::SColor color(128,255,0,0); - driver->draw2DRectangle(color, - core::rect(0,0,screensize.X,screensize.Y), - NULL); - } - - /* - End scene - */ - { - TimeTaker timer("endScene"); - driver->endScene(); - endscenetime = timer.stop(true); - } - - drawtime = drawtimer.stop(true); - - /* - End of drawing - */ - -#if 0 - /* - Refresh map plot if player has moved considerably - */ - if(g_refresh_map_plot) - { - static v3f old_player_pos = v3f(1,1,1) * 10000000; - v3f p = client.getPlayerPosition() / BS; - if(old_player_pos.getDistanceFrom(p) > 4 * g_map_plot_texture_scale) - { - updateMapPlotTexture(v2f(p.X,p.Z), driver, &client); - old_player_pos = p; - } - g_refresh_map_plot = false; - } -#endif - - static s16 lastFPS = 0; - //u16 fps = driver->getFPS(); - u16 fps = (1.0/dtime_avg1); - - if (lastFPS != fps) - { - core::stringw str = L"Minetest ["; - str += driver->getName(); - str += "] FPS:"; - str += fps; - - device->setWindowCaption(str.c_str()); - lastFPS = fps; - } - } - - } // client and server are deleted at this point - - } //try - catch(con::PeerNotFoundException &e) - { - dstream<drop(); - - /* - Update configuration file - */ - /*if(configpath != "") - { - g_settings.updateConfigFile(configpath.c_str()); - }*/ - END_DEBUG_EXCEPTION_HANDLER debugstreams_deinit(); diff --git a/src/main.h b/src/main.h index 4248bd3e..c8ac7ccf 100644 --- a/src/main.h +++ b/src/main.h @@ -46,5 +46,98 @@ extern std::ostream *derr_server_ptr; #define dout_server (*dout_server_ptr) #define derr_server (*derr_server_ptr) +/* + All kinds of stuff that needs to be exposed from main.cpp +*/ + +#include "modalMenu.h" +#include "guiPauseMenu.h" //For IGameCallback + +extern gui::IGUIEnvironment* guienv; +extern gui::IGUIStaticText *guiroot; + +// Handler for the modal menus + +class MainMenuManager : public IMenuManager +{ +public: + virtual void createdMenu(GUIModalMenu *menu) + { + for(core::list::Iterator + i = m_stack.begin(); + i != m_stack.end(); i++) + { + assert(*i != menu); + } + + if(m_stack.size() != 0) + (*m_stack.getLast())->setVisible(false); + m_stack.push_back(menu); + } + + virtual void deletingMenu(GUIModalMenu *menu) + { + // Remove all entries if there are duplicates + bool removed_entry; + do{ + removed_entry = false; + for(core::list::Iterator + i = m_stack.begin(); + i != m_stack.end(); i++) + { + if(*i == menu) + { + m_stack.erase(i); + removed_entry = true; + break; + } + } + }while(removed_entry); + + /*core::list::Iterator i = m_stack.getLast(); + assert(*i == menu); + m_stack.erase(i);*/ + + if(m_stack.size() != 0) + (*m_stack.getLast())->setVisible(true); + } + + u32 menuCount() + { + return m_stack.size(); + } + + core::list m_stack; +}; + +extern MainMenuManager g_menumgr; + +extern bool noMenuActive(); + +class MainGameCallback : public IGameCallback +{ +public: + MainGameCallback(IrrlichtDevice *a_device): + disconnect_requested(false), + device(a_device) + { + } + + virtual void exitToOS() + { + device->closeDevice(); + } + + virtual void disconnect() + { + disconnect_requested = true; + } + + bool disconnect_requested; + IrrlichtDevice *device; +}; + +extern MainGameCallback *g_gamecallback; + #endif diff --git a/src/player.cpp b/src/player.cpp index 3d4c9826..64780de7 100644 --- a/src/player.cpp +++ b/src/player.cpp @@ -1,6 +1,6 @@ /* Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Copyright (C) 2010-2011 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -(c) 2010 Perttu Ahola -*/ - #include "player.h" #include "map.h" #include "connection.h" diff --git a/src/player.h b/src/player.h index 03fba1e2..f70b52fe 100644 --- a/src/player.h +++ b/src/player.h @@ -1,6 +1,6 @@ /* Minetest-c55 -Copyright (C) 2010 celeron55, Perttu Ahola +Copyright (C) 2010-2011 celeron55, Perttu Ahola This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -17,10 +17,6 @@ with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -/* -(c) 2010 Perttu Ahola -*/ - #ifndef PLAYER_HEADER #define PLAYER_HEADER -- 2.30.2