Remove give_initial_stuff
parent
c1479a2732
commit
77337271fc
|
@ -124,77 +124,4 @@ void craft_set_creative_inventory(Player *player, IGameDef *gamedef)
|
||||||
}*/
|
}*/
|
||||||
}
|
}
|
||||||
|
|
||||||
void craft_give_initial_stuff(Player *player, IGameDef *gamedef)
|
|
||||||
{
|
|
||||||
INodeDefManager *ndef = gamedef->ndef();
|
|
||||||
|
|
||||||
{
|
|
||||||
InventoryItem *item = new ToolItem(gamedef, "SteelPick", 0);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new MaterialItem(gamedef, LEGN(ndef, "CONTENT_TORCH"), 99);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new ToolItem(gamedef, "SteelAxe", 0);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new ToolItem(gamedef, "SteelShovel", 0);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new MaterialItem(gamedef, LEGN(ndef, "CONTENT_COBBLE"), 99);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
/*{
|
|
||||||
InventoryItem *item = new MaterialItem(gamedef, LEGN(ndef, "CONTENT_MESE"), 6);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new MaterialItem(gamedef, LEGN(ndef, "CONTENT_COALSTONE"), 6);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new MaterialItem(gamedef, LEGN(ndef, "CONTENT_WOOD"), 6);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new CraftItem(gamedef, "Stick", 4);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new ToolItem(gamedef, "WPick", 32000);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}
|
|
||||||
{
|
|
||||||
InventoryItem *item = new ToolItem(gamedef, "STPick", 32000);
|
|
||||||
void* r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == NULL);
|
|
||||||
}*/
|
|
||||||
/*// and some signs
|
|
||||||
for(u16 i=0; i<4; i++)
|
|
||||||
{
|
|
||||||
InventoryItem *item = new MapBlockObjectItem(gamedef, "Sign Example text");
|
|
||||||
bool r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == true);
|
|
||||||
}*/
|
|
||||||
/*// Give some other stuff
|
|
||||||
{
|
|
||||||
InventoryItem *item = new MaterialItem(gamedef, LEGN(ndef, "CONTENT_TREE"), 999);
|
|
||||||
bool r = player->inventory.addItem("main", item);
|
|
||||||
assert(r == true);
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
|
@ -26,8 +26,5 @@ class IGameDef;
|
||||||
|
|
||||||
void craft_set_creative_inventory(Player *player, IGameDef *gamedef);
|
void craft_set_creative_inventory(Player *player, IGameDef *gamedef);
|
||||||
|
|
||||||
// Called when give_initial_stuff setting is used
|
|
||||||
void craft_give_initial_stuff(Player *player, IGameDef *gamedef);
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -89,7 +89,6 @@ void set_default_settings(Settings *settings)
|
||||||
settings->setDefault("enable_damage", "true");
|
settings->setDefault("enable_damage", "true");
|
||||||
settings->setDefault("only_peaceful_mobs", "false");
|
settings->setDefault("only_peaceful_mobs", "false");
|
||||||
settings->setDefault("fixed_map_seed", "");
|
settings->setDefault("fixed_map_seed", "");
|
||||||
settings->setDefault("give_initial_stuff", "false");
|
|
||||||
settings->setDefault("default_password", "");
|
settings->setDefault("default_password", "");
|
||||||
settings->setDefault("default_privs", "build, shout");
|
settings->setDefault("default_privs", "build, shout");
|
||||||
|
|
||||||
|
|
|
@ -4647,10 +4647,6 @@ Player *Server::emergePlayer(const char *name, const char *password, u16 peer_id
|
||||||
// Set creative inventory
|
// Set creative inventory
|
||||||
craft_set_creative_inventory(player, this);
|
craft_set_creative_inventory(player, this);
|
||||||
}
|
}
|
||||||
else if(g_settings->getBool("give_initial_stuff"))
|
|
||||||
{
|
|
||||||
craft_give_initial_stuff(player, this);
|
|
||||||
}
|
|
||||||
|
|
||||||
return player;
|
return player;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue