From 0da7a047a2d2be8ae3f551e0802ceaa2cd882f99 Mon Sep 17 00:00:00 2001 From: Vegard Storheil Eriksen Date: Fri, 19 Nov 2010 17:50:39 +0100 Subject: Remove useless Tile(uint16_t) constructor. --- common/tile.cpp | 6 ------ common/tile.h | 8 +++++++- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'common') 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 + void serialize(Archive & ar, const unsigned int version) { + ar & type; + ar & red; + ar & rotated; + } }; typedef std::vector Tiles; -- cgit v1.2.3