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.cpp
+4 -4
View File
@@ -2,7 +2,7 @@
MapObject::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 ) {
setTerrain(terrain_id, terrain_type);
if(character_id != 0)
setCharacter(character_id, character_type);
@@ -12,7 +12,7 @@ MapObject::MapObject( uint16_t terrain_id, LandType::Value terrain_type,
MapObject::MapObject( uint16_t terrain_id, uint8_t terrain_type,
uint8_t character_id, uint8_t character_type,
uint8_t modifier_id, uint8_t modifier_data )
uint32_t modifier_id, uint8_t modifier_data )
: MapObject( terrain_id, static_cast< LandType::Value >( terrain_type ),
character_id,
static_cast< LandType::Value >( character_type ),
@@ -40,7 +40,7 @@ void MapObject::setCharacter( uint8_t id, uint8_t land_type ) {
setCharacter( id, static_cast< LandType::Value >( land_type ) );
}
void MapObject::setModifier( uint8_t id, uint8_t data ) {
void MapObject::setModifier( uint32_t id, uint8_t data ) {
modifier_id = id;
modifier_data = data;
if(hasCharacter()) {
@@ -81,7 +81,7 @@ uint8_t MapObject::getCharacterId() {
return character_id;
}
uint8_t MapObject::getModifierId() {
uint32_t MapObject::getModifierId() {
return modifier_id;
}