summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJulian Laubstein <julianlaubstein@yahoo.de>2014-05-19 10:37:43 +0200
committerJulian Laubstein <julianlaubstein@yahoo.de>2014-05-19 10:37:43 +0200
commitcfbb2563604e77e044be9a0f12b2152a7d626b51 (patch)
tree7dd3d640e9bfbe3cab120ded858a8b34c1b09555
parentremoved the <list> include (diff)
downloadcuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.tar
cuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.tar.gz
cuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.tar.bz2
cuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.tar.lz
cuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.tar.xz
cuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.tar.zst
cuberite-cfbb2563604e77e044be9a0f12b2152a7d626b51.zip
-rw-r--r--Tools/MCADefrag/Globals.h1
-rw-r--r--src/Simulator/IncrementalRedstoneSimulator.h14
2 files changed, 13 insertions, 2 deletions
diff --git a/Tools/MCADefrag/Globals.h b/Tools/MCADefrag/Globals.h
index 0f31de7e3..17dc3920d 100644
--- a/Tools/MCADefrag/Globals.h
+++ b/Tools/MCADefrag/Globals.h
@@ -225,6 +225,7 @@ template <typename Type> class cItemCallback
public:
/// Called for each item in the internal list; return true to stop the loop, or false to continue enumerating
virtual bool Item(Type * a_Type) = 0;
+ virtual ~cItemCallback();
} ;
diff --git a/src/Simulator/IncrementalRedstoneSimulator.h b/src/Simulator/IncrementalRedstoneSimulator.h
index 233a3d408..a57a17328 100644
--- a/src/Simulator/IncrementalRedstoneSimulator.h
+++ b/src/Simulator/IncrementalRedstoneSimulator.h
@@ -202,8 +202,13 @@ private:
case E_BLOCK_POWERED_RAIL:
{
return true;
+ break;
+ }
+ default:
+ {
+ return false;
+ break;
}
- default: return false;
}
}
@@ -275,8 +280,13 @@ private:
case E_BLOCK_PISTON:
{
return true;
+ break;
+ }
+ default:
+ {
+ return false;
+ break;
}
- default: return false;
}
}
};