xrParticles: refactor of size type

OpenXRay · Nov 28, 2018 · d4895db · d4895db
1 parent 155f44b
commit d4895db
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/xrParticles/particle_actions.h b/src/xrParticles/particle_actions.h
@@ -56,7 +56,7 @@ class ParticleActions
     bool empty() const { return actions.empty(); }
     PAVecIt begin() { return actions.begin(); }
     PAVecIt end() { return actions.end(); }
-    int size() const { return actions.size(); }
+    size_t size() const { return actions.size(); }
 
     void resize(int cnt)
     {

diff --git a/src/xrParticles/particle_actions_collection_io.cpp b/src/xrParticles/particle_actions_collection_io.cpp
@@ -6,7 +6,7 @@ using namespace PAPI;
 void ParticleAction::Load(IReader& F)
 {
     m_Flags.assign(F.r_u32());
-    type = (PActionEnum)F.r_u32();
+    type = PActionEnum(F.r_u32());
 }
 
 void ParticleAction::Save(IWriter& F)

diff --git a/src/xrParticles/particle_manager.cpp b/src/xrParticles/particle_manager.cpp
@@ -302,7 +302,7 @@ ParticleAction* CParticleManager::CreateAction(PActionEnum type)
     return pa;
 }
 
-u32 CParticleManager::LoadActions(int alist_id, IReader& R)
+size_t CParticleManager::LoadActions(int alist_id, IReader& R)
 {
     // Execute the specified action list.
     ParticleActions* pa = GetActionListPtr(alist_id);
@@ -313,7 +313,7 @@ u32 CParticleManager::LoadActions(int alist_id, IReader& R)
         u32 cnt = R.r_u32();
         for (u32 k = 0; k < cnt; k++)
         {
-            ParticleAction* act = CreateAction((PActionEnum)R.r_u32());
+            ParticleAction* act = CreateAction(PActionEnum(R.r_u32()));
             act->Load(R);
             pa->append(act);
         }

diff --git a/src/xrParticles/particle_manager.h b/src/xrParticles/particle_manager.h
@@ -44,7 +44,7 @@ class CParticleManager : public IParticleManager
 
     // action
     ParticleAction* CreateAction(PActionEnum action_id) override;
-    u32 LoadActions(int alist_id, IReader& R) override;
+    size_t LoadActions(int alist_id, IReader& R) override;
     void SaveActions(int alist_id, IWriter& W) override;
 };
 } // namespace PAPI
diff --git a/src/xrParticles/psystem.h b/src/xrParticles/psystem.h
@@ -208,7 +208,7 @@ class IParticleManager
 
     // action
     virtual ParticleAction* CreateAction(PActionEnum type) = 0;
-    virtual u32 LoadActions(int alist_id, IReader& R) = 0;
+    virtual size_t LoadActions(int alist_id, IReader& R) = 0;
     virtual void SaveActions(int alist_id, IWriter& W) = 0;
 };