From 0d8e953d674c8a6f87c88d22ec14ecbe44a6c07d Mon Sep 17 00:00:00 2001 From: darkrose Date: Sat, 12 Apr 2014 19:22:25 +1000 Subject: [PATCH] some tweaks --- src/content_craft.cpp | 2 +- src/content_mapnode.cpp | 8 ++++---- src/content_toolitem.cpp | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/content_craft.cpp b/src/content_craft.cpp index d495a33..efae5cb 100644 --- a/src/content_craft.cpp +++ b/src/content_craft.cpp @@ -598,7 +598,7 @@ int getResultCount(InventoryItem *item) void giveCreative(Player *player) { - std::vector &creativeinv = lists::get("creativeinv"); + std::vector &creativeinv = lists::get("player-creative"); player->resetInventory(); diff --git a/src/content_mapnode.cpp b/src/content_mapnode.cpp index 53079e8..3ddd93e 100644 --- a/src/content_mapnode.cpp +++ b/src/content_mapnode.cpp @@ -1290,7 +1290,7 @@ void content_mapnode_init() f->hardness = 1.0; crafting::setBrickRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONEBRICK); lists::add("craftguide",i); - lists::add("creativeinv",i); + lists::add("player-creative",i); lists::add("creative",i); i = CONTENT_ROUGHSTONEBLOCK; @@ -2957,7 +2957,7 @@ void content_mapnode_init() crafting::setRecipe(r,CONTENT_BORDERSTONE,1); } lists::add("craftguide",i); - lists::add("creativeinv",i); + lists::add("player-creative",i); lists::add("creative",i); i = CONTENT_WOOD; @@ -5082,7 +5082,7 @@ void content_mapnode_init() crafting::set1over4Recipe(CONTENT_CRAFTITEM_COAL,CONTENT_CRAFTITEM_STICK,CONTENT_TORCH); crafting::set1over4Recipe(CONTENT_CRAFTITEM_CHARCOAL,CONTENT_CRAFTITEM_STICK,CONTENT_TORCH); lists::add("craftguide",i); - lists::add("creativeinv",i); + lists::add("player-creative",i); lists::add("creative",i); i = CONTENT_SIGN_WALL; @@ -5332,7 +5332,7 @@ void content_mapnode_init() f->initial_metadata = new CreativeChestNodeMetadata(); f->type = CMT_WOOD; f->hardness = 1.0; - lists::add("creativeinv",i); + lists::add("player-creative",i); lists::add("creative",i); i = CONTENT_LOCKABLE_CHEST; diff --git a/src/content_toolitem.cpp b/src/content_toolitem.cpp index 37b87b9..dff7e95 100644 --- a/src/content_toolitem.cpp +++ b/src/content_toolitem.cpp @@ -157,7 +157,7 @@ void content_toolitem_init() f->dig_time = 0.; crafting::setPickRecipe(CONTENT_MESE,CONTENT_TOOLITEM_MESEPICK); lists::add("craftguide",i); - lists::add("creativeinv",i); + lists::add("player-creative",i); lists::add("creative",i); i = CONTENT_TOOLITEM_WSHOVEL;