mirror of
https://gitea.sffempire.ru/Kolyah35/minecraft-pe-0.6.1.git
synced 2026-03-22 07:53:30 +00:00
revert all sht
This commit is contained in:
@@ -873,16 +873,12 @@ void Minecraft::tickInput() {
|
|||||||
if (useTouchscreen()) {
|
if (useTouchscreen()) {
|
||||||
// Touch: gesture recognizer classifies the action type (turn/destroy/build)
|
// Touch: gesture recognizer classifies the action type (turn/destroy/build)
|
||||||
BuildActionIntention bai;
|
BuildActionIntention bai;
|
||||||
bool buildHandled = inputHolder->getBuildInput()->tickBuild(player, &bai);
|
|
||||||
|
|
||||||
if (buildHandled) {
|
if (inputHolder && inputHolder->getBuildInput()->tickBuild(player, &bai)) {
|
||||||
if (!bai.isRemoveContinue())
|
handleBuildAction(&bai);
|
||||||
handleBuildAction(&bai);
|
} else {
|
||||||
|
gameMode->stopDestroyBlock();
|
||||||
}
|
}
|
||||||
#ifdef __ANDROID__
|
|
||||||
bool isTryingToDestroyBlock = buildHandled && bai.isRemove();
|
|
||||||
handleMouseDown(MouseAction::ACTION_LEFT, isTryingToDestroyBlock || (buildHandled && bai.isInteract()));
|
|
||||||
#endif
|
|
||||||
} else {
|
} else {
|
||||||
// Desktop: left mouse = destroy/attack
|
// Desktop: left mouse = destroy/attack
|
||||||
if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
|
if (Mouse::isButtonDown(MouseAction::ACTION_LEFT)) {
|
||||||
@@ -925,32 +921,6 @@ void Minecraft::tickInput() {
|
|||||||
TIMER_POP();
|
TIMER_POP();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
void Minecraft::handleMouseDown(int button, bool down) {
|
|
||||||
#ifndef STANDALONE_SERVER
|
|
||||||
#ifdef __ANDROID__
|
|
||||||
if(player->isUsingItem()) {
|
|
||||||
if(!down) {
|
|
||||||
gameMode->releaseUsingItem(player);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
if(player->isSleeping()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (button == MouseAction::ACTION_LEFT && missTime > 0) return;
|
|
||||||
if (down && hitResult.type == TILE && button == MouseAction::ACTION_LEFT && !hitResult.indirectHit) {
|
|
||||||
int x = hitResult.x;
|
|
||||||
int y = hitResult.y;
|
|
||||||
int z = hitResult.z;
|
|
||||||
gameMode->continueDestroyBlock(x, y, z, hitResult.f);
|
|
||||||
particleEngine->crack(x, y, z, hitResult.f);
|
|
||||||
player->swing();
|
|
||||||
} else {
|
|
||||||
gameMode->stopDestroyBlock();
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void Minecraft::handleBuildAction(BuildActionIntention* action) {
|
void Minecraft::handleBuildAction(BuildActionIntention* action) {
|
||||||
#ifndef STANDALONE_SERVER
|
#ifndef STANDALONE_SERVER
|
||||||
|
|||||||
Reference in New Issue
Block a user