forked from Mirrorlandia_minetest/minetest
Fix misc. style issues
This commit is contained in:
parent
01ce57ade5
commit
37d3c3d328
@ -536,8 +536,8 @@ content_t CNodeDefManager::getId(const std::string &name) const
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CNodeDefManager::getIds(const std::string &name, std::set<content_t> &result)
|
void CNodeDefManager::getIds(const std::string &name,
|
||||||
const
|
std::set<content_t> &result) const
|
||||||
{
|
{
|
||||||
//TimeTaker t("getIds", NULL, PRECISION_MICRO);
|
//TimeTaker t("getIds", NULL, PRECISION_MICRO);
|
||||||
if (name.substr(0,6) != "group:") {
|
if (name.substr(0,6) != "group:") {
|
||||||
@ -768,6 +768,8 @@ void CNodeDefManager::updateTextures(ITextureSource *tsrc, IShaderSource *shdsrc
|
|||||||
break;
|
break;
|
||||||
case NDT_FIRELIKE:
|
case NDT_FIRELIKE:
|
||||||
f->backface_culling = false;
|
f->backface_culling = false;
|
||||||
|
f->solidness = 0;
|
||||||
|
break;
|
||||||
case NDT_TORCHLIKE:
|
case NDT_TORCHLIKE:
|
||||||
case NDT_SIGNLIKE:
|
case NDT_SIGNLIKE:
|
||||||
case NDT_FENCELIKE:
|
case NDT_FENCELIKE:
|
||||||
|
10
src/tile.h
10
src/tile.h
@ -229,7 +229,7 @@ struct TileSpec
|
|||||||
// Sets everything else except the texture in the material
|
// Sets everything else except the texture in the material
|
||||||
void applyMaterialOptions(video::SMaterial &material) const
|
void applyMaterialOptions(video::SMaterial &material) const
|
||||||
{
|
{
|
||||||
switch(material_type){
|
switch (material_type) {
|
||||||
case TILE_MATERIAL_BASIC:
|
case TILE_MATERIAL_BASIC:
|
||||||
material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
|
material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
|
||||||
break;
|
break;
|
||||||
@ -247,14 +247,16 @@ struct TileSpec
|
|||||||
break;
|
break;
|
||||||
case TILE_MATERIAL_WAVING_PLANTS:
|
case TILE_MATERIAL_WAVING_PLANTS:
|
||||||
material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
|
material.MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL_REF;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) ? true : false;
|
material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING)
|
||||||
|
? true : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void applyMaterialOptionsWithShaders(video::SMaterial &material) const
|
void applyMaterialOptionsWithShaders(video::SMaterial &material) const
|
||||||
{
|
{
|
||||||
material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING) ? true : false;
|
material.BackfaceCulling = (material_flags & MATERIAL_FLAG_BACKFACE_CULLING)
|
||||||
|
? true : false;
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 texture_id;
|
u32 texture_id;
|
||||||
|
@ -30,7 +30,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
|||||||
#include "../porting.h"
|
#include "../porting.h"
|
||||||
|
|
||||||
#ifdef __ANDROID__
|
#ifdef __ANDROID__
|
||||||
const wchar_t* wide_chars = L" !\"#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~";
|
const wchar_t* wide_chars =
|
||||||
|
L" !\"#$%&'()*+,-./0123456789:;<=>?@"
|
||||||
|
L"ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`"
|
||||||
|
L"abcdefghijklmnopqrstuvwxyz{|}~";
|
||||||
|
|
||||||
int wctomb(char *s, wchar_t wc)
|
int wctomb(char *s, wchar_t wc)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user