wrap gettext around a lot of things

master
darkrose 2014-09-24 05:21:20 +10:00
parent 03224a157f
commit 0de926b7d4
28 changed files with 8652 additions and 612 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -22,6 +22,7 @@
#include "content_craft.h"
#include "content_list.h"
#include <map>
#include "gettext.h"
std::map<content_t,struct CraftItemFeatures> g_content_craftitem_features;
@ -69,7 +70,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_PAPER;
f->texture = "paper.png";
f->name = "paper";
f->description = "Paper";
f->description = wgettext("Paper");
crafting::setRow1Recipe(CONTENT_PAPYRUS,CONTENT_CRAFTITEM_PAPER);
lists::add("craftguide",i);
lists::add("creative",i);
@ -79,7 +80,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CHARCOAL;
f->texture = "lump_of_charcoal.png";
f->name = "lump_of_charcoal";
f->description = "Charcoal Lump";
f->description = wgettext("Charcoal Lump");
f->fuel_time = 40;
lists::add("creative",i);
@ -88,7 +89,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_COAL;
f->texture = "lump_of_coal.png";
f->name = "lump_of_coal";
f->description = "Coal Lump";
f->description = wgettext("Coal Lump");
f->fuel_time = 40;
lists::add("creative",i);
@ -97,7 +98,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_IRON;
f->texture = "lump_of_iron.png";
f->name = "lump_of_iron";
f->description = "Iron Lump";
f->description = wgettext("Iron Lump");
f->cook_result = "CraftItem steel_ingot 1";
lists::add("creative",i);
lists::add("cooking",i);
@ -107,7 +108,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CLAY;
f->texture = "lump_of_clay.png";
f->name = "lump_of_clay";
f->description = "Clay Lump";
f->description = wgettext("Clay Lump");
f->cook_result = "CraftItem clay_brick 1";
lists::add("creative",i);
lists::add("cooking",i);
@ -117,7 +118,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_TIN;
f->texture = "lump_of_tin.png";
f->name = "lump_of_tin";
f->description = "Tin Lump";
f->description = wgettext("Tin Lump");
f->cook_result = "CraftItem tin_ingot 1";
lists::add("creative",i);
lists::add("cooking",i);
@ -127,7 +128,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_COPPER;
f->texture = "lump_of_copper.png";
f->name = "lump_of_copper";
f->description = "Copper Lump";
f->description = wgettext("Copper Lump");
f->cook_result = "CraftItem copper_ingot 1";
lists::add("creative",i);
lists::add("cooking",i);
@ -137,7 +138,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_SILVER;
f->texture = "lump_of_silver.png";
f->name = "lump_of_silver";
f->description = "Silver Lump";
f->description = wgettext("Silver Lump");
f->cook_result = "CraftItem silver_ingot 1";
lists::add("creative",i);
lists::add("cooking",i);
@ -147,7 +148,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_GOLD;
f->texture = "lump_of_gold.png";
f->name = "lump_of_gold";
f->description = "Gold Lump";
f->description = wgettext("Gold Lump");
f->cook_result = "CraftItem gold_ingot 1";
lists::add("creative",i);
lists::add("cooking",i);
@ -157,7 +158,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_QUARTZ;
f->texture = "lump_of_quartz.png";
f->name = "lump_of_quartz";
f->description = "Quartz Crystal";
f->description = wgettext("Quartz Crystal");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_TIN_INGOT;
@ -165,7 +166,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_TIN_INGOT;
f->texture = "tin_ingot.png";
f->name = "tin_ingot";
f->description = "Tin Ingot";
f->description = wgettext("Tin Ingot");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_COPPER_INGOT;
@ -173,7 +174,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_COPPER_INGOT;
f->texture = "copper_ingot.png";
f->name = "copper_ingot";
f->description = "Copper Ingot";
f->description = wgettext("Copper Ingot");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_SILVER_INGOT;
@ -181,7 +182,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_SILVER_INGOT;
f->texture = "silver_ingot.png";
f->name = "silver_ingot";
f->description = "Silver Ingot";
f->description = wgettext("Silver Ingot");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_GOLD_INGOT;
@ -189,7 +190,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_GOLD_INGOT;
f->texture = "gold_ingot.png";
f->name = "gold_ingot";
f->description = "Gold Ingot";
f->description = wgettext("Gold Ingot");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_FLINT;
@ -197,7 +198,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_FLINT;
f->texture = "lump_of_flint.png";
f->name = "lump_of_flint";
f->description = "Flint";
f->description = wgettext("Flint");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_STEEL_INGOT;
@ -205,7 +206,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_STEEL_INGOT;
f->texture = "steel_ingot.png";
f->name = "steel_ingot";
f->description = "Steel Ingot";
f->description = wgettext("Steel Ingot");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_CLAY_BRICK;
@ -213,7 +214,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CLAY_BRICK;
f->texture = "clay_brick.png";
f->name = "clay_brick";
f->description = "Brick";
f->description = wgettext("Brick");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_RAT;
@ -221,7 +222,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_RAT;
f->texture = "rat.png";
f->name = "rat";
f->description = "Rat";
f->description = wgettext("Rat");
f->cook_result = "CraftItem cooked_rat 1";
f->drop_count = 1;
lists::add("creative",i);
@ -232,7 +233,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_COOKED_RAT;
f->texture = "cooked_rat.png";
f->name = "cooked_rat";
f->description = "Cooked Rat";
f->description = wgettext("Cooked Rat");
f->cook_result = "CraftItem ash 1";
f->edible = 6;
lists::add("creative",i);
@ -243,7 +244,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_FIREFLY;
f->texture = "firefly.png";
f->name = "firefly";
f->description = "Firefly";
f->description = wgettext("Firefly");
f->drop_count = 1;
lists::add("creative",i);
@ -252,7 +253,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_APPLE;
f->texture = "apple.png^[forcesingle";
f->name = "apple";
f->description = "Apple";
f->description = wgettext("Apple");
f->edible = 4;
lists::add("creative",i);
@ -261,7 +262,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_APPLE_IRON;
f->texture = "apple_iron.png";
f->name = "apple_iron";
f->description = "apple_iron";
f->description = wgettext("Iron Apple");
f->edible = 8;
{
u16 recipe[9] = {
@ -279,7 +280,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_BLUE;
f->texture = "dye_blue.png";
f->name = "dye_blue";
f->description = "Blue Dye";
f->description = wgettext("Blue Dye");
crafting::set1To2Recipe(CONTENT_FLOWER_TULIP,CONTENT_CRAFTITEM_DYE_BLUE);
lists::add("craftguide",i);
lists::add("creative",i);
@ -289,7 +290,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_GREEN;
f->texture = "dye_green.png";
f->name = "dye_green";
f->description = "Green Dye";
f->description = wgettext("Green Dye");
crafting::set2Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_CRAFTITEM_DYE_GREEN);
lists::add("craftguide",i);
lists::add("creative",i);
@ -299,7 +300,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_ORANGE;
f->texture = "dye_orange.png";
f->name = "dye_orange";
f->description = "Orange Dye";
f->description = wgettext("Orange Dye");
crafting::set2Any2Recipe(CONTENT_CRAFTITEM_DYE_RED,CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_CRAFTITEM_DYE_ORANGE);
lists::add("craftguide",i);
lists::add("creative",i);
@ -309,7 +310,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_PURPLE;
f->texture = "dye_purple.png";
f->name = "dye_purple";
f->description = "Purple Dye";
f->description = wgettext("Purple Dye");
crafting::set2Any2Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_CRAFTITEM_DYE_RED,CONTENT_CRAFTITEM_DYE_PURPLE);
lists::add("craftguide",i);
lists::add("creative",i);
@ -319,7 +320,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_RED;
f->texture = "dye_red.png";
f->name = "dye_red";
f->description = "Red Dye";
f->description = wgettext("Red Dye");
crafting::set1To2Recipe(CONTENT_FLOWER_ROSE,CONTENT_CRAFTITEM_DYE_RED);
lists::add("craftguide",i);
lists::add("creative",i);
@ -329,7 +330,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_YELLOW;
f->texture = "dye_yellow.png";
f->name = "dye_yellow";
f->description = "Yellow Dye";
f->description = wgettext("Yellow Dye");
crafting::set1To2Recipe(CONTENT_CACTUS_BLOSSOM,CONTENT_CRAFTITEM_DYE_YELLOW);
crafting::set1To2Recipe(CONTENT_FLOWER_DAFFODIL,CONTENT_CRAFTITEM_DYE_YELLOW);
lists::add("craftguide",i);
@ -340,7 +341,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_WHITE;
f->texture = "dye_white.png";
f->name = "dye_white";
f->description = "White Dye";
f->description = wgettext("White Dye");
crafting::set1To1Recipe(CONTENT_CRAFTITEM_APPLE_BLOSSOM,CONTENT_CRAFTITEM_DYE_WHITE);
crafting::set2Any3Recipe(CONTENT_CRAFTITEM_DYE_BLUE,CONTENT_CRAFTITEM_DYE_RED,CONTENT_CRAFTITEM_DYE_YELLOW,CONTENT_CRAFTITEM_DYE_WHITE);
lists::add("craftguide",i);
@ -351,7 +352,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DYE_BLACK;
f->texture = "dye_black.png";
f->name = "dye_black";
f->description = "Black Dye";
f->description = wgettext("Black Dye");
crafting::set2Any2Recipe(CONTENT_CRAFTITEM_DYE_WHITE,CONTENT_CRAFTITEM_COAL,CONTENT_CRAFTITEM_DYE_BLACK);
lists::add("craftguide",i);
lists::add("creative",i);
@ -361,7 +362,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_QUARTZ_DUST;
f->texture = "quartz_dust.png";
f->name = "quartz_dust";
f->description = "Quartz Dust";
f->description = wgettext("Quartz Dust");
crafting::set1To2Recipe(CONTENT_CRAFTITEM_QUARTZ,CONTENT_CRAFTITEM_QUARTZ_DUST);
lists::add("craftguide",i);
lists::add("creative",i);
@ -371,7 +372,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_SALTPETER;
f->texture = "saltpeter.png";
f->name = "saltpeter";
f->description = "Saltpeter";
f->description = wgettext("Saltpeter");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_GUNPOWDER;
@ -379,7 +380,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_GUNPOWDER;
f->texture = "gunpowder.png";
f->name = "gunpowder";
f->description = "Gun Powder";
f->description = wgettext("Gun Powder");
crafting::set1Any3Recipe(CONTENT_CRAFTITEM_CHARCOAL,CONTENT_CRAFTITEM_FLINT,CONTENT_CRAFTITEM_SALTPETER,CONTENT_CRAFTITEM_GUNPOWDER);
lists::add("craftguide",i);
lists::add("creative",i);
@ -389,14 +390,14 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_SNOW_BALL;
f->texture = "snow_ball.png";
f->name = "snow_ball";
f->description = "Snow Ball";
f->description = wgettext("Snow Ball");
i = CONTENT_CRAFTITEM_STICK;
f = &g_content_craftitem_features[i];
f->content = CONTENT_CRAFTITEM_STICK;
f->texture = "stick.png";
f->name = "Stick";
f->description = "Stick";
f->description = wgettext("Stick");
f->fuel_time = 30/16;
crafting::set1To2Recipe(CONTENT_CRAFTITEM_PINE_PLANK,CONTENT_CRAFTITEM_STICK);
crafting::set1To2Recipe(CONTENT_CRAFTITEM_WOOD_PLANK,CONTENT_CRAFTITEM_STICK);
@ -413,7 +414,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_PINE_PLANK;
f->texture = "pine_plank.png";
f->name = "pine_plank";
f->description = "Pine Plank";
f->description = wgettext("Pine Plank");
f->fuel_time = 30/16;
crafting::set1To4Recipe(CONTENT_WOOD_PINE,CONTENT_CRAFTITEM_PINE_PLANK);
crafting::set1To2Recipe(CONTENT_YOUNG_CONIFER_TREE,CONTENT_CRAFTITEM_PINE_PLANK);
@ -425,7 +426,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_WOOD_PLANK;
f->texture = "wood_plank.png";
f->name = "wood_plank";
f->description = "Wood Plank";
f->description = wgettext("Wood Plank");
f->fuel_time = 30/16;
crafting::set1To4Recipe(CONTENT_WOOD,CONTENT_CRAFTITEM_WOOD_PLANK);
crafting::set1To2Recipe(CONTENT_YOUNG_TREE,CONTENT_CRAFTITEM_WOOD_PLANK);
@ -438,7 +439,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_JUNGLE_PLANK;
f->texture = "jungle_plank.png";
f->name = "jungle_plank";
f->description = "Jungle Wood Plank";
f->description = wgettext("Jungle Wood Plank");
f->fuel_time = 30/16;
crafting::set1To4Recipe(CONTENT_JUNGLEWOOD,CONTENT_CRAFTITEM_JUNGLE_PLANK);
crafting::set1To2Recipe(CONTENT_YOUNG_JUNGLETREE,CONTENT_CRAFTITEM_JUNGLE_PLANK);
@ -450,7 +451,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_TNT;
f->texture = "tnt_stick.png";
f->name = "tnt_stick";
f->description = "TNT Stick";
f->description = wgettext("TNT Stick");
{
u16 recipe[9] = {
CONTENT_CRAFTITEM_PAPER, CONTENT_CRAFTITEM_GUNPOWDER, CONTENT_CRAFTITEM_PAPER,
@ -467,7 +468,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_ASH;
f->texture = "lump_of_ash.png";
f->name = "lump_of_ash";
f->description = "Ash";
f->description = wgettext("Ash");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_APPLE_BLOSSOM;
@ -475,7 +476,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_APPLE_BLOSSOM;
f->texture = "apple_blossom.png";
f->name = "apple_blossom";
f->description = "Apple Blossoms";
f->description = wgettext("Apple Blossoms");
f->edible = 1;
f->fuel_time = 30/16;
lists::add("creative",i);
@ -485,7 +486,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CACTUS_FRUIT;
f->texture = "cactus_fruit.png^[forcesingle";
f->name = "cactus_fruit";
f->description = "Cactus Berry";
f->description = wgettext("Cactus Berry");
f->edible = 3;
lists::add("creative",i);
@ -494,7 +495,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_MUSH;
f->texture = "mush.png";
f->name = "mush";
f->description = "Mush";
f->description = wgettext("Mush");
f->edible = -1;
lists::add("creative",i);
@ -503,7 +504,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_PUMPKINSLICE;
f->texture = "pumpkin_slice.png";
f->name = "pumpkin_slice";
f->description = "Sliced Pumpkin";
f->description = wgettext("Sliced Pumpkin");
f->edible = 2;
crafting::set1To2Recipe(CONTENT_FARM_PUMPKIN,CONTENT_CRAFTITEM_PUMPKINSLICE);
lists::add("craftguide",i);
@ -514,7 +515,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_PUMPKIN_PIE_SLICE;
f->texture = "pumpkin_pie_slice.png";
f->name = "pumpkin_pie_slice";
f->description = "Pumpkin Pie Slice";
f->description = wgettext("Pumpkin Pie Slice");
f->edible = 6;
lists::add("craftguide",i);
@ -523,7 +524,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_APPLE_PIE_SLICE;
f->texture = "apple_pie_slice.png";
f->name = "apple_pie_slice";
f->description = "Apple Pie Slice";
f->description = wgettext("Apple Pie Slice");
f->edible = 6;
lists::add("creative",i);
@ -532,7 +533,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_MELONSLICE;
f->texture = "melon_slice.png";
f->name = "melon_slice";
f->description = "Sliced Melon";
f->description = wgettext("Sliced Melon");
f->edible = 4;
crafting::set1To2Recipe(CONTENT_FARM_MELON,CONTENT_CRAFTITEM_MELONSLICE);
lists::add("craftguide",i);
@ -543,7 +544,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_WHEAT;
f->texture = "harvested_wheat.png";
f->name = "harvested_wheat";
f->description = "Wheat";
f->description = wgettext("Wheat");
f->edible = 1;
lists::add("creative",i);
@ -552,7 +553,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_FLOUR;
f->texture = "flour.png";
f->name = "flour";
f->description = "Flour";
f->description = wgettext("Flour");
f->edible = 1;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_WHEAT,CONTENT_CRAFTITEM_WHEAT,CONTENT_CRAFTITEM_FLOUR);
lists::add("craftguide",i);
@ -563,7 +564,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_DOUGH;
f->texture = "dough.png";
f->name = "dough";
f->description = "Dough";
f->description = wgettext("Dough");
f->cook_result = std::string("CraftItem bread 1");
f->edible = 2;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_FLOUR,CONTENT_CRAFTITEM_FLOUR,CONTENT_CRAFTITEM_DOUGH);
@ -576,7 +577,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_BREAD;
f->texture = "bread.png";
f->name = "bread";
f->description = "Bread";
f->description = wgettext("Bread");
f->edible = 5;
lists::add("creative",i);
@ -585,7 +586,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_POTATO;
f->texture = "harvested_potato.png";
f->name = "harvested_potato";
f->description = "Potato";
f->description = wgettext("Potato");
f->cook_result = std::string("CraftItem roast_potato 1");
f->edible = 3;
lists::add("creative",i);
@ -596,7 +597,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_STARCH;
f->texture = "potato_starch.png";
f->name = "potato_starch";
f->description = "Potato Starch";
f->description = wgettext("Potato Starch");
crafting::set1To2Recipe(CONTENT_CRAFTITEM_POTATO,CONTENT_CRAFTITEM_STARCH);
lists::add("craftguide",i);
lists::add("creative",i);
@ -606,7 +607,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_ROASTPOTATO;
f->texture = "roast_potato.png";
f->name = "roast_potato";
f->description = "Roast Potato";
f->description = wgettext("Roast Potato");
f->edible = 6;
lists::add("creative",i);
@ -615,7 +616,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CARROT;
f->texture = "harvested_carrot.png";
f->name = "harvested_carrot";
f->description = "Carrot";
f->description = wgettext("Carrot");
f->edible = 4;
lists::add("creative",i);
@ -624,7 +625,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CARROT_CAKE_RAW;
f->texture = "carrot_cake_raw.png";
f->name = "carrot_cake_raw";
f->description = "Raw Carrot Cake";
f->description = wgettext("Raw Carrot Cake");
f->cook_result = std::string("CraftItem carrot_cake 1");
f->edible = 3;
crafting::set1over1Recipe(CONTENT_CRAFTITEM_CARROT,CONTENT_CRAFTITEM_DOUGH,CONTENT_CRAFTITEM_CARROT_CAKE_RAW);
@ -636,7 +637,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_CARROT_CAKE;
f->texture = "carrot_cake.png";
f->name = "carrot_cake";
f->description = "Carrot Cake";
f->description = wgettext("Carrot Cake");
f->edible = 6;
lists::add("creative",i);
@ -645,7 +646,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_BEETROOT;
f->texture = "harvested_beetroot.png";
f->name = "harvested_beetroot";
f->description = "Beetroot";
f->description = wgettext("Beetroot");
f->edible = 3;
lists::add("creative",i);
@ -654,7 +655,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_GRAPE;
f->texture = "harvested_grape.png";
f->name = "harvested_grape";
f->description = "Bunch of Grapes";
f->description = wgettext("Bunch of Grapes");
f->edible = 4;
lists::add("creative",i);
@ -663,7 +664,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_STRING;
f->texture = "string.png";
f->name = "string";
f->description = "String";
f->description = wgettext("String");
lists::add("creative",i);
i = CONTENT_CRAFTITEM_MESEDUST;
@ -671,7 +672,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_MESEDUST;
f->texture = "mese_dust.png";
f->name = "mese_dust";
f->description = "Mese Dust";
f->description = wgettext("Mese Dust");
f->drop_count = 1;
crafting::set1To2Recipe(CONTENT_MESE,CONTENT_CRAFTITEM_MESEDUST);
@ -680,7 +681,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_RESIN;
f->texture = "resin.png";
f->name = "lump_of_resin";
f->description = "Resin";
f->description = wgettext("Resin");
f->drop_count = 1;
i = CONTENT_CRAFTITEM_OERKKI_DUST;
@ -688,7 +689,7 @@ void content_craftitem_init()
f->content = CONTENT_CRAFTITEM_OERKKI_DUST;
f->texture = "oerkki_dust.png";
f->name = "oerkki_dust";
f->description = "Oerkki Dust";
f->description = wgettext("Oerkki Dust");
f->drop_count = 1;
lists::add("creative",i);
}

View File

@ -11,7 +11,7 @@ struct CraftItemFeatures {
// the old 'subname'
std::string name;
// tooltip used in inventory
std::string description;
std::wstring description;
// the result of cooking this item
std::string cook_result;
// the fuel value of this item
@ -25,7 +25,7 @@ struct CraftItemFeatures {
content(CONTENT_IGNORE),
texture("unknown_item.png"),
name(""),
description(""),
description(L""),
cook_result(""),
fuel_time(0.0),
edible(0),

View File

@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef SERVER
#include "tile.h"
#endif
#include "gettext.h"
#define WATER_ALPHA 160
@ -190,7 +191,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_STONE;
f = &content_features(i);
f->description = std::string("Stone");
f->description = wgettext("Stone");
f->setAllTextures("stone.png");
f->setInventoryTextureCube("stone.png", "stone.png", "stone.png");
f->param_type = CPT_MINERAL;
@ -207,7 +208,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_ICE;
f = &content_features(i);
f->description = std::string("Ice");
f->description = wgettext("Ice");
f->setAllTextures("ice.png");
f->setInventoryTextureCube("ice.png", "ice.png", "ice.png");
f->draw_type = CDT_CUBELIKE;
@ -222,7 +223,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COAL;
f = &content_features(i);
f->description = std::string("Coal Block");
f->description = wgettext("Coal Block");
f->setAllTextures("coal.png");
f->setInventoryTextureCube("coal.png", "coal.png", "coal.png");
f->draw_type = CDT_CUBELIKE;
@ -239,7 +240,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CHARCOAL;
f = &content_features(i);
f->description = std::string("Charcoal Block");
f->description = wgettext("Charcoal Block");
f->setAllTextures("charcoal.png");
f->setInventoryTextureCube("charcoal.png", "charcoal.png", "charcoal.png");
f->draw_type = CDT_CUBELIKE;
@ -256,7 +257,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_STONEBRICK;
f = &content_features(i);
f->description = std::string("Stone Brick");
f->description = wgettext("Stone Brick");
f->setAllTextures("stonebrick.png");
f->setInventoryTextureCube("stonebrick.png", "stonebrick.png", "stonebrick.png");
f->draw_type = CDT_CUBELIKE;
@ -270,7 +271,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_STONEBLOCK;
f = &content_features(i);
f->description = std::string("Stone Block");
f->description = wgettext("Stone Block");
f->setAllTextures("stoneblock.png");
f->setInventoryTextureCube("stoneblock.png", "stoneblock.png", "stoneblock.png");
f->draw_type = CDT_CUBELIKE;
@ -284,7 +285,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_ROUGHSTONEBRICK;
f = &content_features(i);
f->description = std::string("Rough Stone Brick");
f->description = wgettext("Rough Stone Brick");
f->setAllTextures("roughstone_brick.png");
f->setInventoryTextureCube("roughstone_brick.png", "roughstone_brick.png", "roughstone_brick.png");
f->draw_type = CDT_CUBELIKE;
@ -301,7 +302,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_ROUGHSTONEBLOCK;
f = &content_features(i);
f->description = std::string("Rough Stone Block");
f->description = wgettext("Rough Stone Block");
f->setAllTextures("roughstone_block.png");
f->setInventoryTextureCube("roughstone_block.png", "roughstone_block.png", "roughstone_block.png");
f->draw_type = CDT_CUBELIKE;
@ -317,7 +318,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GRASS;
f = &content_features(i);
f->description = std::string("Grass");
f->description = wgettext("Grass");
f->setAllTextures("mud.png^grass_side.png");
f->setTexture(0, "grass.png");
f->setTexture(1, "mud.png");
@ -333,7 +334,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GRASS_FOOTSTEPS;
f = &content_features(i);
f->description = std::string("Grass");
f->description = wgettext("Grass");
f->setAllTextures("mud.png^grass_side.png");
f->setTexture(0, "grass_footsteps.png");
f->setTexture(1, "mud.png");
@ -345,7 +346,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_MUDSNOW;
f = &content_features(i);
f->description = std::string("Muddy Snow");
f->description = wgettext("Muddy Snow");
f->setAllTextures("mud.png^snow_side.png");
f->setTexture(0, "snow.png");
f->setTexture(1, "mud.png");
@ -361,7 +362,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_MUD;
f = &content_features(i);
f->description = std::string("Mud");
f->description = wgettext("Mud");
f->setAllTextures("mud.png");
f->setInventoryTextureCube("mud.png", "mud.png", "mud.png");
f->draw_type = CDT_CUBELIKE;
@ -373,7 +374,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_ASH;
f = &content_features(i);
f->description = std::string("Ash Block");
f->description = wgettext("Ash Block");
f->setAllTextures("ash.png");
f->setInventoryTextureCube("ash.png", "ash.png", "ash.png");
f->draw_type = CDT_CUBELIKE;
@ -388,7 +389,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SAND;
f = &content_features(i);
f->description = std::string("Sand");
f->description = wgettext("Sand");
f->setAllTextures("sand.png");
f->setInventoryTextureCube("sand.png", "sand.png", "sand.png");
f->draw_type = CDT_CUBELIKE;
@ -403,7 +404,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GRAVEL;
f = &content_features(i);
f->description = std::string("Gravel");
f->description = wgettext("Gravel");
f->setAllTextures("gravel.png");
f->setInventoryTextureCube("gravel.png", "gravel.png", "gravel.png");
f->draw_type = CDT_CUBELIKE;
@ -418,7 +419,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SANDSTONE;
f = &content_features(i);
f->description = std::string("Sand Stone");
f->description = wgettext("Sand Stone");
f->setAllTextures("sandstone.png");
f->setInventoryTextureCube("sandstone.png", "sandstone.png", "sandstone.png");
f->draw_type = CDT_CUBELIKE;
@ -433,7 +434,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SANDSTONE_BRICK;
f = &content_features(i);
f->description = std::string("Sand Stone Bricks");
f->description = wgettext("Sand Stone Bricks");
f->setAllTextures("sandstone_brick.png");
f->setInventoryTextureCube("sandstone_brick.png", "sandstone_brick.png", "sandstone_brick.png");
f->draw_type = CDT_CUBELIKE;
@ -448,7 +449,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SANDSTONE_BLOCK;
f = &content_features(i);
f->description = std::string("Sand Stone Blocks");
f->description = wgettext("Sand Stone Blocks");
f->setAllTextures("sandstone_block.png");
f->setInventoryTextureCube("sandstone_block.png", "sandstone_block.png", "sandstone_block.png");
f->draw_type = CDT_CUBELIKE;
@ -463,7 +464,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY;
f = &content_features(i);
f->description = std::string("Clay");
f->description = wgettext("Clay");
f->setAllTextures("clay.png");
f->setInventoryTextureCube("clay.png", "clay.png", "clay.png");
f->draw_type = CDT_CUBELIKE;
@ -480,7 +481,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_BLUE;
f = &content_features(i);
f->description = std::string("Blue Clay");
f->description = wgettext("Blue Clay");
f->setAllTextures("clay_blue.png");
f->setInventoryTextureCube("clay_blue.png", "clay_blue.png", "clay_blue.png");
f->draw_type = CDT_CUBELIKE;
@ -497,7 +498,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_GREEN;
f = &content_features(i);
f->description = std::string("Green Clay");
f->description = wgettext("Green Clay");
f->setAllTextures("clay_green.png");
f->setInventoryTextureCube("clay_green.png", "clay_green.png", "clay_green.png");
f->draw_type = CDT_CUBELIKE;
@ -514,7 +515,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Clay");
f->description = wgettext("Orange Clay");
f->setAllTextures("clay_orange.png");
f->setInventoryTextureCube("clay_orange.png", "clay_orange.png", "clay_orange.png");
f->draw_type = CDT_CUBELIKE;
@ -531,7 +532,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Clay");
f->description = wgettext("Purple Clay");
f->setAllTextures("clay_purple.png");
f->setInventoryTextureCube("clay_purple.png", "clay_purple.png", "clay_purple.png");
f->draw_type = CDT_CUBELIKE;
@ -548,7 +549,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_RED;
f = &content_features(i);
f->description = std::string("Red Clay");
f->description = wgettext("Red Clay");
f->setAllTextures("clay_red.png");
f->setInventoryTextureCube("clay_red.png", "clay_red.png", "clay_red.png");
f->draw_type = CDT_CUBELIKE;
@ -565,7 +566,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Clay");
f->description = wgettext("Yellow Clay");
f->setAllTextures("clay_yellow.png");
f->setInventoryTextureCube("clay_yellow.png", "clay_yellow.png", "clay_yellow.png");
f->draw_type = CDT_CUBELIKE;
@ -582,7 +583,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CLAY_BLACK;
f = &content_features(i);
f->description = std::string("Black Clay");
f->description = wgettext("Black Clay");
f->setAllTextures("clay_black.png");
f->setInventoryTextureCube("clay_black.png", "clay_black.png", "clay_black.png");
f->draw_type = CDT_CUBELIKE;
@ -599,7 +600,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_BRICK;
f = &content_features(i);
f->description = std::string("Brick");
f->description = wgettext("Brick");
f->setAllTextures("brick.png");
f->setInventoryTextureCube("brick.png", "brick.png", "brick.png");
f->draw_type = CDT_CUBELIKE;
@ -614,7 +615,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_TERRACOTTA;
f = &content_features(i);
f->description = std::string("Terracotta");
f->description = wgettext("Terracotta");
f->setAllTextures("terracotta.png");
f->setInventoryTextureCube("terracotta.png", "terracotta.png", "terracotta.png");
f->draw_type = CDT_CUBELIKE;
@ -626,7 +627,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_TERRACOTTA_BRICK;
f = &content_features(i);
f->description = std::string("Terracotta Brick");
f->description = wgettext("Terracotta Brick");
f->setAllTextures("terracotta_brick.png");
f->setInventoryTextureCube("terracotta_brick.png", "terracotta_brick.png", "terracotta_brick.png");
f->draw_type = CDT_CUBELIKE;
@ -640,7 +641,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_TERRACOTTA_BLOCK;
f = &content_features(i);
f->description = std::string("Terracotta Block");
f->description = wgettext("Terracotta Block");
f->setAllTextures("terracotta_block.png");
f->setInventoryTextureCube("terracotta_block.png", "terracotta_block.png", "terracotta_block.png");
f->draw_type = CDT_CUBELIKE;
@ -654,7 +655,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_TERRACOTTA_TILE;
f = &content_features(i);
f->description = std::string("Terracotta Tile");
f->description = wgettext("Terracotta Tile");
f->setAllTextures("terracotta_tile.png");
f->dug_item = std::string("MaterialItem2 ")+itos(i)+" 1";
f->type = CMT_STONE;
@ -673,7 +674,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS;
f = &content_features(i);
f->description = std::string("Glass");
f->description = wgettext("Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -693,7 +694,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_BLUE;
f = &content_features(i);
f->description = std::string("Blue Glass");
f->description = wgettext("Blue Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -715,7 +716,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_GREEN;
f = &content_features(i);
f->description = std::string("Green Glass");
f->description = wgettext("Green Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -737,7 +738,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Glass");
f->description = wgettext("Orange Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -759,7 +760,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Glass");
f->description = wgettext("Purple Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -781,7 +782,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_RED;
f = &content_features(i);
f->description = std::string("Red Glass");
f->description = wgettext("Red Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -803,7 +804,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Glass");
f->description = wgettext("Yellow Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -825,7 +826,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_BLACK;
f = &content_features(i);
f->description = std::string("Black Glass");
f->description = wgettext("Black Glass");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -847,7 +848,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE;
f = &content_features(i);
f->description = std::string("Glass Pane");
f->description = wgettext("Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -880,7 +881,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_BLUE;
f = &content_features(i);
f->description = std::string("Blue Glass Pane");
f->description = wgettext("Blue Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -914,7 +915,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_GREEN;
f = &content_features(i);
f->description = std::string("Green Glass Pane");
f->description = wgettext("Green Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -948,7 +949,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Glass Pane");
f->description = wgettext("Orange Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -982,7 +983,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Glass Pane");
f->description = wgettext("Purple Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -1016,7 +1017,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_RED;
f = &content_features(i);
f->description = std::string("Red Glass Pane");
f->description = wgettext("Red Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -1050,7 +1051,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Glass Pane");
f->description = wgettext("Yellow Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -1084,7 +1085,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASS_PANE_BLACK;
f = &content_features(i);
f->description = std::string("Black Glass Pane");
f->description = wgettext("Black Glass Pane");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->param_type = CPT_LIGHT;
f->light_propagates = true;
@ -1118,7 +1119,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GLASSLIGHT;
f = &content_features(i);
f->description = std::string("Glass Light");
f->description = wgettext("Glass Light");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -1141,7 +1142,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_WOOD;
f = &content_features(i);
f->description = std::string("Wood");
f->description = wgettext("Wood");
f->setAllTextures("wood.png");
f->setInventoryTextureCube("wood.png", "wood.png", "wood.png");
f->draw_type = CDT_CUBELIKE;
@ -1167,7 +1168,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_JUNGLEWOOD;
f = &content_features(i);
f->description = std::string("Jungle Wood");
f->description = wgettext("Jungle Wood");
f->setAllTextures("junglewood.png");
f->setInventoryTextureCube("junglewood.png", "junglewood.png", "junglewood.png");
f->draw_type = CDT_CUBELIKE;
@ -1192,7 +1193,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_WOOD_PINE;
f = &content_features(i);
f->description = std::string("Pine");
f->description = wgettext("Pine");
f->setAllTextures("pine.png");
f->setInventoryTextureCube("pine.png", "pine.png", "pine.png");
f->draw_type = CDT_CUBELIKE;
@ -1217,7 +1218,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_MESE;
f = &content_features(i);
f->description = std::string("Mese");
f->description = wgettext("Mese");
f->setAllTextures("mese.png");
f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
f->draw_type = CDT_CUBELIKE;
@ -1232,7 +1233,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_MESE_DIGGING;
f = &content_features(i);
f->description = std::string("Mese");
f->description = wgettext("Mese");
f->setAllTextures("mese.png");
f->setInventoryTextureCube("mese.png", "mese.png", "mese.png");
f->param_type = CPT_LIGHT;
@ -1245,7 +1246,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SPONGE;
f = &content_features(i);
f->description = std::string("Sponge");
f->description = wgettext("Sponge");
f->setAllTextures("sponge.png");
f->setInventoryTextureCube("sponge.png", "sponge.png", "sponge.png");
f->draw_type = CDT_CUBELIKE;
@ -1260,7 +1261,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SPONGE_FULL;
f = &content_features(i);
f->description = std::string("Waterlogged Sponge");
f->description = wgettext("Waterlogged Sponge");
f->setAllTextures("sponge_full.png");
f->setInventoryTextureCube("sponge_full.png", "sponge_full.png", "sponge_full.png");
f->draw_type = CDT_CUBELIKE;
@ -1272,7 +1273,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_HAY;
f = &content_features(i);
f->description = std::string("Hay Bale");
f->description = wgettext("Hay Bale");
f->setAllTextures("hay_bale.png");
f->setInventoryTextureCube("hay_bale.png", "hay_bale.png", "hay_bale.png");
f->draw_type = CDT_CUBELIKE;
@ -1289,7 +1290,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_APPLE_PIE_RAW;
f = &content_features(i);
f->description = std::string("Raw Apple Pie");
f->description = wgettext("Raw Apple Pie");
f->setTexture(0, "apple_pie_raw.png");
f->setTexture(1, "apple_pie_raw.png");
f->setTexture(2, "apple_pie_raw.png");
@ -1317,7 +1318,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_APPLE_PIE;
f = &content_features(i);
f->description = std::string("Apple Pie");
f->description = wgettext("Apple Pie");
f->setTexture(0, "apple_pie.png");
f->setTexture(1, "apple_pie.png");
f->setTexture(2, "apple_pie.png");
@ -1408,7 +1409,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_PUMPKIN_PIE_RAW;
f = &content_features(i);
f->description = std::string("Raw Pumpkin Pie");
f->description = wgettext("Raw Pumpkin Pie");
f->setTexture(0, "pumpkin_pie_raw.png");
f->setTexture(1, "pumpkin_pie_raw.png");
f->setTexture(2, "pumpkin_pie_raw.png");
@ -1436,7 +1437,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_PUMPKIN_PIE;
f = &content_features(i);
f->description = std::string("Pumpkin Pie");
f->description = wgettext("Pumpkin Pie");
f->setTexture(0, "pumpkin_pie.png");
f->setTexture(1, "pumpkin_pie.png");
f->setTexture(2, "pumpkin_pie.png");
@ -1527,7 +1528,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_DEAD_VINE;
f = &content_features(i);
f->description = std::string("Dead Vine");
f->description = wgettext("Dead Vine");
f->setAllTextures("dead_vine.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;
@ -1545,7 +1546,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SNOW_BLOCK;
f = &content_features(i);
f->description = std::string("Snow");
f->description = wgettext("Snow");
f->setAllTextures("snow.png");
f->setInventoryTextureCube("snow.png", "snow.png", "snow.png");
f->draw_type = CDT_CUBELIKE;
@ -1560,7 +1561,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SNOWMAN;
f = &content_features(i);
f->description = std::string("Snowman");
f->description = wgettext("Snowman");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->solidness = 0;
f->setAllTextures("snowman.png");
@ -1623,7 +1624,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SNOW;
f = &content_features(i);
f->description = std::string("Snow");
f->description = wgettext("Snow");
f->setAllTextures("snow.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1644,7 +1645,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON;
f = &content_features(i);
f->description = std::string("Cotton");
f->description = wgettext("Cotton");
f->setAllTextures("cotton.png");
f->setInventoryTextureCube("cotton.png", "cotton.png", "cotton.png");
f->draw_type = CDT_CUBELIKE;
@ -1676,7 +1677,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_BLUE;
f = &content_features(i);
f->description = std::string("Blue Cotton");
f->description = wgettext("Blue Cotton");
f->setAllTextures("cotton_blue.png");
f->setInventoryTextureCube("cotton_blue.png", "cotton_blue.png", "cotton_blue.png");
f->draw_type = CDT_CUBELIKE;
@ -1693,7 +1694,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_GREEN;
f = &content_features(i);
f->description = std::string("Green Cotton");
f->description = wgettext("Green Cotton");
f->setAllTextures("cotton_green.png");
f->setInventoryTextureCube("cotton_green.png", "cotton_green.png", "cotton_green.png");
f->draw_type = CDT_CUBELIKE;
@ -1710,7 +1711,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Cotton");
f->description = wgettext("Orange Cotton");
f->setAllTextures("cotton_orange.png");
f->setInventoryTextureCube("cotton_orange.png", "cotton_orange.png", "cotton_orange.png");
f->draw_type = CDT_CUBELIKE;
@ -1727,7 +1728,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Cotton");
f->description = wgettext("Purple Cotton");
f->setAllTextures("cotton_purple.png");
f->setInventoryTextureCube("cotton_purple.png", "cotton_purple.png", "cotton_purple.png");
f->draw_type = CDT_CUBELIKE;
@ -1744,7 +1745,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_RED;
f = &content_features(i);
f->description = std::string("Red Cotton");
f->description = wgettext("Red Cotton");
f->setAllTextures("cotton_red.png");
f->setInventoryTextureCube("cotton_red.png", "cotton_red.png", "cotton_red.png");
f->draw_type = CDT_CUBELIKE;
@ -1761,7 +1762,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Cotton");
f->description = wgettext("Yellow Cotton");
f->setAllTextures("cotton_yellow.png");
f->setInventoryTextureCube("cotton_yellow.png", "cotton_yellow.png", "cotton_yellow.png");
f->draw_type = CDT_CUBELIKE;
@ -1778,7 +1779,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COTTON_BLACK;
f = &content_features(i);
f->description = std::string("Black Cotton");
f->description = wgettext("Black Cotton");
f->setAllTextures("cotton_black.png");
f->setInventoryTextureCube("cotton_black.png", "cotton_black.png", "cotton_black.png");
f->draw_type = CDT_CUBELIKE;
@ -1795,7 +1796,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET;
f = &content_features(i);
f->description = std::string("Carpet");
f->description = wgettext("Carpet");
f->setAllTextures("cotton.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1817,7 +1818,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_BLUE;
f = &content_features(i);
f->description = std::string("Blue Carpet");
f->description = wgettext("Blue Carpet");
f->setAllTextures("cotton_blue.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1840,7 +1841,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_GREEN;
f = &content_features(i);
f->description = std::string("Green Carpet");
f->description = wgettext("Green Carpet");
f->setAllTextures("cotton_green.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1863,7 +1864,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Carpet");
f->description = wgettext("Orange Carpet");
f->setAllTextures("cotton_orange.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1886,7 +1887,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Carpet");
f->description = wgettext("Purple Carpet");
f->setAllTextures("cotton_purple.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1909,7 +1910,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_RED;
f = &content_features(i);
f->description = std::string("Red Carpet");
f->description = wgettext("Red Carpet");
f->setAllTextures("cotton_red.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1932,7 +1933,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Carpet");
f->description = wgettext("Yellow Carpet");
f->setAllTextures("cotton_yellow.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1955,7 +1956,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_CARPET_BLACK;
f = &content_features(i);
f->description = std::string("Black Carpet");
f->description = wgettext("Black Carpet");
f->setAllTextures("cotton_black.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -1978,7 +1979,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_AIR;
f = &content_features(i);
f->description = std::string("Air");
f->description = wgettext("Air");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_AIRLIKE;
f->light_propagates = true;
@ -1993,7 +1994,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_WATER;
f = &content_features(i);
f->description = std::string("Water");
f->description = wgettext("Water");
f->setAllTextures("water.png");
f->setInventoryTextureCube("water.png", "water.png", "water.png");
f->param_type = CPT_LIGHT;
@ -2021,7 +2022,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_WATERSOURCE;
f = &content_features(i);
f->description = std::string("Water");
f->description = wgettext("Water");
f->setAllTextures("water.png");
f->setInventoryTextureCube("water.png", "water.png", "water.png");
if(new_style_water)
@ -2069,7 +2070,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_LAVA;
f = &content_features(i);
f->description = std::string("Lava");
f->description = wgettext("Lava");
f->setAllTextures("lava.png");
f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
f->param_type = CPT_LIGHT;
@ -2097,7 +2098,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_LAVASOURCE;
f = &content_features(i);
f->description = std::string("Lava");
f->description = wgettext("Lava");
f->setAllTextures("lava.png");
f->setInventoryTextureCube("lava.png", "lava.png", "lava.png");
if(new_style_water)
@ -2144,7 +2145,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_ROUGHSTONE;
f = &content_features(i);
f->description = std::string("Rough Stone");
f->description = wgettext("Rough Stone");
f->setAllTextures("roughstone.png");
f->setInventoryTextureCube("roughstone.png", "roughstone.png", "roughstone.png");
f->param_type = CPT_NONE;
@ -2161,7 +2162,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_COBBLE;
f = &content_features(i);
f->description = std::string("Cobble Stone");
f->description = wgettext("Cobble Stone");
f->setAllTextures("cobble.png");
f->setInventoryTextureCube("cobble.png", "cobble.png", "cobble.png");
f->param_type = CPT_NONE;
@ -2176,7 +2177,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_MOSSYCOBBLE;
f = &content_features(i);
f->description = std::string("Mossy Cobble Stone");
f->description = wgettext("Mossy Cobble Stone");
f->setAllTextures("mossycobble.png");
f->setInventoryTextureCube("mossycobble.png", "mossycobble.png", "mossycobble.png");
f->param_type = CPT_NONE;
@ -2189,7 +2190,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_STEEL;
f = &content_features(i);
f->description = std::string("Steel Block");
f->description = wgettext("Steel Block");
f->setAllTextures("steel_block.png");
f->setInventoryTextureCube("steel_block.png", "steel_block.png", "steel_block.png");
f->param_type = CPT_NONE;
@ -2203,16 +2204,16 @@ void content_mapnode_init(bool repeat)
lists::add("craftguide",i);
lists::add("creative",i);
content_nodedef_knob(CONTENT_STONE_KNOB, CONTENT_STONE, CMT_STONE, "stone.png", "Stone Knob");
content_nodedef_knob(CONTENT_ROUGHSTONE_KNOB, CONTENT_ROUGHSTONE, CMT_STONE, "roughstone.png", "Rough Stone Knob");
content_nodedef_knob(CONTENT_SANDSTONE_KNOB, CONTENT_SANDSTONE, CMT_STONE, "sandstone.png", "Sandstone Knob");
content_nodedef_knob(CONTENT_WOOD_KNOB, CONTENT_CRAFTITEM_WOOD_PLANK, CMT_WOOD, "wood.png", "Wooden Knob");
content_nodedef_knob(CONTENT_JUNGLEWOOD_KNOB, CONTENT_CRAFTITEM_JUNGLE_PLANK, CMT_WOOD, "junglewood.png", "Junglewood Knob");
content_nodedef_knob(CONTENT_PINE_KNOB, CONTENT_CRAFTITEM_PINE_PLANK, CMT_WOOD, "pine.png", "Pine Knob");
content_nodedef_knob(CONTENT_STONE_KNOB, CONTENT_STONE, CMT_STONE, "stone.png", wgettext("Stone Knob"));
content_nodedef_knob(CONTENT_ROUGHSTONE_KNOB, CONTENT_ROUGHSTONE, CMT_STONE, "roughstone.png", wgettext("Rough Stone Knob"));
content_nodedef_knob(CONTENT_SANDSTONE_KNOB, CONTENT_SANDSTONE, CMT_STONE, "sandstone.png", wgettext("Sandstone Knob"));
content_nodedef_knob(CONTENT_WOOD_KNOB, CONTENT_CRAFTITEM_WOOD_PLANK, CMT_WOOD, "wood.png", wgettext("Wooden Knob"));
content_nodedef_knob(CONTENT_JUNGLEWOOD_KNOB, CONTENT_CRAFTITEM_JUNGLE_PLANK, CMT_WOOD, "junglewood.png", wgettext("Junglewood Knob"));
content_nodedef_knob(CONTENT_PINE_KNOB, CONTENT_CRAFTITEM_PINE_PLANK, CMT_WOOD, "pine.png", wgettext("Pine Knob"));
i = CONTENT_COPPER;
f = &content_features(i);
f->description = std::string("Copper Block");
f->description = wgettext("Copper Block");
f->setAllTextures("copper_block.png");
f->setInventoryTextureCube("copper_block.png", "copper_block.png", "copper_block.png");
f->param_type = CPT_NONE;
@ -2228,7 +2229,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_GOLD;
f = &content_features(i);
f->description = std::string("Gold Block");
f->description = wgettext("Gold Block");
f->setAllTextures("gold_block.png");
f->setInventoryTextureCube("gold_block.png", "gold_block.png", "gold_block.png");
f->param_type = CPT_NONE;
@ -2244,7 +2245,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_SILVER;
f = &content_features(i);
f->description = std::string("Silver Block");
f->description = wgettext("Silver Block");
f->setAllTextures("silver_block.png");
f->setInventoryTextureCube("silver_block.png", "silver_block.png", "silver_block.png");
f->param_type = CPT_NONE;
@ -2260,7 +2261,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_TIN;
f = &content_features(i);
f->description = std::string("Tin Block");
f->description = wgettext("Tin Block");
f->setAllTextures("tin_block.png");
f->setInventoryTextureCube("tin_block.png", "tin_block.png", "tin_block.png");
f->param_type = CPT_NONE;
@ -2276,7 +2277,7 @@ void content_mapnode_init(bool repeat)
i = CONTENT_QUARTZ;
f = &content_features(i);
f->description = std::string("Quartz Block");
f->description = wgettext("Quartz Block");
f->setAllTextures("quartz_block.png");
f->setInventoryTextureCube("quartz_block.png", "quartz_block.png", "quartz_block.png");
f->param_type = CPT_NONE;

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_circuit(bool repeat)
{
@ -32,7 +33,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_MESEWIRE;
f = &content_features(i);
f->description = std::string("Mese Wire");
f->description = wgettext("Mese Wire");
f->setAllTextures("mese_wire.png");
f->setAllTextureFlags(0);
f->param_type = CPT_LIGHT;
@ -55,7 +56,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_COPPERWIRE;
f = &content_features(i);
f->description = std::string("Copper Wire");
f->description = wgettext("Copper Wire");
f->setAllTextures("copper_wire.png");
f->setAllTextureFlags(0);
f->param_type = CPT_LIGHT;
@ -86,7 +87,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_REACTOR;
f = &content_features(i);
f->description = std::string("Reactor");
f->description = wgettext("Reactor");
f->setAllTextures("circuit_reactor.png");
f->setTexture(0,"circuit_reactor_top.png");
f->setTexture(1,"circuit_reactor_bottom.png");
@ -108,7 +109,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_SOLARPANEL;
f = &content_features(i);
f->description = std::string("Solar Panel");
f->description = wgettext("Solar Panel");
f->setAllTextures("wood.png");
f->setTexture(0,"circuit_solarpanel_top.png");
f->param_type = CPT_LIGHT;
@ -138,7 +139,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_WATERWHEEL;
f = &content_features(i);
f->description = std::string("Water Wheel");
f->description = wgettext("Water Wheel");
f->setAllTextures("circuit_waterwheel.png");
f->setTexture(2,"circuit_waterwheel_side.png");
f->setTexture(3,"circuit_waterwheel_side.png^[transformFX");
@ -171,7 +172,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_SWITCH;
f = &content_features(i);
f->description = std::string("Switch");
f->description = wgettext("Switch");
f->setAllTextures("stone.png");
f->setTexture(5,"circuit_switch_front.png");
f->setAllMetaTextures("stone.png");
@ -205,7 +206,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_BUTTON;
f = &content_features(i);
f->description = std::string("Button");
f->description = wgettext("Button");
f->setAllTextures("stone.png");
f->param_type = CPT_LIGHT;
f->param2_type = CPT_FACEDIR_WALLMOUNT;
@ -235,7 +236,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PRESSUREPLATE_STONE;
f = &content_features(i);
f->description = std::string("Stone Pressure Plate");
f->description = wgettext("Stone Pressure Plate");
f->setAllTextures("stone.png");
f->setTexture(0,"pressureplate_stone_top.png");
f->draw_type = CDT_NODEBOX;
@ -263,7 +264,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PRESSUREPLATE_WOOD;
f = &content_features(i);
f->description = std::string("Wood Pressure Plate");
f->description = wgettext("Wood Pressure Plate");
f->setAllTextures("stone.png");
f->setTexture(0,"pressureplate_wood_top.png");
f->draw_type = CDT_NODEBOX;
@ -291,7 +292,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_NOTGATE;
f = &content_features(i);
f->description = std::string("Not Gate");
f->description = wgettext("Not Gate");
f->setAllTextures("circuit_gate.png");
f->setTexture(0,"circuit_gate_top.png");
f->rotate_tile_with_nodebox = true;
@ -321,7 +322,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_REPEATER;
f = &content_features(i);
f->description = std::string("Repeater");
f->description = wgettext("Repeater");
f->setAllTextures("circuit_repeater.png");
f->setTexture(0,"circuit_repeater_top.png");
f->rotate_tile_with_nodebox = true;
@ -351,7 +352,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_LAMP;
f = &content_features(i);
f->description = std::string("Electric Lamp");
f->description = wgettext("Electric Lamp");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -375,7 +376,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_LAMP_OFF;
f = &content_features(i);
f->description = std::string("Electric Lamp");
f->description = wgettext("Electric Lamp");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -409,7 +410,7 @@ void content_mapnode_circuit(bool repeat)
// regular piston
i = CONTENT_CIRCUIT_PISTON_OFF;
f = &content_features(i);
f->description = std::string("Piston");
f->description = wgettext("Piston");
f->is_ground_content = true;
f->visual_solidness = 1;
f->param_type = CPT_FACEDIR_SIMPLE;
@ -444,7 +445,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PISTON;
f = &content_features(i);
f->description = std::string("Piston");
f->description = wgettext("Piston");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -470,7 +471,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PISTON_ARM;
f = &content_features(i);
f->description = std::string("Piston Arm");
f->description = wgettext("Piston Arm");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -495,7 +496,7 @@ void content_mapnode_circuit(bool repeat)
// push up
i = CONTENT_CIRCUIT_PISTON_UP_OFF;
f = &content_features(i);
f->description = std::string("Piston");
f->description = wgettext("Piston");
f->is_ground_content = true;
f->visual_solidness = 1;
f->draw_type = CDT_CUBELIKE;
@ -516,7 +517,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PISTON_UP;
f = &content_features(i);
f->description = std::string("Piston");
f->description = wgettext("Piston");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -538,7 +539,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PISTON_UP_ARM;
f = &content_features(i);
f->description = std::string("Piston Arm");
f->description = wgettext("Piston Arm");
f->is_ground_content = true;
f->air_equivalent = true;
f->solidness = 0; // drawn separately, makes no faces
@ -558,7 +559,7 @@ void content_mapnode_circuit(bool repeat)
// push down
i = CONTENT_CIRCUIT_PISTON_DOWN_OFF;
f = &content_features(i);
f->description = std::string("Piston");
f->description = wgettext("Piston");
f->is_ground_content = true;
f->visual_solidness = 1;
f->draw_type = CDT_CUBELIKE;
@ -579,7 +580,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PISTON_DOWN;
f = &content_features(i);
f->description = std::string("Piston");
f->description = wgettext("Piston");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -601,7 +602,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_PISTON_DOWN_ARM;
f = &content_features(i);
f->description = std::string("Piston Arm");
f->description = wgettext("Piston Arm");
f->is_ground_content = true;
f->air_equivalent = true;
f->solidness = 0; // drawn separately, makes no faces
@ -621,7 +622,7 @@ void content_mapnode_circuit(bool repeat)
// sticky piston
i = CONTENT_CIRCUIT_STICKYPISTON_OFF;
f = &content_features(i);
f->description = std::string("Sticky Piston");
f->description = wgettext("Sticky Piston");
f->is_ground_content = true;
f->visual_solidness = 1;
f->param_type = CPT_FACEDIR_SIMPLE;
@ -649,7 +650,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_STICKYPISTON;
f = &content_features(i);
f->description = std::string("Sticky Piston");
f->description = wgettext("Sticky Piston");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -675,7 +676,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_STICKYPISTON_ARM;
f = &content_features(i);
f->description = std::string("Sticky Piston Arm");
f->description = wgettext("Sticky Piston Arm");
f->is_ground_content = true;
f->air_equivalent = true;
f->solidness = 0; // drawn separately, makes no faces
@ -700,7 +701,7 @@ void content_mapnode_circuit(bool repeat)
// push up
i = CONTENT_CIRCUIT_STICKYPISTON_UP_OFF;
f = &content_features(i);
f->description = std::string("Sticky Piston");
f->description = wgettext("Sticky Piston");
f->is_ground_content = true;
f->visual_solidness = 1;
f->draw_type = CDT_CUBELIKE;
@ -721,7 +722,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_STICKYPISTON_UP;
f = &content_features(i);
f->description = std::string("Sticky Piston");
f->description = wgettext("Sticky Piston");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -743,7 +744,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_STICKYPISTON_UP_ARM;
f = &content_features(i);
f->description = std::string("Sticky Piston Arm");
f->description = wgettext("Sticky Piston Arm");
f->is_ground_content = true;
f->air_equivalent = true;
f->solidness = 0; // drawn separately, makes no faces
@ -763,7 +764,7 @@ void content_mapnode_circuit(bool repeat)
// push down
i = CONTENT_CIRCUIT_STICKYPISTON_DOWN_OFF;
f = &content_features(i);
f->description = std::string("Sticky Piston");
f->description = wgettext("Sticky Piston");
f->is_ground_content = true;
f->visual_solidness = 1;
f->draw_type = CDT_CUBELIKE;
@ -784,7 +785,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_STICKYPISTON_DOWN;
f = &content_features(i);
f->description = std::string("Sticky Piston");
f->description = wgettext("Sticky Piston");
f->is_ground_content = true;
f->solidness = 0; // drawn separately, makes no faces
f->visual_solidness = 1;
@ -806,7 +807,7 @@ void content_mapnode_circuit(bool repeat)
i = CONTENT_CIRCUIT_STICKYPISTON_DOWN_ARM;
f = &content_features(i);
f->description = std::string("Sticky Piston Arm");
f->description = wgettext("Sticky Piston Arm");
f->is_ground_content = true;
f->air_equivalent = true;
f->solidness = 0; // drawn separately, makes no faces

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_door(bool repeat)
{
@ -34,7 +35,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_LB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Door");
f->description = wgettext("Wood Door");
f->setAllTextures("door_wood_b.png");
f->setTexture(2,"door_wood_b.png^[transformFX");
f->setTexture(3,"door_wood_b.png^[transformFX");
@ -57,7 +58,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_LT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Door");
f->description = wgettext("Wood Door");
f->setAllTextures("door_wood_t.png");
f->setTexture(2,"door_wood_t.png^[transformFX");
f->setTexture(3,"door_wood_t.png^[transformFX");
@ -85,7 +86,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_LB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Door");
f->description = wgettext("Steel Door");
f->setAllTextures("door_steel_b.png");
f->setTexture(2,"door_steel_b.png^[transformFX");
f->setTexture(3,"door_steel_b.png^[transformFX");
@ -109,7 +110,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_LT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Door");
f->description = wgettext("Steel Door");
f->setAllTextures("door_steel_t.png");
f->setTexture(2,"door_steel_t.png^[transformFX");
f->setTexture(3,"door_steel_t.png^[transformFX");
@ -138,7 +139,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_LB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Glass Door");
f->description = wgettext("Glass Door");
f->setAllTextures("door_glass_b.png");
f->setTexture(2,"door_glass_b.png^[transformFX");
f->setTexture(3,"door_glass_b.png^[transformFX");
@ -161,7 +162,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_LT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Glass Door");
f->description = wgettext("Glass Door");
f->setAllTextures("door_glass_t.png");
f->setTexture(2,"door_glass_t.png^[transformFX");
f->setTexture(3,"door_glass_t.png^[transformFX");
@ -189,7 +190,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_LB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Windowed Door");
f->description = wgettext("Wood Windowed Door");
f->setAllTextures("door_wood_wb.png");
f->setTexture(2,"door_wood_wb.png^[transformFX");
f->setTexture(3,"door_wood_wb.png^[transformFX");
@ -213,7 +214,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_LT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Windowed Door");
f->description = wgettext("Wood Windowed Door");
f->setAllTextures("door_wood_wt.png");
f->setTexture(2,"door_wood_wt.png^[transformFX");
f->setTexture(3,"door_wood_wt.png^[transformFX");
@ -243,7 +244,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_LB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Windowed Door");
f->description = wgettext("Steel Windowed Door");
f->setAllTextures("door_steel_wb.png");
f->setTexture(2,"door_steel_wb.png^[transformFX");
f->setTexture(3,"door_steel_wb.png^[transformFX");
@ -268,7 +269,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_LT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Windowed Door");
f->description = wgettext("Steel Windowed Door");
f->setAllTextures("door_steel_wt.png");
f->setTexture(2,"door_steel_wt.png^[transformFX");
f->setTexture(3,"door_steel_wt.png^[transformFX");
@ -300,7 +301,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_RB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Door");
f->description = wgettext("Right Hanging Wood Door");
f->setAllTextures("door_wood_b.png^[transformFX");
f->setTexture(2,"door_wood_b.png");
f->setTexture(3,"door_wood_b.png");
@ -323,7 +324,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_RT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Door");
f->description = wgettext("Right Hanging Wood Door");
f->setAllTextures("door_wood_t.png^[transformFX");
f->setTexture(2,"door_wood_t.png");
f->setTexture(3,"door_wood_t.png");
@ -350,7 +351,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_RB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Glass Door");
f->description = wgettext("Right Hanging Glass Door");
f->setAllTextures("door_glass_b.png^[transformFX");
f->setTexture(2,"door_glass_b.png");
f->setTexture(3,"door_glass_b.png");
@ -374,7 +375,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_RT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Glass Door");
f->description = wgettext("Right Hanging Glass Door");
f->setAllTextures("door_glass_t.png^[transformFX");
f->setTexture(2,"door_glass_t.png");
f->setTexture(3,"door_glass_t.png");
@ -402,7 +403,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_RB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Door");
f->description = wgettext("Right Hanging Steel Door");
f->setAllTextures("door_steel_b.png^[transformFX");
f->setTexture(2,"door_steel_b.png");
f->setTexture(3,"door_steel_b.png");
@ -426,7 +427,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_RT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Door");
f->description = wgettext("Right Hanging Steel Door");
f->setAllTextures("door_steel_t.png^[transformFX");
f->setTexture(2,"door_steel_t.png");
f->setTexture(3,"door_steel_t.png");
@ -454,7 +455,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_RB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Windowed Door");
f->description = wgettext("Right Hanging Wood Windowed Door");
f->setAllTextures("door_wood_wb.png^[transformFX");
f->setTexture(2,"door_wood_wb.png");
f->setTexture(3,"door_wood_wb.png");
@ -478,7 +479,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_RT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Windowed Door");
f->description = wgettext("Right Hanging Wood Windowed Door");
f->setAllTextures("door_wood_wt.png^[transformFX");
f->setTexture(2,"door_wood_wt.png");
f->setTexture(3,"door_wood_wt.png");
@ -507,7 +508,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_RB;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Windowed Door");
f->description = wgettext("Right Hanging Steel Windowed Door");
f->setAllTextures("door_steel_wb.png^[transformFX");
f->setTexture(2,"door_steel_wb.png");
f->setTexture(3,"door_steel_wb.png");
@ -532,7 +533,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_RT;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Windowed Door");
f->description = wgettext("Right Hanging Steel Windowed Door");
f->setAllTextures("door_steel_wt.png^[transformFX");
f->setTexture(2,"door_steel_wt.png");
f->setTexture(3,"door_steel_wt.png");
@ -563,7 +564,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_LB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Door");
f->description = wgettext("Wood Door");
f->setAllTextures("door_wood_b.png");
f->setTexture(3,"door_wood_b.png^[transformFX");
f->setInventoryTexture("door_wood_inv.png");
@ -585,7 +586,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_LT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Door");
f->description = wgettext("Wood Door");
f->setAllTextures("door_wood_t.png");
f->setTexture(3,"door_wood_t.png^[transformFX");
f->setInventoryTexture("door_wood_inv.png");
@ -608,7 +609,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_LB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Glass Door");
f->description = wgettext("Glass Door");
f->setAllTextures("door_glass_b.png");
f->setTexture(3,"door_glass_b.png^[transformFX");
f->setInventoryTexture("door_glass_inv.png");
@ -630,7 +631,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_LT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Glass Door");
f->description = wgettext("Glass Door");
f->setAllTextures("door_glass_t.png");
f->setTexture(3,"door_glass_t.png^[transformFX");
f->setInventoryTexture("door_glass_inv.png");
@ -653,7 +654,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_LB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Door");
f->description = wgettext("Steel Door");
f->setAllTextures("door_steel_b.png");
f->setTexture(3,"door_steel_b.png^[transformFX");
f->setInventoryTexture("door_steel_inv.png");
@ -676,7 +677,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_LT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Door");
f->description = wgettext("Steel Door");
f->setAllTextures("door_steel_t.png");
f->setTexture(3,"door_steel_t.png^[transformFX");
f->setInventoryTexture("door_steel_inv.png");
@ -700,7 +701,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_LB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Windowed Door");
f->description = wgettext("Wood Windowed Door");
f->setAllTextures("door_wood_wb.png");
f->setTexture(3,"door_wood_wb.png^[transformFX");
f->setInventoryTexture("door_wood_w_inv.png");
@ -722,7 +723,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_LT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Windowed Door");
f->description = wgettext("Wood Windowed Door");
f->setAllTextures("door_wood_wt.png");
f->setTexture(3,"door_wood_wt.png^[transformFX");
f->setInventoryTexture("door_wood_w_inv.png");
@ -745,7 +746,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_LB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Windowed Door");
f->description = wgettext("Steel Windowed Door");
f->setAllTextures("door_steel_wb.png");
f->setTexture(3,"door_steel_wb.png^[transformFX");
f->setInventoryTexture("door_steel_w_inv.png");
@ -768,7 +769,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_LT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Windowed Door");
f->description = wgettext("Steel Windowed Door");
f->setAllTextures("door_steel_wt.png");
f->setTexture(3,"door_steel_wt.png^[transformFX");
f->setInventoryTexture("door_steel_w_inv.png");
@ -793,7 +794,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_RB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Door");
f->description = wgettext("Right Hanging Wood Door");
f->setAllTextures("door_wood_b.png");
f->setTexture(3,"door_wood_b.png^[transformFX");
f->setTexture(4,"door_wood_b.png^[transformFX");
@ -817,7 +818,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_DOOR_RT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Door");
f->description = wgettext("Right Hanging Wood Door");
f->setAllTextures("door_wood_t.png");
f->setTexture(3,"door_wood_t.png^[transformFX");
f->setTexture(4,"door_wood_t.png^[transformFX");
@ -842,7 +843,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_RB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Glass Door");
f->description = wgettext("Right Hanging Glass Door");
f->setAllTextures("door_glass_b.png");
f->setTexture(2,"door_glass_b.png^[transformFX");
f->setTexture(3,"door_glass_b.png^[transformFX");
@ -866,7 +867,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_GLASS_DOOR_RT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Glass Door");
f->description = wgettext("Right Hanging Glass Door");
f->setAllTextures("door_glass_t.png");
f->setTexture(2,"door_glass_t.png^[transformFX");
f->setTexture(3,"door_glass_t.png^[transformFX");
@ -891,7 +892,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_RB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Door");
f->description = wgettext("Right Hanging Steel Door");
f->setAllTextures("door_steel_b.png");
f->setTexture(3,"door_steel_b.png^[transformFX");
f->setTexture(4,"door_steel_b.png^[transformFX");
@ -916,7 +917,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_DOOR_RT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Door");
f->description = wgettext("Right Hanging Steel Door");
f->setAllTextures("door_steel_b.png");
f->setTexture(3,"door_steel_t.png^[transformFX");
f->setTexture(4,"door_steel_t.png^[transformFX");
@ -942,7 +943,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_RB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Windowed Door");
f->description = wgettext("Right Hanging Wood Windowed Door");
f->setAllTextures("door_wood_wb.png");
f->setTexture(3,"door_wood_wb.png^[transformFX");
f->setTexture(4,"door_wood_wb.png^[transformFX");
@ -966,7 +967,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_DOOR_RT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Wood Windowed Door");
f->description = wgettext("Right Hanging Wood Windowed Door");
f->setAllTextures("door_wood_wt.png");
f->setTexture(3,"door_wood_wt.png^[transformFX");
f->setTexture(4,"door_wood_wt.png^[transformFX");
@ -991,7 +992,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_RB_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Windowed Door");
f->description = wgettext("Right Hanging Steel Windowed Door");
f->setAllTextures("door_steel_wb.png");
f->setTexture(3,"door_steel_wb.png^[transformFX");
f->setTexture(4,"door_steel_wb.png^[transformFX");
@ -1016,7 +1017,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_DOOR_RT_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Right Hanging Steel Windowed Door");
f->description = wgettext("Right Hanging Steel Windowed Door");
f->setAllTextures("door_steel_wt.png");
f->setTexture(3,"door_steel_wt.png^[transformFX");
f->setTexture(4,"door_steel_wt.png^[transformFX");
@ -1043,7 +1044,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_HATCH;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Hatch");
f->description = wgettext("Wood Hatch");
f->setAllTextures("hatch_wood.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("hatch_wood_inv.png");
@ -1067,7 +1068,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_HATCH;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Hatch");
f->description = wgettext("Steel Hatch");
f->setAllTextures("hatch_steel.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("hatch_steel_inv.png");
@ -1091,7 +1092,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_HATCH;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Windowed Hatch");
f->description = wgettext("Wood Windowed Hatch");
f->setAllTextures("hatch_wood_w.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("hatch_wood_w_inv.png");
@ -1117,7 +1118,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_HATCH;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Windowed Hatch");
f->description = wgettext("Steel Windowed Hatch");
f->setAllTextures("hatch_steel_w.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("hatch_steel_w_inv.png");
@ -1145,7 +1146,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_GATE;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Gate");
f->description = wgettext("Wood Gate");
f->setAllTextures("gate_wood.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("gate_wood_inv.png");
@ -1175,7 +1176,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_GATE;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Gate");
f->description = wgettext("Steel Gate");
f->setAllTextures("gate_steel.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("gate_steel_inv.png");
@ -1204,7 +1205,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_HATCH_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Hatch");
f->description = wgettext("Wood Hatch");
f->setAllTextures("hatch_wood.png");
f->setTexture(2,"hatch_wood.png^[transformR90");
f->setTexture(3,"hatch_wood.png^[transformR90");
@ -1229,7 +1230,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_HATCH_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Hatch");
f->description = wgettext("Steel Hatch");
f->setAllTextures("hatch_steel.png");
f->setTexture(2,"hatch_steel.png^[transformR90");
f->setTexture(3,"hatch_steel.png^[transformR90");
@ -1255,7 +1256,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_W_HATCH_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Hatch");
f->description = wgettext("Wood Hatch");
f->setAllTextures("hatch_wood_w.png");
f->setTexture(2,"hatch_wood.png^[transformR90");
f->setTexture(3,"hatch_wood.png^[transformR90");
@ -1280,7 +1281,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_W_HATCH_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Hatch");
f->description = wgettext("Steel Hatch");
f->setAllTextures("hatch_steel_w.png");
f->setTexture(2,"hatch_steel.png^[transformR90");
f->setTexture(3,"hatch_steel.png^[transformR90");
@ -1307,7 +1308,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_WOOD_GATE_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Wood Gate");
f->description = wgettext("Wood Gate");
f->setAllTextures("gate_wood.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("gate_wood_inv.png");
@ -1330,7 +1331,7 @@ void content_mapnode_door(bool repeat)
i = CONTENT_STEEL_GATE_OPEN;
f = &content_features(i);
f->param2_type = CPT_FACEDIR_SIMPLE;
f->description = std::string("Steel Gate");
f->description = wgettext("Steel Gate");
f->setAllTextures("gate_steel.png");
f->rotate_tile_with_nodebox = true;
f->setInventoryTexture("gate_steel_inv.png");

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_farm(bool repeat)
{
@ -32,7 +33,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_DIRT;
f = &content_features(i);
f->description = std::string("Farm Dirt");
f->description = wgettext("Farm Dirt");
f->setAllTextures("dirt.png");
f->setInventoryTextureCube("dirt.png","dirt.png","dirt.png");
f->draw_type = CDT_CUBELIKE;
@ -44,7 +45,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FERTILIZER;
f = &content_features(i);
f->description = std::string("Fertilizer");
f->description = wgettext("Fertilizer");
f->setAllTextures("fertilizer.png");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_NODEBOX;
@ -64,7 +65,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_TRELLIS;
f = &content_features(i);
f->description = std::string("Trellis");
f->description = wgettext("Trellis");
f->setAllTextures("trellis.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;
@ -87,7 +88,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_WHEAT;
f = &content_features(i);
f->description = std::string("Wheat Seeds");
f->description = wgettext("Wheat Seeds");
f->setAllTextures("farm_seeds_wheat.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -105,7 +106,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_MELON;
f = &content_features(i);
f->description = std::string("Melon Seeds");
f->description = wgettext("Melon Seeds");
f->setAllTextures("farm_seeds_melon.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -124,7 +125,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_PUMPKIN;
f = &content_features(i);
f->description = std::string("Pumpkin Seeds");
f->description = wgettext("Pumpkin Seeds");
f->setAllTextures("farm_seeds_pumpkin.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -143,7 +144,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_POTATO;
f = &content_features(i);
f->description = std::string("Potato Seeds");
f->description = wgettext("Potato Seeds");
f->setAllTextures("farm_seeds_potato.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -161,7 +162,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_CARROT;
f = &content_features(i);
f->description = std::string("Carrot Seeds");
f->description = wgettext("Carrot Seeds");
f->setAllTextures("farm_seeds_carrot.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -179,7 +180,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_BEETROOT;
f = &content_features(i);
f->description = std::string("Beetroot Seeds");
f->description = wgettext("Beetroot Seeds");
f->setAllTextures("farm_seeds_beetroot.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -197,7 +198,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_GRAPE;
f = &content_features(i);
f->description = std::string("Grape Seeds");
f->description = wgettext("Grape Seeds");
f->setAllTextures("farm_seeds_grape.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -216,7 +217,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_SEEDS_COTTON;
f = &content_features(i);
f->description = std::string("Cotton Seeds");
f->description = wgettext("Cotton Seeds");
f->setAllTextures("farm_seeds_cotton.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -234,7 +235,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_WHEAT_1;
f = &content_features(i);
f->description = std::string("Wheat");
f->description = wgettext("Wheat");
f->setAllTextures("farm_wheat.png");
f->draw_type = CDT_PLANTGROWTH_1;
f->param_type = CPT_LIGHT;
@ -252,7 +253,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_WHEAT_2;
f = &content_features(i);
f->description = std::string("Wheat");
f->description = wgettext("Wheat");
f->setAllTextures("farm_wheat.png");
f->draw_type = CDT_PLANTGROWTH_2;
f->param_type = CPT_LIGHT;
@ -270,7 +271,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_WHEAT_3;
f = &content_features(i);
f->description = std::string("Wheat");
f->description = wgettext("Wheat");
f->setAllTextures("farm_wheat.png");
f->draw_type = CDT_PLANTGROWTH_3;
f->param_type = CPT_LIGHT;
@ -290,7 +291,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_WHEAT;
f = &content_features(i);
f->description = std::string("Wheat");
f->description = wgettext("Wheat");
f->setAllTextures("farm_wheat.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -310,7 +311,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_MELON_1;
f = &content_features(i);
f->description = std::string("Melon");
f->description = wgettext("Melon");
f->setAllTextures("farm_melon.png");
f->setTexture(0,"farm_melon_top.png");
f->setTexture(1,"farm_melon_top.png");
@ -330,7 +331,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_MELON_2;
f = &content_features(i);
f->description = std::string("Melon");
f->description = wgettext("Melon");
f->setAllTextures("farm_melon.png");
f->setTexture(0,"farm_melon_top.png");
f->setTexture(1,"farm_melon_top.png");
@ -350,7 +351,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_MELON_3;
f = &content_features(i);
f->description = std::string("Melon");
f->description = wgettext("Melon");
f->setAllTextures("farm_melon.png");
f->setTexture(0,"farm_melon_top.png");
f->setTexture(1,"farm_melon_top.png");
@ -370,7 +371,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_MELON;
f = &content_features(i);
f->description = std::string("Melon");
f->description = wgettext("Melon");
f->setAllTextures("farm_melon.png");
f->setTexture(0,"farm_melon_top.png");
f->setTexture(1,"farm_melon_top.png");
@ -384,7 +385,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_PUMPKIN_1;
f = &content_features(i);
f->description = std::string("Pumpkin");
f->description = wgettext("Pumpkin");
f->setAllTextures("farm_pumpkin.png");
f->setTexture(0,"farm_pumpkin_top.png");
f->setTexture(1,"farm_pumpkin_top.png");
@ -403,7 +404,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_PUMPKIN_2;
f = &content_features(i);
f->description = std::string("Pumpkin");
f->description = wgettext("Pumpkin");
f->setAllTextures("farm_pumpkin.png");
f->setTexture(0,"farm_pumpkin_top.png");
f->setTexture(1,"farm_pumpkin_top.png");
@ -422,7 +423,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_PUMPKIN_3;
f = &content_features(i);
f->description = std::string("Pumpkin");
f->description = wgettext("Pumpkin");
f->setAllTextures("farm_pumpkin.png");
f->setTexture(0,"farm_pumpkin_top.png");
f->setTexture(1,"farm_pumpkin_top.png");
@ -442,7 +443,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_PUMPKIN;
f = &content_features(i);
f->description = std::string("Pumpkin");
f->description = wgettext("Pumpkin");
f->setAllTextures("farm_pumpkin.png");
f->setTexture(0,"farm_pumpkin_top.png");
f->setTexture(1,"farm_pumpkin_top.png");
@ -457,7 +458,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_PUMPKIN_JACK;
f = &content_features(i);
f->description = std::string("Jack' O Lantern");
f->description = wgettext("Jack' O Lantern");
f->param2_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("farm_pumpkin.png");
f->setTexture(0,"farm_pumpkin_top.png");
@ -479,7 +480,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_POTATO_1;
f = &content_features(i);
f->description = std::string("Potato");
f->description = wgettext("Potato");
f->setAllTextures("farm_potato.png");
f->draw_type = CDT_PLANTGROWTH_1;
f->param_type = CPT_LIGHT;
@ -499,7 +500,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_POTATO_2;
f = &content_features(i);
f->description = std::string("Potato");
f->description = wgettext("Potato");
f->setAllTextures("farm_potato.png");
f->draw_type = CDT_PLANTGROWTH_2;
f->param_type = CPT_LIGHT;
@ -519,7 +520,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_POTATO_3;
f = &content_features(i);
f->description = std::string("Potato");
f->description = wgettext("Potato");
f->setAllTextures("farm_potato.png");
f->draw_type = CDT_PLANTGROWTH_3;
f->param_type = CPT_LIGHT;
@ -539,7 +540,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_POTATO;
f = &content_features(i);
f->description = std::string("Potato");
f->description = wgettext("Potato");
f->setAllTextures("farm_potato.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -559,7 +560,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_CARROT_1;
f = &content_features(i);
f->description = std::string("Carrot");
f->description = wgettext("Carrot");
f->setAllTextures("farm_carrot.png");
f->draw_type = CDT_PLANTGROWTH_1;
f->param_type = CPT_LIGHT;
@ -579,7 +580,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_CARROT_2;
f = &content_features(i);
f->description = std::string("Carrot");
f->description = wgettext("Carrot");
f->setAllTextures("farm_carrot.png");
f->draw_type = CDT_PLANTGROWTH_2;
f->param_type = CPT_LIGHT;
@ -599,7 +600,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_CARROT_3;
f = &content_features(i);
f->description = std::string("Carrot");
f->description = wgettext("Carrot");
f->setAllTextures("farm_carrot.png");
f->draw_type = CDT_PLANTGROWTH_3;
f->param_type = CPT_LIGHT;
@ -619,7 +620,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_CARROT;
f = &content_features(i);
f->description = std::string("Carrot");
f->description = wgettext("Carrot");
f->setAllTextures("farm_carrot.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -639,7 +640,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_BEETROOT_1;
f = &content_features(i);
f->description = std::string("Beetroot");
f->description = wgettext("Beetroot");
f->setAllTextures("farm_beetroot.png");
f->draw_type = CDT_PLANTGROWTH_1;
f->param_type = CPT_LIGHT;
@ -659,7 +660,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_BEETROOT_2;
f = &content_features(i);
f->description = std::string("Beetroot");
f->description = wgettext("Beetroot");
f->setAllTextures("farm_beetroot.png");
f->draw_type = CDT_PLANTGROWTH_2;
f->param_type = CPT_LIGHT;
@ -679,7 +680,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_BEETROOT_3;
f = &content_features(i);
f->description = std::string("Beetroot");
f->description = wgettext("Beetroot");
f->setAllTextures("farm_beetroot.png");
f->draw_type = CDT_PLANTGROWTH_3;
f->param_type = CPT_LIGHT;
@ -699,7 +700,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_BEETROOT;
f = &content_features(i);
f->description = std::string("Beetroot");
f->description = wgettext("Beetroot");
f->setAllTextures("farm_beetroot.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -719,7 +720,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_GRAPEVINE_1;
f = &content_features(i);
f->description = std::string("Grape");
f->description = wgettext("Grape");
f->setAllTextures("farm_grapevine.png");
f->draw_type = CDT_PLANTGROWTH_1;
f->param_type = CPT_LIGHT;
@ -739,7 +740,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_GRAPEVINE_2;
f = &content_features(i);
f->description = std::string("Grape");
f->description = wgettext("Grape");
f->setAllTextures("farm_grapevine.png");
f->draw_type = CDT_PLANTGROWTH_2;
f->param_type = CPT_LIGHT;
@ -759,7 +760,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_GRAPEVINE_3;
f = &content_features(i);
f->description = std::string("Grape");
f->description = wgettext("Grape");
f->setAllTextures("farm_grapevine.png");
f->draw_type = CDT_PLANTGROWTH_3;
f->param_type = CPT_LIGHT;
@ -779,7 +780,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_GRAPEVINE;
f = &content_features(i);
f->description = std::string("Grape");
f->description = wgettext("Grape");
f->setAllTextures("farm_grapevine.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -797,7 +798,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_COTTON_1;
f = &content_features(i);
f->description = std::string("Cotton");
f->description = wgettext("Cotton");
f->setAllTextures("farm_cotton.png");
f->draw_type = CDT_PLANTGROWTH_1;
f->param_type = CPT_LIGHT;
@ -815,7 +816,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_COTTON_2;
f = &content_features(i);
f->description = std::string("Cotton");
f->description = wgettext("Cotton");
f->setAllTextures("farm_cotton.png");
f->draw_type = CDT_PLANTGROWTH_2;
f->param_type = CPT_LIGHT;
@ -834,7 +835,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_COTTON_3;
f = &content_features(i);
f->description = std::string("Cotton");
f->description = wgettext("Cotton");
f->setAllTextures("farm_cotton.png");
f->draw_type = CDT_PLANTGROWTH_3;
f->param_type = CPT_LIGHT;
@ -854,7 +855,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_COTTON;
f = &content_features(i);
f->description = std::string("Cotton");
f->description = wgettext("Cotton");
f->setAllTextures("farm_cotton.png");
f->draw_type = CDT_PLANTLIKE;
f->param_type = CPT_LIGHT;
@ -874,7 +875,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_TRELLIS_GRAPE_1;
f = &content_features(i);
f->description = std::string("Trellis");
f->description = wgettext("Trellis");
f->setAllTextures("trellis_grape_1.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;
@ -894,7 +895,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_TRELLIS_GRAPE_2;
f = &content_features(i);
f->description = std::string("Trellis");
f->description = wgettext("Trellis");
f->setAllTextures("trellis_grape_2.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;
@ -914,7 +915,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_TRELLIS_GRAPE_3;
f = &content_features(i);
f->description = std::string("Trellis");
f->description = wgettext("Trellis");
f->setAllTextures("trellis_grape_3.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;
@ -936,7 +937,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_FARM_TRELLIS_GRAPE;
f = &content_features(i);
f->description = std::string("Trellis");
f->description = wgettext("Trellis");
f->setAllTextures("trellis_grape.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;
@ -958,7 +959,7 @@ void content_mapnode_farm(bool repeat)
i = CONTENT_TRELLIS_DEAD_VINE;
f = &content_features(i);
f->description = std::string("Dead Vine");
f->description = wgettext("Dead Vine");
f->setAllTextures("trellis_dead_vine.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_PLANTLIKE;

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_furniture(bool repeat)
{
@ -32,7 +33,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BOOKSHELF;
f = &content_features(i);
f->description = std::string("Book Shelf");
f->description = wgettext("Book Shelf");
f->setAllTextures("bookshelf_front.png");
f->setTexture(0, "bookshelf_top.png");
f->setTexture(1, "bookshelf_top.png");
@ -76,7 +77,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE;
f = &content_features(i);
f->description = std::string("Couch");
f->description = wgettext("Couch");
f->setAllTextures("cotton.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -94,7 +95,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL;
f = &content_features(i);
f->description = std::string("Couch");
f->description = wgettext("Couch");
f->setAllTextures("cotton.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -112,7 +113,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR;
f = &content_features(i);
f->description = std::string("Couch");
f->description = wgettext("Couch");
f->setAllTextures("cotton.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -130,7 +131,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER;
f = &content_features(i);
f->description = std::string("Couch");
f->description = wgettext("Couch");
f->setAllTextures("cotton.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -148,7 +149,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER;
f = &content_features(i);
f->description = std::string("Couch");
f->description = wgettext("Couch");
f->setAllTextures("cotton.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -166,7 +167,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR;
f = &content_features(i);
f->description = std::string("Couch");
f->description = wgettext("Couch");
f->setAllTextures("cotton.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -194,7 +195,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_BLUE;
f = &content_features(i);
f->description = std::string("Blue Couch");
f->description = wgettext("Blue Couch");
f->setAllTextures("cotton_blue.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -212,7 +213,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_BLUE;
f = &content_features(i);
f->description = std::string("Blue Couch");
f->description = wgettext("Blue Couch");
f->setAllTextures("cotton_blue.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -230,7 +231,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_BLUE;
f = &content_features(i);
f->description = std::string("Blue Couch");
f->description = wgettext("Blue Couch");
f->setAllTextures("cotton_blue.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -248,7 +249,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_BLUE;
f = &content_features(i);
f->description = std::string("Blue Couch");
f->description = wgettext("Blue Couch");
f->setAllTextures("cotton_blue.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -266,7 +267,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_BLUE;
f = &content_features(i);
f->description = std::string("Blue Couch");
f->description = wgettext("Blue Couch");
f->setAllTextures("cotton_blue.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -284,7 +285,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_BLUE;
f = &content_features(i);
f->description = std::string("Blue Couch");
f->description = wgettext("Blue Couch");
f->setAllTextures("cotton_blue.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -306,7 +307,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_GREEN;
f = &content_features(i);
f->description = std::string("Green Couch");
f->description = wgettext("Green Couch");
f->setAllTextures("cotton_green.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -324,7 +325,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_GREEN;
f = &content_features(i);
f->description = std::string("Green Couch");
f->description = wgettext("Green Couch");
f->setAllTextures("cotton_green.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -342,7 +343,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_GREEN;
f = &content_features(i);
f->description = std::string("Green Couch");
f->description = wgettext("Green Couch");
f->setAllTextures("cotton_green.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -360,7 +361,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_GREEN;
f = &content_features(i);
f->description = std::string("Green Couch");
f->description = wgettext("Green Couch");
f->setAllTextures("cotton_green.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -378,7 +379,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_GREEN;
f = &content_features(i);
f->description = std::string("Green Couch");
f->description = wgettext("Green Couch");
f->setAllTextures("cotton_green.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -396,7 +397,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_GREEN;
f = &content_features(i);
f->description = std::string("Green Couch");
f->description = wgettext("Green Couch");
f->setAllTextures("cotton_green.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -418,7 +419,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Couch");
f->description = wgettext("Orange Couch");
f->setAllTextures("cotton_orange.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -436,7 +437,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Couch");
f->description = wgettext("Orange Couch");
f->setAllTextures("cotton_orange.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -454,7 +455,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Couch");
f->description = wgettext("Orange Couch");
f->setAllTextures("cotton_orange.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -472,7 +473,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Couch");
f->description = wgettext("Orange Couch");
f->setAllTextures("cotton_orange.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -490,7 +491,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Couch");
f->description = wgettext("Orange Couch");
f->setAllTextures("cotton_orange.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -508,7 +509,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Couch");
f->description = wgettext("Orange Couch");
f->setAllTextures("cotton_orange.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -530,7 +531,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Couch");
f->description = wgettext("Purple Couch");
f->setAllTextures("cotton_purple.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -548,7 +549,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Couch");
f->description = wgettext("Purple Couch");
f->setAllTextures("cotton_purple.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -566,7 +567,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Couch");
f->description = wgettext("Purple Couch");
f->setAllTextures("cotton_purple.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -584,7 +585,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Couch");
f->description = wgettext("Purple Couch");
f->setAllTextures("cotton_purple.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -602,7 +603,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Couch");
f->description = wgettext("Purple Couch");
f->setAllTextures("cotton_purple.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -620,7 +621,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Couch");
f->description = wgettext("Purple Couch");
f->setAllTextures("cotton_purple.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -642,7 +643,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_RED;
f = &content_features(i);
f->description = std::string("Red Couch");
f->description = wgettext("Red Couch");
f->setAllTextures("cotton_red.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -660,7 +661,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_RED;
f = &content_features(i);
f->description = std::string("Red Couch");
f->description = wgettext("Red Couch");
f->setAllTextures("cotton_red.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -678,7 +679,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_RED;
f = &content_features(i);
f->description = std::string("Red Couch");
f->description = wgettext("Red Couch");
f->setAllTextures("cotton_red.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -696,7 +697,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_RED;
f = &content_features(i);
f->description = std::string("Red Couch");
f->description = wgettext("Red Couch");
f->setAllTextures("cotton_red.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -714,7 +715,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_RED;
f = &content_features(i);
f->description = std::string("Red Couch");
f->description = wgettext("Red Couch");
f->setAllTextures("cotton_red.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -732,7 +733,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_RED;
f = &content_features(i);
f->description = std::string("Red Couch");
f->description = wgettext("Red Couch");
f->setAllTextures("cotton_red.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -754,7 +755,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Couch");
f->description = wgettext("Yellow Couch");
f->setAllTextures("cotton_yellow.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -772,7 +773,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Couch");
f->description = wgettext("Yellow Couch");
f->setAllTextures("cotton_yellow.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -790,7 +791,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Couch");
f->description = wgettext("Yellow Couch");
f->setAllTextures("cotton_yellow.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -808,7 +809,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Couch");
f->description = wgettext("Yellow Couch");
f->setAllTextures("cotton_yellow.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -826,7 +827,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Couch");
f->description = wgettext("Yellow Couch");
f->setAllTextures("cotton_yellow.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -844,7 +845,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Couch");
f->description = wgettext("Yellow Couch");
f->setAllTextures("cotton_yellow.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -866,7 +867,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CENTRE_BLACK;
f = &content_features(i);
f->description = std::string("Black Couch");
f->description = wgettext("Black Couch");
f->setAllTextures("cotton_black.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -884,7 +885,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDL_BLACK;
f = &content_features(i);
f->description = std::string("Black Couch");
f->description = wgettext("Black Couch");
f->setAllTextures("cotton_black.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -902,7 +903,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_ENDR_BLACK;
f = &content_features(i);
f->description = std::string("Black Couch");
f->description = wgettext("Black Couch");
f->setAllTextures("cotton_black.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -920,7 +921,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_INNER_BLACK;
f = &content_features(i);
f->description = std::string("Black Couch");
f->description = wgettext("Black Couch");
f->setAllTextures("cotton_black.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -938,7 +939,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_OUTER_BLACK;
f = &content_features(i);
f->description = std::string("Black Couch");
f->description = wgettext("Black Couch");
f->setAllTextures("cotton_black.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -956,7 +957,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_COUCH_CHAIR_BLACK;
f = &content_features(i);
f->description = std::string("Black Couch");
f->description = wgettext("Black Couch");
f->setAllTextures("cotton_black.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -978,7 +979,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_CHAIR;
f = &content_features(i);
f->description = std::string("Chair");
f->description = wgettext("Chair");
f->setAllTextures("pine.png");
f->param_type = CPT_LIGHT;
f->param2_type = CPT_FACEDIR_SIMPLE;
@ -1026,7 +1027,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_TABLE;
f = &content_features(i);
f->description = std::string("Table");
f->description = wgettext("Table");
f->setAllTextures("pine.png");
f->param_type = CPT_LIGHT;
f->param2_type = CPT_FACEDIR_SIMPLE;
@ -1082,7 +1083,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_HEAD;
f = &content_features(i);
f->description = std::string("Bed");
f->description = wgettext("Bed");
f->setTexture(0,"cotton.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton.png^bed_side_head.png");
@ -1111,7 +1112,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_FOOT;
f = &content_features(i);
f->description = std::string("Bed");
f->description = wgettext("Bed");
f->setTexture(0,"cotton.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton.png^bed_side.png^[transformFX");
@ -1137,7 +1138,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_BLUE_HEAD;
f = &content_features(i);
f->description = std::string("Blue Bed");
f->description = wgettext("Blue Bed");
f->setTexture(0,"cotton_blue.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_blue.png^bed_side_head.png");
@ -1166,7 +1167,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_BLUE_FOOT;
f = &content_features(i);
f->description = std::string("Blue Bed");
f->description = wgettext("Blue Bed");
f->setTexture(0,"cotton_blue.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_blue.png^bed_side.png^[transformFX");
@ -1192,7 +1193,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_GREEN_HEAD;
f = &content_features(i);
f->description = std::string("Green Bed");
f->description = wgettext("Green Bed");
f->setTexture(0,"cotton_green.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_green.png^bed_side_head.png");
@ -1221,7 +1222,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_GREEN_FOOT;
f = &content_features(i);
f->description = std::string("Green Bed");
f->description = wgettext("Green Bed");
f->setTexture(0,"cotton_green.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_green.png^bed_side.png^[transformFX");
@ -1247,7 +1248,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_ORANGE_HEAD;
f = &content_features(i);
f->description = std::string("Orange Bed");
f->description = wgettext("Orange Bed");
f->setTexture(0,"cotton_orange.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_orange.png^bed_side_head.png");
@ -1276,7 +1277,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_ORANGE_FOOT;
f = &content_features(i);
f->description = std::string("Orange Bed");
f->description = wgettext("Orange Bed");
f->setTexture(0,"cotton_orange.png^bed_top.png");
f->setTexture(1,"cotton_orange.png^bed_bottom.png");
f->setTexture(2,"cotton_orange.png^bed_side.png^[transformFX");
@ -1302,7 +1303,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_PURPLE_HEAD;
f = &content_features(i);
f->description = std::string("Purple Bed");
f->description = wgettext("Purple Bed");
f->setTexture(0,"cotton_purple.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_purple.png^bed_side_head.png");
@ -1331,7 +1332,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_PURPLE_FOOT;
f = &content_features(i);
f->description = std::string("Purple Bed");
f->description = wgettext("Purple Bed");
f->setTexture(0,"cotton_purple.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_purple.png^bed_side.png^[transformFX");
@ -1357,7 +1358,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_RED_HEAD;
f = &content_features(i);
f->description = std::string("Red Bed");
f->description = wgettext("Red Bed");
f->setTexture(0,"cotton_red.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_red.png^bed_side_head.png");
@ -1386,7 +1387,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_RED_FOOT;
f = &content_features(i);
f->description = std::string("Red Bed");
f->description = wgettext("Red Bed");
f->setTexture(0,"cotton_red.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_red.png^bed_side.png^[transformFX");
@ -1412,7 +1413,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_YELLOW_HEAD;
f = &content_features(i);
f->description = std::string("Yellow Bed");
f->description = wgettext("Yellow Bed");
f->setTexture(0,"cotton_yellow.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_yellow.png^bed_side_head.png");
@ -1441,7 +1442,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_YELLOW_FOOT;
f = &content_features(i);
f->description = std::string("Yellow Bed");
f->description = wgettext("Yellow Bed");
f->setTexture(0,"cotton_yellow.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_yellow.png^bed_side.png^[transformFX");
@ -1467,7 +1468,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_BLACK_HEAD;
f = &content_features(i);
f->description = std::string("Black Bed");
f->description = wgettext("Black Bed");
f->setTexture(0,"cotton_black.png^bed_head.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_black.png^bed_side_head.png");
@ -1496,7 +1497,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_BED_BLACK_FOOT;
f = &content_features(i);
f->description = std::string("Black Bed");
f->description = wgettext("Black Bed");
f->setTexture(0,"cotton_black.png^bed_top.png");
f->setTexture(1,"bed_bottom.png");
f->setTexture(2,"cotton_black.png^bed_side.png^[transformFX");
@ -1523,7 +1524,7 @@ void content_mapnode_furniture(bool repeat)
// Paintings
i = CONTENT_PAINTING_WHITE;
f = &content_features(i);
f->description = std::string("Colorful Painting");
f->description = wgettext("Colorful Painting");
f->setAllTextures("painting.png");
f->setTexture(4, "painting.png");
f->setTexture(5, "painting_white.png");
@ -1557,7 +1558,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_PAINTING_RED;
f = &content_features(i);
f->description = std::string("Red Rose Painting");
f->description = wgettext("Red Rose Painting");
f->setAllTextures("painting.png");
f->setTexture(4, "painting.png");
f->setTexture(5, "painting_red.png");
@ -1591,7 +1592,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_PAINTING_GREEN;
f = &content_features(i);
f->description = std::string("Field Painting");
f->description = wgettext("Field Painting");
f->setAllTextures("painting.png");
f->setTexture(4, "painting.png");
f->setTexture(5, "painting_green.png");
@ -1625,7 +1626,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_PAINTING_BLUE;
f = &content_features(i);
f->description = std::string("Blue Flower Painting");
f->description = wgettext("Blue Flower Painting");
f->setAllTextures("painting.png");
f->setTexture(4, "painting.png");
f->setTexture(5, "painting_blue.png");
@ -1659,7 +1660,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_PAINTING_CANVAS;
f = &content_features(i);
f->description = std::string("Painting Canvas");
f->description = wgettext("Painting Canvas");
f->setAllTextures("painting.png");
f->setTexture(4, "painting.png");
f->setTexture(5, "painting_canvas.png");
@ -1696,7 +1697,7 @@ void content_mapnode_furniture(bool repeat)
i = CONTENT_CLOCK;
f = &content_features(i);
f->description = std::string("Clock");
f->description = wgettext("Clock");
f->setAllTextures("clock.png");
f->setTexture(5, "clock_front.png");
f->setAllMetaTextures("clock_numbers.png");

View File

@ -28,6 +28,7 @@
#include "content_craft.h"
#include "content_nodemeta.h"
#include "settings.h"
#include "gettext.h"
void content_mapnode_plants(bool repeat)
{
@ -38,7 +39,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_TREE;
f = &content_features(i);
f->description = std::string("Tree");
f->description = wgettext("Tree");
f->setAllTextures("tree.png");
f->setTexture(0, "tree_top.png");
f->setTexture(1, "tree_top.png");
@ -56,7 +57,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_APPLE_TREE;
f = &content_features(i);
f->description = std::string("Apple Tree");
f->description = wgettext("Apple Tree");
f->setAllTextures("apple_tree.png");
f->setTexture(0, "apple_tree_top.png");
f->setTexture(1, "apple_tree_top.png");
@ -74,7 +75,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_JUNGLETREE;
f = &content_features(i);
f->description = std::string("Jungle Tree");
f->description = wgettext("Jungle Tree");
f->setAllTextures("jungletree.png");
f->setTexture(0, "jungletree_top.png");
f->setTexture(1, "jungletree_top.png");
@ -90,7 +91,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CONIFER_TREE;
f = &content_features(i);
f->description = std::string("Conifer Tree");
f->description = wgettext("Conifer Tree");
f->setAllTextures("conifer_tree.png");
f->setTexture(0, "conifer_tree_top.png");
f->setTexture(1, "conifer_tree_top.png");
@ -124,7 +125,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_YOUNG_TREE;
f = &content_features(i);
f->description = std::string("Young Tree");
f->description = wgettext("Young Tree");
f->setAllTextures("tree.png");
f->setTexture(0, "tree_top.png");
f->setTexture(1, "tree_top.png");
@ -143,7 +144,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_YOUNG_JUNGLETREE;
f = &content_features(i);
f->description = std::string("Young Jungle Tree");
f->description = wgettext("Young Jungle Tree");
f->setAllTextures("jungletree.png");
f->setTexture(0, "jungletree_top.png");
f->setTexture(1, "jungletree_top.png");
@ -162,7 +163,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_YOUNG_APPLE_TREE;
f = &content_features(i);
f->description = std::string("Young Apple Tree");
f->description = wgettext("Young Apple Tree");
f->setAllTextures("apple_tree.png");
f->setTexture(0, "apple_tree_top.png");
f->setTexture(1, "apple_tree_top.png");
@ -181,7 +182,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_YOUNG_CONIFER_TREE;
f = &content_features(i);
f->description = std::string("Young Conifer Tree");
f->description = wgettext("Young Conifer Tree");
f->setAllTextures("conifer_tree.png");
f->setTexture(0, "conifer_tree_top.png");
f->setTexture(1, "conifer_tree_top.png");
@ -200,7 +201,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_JUNGLEGRASS;
f = &content_features(i);
f->description = std::string("Jungle Grass");
f->description = wgettext("Jungle Grass");
f->setInventoryTexture("junglegrass.png");
f->setAllTextures("junglegrass.png");
f->setAllTextureFlags(0);
@ -221,7 +222,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_LEAVES;
f = &content_features(i);
f->description = std::string("Leaves");
f->description = wgettext("Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -253,7 +254,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_APPLE_LEAVES;
f = &content_features(i);
f->description = std::string("Apple Tree Leaves");
f->description = wgettext("Apple Tree Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -285,7 +286,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_JUNGLELEAVES;
f = &content_features(i);
f->description = std::string("Jungle Leaves");
f->description = wgettext("Jungle Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -317,7 +318,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CONIFER_LEAVES;
f = &content_features(i);
f->description = std::string("Conifer Leaves");
f->description = wgettext("Conifer Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -349,7 +350,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_TRIMMED_LEAVES;
f = &content_features(i);
f->description = std::string("Trimmed Leaves");
f->description = wgettext("Trimmed Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -378,7 +379,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_TRIMMED_APPLE_LEAVES;
f = &content_features(i);
f->description = std::string("Trimmed Apple Tree Leaves");
f->description = wgettext("Trimmed Apple Tree Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -407,7 +408,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_TRIMMED_JUNGLE_LEAVES;
f = &content_features(i);
f->description = std::string("Trimmed Jungle Leaves");
f->description = wgettext("Trimmed Jungle Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -436,7 +437,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_TRIMMED_CONIFER_LEAVES;
f = &content_features(i);
f->description = std::string("Trimmed Conifer Leaves");
f->description = wgettext("Trimmed Conifer Leaves");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -465,7 +466,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_APPLE_BLOSSOM;
f = &content_features(i);
f->description = std::string("Apple Tree Blossom");
f->description = wgettext("Apple Tree Blossom");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -494,7 +495,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_TRIMMED_APPLE_BLOSSOM;
f = &content_features(i);
f->description = std::string("Trimmed Apple Tree Blossom");
f->description = wgettext("Trimmed Apple Tree Blossom");
f->light_propagates = true;
f->air_equivalent = true;
f->param_type = CPT_LIGHT;
@ -520,7 +521,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CACTUS_BLOSSOM;
f = &content_features(i);
f->description = std::string("Cactus Blossom");
f->description = wgettext("Cactus Blossom");
f->setInventoryTexture("cactus_blossom.png");
f->setAllTextures("cactus_blossom.png");
f->setAllTextureFlags(0);
@ -540,7 +541,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CACTUS_FLOWER;
f = &content_features(i);
f->description = std::string("Cactus Flower");
f->description = wgettext("Cactus Flower");
f->setInventoryTexture("cactus_flower.png");
f->setAllTextures("cactus_flower.png");
f->setAllTextureFlags(0);
@ -561,7 +562,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CACTUS_FRUIT;
f = &content_features(i);
f->description = std::string("Cactus Berry");
f->description = wgettext("Cactus Berry");
f->setInventoryTexture("cactus_fruit.png");
f->setAllTextures("cactus_fruit.png");
f->setAllTextureFlags(0);
@ -581,7 +582,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CACTUS;
f = &content_features(i);
f->description = std::string("Cactus");
f->description = wgettext("Cactus");
f->setAllTextures("cactus_side.png");
f->setTexture(0, "cactus_top.png");
f->setTexture(1, "cactus_top.png");
@ -643,7 +644,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_PAPYRUS;
f = &content_features(i);
f->description = std::string("Papyrus");
f->description = wgettext("Papyrus");
f->setInventoryTexture("papyrus.png");
f->setAllTextures("papyrus.png");
f->setAllTextureFlags(0);
@ -663,7 +664,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_SAPLING;
f = &content_features(i);
f->description = std::string("Sapling");
f->description = wgettext("Sapling");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_PLANTLIKE;
f->setAllTextures("sapling.png");
@ -682,7 +683,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_APPLE_SAPLING;
f = &content_features(i);
f->description = std::string("Apple Tree Sapling");
f->description = wgettext("Apple Tree Sapling");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_PLANTLIKE;
f->setAllTextures("apple_sapling.png");
@ -702,7 +703,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_JUNGLESAPLING;
f = &content_features(i);
f->description = std::string("Jungle Sapling");
f->description = wgettext("Jungle Sapling");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_PLANTLIKE;
f->setAllTextures("junglesapling.png");
@ -722,7 +723,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_CONIFER_SAPLING;
f = &content_features(i);
f->description = std::string("Conifer Sapling");
f->description = wgettext("Conifer Sapling");
f->param_type = CPT_LIGHT;
f->draw_type = CDT_PLANTLIKE;
f->setAllTextures("conifer_sapling.png");
@ -742,7 +743,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_APPLE;
f = &content_features(i);
f->description = std::string("Apple");
f->description = wgettext("Apple");
f->setInventoryTexture("apple.png");
f->setAllTextures("apple.png");
f->setAllTextureFlags(0);
@ -764,7 +765,7 @@ void content_mapnode_plants(bool repeat)
// plants
i = CONTENT_WILDGRASS_SHORT;
f = &content_features(i);
f->description = std::string("Wild Grass");
f->description = wgettext("Wild Grass");
f->setInventoryTexture("wildgrass_short.png");
f->setAllTextures("wildgrass_short.png");
f->setAllTextureFlags(0);
@ -787,7 +788,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_WILDGRASS_LONG;
f = &content_features(i);
f->description = std::string("Wild Grass");
f->description = wgettext("Wild Grass");
f->setInventoryTexture("wildgrass_long.png");
f->setAllTextures("wildgrass_long.png");
f->setAllTextureFlags(0);
@ -809,7 +810,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_DEADGRASS;
f = &content_features(i);
f->description = std::string("Dead Grass");
f->description = wgettext("Dead Grass");
f->setInventoryTexture("deadgrass.png");
f->setAllTextures("deadgrass.png");
f->setAllTextureFlags(0);
@ -831,7 +832,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_FLOWER_STEM;
f = &content_features(i);
f->description = std::string("Flower Stem");
f->description = wgettext("Flower Stem");
f->setInventoryTexture("flower_stem.png");
f->setAllTextures("flower_stem.png");
f->setAllTextureFlags(0);
@ -853,7 +854,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_FLOWER_ROSE;
f = &content_features(i);
f->description = std::string("Rose");
f->description = wgettext("Rose");
f->setInventoryTexture("flower_rose.png");
f->setAllTextures("flower_rose.png");
f->setAllTextureFlags(0);
@ -876,7 +877,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_FLOWER_DAFFODIL;
f = &content_features(i);
f->description = std::string("Daffodil");
f->description = wgettext("Daffodil");
f->setInventoryTexture("flower_daffodil.png");
f->setAllTextures("flower_daffodil.png");
f->setAllTextureFlags(0);
@ -899,7 +900,7 @@ void content_mapnode_plants(bool repeat)
i = CONTENT_FLOWER_TULIP;
f = &content_features(i);
f->description = std::string("Tulip");
f->description = wgettext("Tulip");
f->setInventoryTexture("flower_tulip.png");
f->setAllTextures("flower_tulip.png");
f->setAllTextureFlags(0);

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_slab(bool repeat)
{
@ -33,7 +34,7 @@ void content_mapnode_slab(bool repeat)
// slabs
i = CONTENT_ROUGHSTONE_SLAB;
f = &content_features(i);
f->description = std::string("Rough Stone Slab");
f->description = wgettext("Rough Stone Slab");
f->setAllTextures("roughstone.png");
f->param_type = CPT_NONE;
f->draw_type = CDT_NODEBOX;
@ -51,7 +52,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_COBBLE_SLAB;
f = &content_features(i);
f->description = std::string("Cobble Stone Slab");
f->description = wgettext("Cobble Stone Slab");
f->setAllTextures("cobble.png");
f->param_type = CPT_NONE;
f->draw_type = CDT_NODEBOX;
@ -69,7 +70,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_MOSSYCOBBLE_SLAB;
f = &content_features(i);
f->description = std::string("Mossy Cobble Stone Slab");
f->description = wgettext("Mossy Cobble Stone Slab");
f->setAllTextures("mossycobble.png");
f->param_type = CPT_NONE;
f->draw_type = CDT_NODEBOX;
@ -87,7 +88,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_STONE_SLAB;
f = &content_features(i);
f->description = std::string("Stone Slab");
f->description = wgettext("Stone Slab");
f->setAllTextures("stone.png");
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
@ -104,7 +105,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_WOOD_SLAB;
f = &content_features(i);
f->description = std::string("Wood Slab");
f->description = wgettext("Wood Slab");
f->setAllTextures("wood.png");
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
@ -123,7 +124,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_JUNGLE_SLAB;
f = &content_features(i);
f->description = std::string("Jungle Wood Slab");
f->description = wgettext("Jungle Wood Slab");
f->setAllTextures("junglewood.png");
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
@ -142,7 +143,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_BRICK_SLAB;
f = &content_features(i);
f->description = std::string("Brick Slab");
f->description = wgettext("Brick Slab");
f->setAllTextures("brick.png");
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
@ -159,7 +160,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_SANDSTONE_SLAB;
f = &content_features(i);
f->description = std::string("Sand Stone Slab");
f->description = wgettext("Sand Stone Slab");
f->setAllTextures("sandstone.png");
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
@ -176,7 +177,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_SLAB;
f = &content_features(i);
f->description = std::string("Glass Slab");
f->description = wgettext("Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -201,7 +202,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_BLUE_SLAB;
f = &content_features(i);
f->description = std::string("Blue Glass Slab");
f->description = wgettext("Blue Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -227,7 +228,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_GREEN_SLAB;
f = &content_features(i);
f->description = std::string("Green Glass Slab");
f->description = wgettext("Green Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -253,7 +254,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_ORANGE_SLAB;
f = &content_features(i);
f->description = std::string("Orange Glass Slab");
f->description = wgettext("Orange Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -279,7 +280,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_PURPLE_SLAB;
f = &content_features(i);
f->description = std::string("Purple Glass Slab");
f->description = wgettext("Purple Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -305,7 +306,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_RED_SLAB;
f = &content_features(i);
f->description = std::string("Red Glass Slab");
f->description = wgettext("Red Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -331,7 +332,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_YELLOW_SLAB;
f = &content_features(i);
f->description = std::string("Yellow Glass Slab");
f->description = wgettext("Yellow Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -357,7 +358,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_BLACK_SLAB;
f = &content_features(i);
f->description = std::string("Black Glass Slab");
f->description = wgettext("Black Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -398,7 +399,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_COBBLE_SLAB_UD;
f = &content_features(i);
f->description = std::string("Cobble Stone Slab");
f->description = wgettext("Cobble Stone Slab");
f->setAllTextures("cobble.png");
f->param_type = CPT_NONE;
f->draw_type = CDT_NODEBOX;
@ -496,7 +497,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_SLAB_UD;
f = &content_features(i);
f->description = std::string("Glass Slab");
f->description = wgettext("Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -518,7 +519,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_BLUE_SLAB_UD;
f = &content_features(i);
f->description = std::string("Blue Glass Slab");
f->description = wgettext("Blue Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -540,7 +541,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_GREEN_SLAB_UD;
f = &content_features(i);
f->description = std::string("Green Glass Slab");
f->description = wgettext("Green Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -562,7 +563,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_ORANGE_SLAB_UD;
f = &content_features(i);
f->description = std::string("Orange Glass Slab");
f->description = wgettext("Orange Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -584,7 +585,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_PURPLE_SLAB_UD;
f = &content_features(i);
f->description = std::string("Purple Glass Slab");
f->description = wgettext("Purple Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -606,7 +607,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_RED_SLAB_UD;
f = &content_features(i);
f->description = std::string("Red Glass Slab");
f->description = wgettext("Red Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -628,7 +629,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_YELLOW_SLAB_UD;
f = &content_features(i);
f->description = std::string("Yellow Glass Slab");
f->description = wgettext("Yellow Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;
@ -650,7 +651,7 @@ void content_mapnode_slab(bool repeat)
i = CONTENT_GLASS_BLACK_SLAB_UD;
f = &content_features(i);
f->description = std::string("Black Glass Slab");
f->description = wgettext("Black Glass Slab");
f->light_propagates = true;
f->sunlight_propagates = true;
f->param_type = CPT_LIGHT;

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_special(bool repeat)
{
@ -33,7 +34,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FENCE;
f = &content_features(i);
f->description = std::string("Fence");
f->description = wgettext("Fence");
f->setAllTextures("fence.png");
f->setTexture(0,"fence_top.png");
f->setTexture(1,"fence_top.png");
@ -62,7 +63,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_RAIL;
f = &content_features(i);
f->description = std::string("Rail");
f->description = wgettext("Rail");
f->setAllTextures("rail.png");
f->setTexture(0,"track_tie.png");
f->setTexture(1,"track_rail.png");
@ -94,7 +95,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_TERRACOTTA;
f = &content_features(i);
f->description = std::string("Terracotta Roof Tile");
f->description = wgettext("Terracotta Roof Tile");
f->setAllTextures("rooftile_terracotta.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_ROOFLIKE;
@ -110,7 +111,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_WOOD;
f = &content_features(i);
f->description = std::string("Wood Roof Tile");
f->description = wgettext("Wood Roof Tile");
f->setAllTextures("rooftile_wood.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_ROOFLIKE;
@ -127,7 +128,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_ASPHALT;
f = &content_features(i);
f->description = std::string("Asphalt Roof Tile");
f->description = wgettext("Asphalt Roof Tile");
f->setAllTextures("rooftile_asphalt.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_ROOFLIKE;
@ -150,7 +151,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_STONE;
f = &content_features(i);
f->description = std::string("Stone Roof Tile");
f->description = wgettext("Stone Roof Tile");
f->setAllTextures("rooftile_stone.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_ROOFLIKE;
@ -166,7 +167,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS;
f = &content_features(i);
f->description = std::string("Glass Roof Tile");
f->description = wgettext("Glass Roof Tile");
f->setAllTextures("glass.png");
f->setTexture(1,"glass_slab.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -188,7 +189,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_BLUE;
f = &content_features(i);
f->description = std::string("Blue Glass Roof Tile");
f->description = wgettext("Blue Glass Roof Tile");
f->setAllTextures("glass_blue.png");
f->setTexture(1,"glass_slab_blue.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -211,7 +212,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_GREEN;
f = &content_features(i);
f->description = std::string("Green Glass Roof Tile");
f->description = wgettext("Green Glass Roof Tile");
f->setAllTextures("glass_green.png");
f->setTexture(1,"glass_slab_green.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -234,7 +235,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Glass Roof Tile");
f->description = wgettext("Orange Glass Roof Tile");
f->setAllTextures("glass_orange.png");
f->setTexture(1,"glass_slab_orange.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -257,7 +258,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Glass Roof Tile");
f->description = wgettext("Purple Glass Roof Tile");
f->setAllTextures("glass_purple.png");
f->setTexture(1,"glass_slab_purple.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -280,7 +281,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_RED;
f = &content_features(i);
f->description = std::string("Red Glass Roof Tile");
f->description = wgettext("Red Glass Roof Tile");
f->setAllTextures("glass_red.png");
f->setTexture(1,"glass_slab_red.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -303,7 +304,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Glass Roof Tile");
f->description = wgettext("Yellow Glass Roof Tile");
f->setAllTextures("glass_yellow.png");
f->setTexture(1,"glass_slab_yellow.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -326,7 +327,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_GLASS_BLACK;
f = &content_features(i);
f->description = std::string("Black Glass Roof Tile");
f->description = wgettext("Black Glass Roof Tile");
f->setAllTextures("glass_black.png");
f->setTexture(1,"glass_slab_black.png"); // special texture for top sections
f->setAllTextureFlags(0);
@ -349,7 +350,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROOFTILE_THATCH;
f = &content_features(i);
f->description = std::string("Thatch Roof Tile");
f->description = wgettext("Thatch Roof Tile");
f->setAllTextures("rooftile_thatch.png");
f->setAllTextureFlags(0);
f->draw_type = CDT_ROOFLIKE;
@ -367,7 +368,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LADDER_LEGACY;
f = &content_features(i);
f->description = std::string("Ladder");
f->description = wgettext("Ladder");
f->setAllTextures("ladder.png");
f->light_propagates = true;
f->param_type = CPT_LIGHT;
@ -403,7 +404,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LADDER_WALL;
f = &content_features(i);
f->description = std::string("Ladder");
f->description = wgettext("Ladder");
f->setAllTextures("ladder.png");
f->light_propagates = true;
f->param_type = CPT_LIGHT;
@ -462,7 +463,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LADDER_FLOOR;
f = &content_features(i);
f->description = std::string("Ladder");
f->description = wgettext("Ladder");
f->setAllTextures("ladder.png");
f->light_propagates = true;
f->param_type = CPT_LIGHT;
@ -496,7 +497,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LADDER_ROOF;
f = &content_features(i);
f->description = std::string("Ladder");
f->description = wgettext("Ladder");
f->setAllTextures("ladder.png");
f->light_propagates = true;
f->param_type = CPT_LIGHT;
@ -530,7 +531,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_BORDERSTONE;
f = &content_features(i);
f->description = std::string("Border Stone");
f->description = wgettext("Border Stone");
f->setAllTextures("borderstone.png");
f->setInventoryTextureCube("borderstone.png", "borderstone.png", "borderstone.png");
f->draw_type = CDT_CUBELIKE;
@ -556,7 +557,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_BOOK;
f = &content_features(i);
f->description = std::string("Book");
f->description = wgettext("Book");
f->setTexture(0, "book_cover.png");
f->setTexture(1, "book_cover.png^[transformFX");
f->setTexture(2, "book_side.png^[transformFY");
@ -586,7 +587,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_COOK_BOOK;
f = &content_features(i);
f->description = std::string("Cook Book");
f->description = wgettext("Cook Book");
f->setTexture(0, "book_cook_cover.png");
f->setTexture(1, "book_cook_cover.png^[transformFX");
f->setTexture(2, "book_cook_side.png^[transformFY");
@ -617,7 +618,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_DECRAFT_BOOK;
f = &content_features(i);
f->description = std::string("Decraft Book");
f->description = wgettext("Decraft Book");
f->setTexture(0, "book_decraft_cover.png");
f->setTexture(1, "book_decraft_cover.png^[transformFX");
f->setTexture(2, "book_decraft_side.png^[transformFY");
@ -647,7 +648,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_DIARY_BOOK;
f = &content_features(i);
f->description = std::string("Diary");
f->description = wgettext("Diary");
f->setTexture(0, "book_diary_cover.png");
f->setTexture(1, "book_diary_cover.png^[transformFX");
f->setTexture(2, "book_diary_side.png^[transformFY");
@ -677,7 +678,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_CRAFT_BOOK;
f = &content_features(i);
f->description = std::string("Craft Book");
f->description = wgettext("Craft Book");
f->setTexture(0, "book_craft_cover.png");
f->setTexture(1, "book_craft_cover.png^[transformFX");
f->setTexture(2, "book_craft_side.png^[transformFY");
@ -715,7 +716,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_BOOK_OPEN;
f = &content_features(i);
f->description = std::string("Guide");
f->description = wgettext("Guide");
f->setAllTextures("guide_side.png");
f->setTexture(0, "guide_top.png");
f->setTexture(1, "guide_bottom.png");
@ -741,7 +742,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_COOK_BOOK_OPEN;
f = &content_features(i);
f->description = std::string("Cooking Guide");
f->description = wgettext("Cooking Guide");
f->setAllTextures("guide_cook_side.png");
f->setTexture(0, "guide_cook_top.png");
f->setTexture(1, "guide_cook_bottom.png");
@ -767,7 +768,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_DECRAFT_BOOK_OPEN;
f = &content_features(i);
f->description = std::string("Decrafting Guide");
f->description = wgettext("Decrafting Guide");
f->setAllTextures("guide_decraft_side.png");
f->setTexture(0, "guide_decraft_top.png");
f->setTexture(1, "guide_decraft_bottom.png");
@ -793,7 +794,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_DIARY_BOOK_OPEN;
f = &content_features(i);
f->description = std::string("Diary");
f->description = wgettext("Diary");
f->setAllTextures("guide_diary_side.png");
f->setTexture(0, "guide_diary_top.png");
f->setTexture(1, "guide_diary_bottom.png");
@ -819,7 +820,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_CRAFT_BOOK_OPEN;
f = &content_features(i);
f->description = std::string("Craft Guide");
f->description = wgettext("Craft Guide");
f->setAllTextures("guide_craft_side.png");
f->setTexture(0, "guide_craft_top.png");
f->setTexture(1, "guide_craft_bottom.png");
@ -845,7 +846,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FIRE;
f = &content_features(i);
f->description = std::string("Fire");
f->description = wgettext("Fire");
f->setAllTextures("fire.png");
f->setAllTextureFlags(0);
f->param_type = CPT_LIGHT;
@ -865,7 +866,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FIRE_SHORTTERM;
f = &content_features(i);
f->description = std::string("Fire");
f->description = wgettext("Fire");
f->setAllTextures("fire.png");
f->setAllTextureFlags(0);
f->param_type = CPT_LIGHT;
@ -885,7 +886,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_TORCH_LEGACY;
f = &content_features(i);
f->description = std::string("Torch");
f->description = wgettext("Torch");
f->setAllTextures("torch.png");
f->setInventoryTexture("torch_inventory.png");
f->setAllTextureFlags(0);
@ -907,7 +908,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_TORCH;
f = &content_features(i);
f->description = std::string("Torch");
f->description = wgettext("Torch");
f->setAllTextures("torch.png");
f->setInventoryTexture("torch_inventory.png");
f->setAllTextureFlags(0);
@ -934,7 +935,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_SIGN_WALL;
f = &content_features(i);
f->description = std::string("Sign");
f->description = wgettext("Sign");
f->setAllTextures("sign_wall.png");
f->param_type = CPT_LIGHT;
f->param2_type = CPT_FACEDIR_WALLMOUNT;
@ -958,7 +959,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_SIGN;
f = &content_features(i);
f->description = std::string("Sign");
f->description = wgettext("Sign");
f->setAllTextures("sign.png");
f->setTexture(4, "sign_back.png");
f->setTexture(5, "sign_front.png"); // Z-
@ -989,7 +990,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_SIGN_UD;
f = &content_features(i);
f->description = std::string("Sign");
f->description = wgettext("Sign");
f->setAllTextures("sign.png");
f->setTexture(4, "sign_back_ud.png");
f->setTexture(5, "sign_front_ud.png"); // Z-
@ -1015,7 +1016,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LOCKABLE_SIGN_WALL;
f = &content_features(i);
f->description = std::string("Locking Sign");
f->description = wgettext("Locking Sign");
f->setAllTextures("sign.png");
f->setTexture(4, "sign_back.png");
f->setTexture(5, "sign_wall_lock.png"); // Z-
@ -1042,7 +1043,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LOCKABLE_SIGN;
f = &content_features(i);
f->description = std::string("Locking Sign");
f->description = wgettext("Locking Sign");
f->setAllTextures("sign.png");
f->setTexture(4, "sign_back.png");
f->setTexture(5, "sign_lock.png"); // Z-
@ -1071,7 +1072,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LOCKABLE_SIGN_UD;
f = &content_features(i);
f->description = std::string("Locking Sign");
f->description = wgettext("Locking Sign");
f->setAllTextures("sign.png");
f->setTexture(4, "sign_back_ud.png");
f->setTexture(5, "sign_lock_ud.png"); // Z-
@ -1097,7 +1098,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_CHEST;
f = &content_features(i);
f->description = std::string("Chest");
f->description = wgettext("Chest");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("chest_side.png");
@ -1119,7 +1120,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_CREATIVE_CHEST;
f = &content_features(i);
f->description = std::string("Creative Chest");
f->description = wgettext("Creative Chest");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("chest_side.png");
@ -1139,7 +1140,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LOCKABLE_CHEST;
f = &content_features(i);
f->description = std::string("Locking Chest");
f->description = wgettext("Locking Chest");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("chest_side.png");
@ -1168,7 +1169,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FURNACE;
f = &content_features(i);
f->description = std::string("Furnace");
f->description = wgettext("Furnace");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("furnace_side.png");
@ -1188,7 +1189,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_LOCKABLE_FURNACE;
f = &content_features(i);
f->description = std::string("Locking Furnace");
f->description = wgettext("Locking Furnace");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("furnace_side.png");
@ -1209,7 +1210,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_INCINERATOR;
f = &content_features(i);
f->description = std::string("Incinerator");
f->description = wgettext("Incinerator");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("incinerator_side.png");
@ -1229,7 +1230,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_NC;
f = &content_features(i);
f->description = std::string("Nyan Cat");
f->description = wgettext("Nyan Cat");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("nc_side.png");
@ -1243,7 +1244,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_NC_RB;
f = &content_features(i);
f->description = std::string("Rainbow");
f->description = wgettext("Rainbow");
f->draw_type = CDT_CUBELIKE;
f->setAllTextures("nc_rb.png");
f->setInventoryTextureCube("nc_rb.png", "nc_rb.png", "nc_rb.png");
@ -1255,7 +1256,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLOWER_POT_RAW;
f = &content_features(i);
f->param_type = CPT_LIGHT;
f->description = std::string("Unbaked Flower Pot");
f->description = wgettext("Unbaked Flower Pot");
f->setAllTextures("flower_pot_raw.png");
f->setTexture(0,"flower_pot_raw_top.png");
f->setTexture(1,"flower_pot_raw_bottom.png");
@ -1316,7 +1317,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLOWER_POT;
f = &content_features(i);
f->param_type = CPT_LIGHT;
f->description = std::string("Flower Pot");
f->description = wgettext("Flower Pot");
f->setAllTextures("flower_pot.png");
f->setTexture(0,"flower_pot_top.png");
f->setTexture(1,"flower_pot_bottom.png");
@ -1373,7 +1374,7 @@ void content_mapnode_special(bool repeat)
// walls
i = CONTENT_COBBLE_WALL;
f = &content_features(i);
f->description = std::string("Cobblestone Wall");
f->description = wgettext("Cobblestone Wall");
f->setAllTextures("cobble.png");
f->light_propagates = true;
f->jumpable = false;
@ -1396,7 +1397,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_ROUGHSTONE_WALL;
f = &content_features(i);
f->description = std::string("Rough Stone Wall");
f->description = wgettext("Rough Stone Wall");
f->setAllTextures("roughstone.png");
f->light_propagates = true;
f->jumpable = false;
@ -1419,7 +1420,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_MOSSYCOBBLE_WALL;
f = &content_features(i);
f->description = std::string("Mossy Cobblestone Wall");
f->description = wgettext("Mossy Cobblestone Wall");
f->setAllTextures("mossycobble.png");
f->light_propagates = true;
f->jumpable = false;
@ -1442,7 +1443,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_STONE_WALL;
f = &content_features(i);
f->description = std::string("Stone Wall");
f->description = wgettext("Stone Wall");
f->setAllTextures("stone.png");
f->light_propagates = true;
f->jumpable = false;
@ -1465,7 +1466,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_SANDSTONE_WALL;
f = &content_features(i);
f->description = std::string("Sand Stone Wall");
f->description = wgettext("Sand Stone Wall");
f->setAllTextures("sandstone.png");
f->light_propagates = true;
f->jumpable = false;
@ -1488,7 +1489,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_TNT;
f = &content_features(i);
f->description = std::string("TNT");
f->description = wgettext("TNT");
f->setAllTextures("tnt.png");
f->setTexture(0, "tnt_top.png");
f->setTexture(1, "tnt_bottom.png");
@ -1507,7 +1508,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLASH;
f = &content_features(i);
f->description = std::string("In-Progress explosion - how did you get this???");
f->description = wgettext("In-Progress explosion - how did you get this???");
f->setAllTextures("flash.png");
f->solidness = 0; // drawn separately, makes no faces
f->param_type = CPT_LIGHT;
@ -1527,7 +1528,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_STEAM;
f = &content_features(i);
f->description = std::string("Steam");
f->description = wgettext("Steam");
f->setAllTextures("steam.png");
f->solidness = 0;
f->param_type = CPT_LIGHT;
@ -1548,7 +1549,7 @@ void content_mapnode_special(bool repeat)
// flags
i = CONTENT_FLAG;
f = &content_features(i);
f->description = std::string("Home Flag");
f->description = wgettext("Home Flag");
f->setAllTextures("flag.png");
f->setTexture(4,"flag.png^[transformFX");
f->setTexture(2,"flag_end.png");
@ -1597,7 +1598,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_BLUE;
f = &content_features(i);
f->description = std::string("Blue Home Flag");
f->description = wgettext("Blue Home Flag");
f->setAllTextures("flag_blue.png");
f->setTexture(4,"flag_blue.png^[transformFX");
f->setTexture(2,"flag_blue_end.png");
@ -1625,7 +1626,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_GREEN;
f = &content_features(i);
f->description = std::string("Green Home Flag");
f->description = wgettext("Green Home Flag");
f->setAllTextures("flag_green.png");
f->setTexture(4,"flag_green.png^[transformFX");
f->setTexture(2,"flag_green_end.png");
@ -1653,7 +1654,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_ORANGE;
f = &content_features(i);
f->description = std::string("Orange Home Flag");
f->description = wgettext("Orange Home Flag");
f->setAllTextures("flag_orange.png");
f->setTexture(4,"flag_orange.png^[transformFX");
f->setTexture(2,"flag_orange_end.png");
@ -1681,7 +1682,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_PURPLE;
f = &content_features(i);
f->description = std::string("Purple Home Flag");
f->description = wgettext("Purple Home Flag");
f->setAllTextures("flag_purple.png");
f->setTexture(4,"flag_purple.png^[transformFX");
f->setTexture(2,"flag_purple_end.png");
@ -1709,7 +1710,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_RED;
f = &content_features(i);
f->description = std::string("Red Home Flag");
f->description = wgettext("Red Home Flag");
f->setAllTextures("flag_red.png");
f->setTexture(4,"flag_red.png^[transformFX");
f->setTexture(2,"flag_red_end.png");
@ -1737,7 +1738,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_YELLOW;
f = &content_features(i);
f->description = std::string("Yellow Home Flag");
f->description = wgettext("Yellow Home Flag");
f->setAllTextures("flag_yellow.png");
f->setTexture(4,"flag_yellow.png^[transformFX");
f->setTexture(2,"flag_yellow_end.png");
@ -1765,7 +1766,7 @@ void content_mapnode_special(bool repeat)
i = CONTENT_FLAG_BLACK;
f = &content_features(i);
f->description = std::string("Black Home Flag");
f->description = wgettext("Black Home Flag");
f->setAllTextures("flag_black.png");
f->setTexture(4,"flag_black.png^[transformFX");
f->setTexture(2,"flag_black_end.png");

View File

@ -24,6 +24,7 @@
#include "content_list.h"
#include "content_craft.h"
#include "content_nodemeta.h"
#include "gettext.h"
void content_mapnode_stair(bool repeat)
{
@ -34,7 +35,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_ROUGHSTONE_STAIR;
f = &content_features(i);
f->description = std::string("Rough Stone Stair");
f->description = wgettext("Rough Stone Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("roughstone.png");
f->draw_type = CDT_NODEBOX;
@ -51,7 +52,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_COBBLE_STAIR;
f = &content_features(i);
f->description = std::string("Cobble Stone Stair");
f->description = wgettext("Cobble Stone Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("cobble.png");
f->draw_type = CDT_NODEBOX;
@ -68,7 +69,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_MOSSYCOBBLE_STAIR;
f = &content_features(i);
f->description = std::string("Mossy Cobble Stone Stair");
f->description = wgettext("Mossy Cobble Stone Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("mossycobble.png");
f->draw_type = CDT_NODEBOX;
@ -85,7 +86,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_STONE_STAIR;
f = &content_features(i);
f->description = std::string("Stone Stair");
f->description = wgettext("Stone Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("stone.png");
f->draw_type = CDT_NODEBOX;
@ -103,7 +104,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_WOOD_STAIR;
f = &content_features(i);
f->description = std::string("Wood Stair");
f->description = wgettext("Wood Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->draw_type = CDT_NODEBOX;
f->solidness = 0; // drawn separately, makes no faces
@ -122,7 +123,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_JUNGLE_STAIR;
f = &content_features(i);
f->description = std::string("Jungle Wood Stair");
f->description = wgettext("Jungle Wood Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("junglewood.png");
f->draw_type = CDT_NODEBOX;
@ -141,7 +142,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_BRICK_STAIR;
f = &content_features(i);
f->description = std::string("Brick Stair");
f->description = wgettext("Brick Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("brick.png");
f->draw_type = CDT_NODEBOX;
@ -158,7 +159,7 @@ void content_mapnode_stair(bool repeat)
i = CONTENT_SANDSTONE_STAIR;
f = &content_features(i);
f->description = std::string("Sand Stone Stair");
f->description = wgettext("Sand Stone Stair");
f->param_type = CPT_FACEDIR_SIMPLE;
f->setAllTextures("sandstone.png");
f->draw_type = CDT_NODEBOX;

View File

@ -19,10 +19,10 @@
#define WATER_VISC 1
#define LAVA_VISC 7
void content_nodedef_knob(content_t nodeid, content_t source_node, ContentMaterialType material_type, const char* texture, const char* desc)
void content_nodedef_knob(content_t nodeid, content_t source_node, ContentMaterialType material_type, const char* texture, const std::wstring desc)
{
ContentFeatures *features = &content_features(nodeid);
features->description = std::string(desc);
features->description = std::wstring(desc);
features->setAllTextures(texture);
features->param_type = CPT_LIGHT;
features->param2_type = CPT_FACEDIR_WALLMOUNT;
@ -39,7 +39,7 @@ void content_nodedef_knob(content_t nodeid, content_t source_node, ContentMateri
content_t recipe[9] = {
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE,
source_node , source_node , CONTENT_IGNORE,
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE};
CONTENT_IGNORE, CONTENT_IGNORE, CONTENT_IGNORE};
crafting::setRecipe(recipe, nodeid, 2);
}

View File

@ -1,7 +1,7 @@
#ifndef CONTENT_MAPNODE_UTIL_HEADER
#define CONTENT_MAPNODE_UTIL_HEADER
void content_nodedef_knob(content_t nodeid, content_t source_node, ContentMaterialType material_type, const char* texture, const char* desc);
void content_nodedef_knob(content_t nodeid, content_t source_node, ContentMaterialType material_type, const char* texture, const std::wstring desc);
#endif

View File

@ -23,6 +23,7 @@
#include "content_list.h"
#include "content_mapnode.h"
#include <map>
#include "gettext.h"
std::map<content_t,struct ToolItemFeatures> g_content_toolitem_features;
@ -111,7 +112,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_woodpick.png";
f->name = "WPick";
f->description = "Wooden Pick";
f->description = wgettext("Wooden Pick");
f->type = TT_PICK;
f->hardness = 30.;
f->dig_time = 1.5;
@ -125,7 +126,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_stonepick.png";
f->name = "STPick";
f->description = "Stone Pick";
f->description = wgettext("Stone Pick");
f->type = TT_PICK;
f->hardness = 100.;
f->dig_time = 0.75;
@ -138,7 +139,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_flintpick.png";
f->name = "FPick";
f->description = "Flint Pick";
f->description = wgettext("Flint Pick");
f->type = TT_PICK;
f->hardness = 180.;
f->dig_time = 1.2;
@ -151,7 +152,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelpick.png";
f->name = "SteelPick";
f->description = "Steel Pick";
f->description = wgettext("Steel Pick");
f->type = TT_PICK;
f->hardness = 333.;
f->dig_time = 0.5;
@ -164,7 +165,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_mesepick.png";
f->name = "MesePick";
f->description = "Mese Pick";
f->description = wgettext("Mese Pick");
f->type = TT_PICK;
f->hardness = 1337.;
f->dig_time = 0.;
@ -178,7 +179,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_woodshovel.png";
f->name = "WShovel";
f->description = "Wooden Shovel";
f->description = wgettext("Wooden Shovel");
f->type = TT_SHOVEL;
f->hardness = 50.;
f->dig_time = 0.4;
@ -192,7 +193,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_stoneshovel.png";
f->name = "STShovel";
f->description = "Stone Shovel";
f->description = wgettext("Stone Shovel");
f->type = TT_SHOVEL;
f->hardness = 150.;
f->dig_time = 0.2;
@ -205,7 +206,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_flintshovel.png";
f->name = "FShovel";
f->description = "Flint Shovel";
f->description = wgettext("Flint Shovel");
f->type = TT_SHOVEL;
f->hardness = 250.;
f->dig_time = 0.17;
@ -218,7 +219,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelshovel.png";
f->name = "SteelShovel";
f->description = "Steel Shovel";
f->description = wgettext("Steel Shovel");
f->type = TT_SHOVEL;
f->hardness = 400.;
f->dig_time = 0.15;
@ -231,7 +232,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_woodaxe.png";
f->name = "WAxe";
f->description = "Wooden Axe";
f->description = wgettext("Wooden Axe");
f->type = TT_AXE;
f->hardness = 30.;
f->dig_time = 1.5;
@ -245,7 +246,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_stoneaxe.png";
f->name = "STAxe";
f->description = "Stone Axe";
f->description = wgettext("Stone Axe");
f->type = TT_AXE;
f->hardness = 100.;
f->dig_time = 0.75;
@ -258,7 +259,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_flintaxe.png";
f->name = "FAxe";
f->description = "Flint Axe";
f->description = wgettext("Flint Axe");
f->type = TT_AXE;
f->hardness = 180.;
f->dig_time = 0.65;
@ -271,7 +272,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelaxe.png";
f->name = "SteelAxe";
f->description = "Steel Axe";
f->description = wgettext("Steel Axe");
f->type = TT_AXE;
f->hardness = 333.;
f->dig_time = 0.5;
@ -284,7 +285,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_woodsword.png";
f->name = "WSword";
f->description = "Wooden Sword";
f->description = wgettext("Wooden Sword");
f->type = TT_SWORD;
f->hardness = 20.;
f->dig_time = 1.5;
@ -298,7 +299,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_stonesword.png";
f->name = "STSword";
f->description = "Stone Sword";
f->description = wgettext("Stone Sword");
f->type = TT_SWORD;
f->hardness = 50.;
f->dig_time = 1.0;
@ -311,7 +312,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelsword.png";
f->name = "SteelSword";
f->description = "Steel Sword";
f->description = wgettext("Steel Sword");
f->type = TT_SWORD;
f->hardness = 80.;
f->dig_time = 0.5;
@ -324,7 +325,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_flintshears.png";
f->name = "FShears";
f->description = "Flint Shears";
f->description = wgettext("Flint Shears");
f->type = TT_SHEAR;
f->hardness = 200.;
f->dig_time = 0.7;
@ -337,7 +338,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelshears.png";
f->name = "Shears";
f->description = "Steel Shears";
f->description = wgettext("Steel Shears");
f->type = TT_SHEAR;
f->hardness = 333.;
f->dig_time = 0.5;
@ -350,7 +351,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_woodbucket.png";
f->name = "WBucket";
f->description = "Wooden Bucket";
f->description = wgettext("Wooden Bucket");
f->liquids_pointable = true;
f->type = TT_BUCKET;
f->hardness = 30.;
@ -365,7 +366,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_tinbucket.png";
f->name = "TinBucket";
f->description = "Tin Bucket";
f->description = wgettext("Tin Bucket");
f->liquids_pointable = true;
f->type = TT_BUCKET;
f->hardness = 50.;
@ -379,7 +380,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_woodbucket_water.png";
f->name = "WBucket_water";
f->description = "Wooden Bucket of Water";
f->description = wgettext("Wooden Bucket of Water");
f->type = TT_SPECIAL;
lists::add("creative",i);
@ -388,7 +389,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_tinbucket_water.png";
f->name = "TinBucket_water";
f->description = "Tin Bucket of Water";
f->description = wgettext("Tin Bucket of Water");
f->type = TT_SPECIAL;
lists::add("creative",i);
@ -397,7 +398,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelbucket.png";
f->name = "SteelBucket";
f->description = "Steel Bucket";
f->description = wgettext("Steel Bucket");
f->liquids_pointable = true;
f->type = TT_BUCKET;
f->hardness = 80.;
@ -411,7 +412,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelbucket_water.png";
f->name = "SteelBucket_water";
f->description = "Steel Bucket of Water";
f->description = wgettext("Steel Bucket of Water");
f->type = TT_SPECIAL;
lists::add("creative",i);
@ -420,7 +421,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_steelbucket_lava.png";
f->name = "SteelBucket_lava";
f->description = "Steel Bucket of Lava";
f->description = wgettext("Steel Bucket of Lava");
f->fuel_time = 80;
f->type = TT_SPECIAL;
lists::add("creative",i);
@ -430,7 +431,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "tool_fire_starter.png";
f->name = "FireStarter";
f->description = "Fire Starter";
f->description = wgettext("Fire Starter");
f->liquids_pointable = true;
f->type = TT_SPECIAL;
crafting::set1Any2Recipe(CONTENT_CRAFTITEM_FLINT,CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_TOOLITEM_FIRESTARTER);
@ -442,7 +443,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "crowbar.png";
f->name = "crowbar";
f->description = "Crowbar";
f->description = wgettext("Crowbar");
f->type = TT_SPECIAL;
crafting::set1over1Recipe(CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_CRAFTITEM_STEEL_INGOT,CONTENT_TOOLITEM_CROWBAR);
lists::add("craftguide",i);
@ -453,7 +454,7 @@ void content_toolitem_init()
f->content = i;
f->texture = "key.png";
f->name = "key";
f->description = "Key";
f->description = wgettext("Key");
f->type = TT_SPECIAL;
crafting::set1To1Recipe(CONTENT_CRAFTITEM_GOLD_INGOT,CONTENT_TOOLITEM_KEY);
lists::add("craftguide",i);

View File

@ -22,7 +22,7 @@ struct ToolItemFeatures {
// the old 'subname'
std::string name;
// tooltip used in inventory
std::string description;
std::wstring description;
// the result of cooking this item
std::string cook_result;
// the fuel value of this item
@ -44,7 +44,7 @@ struct ToolItemFeatures {
content(CONTENT_IGNORE),
texture("unknown_item.png"),
name(""),
description(""),
description(L""),
cook_result(""),
fuel_time(0.0),
edible(0),

View File

@ -261,10 +261,9 @@ void draw_hotbar(video::IVideoDriver *driver, gui::IGUIFont *font,
if (item != NULL) {
drawInventoryItem(driver, font, item, rect, NULL);
std::string name = item->getGuiName();
if (name != "") {
selected = name;
}
std::wstring name = item->getGuiName();
if (name != L"")
selected = wide_to_narrow(name);
}
}else{
video::SColor bgcolor2(128,0,0,0);
@ -682,7 +681,7 @@ void update_skybox(video::IVideoDriver* driver,
Draws a screen with logo and text on it.
Text will be removed when the screen is drawn the next time.
*/
void drawLoadingScreen(video::IVideoDriver* driver, const char* msg)
void drawLoadingScreen(video::IVideoDriver* driver, const std::wstring msg)
{
if (driver == NULL)
return;
@ -702,8 +701,8 @@ void drawLoadingScreen(video::IVideoDriver* driver, const char* msg)
}
if (guienv) {
std::wstring m;
if (msg) {
m = narrow_to_wide(msg);
if (msg != L"") {
m = msg;
}else{
m = L"Loading";
}
@ -782,7 +781,7 @@ void the_game(
Draw "Loading" screen
*/
//draw_load_screen(L"Loading...", driver, font);
drawLoadingScreen(driver,"Loading...");
drawLoadingScreen(driver,wgettext("Loading..."));
/*
Create server.
@ -791,7 +790,7 @@ void the_game(
SharedPtr<Server> server;
if(address == ""){
//draw_load_screen(L"Creating server...", driver, font);
drawLoadingScreen(driver,"Creating server...");
drawLoadingScreen(driver,wgettext("Creating server..."));
infostream<<"Creating server"<<std::endl;
server = new Server(map_dir, configpath);
server->start(port);
@ -802,12 +801,12 @@ void the_game(
*/
//draw_load_screen(L"Creating client...", driver, font);
drawLoadingScreen(driver,"Creating client...");
drawLoadingScreen(driver,wgettext("Creating client..."));
infostream<<"Creating client"<<std::endl;
MapDrawControl draw_control;
Client client(device, playername.c_str(), password, draw_control, sound);
drawLoadingScreen(driver,"Resolving address...");
drawLoadingScreen(driver,wgettext("Resolving address..."));
Address connect_address(0,0,0,0, port);
try{
if(address == "")
@ -852,12 +851,12 @@ void the_game(
break;
}
std::ostringstream ss;
ss<<"Connecting to server... (timeout in ";
std::wostringstream ss;
ss<<wgettext("Connecting to server... (timeout in ");
ss<<(int)(10.0 - time_counter + 1.0);
ss<<" seconds)";
ss<<wgettext(" seconds)");
//draw_load_screen(ss.str(), driver, font);
drawLoadingScreen(driver,ss.str().c_str());
drawLoadingScreen(driver,ss.str());
// Update client and server
client.step(0.1);
@ -2448,7 +2447,7 @@ void the_game(
generator and other stuff quits
*/
{
drawLoadingScreen(driver,"Shutting down...");
drawLoadingScreen(driver,wgettext("Shutting down..."));
}
}

View File

@ -25,7 +25,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "keycode.h"
void drawLoadingScreen(video::IVideoDriver* driver, const char* msg);
void drawLoadingScreen(video::IVideoDriver* driver, const std::wstring);
class KeyList : protected core::list<KeyPress>
{

View File

@ -556,11 +556,11 @@ void GUIFormSpecMenu::drawList(const ListDrawSpec &s, int phase)
if (item) {
drawInventoryItem(driver, font, item, rect, &AbsoluteClippingRect);
if (rect.isPointInside(m_pointer)) {
std::string name = item->getGuiName();
if (name != "") {
std::wstring name = item->getGuiName();
if (name != L"") {
m_tooltip_element->setVisible(true);
this->bringToFront(m_tooltip_element);
m_tooltip_element->setText(narrow_to_wide(name).c_str());
m_tooltip_element->setText(name.c_str());
s32 tooltip_x = m_pointer.X + 15;
s32 tooltip_y = m_pointer.Y + 15;
s32 tooltip_width = m_tooltip_element->getTextWidth() + 14;

View File

@ -198,7 +198,7 @@ video::ITexture * CraftItem::getImage() const
return g_texturesource->getTextureRaw(name);
}
#endif
std::string CraftItem::getGuiName()
std::wstring CraftItem::getGuiName()
{
return content_craftitem_features(m_content).description;
}

View File

@ -67,7 +67,7 @@ public:
// get the content type
content_t getContent() {return m_content;}
// this is used for tool tips
virtual std::string getGuiName() { return ""; }
virtual std::wstring getGuiName() { return L""; }
// Shall return a text to show in the GUI
virtual std::string getText() { return ""; }
// Returns the string used for inventory
@ -173,7 +173,7 @@ public:
return content_features(m_content).inventory_texture;
}
#endif
std::string getGuiName()
std::wstring getGuiName()
{
return content_features(m_content).description;
}
@ -260,7 +260,7 @@ public:
video::ITexture * getImage() const;
#endif
std::string getGuiName();
std::wstring getGuiName();
std::string getText()
{
@ -380,7 +380,7 @@ public:
return g_texturesource->getTextureRaw(getBasename());
}
#endif
std::string getGuiName() {
std::wstring getGuiName() {
return content_toolitem_features(m_content).description;
}
std::string getText()

View File

@ -1070,7 +1070,7 @@ int main(int argc, char *argv[])
// Create texture source
g_texturesource = new TextureSource(device);
drawLoadingScreen(driver,NULL);
drawLoadingScreen(driver,L"");
/*
Speed tests (done after irrlicht is loaded to get timer)
@ -1105,7 +1105,7 @@ int main(int argc, char *argv[])
// If font was not found, this will get us one
font = skin->getFont();
assert(font);
drawLoadingScreen(driver,"Setting Up UI");
drawLoadingScreen(driver,wgettext("Setting Up UI"));
u32 text_height = font->getDimension(L"Hello, world!").Height;
infostream<<"text_height="<<text_height<<std::endl;
@ -1128,7 +1128,7 @@ int main(int argc, char *argv[])
Preload some textures and stuff
*/
drawLoadingScreen(driver,"Loading MapNodes");
drawLoadingScreen(driver,wgettext("Loading MapNodes"));
init_mapnode(driver); // Second call with g_texturesource set
/*

View File

@ -201,6 +201,7 @@ ContentFeatures & content_features(MapNode &n)
#ifndef SERVER
#include "common_irrlicht.h"
#include "game.h"
#include "gettext.h"
void init_mapnode(video::IVideoDriver* driver)
#else
void init_mapnode()
@ -270,31 +271,31 @@ void init_mapnode()
Initialize mapnode content
*/
#ifndef SERVER
drawLoadingScreen(driver,"Loading Base MapNodes");
drawLoadingScreen(driver,wgettext("Loading Base MapNodes"));
#endif
content_mapnode_init(repeat);
#ifndef SERVER
drawLoadingScreen(driver,"Loading Circuit MapNodes");
drawLoadingScreen(driver,wgettext("Loading Circuit MapNodes"));
#endif
content_mapnode_circuit(repeat);
#ifndef SERVER
drawLoadingScreen(driver,"Loading Plant MapNodes");
drawLoadingScreen(driver,wgettext("Loading Plant MapNodes"));
#endif
content_mapnode_plants(repeat);
#ifndef SERVER
drawLoadingScreen(driver,"Loading Farming MapNodes");
drawLoadingScreen(driver,wgettext("Loading Farming MapNodes"));
#endif
content_mapnode_farm(repeat);
#ifndef SERVER
drawLoadingScreen(driver,"Loading Decorative MapNodes");
drawLoadingScreen(driver,wgettext("Loading Decorative MapNodes"));
#endif
content_mapnode_furniture(repeat);
#ifndef SERVER
drawLoadingScreen(driver,"Loading Interactive MapNodes");
drawLoadingScreen(driver,wgettext("Loading Interactive MapNodes"));
#endif
content_mapnode_door(repeat);
#ifndef SERVER
drawLoadingScreen(driver,"Loading Special MapNodes");
drawLoadingScreen(driver,wgettext("Loading Special MapNodes"));
#endif
content_mapnode_stair(repeat);
content_mapnode_slab(repeat);

View File

@ -197,7 +197,7 @@ struct ContentFeatures
bool rotate_tile_with_nodebox;
bool wield_nodebox;
std::string description;
std::wstring description;
std::vector<aabb3f> nodeboxes;
std::vector<aabb3f> wield_nodeboxes;
@ -320,7 +320,7 @@ struct ContentFeatures
#endif
rotate_tile_with_nodebox = false;
wield_nodebox = true;
description = std::string("");
description = std::wstring(L"");
nodeboxes.clear();
nodeboxes.push_back(core::aabbox3d<f32>(
-0.5*BS,