summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVegard Storheil Eriksen <zyp@jvnv.net>2010-11-19 17:50:39 +0100
committerVegard Storheil Eriksen <zyp@jvnv.net>2010-11-19 17:50:39 +0100
commit0da7a047a2d2be8ae3f551e0802ceaa2cd882f99 (patch)
treed8020ea503c5872869650b6b8dfa4dfe89b1882b
parenteabf64afff50054bfff677456013feacd4594c8a (diff)
Remove useless Tile(uint16_t) constructor.
-rw-r--r--common/tile.cpp6
-rw-r--r--common/tile.h8
2 files changed, 7 insertions, 7 deletions
diff --git a/common/tile.cpp b/common/tile.cpp
index 6164fcc..1b3dcd7 100644
--- a/common/tile.cpp
+++ b/common/tile.cpp
@@ -7,9 +7,3 @@ Tile::Tile() {
Tile::Tile(Tile::Type t, bool re, bool ro) : type(t), red(re), rotated(ro){
}
-
-Tile::Tile(uint16_t w) {
- type = Type(w & 0x00ff);
- red = (w >> 8);
- rotated = (w >> 9);
-}
diff --git a/common/tile.h b/common/tile.h
index 8bd01b5..14fe8c1 100644
--- a/common/tile.h
+++ b/common/tile.h
@@ -56,7 +56,13 @@ class Tile {
Tile();
Tile(Type t, bool re = false, bool ro = false);
- Tile(uint16_t w);
+
+ template<class Archive>
+ void serialize(Archive & ar, const unsigned int version) {
+ ar & type;
+ ar & red;
+ ar & rotated;
+ }
};
typedef std::vector<Tile> Tiles;