minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1 from bcnjr5/pull-request-1 

Pull request 1
This commit is contained in:
bcnjr5 2013-11-14 13:18:25 -08:00
parent dc1ded0d48 f212d5028c
commit c99cc55e31
2 changed files with 83 additions and 97 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/main.cpp
View File

@ -280,27 +280,17 @@ public:
right_active = event.MouseInput.isRightPressed();
if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
{
leftclicked = true;
}
if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
{
rightclicked = true;
}
if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP)
{
leftreleased = true;
}
if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP)
{
rightreleased = true;
}
if(event.MouseInput.Event == EMIE_MOUSE_WHEEL)
{
mouse_wheel += event.MouseInput.Wheel;
}
}
}
return false;
}
@ -646,9 +636,8 @@ void SpeedTests()
tempstring = "";
tempstring2 = "";
const u32 ii = 10;
for(u32 i=0; i<ii; i++){
for(u32 i=0; i<ii; i++)
tempstring2 += "asd";
}
for(u32 i=0; i<ii+1; i++){
tempstring += "asd";
if(tempstring == tempstring2)
@ -693,11 +682,10 @@ void SpeedTests()
}
}
for(s16 y=ii-1; y>=0; y--){
for(s16 x=0; x<ii; x++){
for(s16 x=0; x<ii; x++)
tempf = map1[v2s16(x,y)];
}
}
}
{
infostream<<"Around 5000/ms should do well here."<<std::endl;
@ -818,9 +806,7 @@ int main(int argc, char *argv[])
{
std::ostringstream os1(std::ios::binary);
os1<<" --"<<i->first;
if(i->second.type == VALUETYPE_FLAG)
{}
else
if(!(i->second.type == VALUETYPE_FLAG))
os1<<_(" <value>");
dstream<<padStringRight(os1.str(), 24);