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

Several code optimizations to remove some redundant redundancies, optimizing the code.

This commit is contained in:
bcnjr5 2013-11-14 16:13:38 -05:00
parent ad793533ea
commit f212d5028c
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main.cpp
View File

@ -275,15 +275,20 @@ public:
} }
else else
{ {
left_active = event.MouseInput.isLeftPressed(); left_active = event.MouseInput.isLeftPressed();
middle_active = event.MouseInput.isMiddlePressed(); middle_active = event.MouseInput.isMiddlePressed();
right_active = event.MouseInput.isRightPressed(); right_active = event.MouseInput.isRightPressed();
if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN) leftclicked = true; if(event.MouseInput.Event == EMIE_LMOUSE_PRESSED_DOWN)
if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN) rightclicked = true; leftclicked = true;
if(event.MouseInput.Event == EMIE_LMOUSE_LEFT_UP) leftreleased = true; if(event.MouseInput.Event == EMIE_RMOUSE_PRESSED_DOWN)
if(event.MouseInput.Event == EMIE_RMOUSE_LEFT_UP) rightreleased = true; rightclicked = true;
if(event.MouseInput.Event == EMIE_MOUSE_WHEEL) mouse_wheel += event.MouseInput.Wheel; 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;
} }
} }
@ -631,9 +636,8 @@ void SpeedTests()
tempstring = ""; tempstring = "";
tempstring2 = ""; tempstring2 = "";
const u32 ii = 10; const u32 ii = 10;
for(u32 i=0; i<ii; i++){ for(u32 i=0; i<ii; i++)
tempstring2 += "asd"; tempstring2 += "asd";
}
for(u32 i=0; i<ii+1; i++){ for(u32 i=0; i<ii+1; i++){
tempstring += "asd"; tempstring += "asd";
if(tempstring == tempstring2) if(tempstring == tempstring2)
@ -678,9 +682,8 @@ void SpeedTests()
} }
} }
for(s16 y=ii-1; y>=0; y--){ 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)]; tempf = map1[v2s16(x,y)];
}
} }
} }
@ -803,9 +806,7 @@ int main(int argc, char *argv[])
{ {
std::ostringstream os1(std::ios::binary); std::ostringstream os1(std::ios::binary);
os1<<" --"<<i->first; os1<<" --"<<i->first;
if(i->second.type == VALUETYPE_FLAG) if(!(i->second.type == VALUETYPE_FLAG))
{}
else
os1<<_(" <value>"); os1<<_(" <value>");
dstream<<padStringRight(os1.str(), 24); dstream<<padStringRight(os1.str(), 24);