Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

some tweaks

This commit is contained in:
darkrose 2014-04-12 19:22:25 +10:00
parent 1d39490bcc
commit 0d8e953d67
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/content_craft.cpp
View File

@ -598,7 +598,7 @@ int getResultCount(InventoryItem *item)
void giveCreative(Player *player) void giveCreative(Player *player)
{ {
std::vector<content_t> &creativeinv = lists::get("creativeinv"); std::vector<content_t> &creativeinv = lists::get("player-creative");
player->resetInventory(); player->resetInventory();

8
src/content_mapnode.cpp
View File

@ -1290,7 +1290,7 @@ void content_mapnode_init()
f->hardness = 1.0; f->hardness = 1.0;
crafting::setBrickRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONEBRICK); crafting::setBrickRecipe(CONTENT_ROUGHSTONE,CONTENT_ROUGHSTONEBRICK);
lists::add("craftguide",i); lists::add("craftguide",i);
lists::add("creativeinv",i); lists::add("player-creative",i);
lists::add("creative",i); lists::add("creative",i);
i = CONTENT_ROUGHSTONEBLOCK; i = CONTENT_ROUGHSTONEBLOCK;
@ -2957,7 +2957,7 @@ void content_mapnode_init()
crafting::setRecipe(r,CONTENT_BORDERSTONE,1); crafting::setRecipe(r,CONTENT_BORDERSTONE,1);
} }
lists::add("craftguide",i); lists::add("craftguide",i);
lists::add("creativeinv",i); lists::add("player-creative",i);
lists::add("creative",i); lists::add("creative",i);
i = CONTENT_WOOD; 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_COAL,CONTENT_CRAFTITEM_STICK,CONTENT_TORCH);
crafting::set1over4Recipe(CONTENT_CRAFTITEM_CHARCOAL,CONTENT_CRAFTITEM_STICK,CONTENT_TORCH); crafting::set1over4Recipe(CONTENT_CRAFTITEM_CHARCOAL,CONTENT_CRAFTITEM_STICK,CONTENT_TORCH);
lists::add("craftguide",i); lists::add("craftguide",i);
lists::add("creativeinv",i); lists::add("player-creative",i);
lists::add("creative",i); lists::add("creative",i);
i = CONTENT_SIGN_WALL; i = CONTENT_SIGN_WALL;
@ -5332,7 +5332,7 @@ void content_mapnode_init()
f->initial_metadata = new CreativeChestNodeMetadata(); f->initial_metadata = new CreativeChestNodeMetadata();
f->type = CMT_WOOD; f->type = CMT_WOOD;
f->hardness = 1.0; f->hardness = 1.0;
lists::add("creativeinv",i); lists::add("player-creative",i);
lists::add("creative",i); lists::add("creative",i);
i = CONTENT_LOCKABLE_CHEST; i = CONTENT_LOCKABLE_CHEST;

2
src/content_toolitem.cpp
View File

@ -157,7 +157,7 @@ void content_toolitem_init()
f->dig_time = 0.; f->dig_time = 0.;
crafting::setPickRecipe(CONTENT_MESE,CONTENT_TOOLITEM_MESEPICK); crafting::setPickRecipe(CONTENT_MESE,CONTENT_TOOLITEM_MESEPICK);
lists::add("craftguide",i); lists::add("craftguide",i);
lists::add("creativeinv",i); lists::add("player-creative",i);
lists::add("creative",i); lists::add("creative",i);
i = CONTENT_TOOLITEM_WSHOVEL; i = CONTENT_TOOLITEM_WSHOVEL;