From 9c72d44fe75cc448cc0da1191a36fe6a7d879f20 Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 30 Apr 2011 02:12:32 +0300
Subject: [PATCH] random comment updates
---
src/clouds.cpp | 2 +-
src/clouds.h | 2 +-
src/common_irrlicht.h | 5 ++++-
src/environment.cpp | 2 +-
src/environment.h | 2 +-
src/game.cpp | 6 +++---
src/main.cpp | 5 ++++-
src/map.cpp | 2 +-
src/map.h | 2 +-
src/server.cpp | 2 +-
src/server.h | 2 +-
11 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/src/clouds.cpp b/src/clouds.cpp
index 1b34bf8e0..70d19fde5 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 6972ccaba..59861371e 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 88e74878b..785f4fec7 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 2b781126b..e47291665 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 00192d262..2d3feaca8 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 771b05d87..92e690a2c 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 edfbc11c3..f5be9c05a 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 e81ddb3af..ddf8d863e 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 77a006390..fa52dc26b 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 e899443f4..d47dcb9ce 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 e9477ba53..4603f98ed 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
--
GitLab