Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
updated menu a bit, and some other small fixes
  • Loading branch information
celeron55 committed Apr 24, 2011
1 parent ba88685 commit c9967d6
Show file tree
Hide file tree
Showing 9 changed files with 71 additions and 5 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -9,7 +9,7 @@ project(minetest)

set(VERSION_MAJOR 0)
set(VERSION_MINOR 2)
set(VERSION_PATCH 20110423_0_test)
set(VERSION_PATCH 20110424_0)
set(VERSION_STRING "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")

# Configuration options
Expand Down
3 changes: 2 additions & 1 deletion doc/changelog.txt
Expand Up @@ -3,8 +3,9 @@ Minetest-c55 changelog
This should contain all the major changes.
For minor stuff, refer to the commit log of the repository.

X:
2011-04-24:
- Smooth lighting with simple ambient occlusion
- Updated main menu

2011-04-23_0_test:
- Small bug fixes
Expand Down
2 changes: 1 addition & 1 deletion src/clientobject.cpp
Expand Up @@ -683,7 +683,7 @@ void Oerkki1CAO::step(float dtime, ClientEnvironment *env)
v2f playerpos_2d(playerpos.X,playerpos.Z);
v2f objectpos_2d(m_position.X,m_position.Z);

if(fabs(objectpos_2d.Y - playerpos_2d.Y) < 2.0*BS &&
if(fabs(m_position.Y - playerpos.Y) < 3.0*BS &&
objectpos_2d.getDistanceFrom(playerpos_2d) < 1.0*BS)
{
if(m_attack_interval.step(dtime, 0.5))
Expand Down
43 changes: 42 additions & 1 deletion src/guiMainMenu.cpp
Expand Up @@ -65,7 +65,10 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
std::wstring text_port;
bool creative_mode;
bool enable_damage;

bool fancy_trees;
bool smooth_lighting;

// Client options
{
gui::IGUIElement *e = getElementFromId(258);
if(e != NULL)
Expand All @@ -87,6 +90,22 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
else
text_port = m_data->port;
}
{
gui::IGUIElement *e = getElementFromId(263);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
fancy_trees = ((gui::IGUICheckBox*)e)->isChecked();
else
fancy_trees = m_data->fancy_trees;
}
{
gui::IGUIElement *e = getElementFromId(262);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
smooth_lighting = ((gui::IGUICheckBox*)e)->isChecked();
else
smooth_lighting = m_data->smooth_lighting;
}

// Server options
{
gui::IGUIElement *e = getElementFromId(259);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
Expand Down Expand Up @@ -187,6 +206,18 @@ void GUIMainMenu::regenerateGui(v2u32 screensize)
const wchar_t *text = L"Leave address blank to start a local server.";
Environment->addStaticText(text, rect, false, true, this, -1);
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_client + v2s32(40, 150);
Environment->addCheckBox(fancy_trees, rect, this, 263,
L"Fancy trees");
}
{
core::rect<s32> rect(0, 0, 250, 30);
rect += topleft_client + v2s32(40, 150+30);
Environment->addCheckBox(smooth_lighting, rect, this, 262,
L"Smooth Lighting");
}
// Start game button
{
core::rect<s32> rect(0, 0, 180, 30);
Expand Down Expand Up @@ -285,6 +316,16 @@ void GUIMainMenu::acceptInput()
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
m_data->enable_damage = ((gui::IGUICheckBox*)e)->isChecked();
}
{
gui::IGUIElement *e = getElementFromId(262);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
m_data->smooth_lighting = ((gui::IGUICheckBox*)e)->isChecked();
}
{
gui::IGUIElement *e = getElementFromId(263);
if(e != NULL && e->getType() == gui::EGUIET_CHECK_BOX)
m_data->fancy_trees = ((gui::IGUICheckBox*)e)->isChecked();
}

m_accepted = true;
}
Expand Down
11 changes: 11 additions & 0 deletions src/guiMainMenu.h
Expand Up @@ -30,14 +30,25 @@ with this program; if not, write to the Free Software Foundation, Inc.,
struct MainMenuData
{
MainMenuData():
// Client opts
fancy_trees(false),
smooth_lighting(false),
// Server opts
creative_mode(false),
enable_damage(false),
// Actions
delete_map(false)
{}

// These are in the native format of the gui elements

// Client options
std::wstring address;
std::wstring port;
std::wstring name;
bool fancy_trees;
bool smooth_lighting;
// Server options
bool creative_mode;
bool enable_damage;
// If map deletion is requested, this is set to true
Expand Down
7 changes: 7 additions & 0 deletions src/main.cpp
Expand Up @@ -1352,6 +1352,8 @@ int main(int argc, char *argv[])
menudata.address = narrow_to_wide(address);
menudata.name = narrow_to_wide(playername);
menudata.port = narrow_to_wide(itos(port));
menudata.fancy_trees = g_settings.getBool("new_style_leaves");
menudata.smooth_lighting = g_settings.getBool("smooth_lighting");
menudata.creative_mode = g_settings.getBool("creative_mode");
menudata.enable_damage = g_settings.getBool("enable_damage");

Expand Down Expand Up @@ -1413,6 +1415,8 @@ int main(int argc, char *argv[])
int newport = stoi(wide_to_narrow(menudata.port));
if(newport != 0)
port = newport;
g_settings.set("new_style_leaves", itos(menudata.fancy_trees));
g_settings.set("smooth_lighting", itos(menudata.smooth_lighting));
g_settings.set("creative_mode", itos(menudata.creative_mode));
g_settings.set("enable_damage", itos(menudata.enable_damage));

Expand All @@ -1439,6 +1443,9 @@ int main(int argc, char *argv[])
if(device->run() == false)
break;

// Initialize mapnode again to enable changed graphics settings
init_mapnode();

/*
Run game
*/
Expand Down
3 changes: 3 additions & 0 deletions src/map.cpp
Expand Up @@ -1794,6 +1794,7 @@ ServerMap::ServerMap(std::string savedir):
Map(dout_server),
m_seed(0)
{
dstream<<__FUNCTION_NAME<<std::endl;

//m_chunksize = 64;
//m_chunksize = 16; // Too slow
Expand Down Expand Up @@ -1891,6 +1892,8 @@ ServerMap::ServerMap(std::string savedir):

ServerMap::~ServerMap()
{
dstream<<__FUNCTION_NAME<<std::endl;

try
{
if(m_map_saving_enabled)
Expand Down
3 changes: 3 additions & 0 deletions src/mapnode.cpp
Expand Up @@ -128,6 +128,9 @@ void init_mapnode()
for(u16 i=0; i<256; i++)
{
ContentFeatures *f = &g_content_features[i];
// Re-initialize
*f = ContentFeatures();

for(u16 j=0; j<6; j++)
f->tiles[j].material_type = initial_material_type;
}
Expand Down
2 changes: 1 addition & 1 deletion src/serverobject.cpp
Expand Up @@ -507,7 +507,7 @@ void Oerkki1SAO::step(float dtime, Queue<ActiveObjectMessage> &messages,
*/

m_age += dtime;
if(m_age > 60)
if(m_age > 120)
{
// Die
m_removed = true;
Expand Down

0 comments on commit c9967d6

Please sign in to comment.