diff --git a/src/clouds.cpp b/src/clouds.cpp
index 1b34bf8e0566d357f6c12330d98322dd1db70acf..70d19fde5ac4c2e4645a81f23b8291b0f865d97d 100644
--- a/src/clouds.cpp
+++ b/src/clouds.cpp
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/clouds.h b/src/clouds.h
index 6972ccaba27020a2549b7ff6d6f7e8db67673552..59861371efd221c5e84a663cd1603e6619b8dff3 100644
--- a/src/clouds.h
+++ b/src/clouds.h
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
index 88e74878bde17eca886c61e5ff6a015285ab9739..785f4fec7646e48e5a02fdd6458d97963491d49b 100644
--- a/src/common_irrlicht.h
+++ b/src/common_irrlicht.h
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
@@ -20,6 +20,9 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef COMMON_IRRLICHT_HEADER
#define COMMON_IRRLICHT_HEADER
+#define endSceneX(d){d->draw2DLine(v2s32(0,0),v2s32(1,0),\
+video::SColor(255,30,30,30));d->endScene();}
+
#include <irrlicht.h>
using namespace irr;
typedef core::vector3df v3f;
diff --git a/src/environment.cpp b/src/environment.cpp
index 2b781126b5f1c9bed7ff3bd99bb97b2afd5684e6..e472916657ede944d490dfb9ae6ec8f603520e0e 100644
--- a/src/environment.cpp
+++ b/src/environment.cpp
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/environment.h b/src/environment.h
index 00192d26278d1bb8a4b23c5900a264a4b2980df9..2d3feaca8e9b32583ef17ec5b4b10116da8c068d 100644
--- a/src/environment.h
+++ b/src/environment.h
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/game.cpp b/src/game.cpp
index 771b05d87238b10c7974ac5112baa01157024955..92e690a2c8a154cd1fba278135928c0c5a2b3767 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2011 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
@@ -2044,7 +2044,7 @@ void the_game(
*/
{
TimeTaker timer("endScene");
- driver->endScene();
+ endSceneX(driver);
endscenetime = timer.stop(true);
}
@@ -2062,7 +2062,7 @@ void the_game(
{
core::stringw str = L"Minetest [";
str += driver->getName();
- str += "] FPS:";
+ str += "] FPS=";
str += fps;
device->setWindowCaption(str.c_str());
diff --git a/src/main.cpp b/src/main.cpp
index edfbc11c3f37aa935b9d3b190766ec4c55e634cc..f5be9c05a8ebd8e5573797bfb8f8ab92d138b33e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
@@ -270,6 +270,9 @@ FIXME: Server sometimes goes into some infinite PeerNotFoundException loop
* Make a small history check to transformLiquids to detect and log
continuous oscillations, in such detail that they can be fixed.
+FIXME: The new optimized map sending doesn't sometimes send enough blocks
+ from big caves and such
+
Objects:
--------
diff --git a/src/map.cpp b/src/map.cpp
index e81ddb3af76785dd164e5ebfc8ecd5cc0e46004e..ddf8d863e57374cd60f606e0e68c8b2c02ff96f0 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/map.h b/src/map.h
index 77a0063902df9d416a5e1b00cc9d11dedd880f56..fa52dc26b33ca1de90ed7e3031e9a60410d9b003 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/server.cpp b/src/server.cpp
index e899443f44a05173b545b4d86ca7c7770e04e880..d47dcb9ce1ad9cd46e17cbfda3b187c40bedd2f1 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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
diff --git a/src/server.h b/src/server.h
index e9477ba53395a8ca9728d3a55a5015849375282f..4603f98ed5eed3b242c10d27ab8f2053af4d5928 100644
--- a/src/server.h
+++ b/src/server.h
@@ -1,6 +1,6 @@
/*
Minetest-c55
-Copyright (C) 2010 celeron55, Perttu Ahola <celeron55@gmail.com>
+Copyright (C) 2010-2011 celeron55, Perttu Ahola <celeron55@gmail.com>
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