|
@@ -258,7 +258,7 @@ bool BasicBlockItem::canBeStackedWith( Item* zItem ) const
|
|
maxHP == item->maxHP &&
|
|
maxHP == item->maxHP &&
|
|
hardness == item->hardness &&
|
|
hardness == item->hardness &&
|
|
toolId == item->toolId &&
|
|
toolId == item->toolId &&
|
|
- speedModifier == item->speedModifier;
|
|
|
|
|
|
+ speedModifier == item->speedModifier && interactable == item->interactable;
|
|
}
|
|
}
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|
|
@@ -281,6 +281,7 @@ void BasicBlockItemType::loadSuperItem( Item* zItem, Framework::StreamReader* zR
|
|
zReader->lese( (char*)&item->hardness, 4 );
|
|
zReader->lese( (char*)&item->hardness, 4 );
|
|
zReader->lese( (char*)&item->toolId, 4 );
|
|
zReader->lese( (char*)&item->toolId, 4 );
|
|
zReader->lese( (char*)&item->speedModifier, 4 );
|
|
zReader->lese( (char*)&item->speedModifier, 4 );
|
|
|
|
+ zReader->lese( (char*)&item->interactable, 1 );
|
|
}
|
|
}
|
|
|
|
|
|
void BasicBlockItemType::saveSuperItem( const Item* zItem, Framework::StreamWriter* zWriter ) const
|
|
void BasicBlockItemType::saveSuperItem( const Item* zItem, Framework::StreamWriter* zWriter ) const
|
|
@@ -296,6 +297,7 @@ void BasicBlockItemType::saveSuperItem( const Item* zItem, Framework::StreamWrit
|
|
zWriter->schreibe( (char*)&item->hardness, 4 );
|
|
zWriter->schreibe( (char*)&item->hardness, 4 );
|
|
zWriter->schreibe( (char*)&item->toolId, 4 );
|
|
zWriter->schreibe( (char*)&item->toolId, 4 );
|
|
zWriter->schreibe( (char*)&item->speedModifier, 4 );
|
|
zWriter->schreibe( (char*)&item->speedModifier, 4 );
|
|
|
|
+ zWriter->schreibe( (char*)&item->interactable, 1 );
|
|
}
|
|
}
|
|
|
|
|
|
void BasicBlockItemType::initializeItem( BasicBlockItem* zItem, bool transparent, bool passable, float hp, float maxHP, float hardness, int toolId, float speedModifier ) const
|
|
void BasicBlockItemType::initializeItem( BasicBlockItem* zItem, bool transparent, bool passable, float hp, float maxHP, float hardness, int toolId, float speedModifier ) const
|