From 822621f79239fadd232243a38120b4673efe60fe Mon Sep 17 00:00:00 2001
From: Perttu Ahola <celeron55@gmail.com>
Date: Sat, 25 Dec 2010 23:23:53 +0200
Subject: [PATCH] some... stuff. dunno. 8-)
---
minetest.conf.example | 2 +-
src/guiPauseMenu.cpp | 5 ++++-
src/irrlichtwrapper.cpp | 13 +++++++++----
src/map.cpp | 24 ++++++++++++++----------
4 files changed, 28 insertions(+), 16 deletions(-)
diff --git a/minetest.conf.example b/minetest.conf.example
index 5aec3ca13..48754c57f 100644
--- a/minetest.conf.example
+++ b/minetest.conf.example
@@ -12,7 +12,7 @@
#wanted_fps = 30
#fps_max = 60
#viewing_range_nodes_max = 300
-#viewing_range_nodes_min = 50
+#viewing_range_nodes_min = 35
#screenW = 800
#screenH = 600
#host_game =
diff --git a/src/guiPauseMenu.cpp b/src/guiPauseMenu.cpp
index 9ff21a437..ede42bb1e 100644
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@ -124,8 +124,11 @@ void GUIPauseMenu::regenerateGui(v2u32 screensize)
wchar_t text[200];
swprintf(text, 200,
L"Minetest-c55\n"
+ L"by Perttu Ahola\n"
+ L"celeron55@gmail.com\n\n"
L"SER_FMT_VER_HIGHEST=%i\n"
- L"max_texture_size=\n(%i,%i)\n",
+ L"max_texture_size=\n(%i,%i)\n"
+ ,
(int)SER_FMT_VER_HIGHEST,
max_texture_size.X,
max_texture_size.Y
diff --git a/src/irrlichtwrapper.cpp b/src/irrlichtwrapper.cpp
index 81cd7f9f0..8bd29b634 100644
--- a/src/irrlichtwrapper.cpp
+++ b/src/irrlichtwrapper.cpp
@@ -120,17 +120,22 @@ video::ITexture * CrackTextureMod::make(video::ITexture *original,
assert(baseimage);
video::ITexture *other = driver->getTexture("../data/crack.png");
+
+ dstream<<__FUNCTION_NAME<<": crack texture size is "
+ <<other->getSize().Width<<"x"
+ <<other->getSize().Height<<std::endl;
// We have to get the whole texture because getting a smaller area
// messes the whole thing. It is probably a bug in Irrlicht.
// NOTE: This doesn't work probably because some systems scale
// the image to fit a texture or something...
- /*video::IImage *otherimage = driver->createImage(
- other, core::position2d<s32>(0,0), other->getSize());*/
- // This should work on more systems
video::IImage *otherimage = driver->createImage(
+ other, core::position2d<s32>(0,0), other->getSize());
+ // This should work on more systems
+ // - no, it doesn't, output is more random.
+ /*video::IImage *otherimage = driver->createImage(
other, core::position2d<s32>(0,0),
- v2u32(16, CRACK_ANIMATION_LENGTH * 16));
+ v2u32(16, CRACK_ANIMATION_LENGTH * 16));*/
assert(otherimage);
diff --git a/src/map.cpp b/src/map.cpp
index 9a23863d5..59053f70c 100644
--- a/src/map.cpp
+++ b/src/map.cpp
@@ -1829,8 +1829,11 @@ MapBlock * ServerMap::emergeBlock(
MapBlock has a tunnel ended in its side
*/
- v3f orp;
- s16 ors;
+ v3f orp(
+ (float)(rand()%ued)+0.5,
+ (float)(rand()%ued)+0.5,
+ (float)(rand()%ued)+0.5
+ );
// Check z-
try
@@ -1843,7 +1846,7 @@ MapBlock * ServerMap::emergeBlock(
if(getNode(ap).d == CONTENT_AIR)
{
orp = v3f(x+1,y+1,0);
- ors = 4;
+ goto continue_generating;
}
}
}
@@ -1860,7 +1863,7 @@ MapBlock * ServerMap::emergeBlock(
if(getNode(ap).d == CONTENT_AIR)
{
orp = v3f(x+1,y+1,ued-1);
- ors = 4;
+ goto continue_generating;
}
}
}
@@ -1877,7 +1880,7 @@ MapBlock * ServerMap::emergeBlock(
if(getNode(ap).d == CONTENT_AIR)
{
orp = v3f(0,y+1,z+1);
- ors = 4;
+ goto continue_generating;
}
}
}
@@ -1894,11 +1897,13 @@ MapBlock * ServerMap::emergeBlock(
if(getNode(ap).d == CONTENT_AIR)
{
orp = v3f(ued-1,y+1,z+1);
- ors = 4;
+ goto continue_generating;
}
}
}
catch(InvalidPositionException &e){}
+
+continue_generating:
/*
Generate some tunnel starting from orp and ors
@@ -1906,9 +1911,9 @@ MapBlock * ServerMap::emergeBlock(
for(u16 i=0; i<3; i++)
{
v3f rp(
- (float)(rand()%(ued-1))+0.5,
- (float)(rand()%(ued-1))+0.5,
- (float)(rand()%(ued-1))+0.5
+ (float)(rand()%ued)+0.5,
+ (float)(rand()%ued)+0.5,
+ (float)(rand()%ued)+0.5
);
s16 min_d = 0;
s16 max_d = 4;
@@ -1943,7 +1948,6 @@ MapBlock * ServerMap::emergeBlock(
}
orp = rp;
- ors = rs;
}
}
--
GitLab