zv0n/game
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mario: support the new modifier object IDs in maploader

Browse Source
This commit is contained in:
zvon
2021-08-08 21:36:47 +02:00
parent a01b6070f3
commit 45ac4dad64
3 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mario/mapobject.hpp
+5 -5
View File
@@ -7,16 +7,16 @@ class MapObject {
public:
MapObject() = default;
MapObject( uint16_t terrain_id, uint8_t terrain_type, uint8_t character_id,
uint8_t character_type, uint8_t modifier_id,
uint8_t character_type, uint32_t modifier_id,
uint8_t modifier_data );
MapObject( uint16_t terrain_id, LandType::Value terrain_type,
uint8_t character_id, LandType::Value character_type,
uint8_t modifier_id, uint8_t modifier_data );
uint32_t modifier_id, uint8_t modifier_data );
void setTerrain( uint16_t id, LandType::Value land_type );
void setTerrain( uint16_t id, uint8_t land_type );
void setCharacter( uint8_t id, LandType::Value land_type );
void setCharacter( uint8_t id, uint8_t land_type );
void setModifier( uint8_t id, uint8_t data );
void setModifier( uint32_t id, uint8_t data );
void unsetTerrain();
void unsetModifier();
void unsetCharacter();
@@ -25,7 +25,7 @@ public:
uint16_t getTerrainId();
uint8_t getCharacterId();
uint8_t getModifierId();
uint32_t getModifierId();
LandType::Value getTerrainType();
LandType::Value getCharacterType();
uint8_t getModifierData();
@@ -35,7 +35,7 @@ private:
uint16_t terrain_id = 0;
LandType::Value character_type = LandType::OVERWORLD;
uint8_t character_id = 0;
uint8_t modifier_id = 0;
uint32_t modifier_id = 0;
uint8_t modifier_data = 0;
};