forked from oerkki/voxelands
remove some legacy nodes
This commit is contained in:
darkrose
parent
38eeea4d55
commit
9272032d06
|
|
@ -56,68 +56,6 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version)
|
|||
{
|
||||
MapNode result = n_from;
|
||||
switch (n_from.getContent()) {
|
||||
case CONTENT_LADDER_LEGACY:
|
||||
{
|
||||
switch (n_from.param2) {
|
||||
case 1:
|
||||
result.setContent(CONTENT_LADDER_WALL);
|
||||
result.param2 = 1;
|
||||
break;
|
||||
case 2:
|
||||
result.setContent(CONTENT_LADDER_WALL);
|
||||
result.param2 = 3;
|
||||
break;
|
||||
case 4:
|
||||
result.setContent(CONTENT_LADDER_ROOF);
|
||||
result.param2 = 0;
|
||||
break;
|
||||
case 8:
|
||||
result.setContent(CONTENT_LADDER_FLOOR);
|
||||
result.param2 = 0;
|
||||
break;
|
||||
case 16:
|
||||
result.setContent(CONTENT_LADDER_WALL);
|
||||
result.param2 = 0;
|
||||
break;
|
||||
case 32:
|
||||
result.setContent(CONTENT_LADDER_WALL);
|
||||
result.param2 = 2;
|
||||
break;
|
||||
default:;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case CONTENT_TORCH_LEGACY:
|
||||
{
|
||||
switch (n_from.param2) {
|
||||
case 1:
|
||||
result.setContent(CONTENT_TORCH);
|
||||
result.param2 = 1;
|
||||
break;
|
||||
case 2:
|
||||
result.setContent(CONTENT_TORCH);
|
||||
result.param2 = 3;
|
||||
break;
|
||||
case 4:
|
||||
result.setContent(CONTENT_TORCH);
|
||||
result.param2 = 4;
|
||||
break;
|
||||
case 8:
|
||||
result.setContent(CONTENT_TORCH);
|
||||
result.param2 = 5;
|
||||
break;
|
||||
case 16:
|
||||
result.setContent(CONTENT_TORCH);
|
||||
result.param2 = 0;
|
||||
break;
|
||||
case 32:
|
||||
result.setContent(CONTENT_TORCH);
|
||||
result.param2 = 2;
|
||||
break;
|
||||
default:;
|
||||
}
|
||||
}
|
||||
break;
|
||||
case CONTENT_FARM_WHEAT_1:
|
||||
result.setContent(CONTENT_FARM_WHEAT);
|
||||
result.param2 = 4;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
|
|||
#define CONTENT_STONE 0x000
|
||||
#define CONTENT_LIMESTONE 0x001
|
||||
#define CONTENT_WATER 0x002
|
||||
#define CONTENT_TORCH_LEGACY 0x003
|
||||
// FREE 0x003
|
||||
#define CONTENT_GLASSLIGHT 0x004
|
||||
#define CONTENT_CHAIR 0x005
|
||||
#define CONTENT_FORGE 0x006
|
||||
|
|
@ -76,8 +76,7 @@ MapNode mapnode_translate_to_internal(MapNode n_from, u8 version);
|
|||
#define CONTENT_STEEL_FENCE 0x01C
|
||||
#define CONTENT_STEEL_BARS 0x01D
|
||||
#define CONTENT_RAIL 0x01E
|
||||
// deprecated, just here for backwards compat
|
||||
#define CONTENT_LADDER_LEGACY 0x01F
|
||||
// FREE 0x01F
|
||||
#define CONTENT_LAVA 0x020
|
||||
#define CONTENT_LAVASOURCE 0x021
|
||||
#define CONTENT_LADDER_WALL 0x022
|
||||
|
|
|
|||
|
|
@ -496,43 +496,6 @@ void content_mapnode_special(bool repeat)
|
|||
lists::add("craftguide",i);
|
||||
lists::add("creative",i);
|
||||
|
||||
i = CONTENT_LADDER_LEGACY;
|
||||
f = &content_features(i);
|
||||
f->description = wgettext("Ladder");
|
||||
f->setAllTextures("ladder.png");
|
||||
f->light_propagates = true;
|
||||
f->param_type = CPT_LIGHT;
|
||||
f->param2_type = CPT_FACEDIR_WALLMOUNT;
|
||||
f->draw_type = CDT_NODEBOX;
|
||||
f->is_ground_content = true;
|
||||
f->dug_item = std::string("MaterialItem ")+itos(CONTENT_LADDER_WALL)+" 1";
|
||||
f->solidness = 0;
|
||||
f->floormount_alternate_node = CONTENT_LADDER_FLOOR;
|
||||
f->wallmount_alternate_node = CONTENT_LADDER_WALL;
|
||||
f->roofmount_alternate_node = CONTENT_LADDER_ROOF;
|
||||
f->rotate_tile_with_nodebox = true;
|
||||
f->climbable = true;
|
||||
f->air_equivalent = true;
|
||||
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
|
||||
f->fuel_time = 30/16;
|
||||
f->type = CMT_WOOD;
|
||||
f->hardness = 0.5;
|
||||
f->pressure_type = CST_CRUSHABLE;
|
||||
f->suffocation_per_second = 0;
|
||||
f->setNodeBox(core::aabbox3d<f32>(
|
||||
-0.4375*BS,-0.5*BS,0.3125*BS,-0.3125*BS,0.5*BS,0.5*BS
|
||||
));
|
||||
f->addNodeBox(core::aabbox3d<f32>(
|
||||
0.3125*BS,-0.5*BS,0.3125*BS,0.4375*BS,0.5*BS,0.5*BS
|
||||
));
|
||||
f->addNodeBox(core::aabbox3d<f32>(
|
||||
-0.3125*BS,-0.25*BS,0.375*BS,0.3125*BS,-0.1875*BS,0.4375*BS
|
||||
));
|
||||
f->addNodeBox(core::aabbox3d<f32>(
|
||||
-0.3125*BS,0.25*BS,0.375*BS,0.3125*BS,0.3125*BS,0.4375*BS
|
||||
));
|
||||
f->setInventoryTextureNodeBox(i,"ladder.png","ladder.png","ladder.png");
|
||||
|
||||
i = CONTENT_LADDER_WALL;
|
||||
f = &content_features(i);
|
||||
f->description = wgettext("Ladder");
|
||||
|
|
@ -1106,29 +1069,6 @@ void content_mapnode_special(bool repeat)
|
|||
#endif
|
||||
f->pressure_type = CST_CRUSHED;
|
||||
|
||||
i = CONTENT_TORCH_LEGACY;
|
||||
f = &content_features(i);
|
||||
f->description = wgettext("Torch");
|
||||
f->setAllTextures("torch.png");
|
||||
f->setInventoryTexture("torch_inventory.png");
|
||||
f->setAllTextureFlags(0);
|
||||
f->param_type = CPT_LIGHT;
|
||||
f->param2_type = CPT_FACEDIR_WALLMOUNT;
|
||||
f->draw_type = CDT_TORCHLIKE;
|
||||
f->light_propagates = true;
|
||||
f->sunlight_propagates = true;
|
||||
f->solidness = 0; // drawn separately, makes no faces
|
||||
f->walkable = false;
|
||||
f->air_equivalent = true;
|
||||
f->flammable = 1; // can be replaced by fire if the node under it is set on fire
|
||||
f->fuel_time = 0.5;
|
||||
f->dug_item = std::string("MaterialItem2 ")+itos(CONTENT_TORCH)+" 1";
|
||||
f->light_source = LIGHT_MAX-1;
|
||||
f->type = CMT_WOOD;
|
||||
f->hardness = 0.0;
|
||||
f->pressure_type = CST_CRUSHED;
|
||||
f->suffocation_per_second = 0;
|
||||
|
||||
i = CONTENT_TORCH;
|
||||
f = &content_features(i);
|
||||
f->description = wgettext("Torch");
|
||||
|
|
|
|||
Loading…
Reference in New Issue