zenithsiz/dcb
1
0
Fork 0
mirror of https://github.com/Zenithsiz/dcb.git synced 2026-02-08 19:34:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replaced .chars().collect() with .to_ascii_string() for AsciiStr.

Browse Source
This commit is contained in:
Filipe Rodrigues
2020-05-01 12:20:30 +01:00
parent 52b7312294
commit 8dffe82143
4 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/game/card/digimon.rs
View File

@@ -263,7 +263,7 @@ impl Bytes for Digimon {
// Return the struct after building it
Ok(Self {
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(),
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(),
speciality: Speciality::from_bytes(&((bytes.speciality_level & 0xF0) >> 4)).map_err(FromBytesError::Speciality)?,
@@ -298,20 +298,16 @@ impl Bytes for Digimon {
effect_description: [
util::read_null_ascii_string(bytes.effect_description_0)
.map_err(FromBytesError::EffectDescriptionFirst)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_1)
.map_err(FromBytesError::EffectDescriptionSecond)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_2)
.map_err(FromBytesError::EffectDescriptionThird)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_3)
.map_err(FromBytesError::EffectDescriptionFourth)?
.chars()
.collect(),
.to_ascii_string(),
],
// Unknown

14
src/game/card/digivolve.rs
View File

@@ -103,26 +103,22 @@ impl Bytes for Digivolve {
Ok(Self {
// Name
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(),
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(),
// Effect
effect_description: [
util::read_null_ascii_string(bytes.effect_description_0)
.map_err(FromBytesError::EffectDescriptionFirst)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_1)
.map_err(FromBytesError::EffectDescriptionSecond)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_2)
.map_err(FromBytesError::EffectDescriptionThird)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_3)
.map_err(FromBytesError::EffectDescriptionFourth)?
.chars()
.collect(),
.to_ascii_string(),
],
// Unknown

14
src/game/card/item.rs
View File

@@ -169,7 +169,7 @@ impl Bytes for Item {
// And return the struct
Ok(Self {
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(),
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(),
// Effects
effect_conditions: [
@@ -188,20 +188,16 @@ impl Bytes for Item {
effect_description: [
util::read_null_ascii_string(bytes.effect_description_0)
.map_err(FromBytesError::EffectDescriptionFirst)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_1)
.map_err(FromBytesError::EffectDescriptionSecond)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_2)
.map_err(FromBytesError::EffectDescriptionThird)?
.chars()
.collect(),
.to_ascii_string(),
util::read_null_ascii_string(bytes.effect_description_3)
.map_err(FromBytesError::EffectDescriptionFourth)?
.chars()
.collect(),
.to_ascii_string(),
],
// Unknown

2
src/game/card/property/moves.rs
View File

@@ -63,7 +63,7 @@ impl Bytes for Move {
// Return the move
Ok(Self {
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.chars().collect(),
name: util::read_null_ascii_string(bytes.name).map_err(FromBytesError::Name)?.to_ascii_string(),
power: LittleEndian::read_u16(bytes.power),
unknown: LittleEndian::read_u32(bytes.unknown),
})