Rename LvdFixedString to FixedString

ultimate-research · Feb 21, 2024 · eedbaab · eedbaab
1 parent 1d95780
commit eedbaab
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 59 deletions.
diff --git a/lvd_lib/src/objects/base.rs b/lvd_lib/src/objects/base.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     id::Id,
-    string::{LvdFixedString56, LvdFixedString64},
+    string::{FixedString56, FixedString64},
     vector::Vector3,
     version::{Version, Versioned},
 };
@@ -25,7 +25,7 @@ pub enum Base {
         meta_info: Versioned<MetaInfo>,
 
         /// Name of the object as seen by the game when flagged as dynamic.
-        dynamic_name: Versioned<LvdFixedString64>,
+        dynamic_name: Versioned<FixedString64>,
     },
 
     /// `Base` version 2.
@@ -36,7 +36,7 @@ pub enum Base {
         meta_info: Versioned<MetaInfo>,
 
         /// Name of the object as seen by the game when flagged as dynamic.
-        dynamic_name: Versioned<LvdFixedString64>,
+        dynamic_name: Versioned<FixedString64>,
 
         /// Positional offset of the object when flagged as dynamic.
         dynamic_offset: Versioned<Vector3>,
@@ -51,7 +51,7 @@ pub enum Base {
         meta_info: Versioned<MetaInfo>,
 
         /// Name of the object as seen by the game when flagged as dynamic.
-        dynamic_name: Versioned<LvdFixedString64>,
+        dynamic_name: Versioned<FixedString64>,
 
         /// Positional offset of the object when flagged as dynamic.
         dynamic_offset: Versioned<Vector3>,
@@ -77,7 +77,7 @@ pub enum Base {
         meta_info: Versioned<MetaInfo>,
 
         /// Name of the object as seen by the game when flagged as dynamic.
-        dynamic_name: Versioned<LvdFixedString64>,
+        dynamic_name: Versioned<FixedString64>,
 
         /// Positional offset of the object when flagged as dynamic.
         dynamic_offset: Versioned<Vector3>,
@@ -98,7 +98,7 @@ pub enum Base {
         joint_index: i32,
 
         /// Name of the target joint from the parent model to parent the dynamic object to.
-        joint_name: Versioned<LvdFixedString64>,
+        joint_name: Versioned<FixedString64>,
     },
 }
 
@@ -126,7 +126,7 @@ pub enum MetaInfo {
         version_info: Versioned<VersionInfo>,
 
         /// Name of the object.
-        name: Versioned<LvdFixedString56>,
+        name: Versioned<FixedString56>,
     },
 }
 

diff --git a/lvd_lib/src/objects/collision/spirits_floor.rs b/lvd_lib/src/objects/collision/spirits_floor.rs
@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     objects::base::Base,
-    string::LvdFixedString64,
+    string::FixedString64,
     version::{Version, Versioned},
 };
 
@@ -27,7 +27,7 @@ pub enum CollisionSpiritsFloor {
         line_index: u32,
 
         /// Name of the line group that the object is associated with.
-        line_group: Versioned<LvdFixedString64>,
+        line_group: Versioned<FixedString64>,
     },
 
     /// `CollisionSpiritsFloor` version 2.
@@ -41,7 +41,7 @@ pub enum CollisionSpiritsFloor {
         line_index: u32,
 
         /// Name of the line group that the object is associated with.
-        line_group: Versioned<LvdFixedString64>,
+        line_group: Versioned<FixedString64>,
 
         // TODO: Field documentation. Usually 1.0. Unused?
         unk1: f32,

diff --git a/lvd_lib/src/objects/field_smash.rs b/lvd_lib/src/objects/field_smash.rs
@@ -8,7 +8,7 @@ use crate::{
     id::Id,
     objects::{base::Base, region::Region},
     shape::{LvdPath, Rect, Shape2, Shape3},
-    string::LvdFixedString32,
+    string::FixedString32,
     tag::Tag,
     vector::Vector2,
     version::{Version, Versioned},
@@ -221,10 +221,10 @@ pub enum AreaLight {
         shape: Versioned<Shape2>,
 
         // TODO: Field documentation.
-        unk1: Versioned<LvdFixedString32>,
+        unk1: Versioned<FixedString32>,
 
         // TODO: Field documentation.
-        unk2: Versioned<LvdFixedString32>,
+        unk2: Versioned<FixedString32>,
     },
 }
 

diff --git a/lvd_lib/src/objects/ptrainer.rs b/lvd_lib/src/objects/ptrainer.rs
@@ -7,7 +7,7 @@ use serde::{Deserialize, Serialize};
 use crate::{
     array::LvdArray,
     objects::base::Base,
-    string::LvdFixedString64,
+    string::FixedString64,
     vector::Vector3,
     version::{Version, Versioned},
 };
@@ -53,10 +53,10 @@ pub enum PTrainerRange {
         trainers: Versioned<LvdArray<Vector3>>,
 
         /// Name of a model for the range to inherit select transformations from.
-        parent_model_name: Versioned<LvdFixedString64>,
+        parent_model_name: Versioned<FixedString64>,
 
         /// Name of a joint from the parent model for the range to inherit select transformations from.
-        parent_joint_name: Versioned<LvdFixedString64>,
+        parent_joint_name: Versioned<FixedString64>,
     },
 }