Merge remote-tracking branch 'origin/master' into patch-modernize

This commit is contained in:
yvt 2019-07-20 16:18:10 +09:00
commit 725ee9f706
No known key found for this signature in database
GPG Key ID: 48F2768FA8D07C92
2 changed files with 0 additions and 2109 deletions

View File

@ -636,7 +636,6 @@ namespace spades {
}
// Draw block cursor
// FIXME: don't use debug line
if (p) {
if (p->IsReadyToUseTool() && p->GetTool() == Player::ToolBlock &&
p->IsAlive()) {

File diff suppressed because it is too large Load Diff