Leahnaya/porymap
1
0
Fork 0
mirror of https://github.com/huderlem/porymap.git synced 2026-09-15 04:15:36 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Privatize Block members

Browse Source
This commit is contained in:
GriffinR
2023-12-12 18:32:54 -05:00
parent 8164aae151
commit 2228f78117
10 changed files with 136 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/core/block.cpp
View File

@@ -1,41 +1,45 @@
#include "block.h"
Block::Block() : metatileId(0), collision(0), elevation(0) { }
Block::Block() :
m_metatileId(0),
m_collision(0),
m_elevation(0)
{ }
Block::Block(uint16_t metatileId, uint16_t collision, uint16_t elevation) :
metatileId(metatileId),
collision(collision),
elevation(elevation)
m_metatileId(metatileId),
m_collision(collision),
m_elevation(elevation)
{ }
Block::Block(uint16_t word) :
metatileId(word & 0x3ff),
collision((word >> 10) & 0x3),
elevation((word >> 12) & 0xf)
m_metatileId(word & 0x3ff),
m_collision((word >> 10) & 0x3),
m_elevation((word >> 12) & 0xf)
{ }
Block::Block(const Block &other) :
metatileId(other.metatileId),
collision(other.collision),
elevation(other.elevation)
m_metatileId(other.m_metatileId),
m_collision(other.m_collision),
m_elevation(other.m_elevation)
{ }
Block &Block::operator=(const Block &other) {
metatileId = other.metatileId;
collision = other.collision;
elevation = other.elevation;
m_metatileId = other.m_metatileId;
m_collision = other.m_collision;
m_elevation = other.m_elevation;
return *this;
}
uint16_t Block::rawValue() const {
return static_cast<uint16_t>(
(metatileId & 0x3ff) +
((collision & 0x3) << 10) +
((elevation & 0xf) << 12));
(m_metatileId & 0x3ff) +
((m_collision & 0x3) << 10) +
((m_elevation & 0xf) << 12));
}
bool Block::operator ==(Block other) const {
return (metatileId == other.metatileId) && (collision == other.collision) && (elevation == other.elevation);
return (m_metatileId == other.m_metatileId) && (m_collision == other.m_collision) && (m_elevation == other.m_elevation);
}
bool Block::operator !=(Block other) const {