builds on both platforms

This commit is contained in:
Perttu Ahola 2010-12-25 02:33:41 +02:00
parent 699d0e9a5e
commit 3fe377be4e
8 changed files with 45 additions and 6 deletions

BIN
data/tool_mesepick.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 990 B

@ -250,6 +250,10 @@
RelativePath=".\src\mapsector.cpp"
>
</File>
<File
RelativePath=".\src\materials.cpp"
>
</File>
<File
RelativePath=".\src\player.cpp"
>

@ -336,6 +336,8 @@ public:
basename = "../data/tool_wpick.png";
else if(m_toolname == "STPick")
basename = "../data/tool_stpick.png";
else if(m_toolname == "MesePick")
basename = "../data/tool_mesepick.png";
// Default to cloud texture
else
basename = tile_texture_path_get(TILE_CLOUD);

@ -163,7 +163,7 @@ video::ITexture * ProgressBarTextureMod::make(video::ITexture *original,
u32 barwidth = size.Width - barpad_x*2;
v2u32 barpos(barpad_x, size.Height - barheight - barpad_y);
u32 barvalue_i = round((float)barwidth * value);
u32 barvalue_i = (u32)(((float)barwidth * value) + 0.5);
video::SColor active(255,255,0,0);
video::SColor inactive(255,0,0,0);

@ -2363,8 +2363,8 @@ int main(int argc, char *argv[])
for(u16 i=0; i<to_be_removed_count; i++)
{
core::list<ChatLine>::Iterator
i = chat_lines.begin();
chat_lines.erase(i);
it = chat_lines.begin();
chat_lines.erase(it);
}
chat_guitext->setText(whole.c_str());
// Update gui element size and position

@ -11,10 +11,14 @@ void setStoneLikeDiggingProperties(u8 material, float toughness)
{
g_material_properties[material].setDiggingProperties("",
DiggingProperties(true, 15.0*toughness, 0));
g_material_properties[material].setDiggingProperties("WPick",
DiggingProperties(true, 2.0*toughness, 65535./20.*toughness));
g_material_properties[material].setDiggingProperties("STPick",
DiggingProperties(true, 1.0*toughness, 65535./50.*toughness));
/*g_material_properties[material].setDiggingProperties("MesePick",
DiggingProperties(true, 0.0*toughness, 65535./20.*toughness));*/
}
void initializeMaterialProperties()
@ -52,7 +56,15 @@ void initializeMaterialProperties()
g_material_properties[CONTENT_WOOD].setDiggingProperties("",
DiggingProperties(true, 1.0, 0));
/*
Add MesePick to everything
*/
for(u16 i=0; i<MATERIAL_PROPERTIES_COUNT; i++)
{
g_material_properties[i].setDiggingProperties("MesePick",
DiggingProperties(true, 0.0, 65535./20.));
}
g_material_properties_initialized = true;
}

@ -2780,6 +2780,22 @@ void Server::SendInventory(u16 peer_id)
}
}
// Mese pick
if(!found)
{
ItemSpec specs[9];
specs[0] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE);
specs[1] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE);
specs[2] = ItemSpec(ITEM_MATERIAL, CONTENT_MESE);
specs[4] = ItemSpec(ITEM_CRAFT, "Stick");
specs[7] = ItemSpec(ITEM_CRAFT, "Stick");
if(checkItemCombination(items, specs))
{
rlist->addItem(new ToolItem("MesePick", 0));
found = true;
}
}
}
/*
@ -3043,6 +3059,11 @@ void Server::handlePeerChange(PeerChange &c)
}
else
{
/*{
InventoryItem *item = new MaterialItem(CONTENT_MESE, 6);
void* r = player->inventory.addItem("main", item);
assert(r == NULL);
}
{
InventoryItem *item = new MaterialItem(CONTENT_COALSTONE, 6);
void* r = player->inventory.addItem("main", item);
@ -3067,7 +3088,7 @@ void Server::handlePeerChange(PeerChange &c)
InventoryItem *item = new ToolItem("STPick", 32000);
void* r = player->inventory.addItem("main", item);
assert(r == NULL);
}
}*/
/*// Give some lights
{
InventoryItem *item = new MaterialItem(CONTENT_TORCH, 999);

@ -65,7 +65,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "constants.h"
#include "strfnd.h"
#include "porting.h"
//#include "irrlichtwrapper.h"
#include "materials.h"
/*
Settings.