disambiguate?
This commit is contained in:
parent
45f0cc35dd
commit
de42ac4f9f
@ -759,7 +759,7 @@ impl Into<EquippedEntity> for PgEquipped {
|
|||||||
impl From<(CharacterEntityId, EquippedEntity)> for PgEquipped {
|
impl From<(CharacterEntityId, EquippedEntity)> for PgEquipped {
|
||||||
fn from(char_equips: (CharacterEntityId, EquippedEntity)) -> PgEquipped {
|
fn from(char_equips: (CharacterEntityId, EquippedEntity)) -> PgEquipped {
|
||||||
PgEquipped {
|
PgEquipped {
|
||||||
pchar: char_equips.0.0 as i32,
|
pchar: (char_equips.0).0 as i32,
|
||||||
weapon: char_equips.1.weapon.map(|i| i.0 as i32),
|
weapon: char_equips.1.weapon.map(|i| i.0 as i32),
|
||||||
armor: char_equips.1.armor.map(|i| i.0 as i32),
|
armor: char_equips.1.armor.map(|i| i.0 as i32),
|
||||||
shield: char_equips.1.shield.map(|i| i.0 as i32),
|
shield: char_equips.1.shield.map(|i| i.0 as i32),
|
||||||
|
Loading…
x
Reference in New Issue
Block a user