BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Add selectionbox_color, crosshair_color, and crosshair_alpha options

Browse Source
This commit is contained in:
Esteban I. Ruiz Moreno 2012-12-26 18:35:48 -03:00
parent 896e1a30b0
commit 578ece8dd0
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
minetest.conf.example
View File

@ -124,6 +124,12 @@
#console_color = (0,0,0) #console_color = (0,0,0)
# In-game chat console background alpha (opaqueness, between 0 and 255) # In-game chat console background alpha (opaqueness, between 0 and 255)
#console_alpha = 200 #console_alpha = 200
# Selection box border color (R,G,B)
#selectionbox_color = (0,0,0)
# Crosshair color (R,G,B)
#crosshair_color = (255,255,255)
# Cross alpha (opaqueness, between 0 and 255)
#crosshair_alpha = 255
# Sound settings # Sound settings
#enable_sound = true #enable_sound = true
#sound_volume = 0.7 #sound_volume = 0.7

3
src/defaultsettings.cpp
View File

@ -108,6 +108,9 @@ void set_default_settings(Settings *settings)
settings->setDefault("opaque_water", "false"); settings->setDefault("opaque_water", "false");
settings->setDefault("console_color", "(0,0,0)"); settings->setDefault("console_color", "(0,0,0)");
settings->setDefault("console_alpha", "200"); settings->setDefault("console_alpha", "200");
settings->setDefault("selectionbox_color", "(0,0,0)");
settings->setDefault("crosshair_color", "(255,255,255)");
settings->setDefault("crosshair_alpha", "255");
settings->setDefault("enable_sound", "true"); settings->setDefault("enable_sound", "true");
settings->setDefault("sound_volume", "0.8"); settings->setDefault("sound_volume", "0.8");
settings->setDefault("desynchronize_mapblock_texture_animation", "true"); settings->setDefault("desynchronize_mapblock_texture_animation", "true");

17
src/game.cpp
View File

@ -2920,6 +2920,11 @@ void the_game(
if(show_hud) if(show_hud)
{ {
v3f selectionbox_color = g_settings->getV3F("selectionbox_color");
u32 selectionbox_color_r = rangelim(myround(selectionbox_color.X), 0, 255);
u32 selectionbox_color_g = rangelim(myround(selectionbox_color.Y), 0, 255);
u32 selectionbox_color_b = rangelim(myround(selectionbox_color.Z), 0, 255);
for(std::vector<aabb3f>::const_iterator for(std::vector<aabb3f>::const_iterator
i = hilightboxes.begin(); i = hilightboxes.begin();
i != hilightboxes.end(); i++) i != hilightboxes.end(); i++)
@ -2929,7 +2934,7 @@ void the_game(
<<" max=" <<" max="
<<"("<<i->MaxEdge.X<<","<<i->MaxEdge.Y<<","<<i->MaxEdge.Z<<")" <<"("<<i->MaxEdge.X<<","<<i->MaxEdge.Y<<","<<i->MaxEdge.Z<<")"
<<std::endl;*/ <<std::endl;*/
driver->draw3DBox(*i, video::SColor(255,0,0,0)); driver->draw3DBox(*i, video::SColor(255,selectionbox_color_r,selectionbox_color_g,selectionbox_color_b));
} }
} }
@ -2962,12 +2967,18 @@ void the_game(
*/ */
if(show_hud) if(show_hud)
{ {
v3f crosshair_color = g_settings->getV3F("crosshair_color");
u32 crosshair_color_r = rangelim(myround(crosshair_color.X), 0, 255);
u32 crosshair_color_g = rangelim(myround(crosshair_color.Y), 0, 255);
u32 crosshair_color_b = rangelim(myround(crosshair_color.Z), 0, 255);
u32 crosshair_alpha = rangelim(g_settings->getS32("crosshair_alpha"), 0, 255);
driver->draw2DLine(displaycenter - core::vector2d<s32>(10,0), driver->draw2DLine(displaycenter - core::vector2d<s32>(10,0),
displaycenter + core::vector2d<s32>(10,0), displaycenter + core::vector2d<s32>(10,0),
video::SColor(255,255,255,255)); video::SColor(crosshair_alpha,crosshair_color_r,crosshair_color_g,crosshair_color_b));
driver->draw2DLine(displaycenter - core::vector2d<s32>(0,10), driver->draw2DLine(displaycenter - core::vector2d<s32>(0,10),
displaycenter + core::vector2d<s32>(0,10), displaycenter + core::vector2d<s32>(0,10),
video::SColor(255,255,255,255)); video::SColor(crosshair_alpha,crosshair_color_r,crosshair_color_g,crosshair_color_b));
} }
} // timer } // timer