From 71760514fc044f273914c17b1510fa3cf10419b3 Mon Sep 17 00:00:00 2001
From: LaG1924 <12997935+LaG1924@users.noreply.github.com>
Date: Fri, 21 Apr 2017 18:31:43 +0500
Subject: 2017-04-21

---
 Block.cpp | 29 +++++------------------------
 1 file changed, 5 insertions(+), 24 deletions(-)

(limited to 'Block.cpp')

diff --git a/Block.cpp b/Block.cpp
index 7c45e76..64e5330 100644
--- a/Block.cpp
+++ b/Block.cpp
@@ -1,29 +1,10 @@
 #include "Block.hpp"
 
+Block::~Block() {}
 
-Block::Block(int id, unsigned char state, unsigned char light, PositionI position) : m_id(id), m_position(position),
-                                                                                     m_light(light), m_state(state) {
+Block::Block(unsigned short idAndState, unsigned char light) : id(idAndState >> 4), state(idAndState & 0x0F),
+                                                               light(light) {}
 
-}
+Block::Block(unsigned short id, unsigned char state, unsigned char light) : id(id), state(state), light(light) {}
 
-Block::~Block() {
-
-}
-
-int Block::GetId() {
-    return m_id;
-}
-
-int Block::GetState() {
-    return m_state;
-}
-
-int Block::GetLight() {
-    return m_light;
-}
-
-Block::Block(unsigned short idAndState, unsigned char light) {
-    m_id = idAndState >> 4;
-    m_state = idAndState & 0b00001111;
-    m_light = light;
-}
+Block::Block() : id(0), state(0), light(0) {}
-- 
cgit v1.2.3