NULL and 0 replaced by nullptr

IC, inline and etc removed where they're not needed

Author: Xottab-DUTY

src/Include/xrRender/EnvironmentRender.h

@@ -13,7 +13,7 @@ class CEnvDescriptor;
 class IEnvDescriptorRender
 {
 public:
-    virtual ~IEnvDescriptorRender() { ; }
+    virtual ~IEnvDescriptorRender() {}
     virtual void Copy(IEnvDescriptorRender& _in) = 0;
 
     virtual void OnDeviceCreate(CEnvDescriptor& owner) = 0;
@@ -23,7 +23,7 @@ class IEnvDescriptorRender
 class IEnvDescriptorMixerRender
 {
 public:
-    virtual ~IEnvDescriptorMixerRender() { ; }
+    virtual ~IEnvDescriptorMixerRender() {}
     virtual void Copy(IEnvDescriptorMixerRender& _in) = 0;
 
     virtual void Destroy() = 0;
@@ -34,7 +34,7 @@ class IEnvDescriptorMixerRender
 class IEnvironmentRender
 {
 public:
-    virtual ~IEnvironmentRender() { ; }
+    virtual ~IEnvironmentRender() {}
     virtual void Copy(IEnvironmentRender& _in) = 0;
     virtual void OnFrame(CEnvironment& env) = 0;
     virtual void OnLoad() = 0;

src/Include/xrRender/FactoryPtr.h

@@ -39,7 +39,7 @@ class FactoryPtr
     // unspecified bool type
     typedef T const* (FactoryPtr::*unspecified_bool_type)() const;
     operator unspecified_bool_type() const { return (!m_pObject ? 0 : &FactoryPtr::get); }
-    bool operator!() const { return m_pObject == 0; }
+    bool operator!() const { return m_pObject == nullptr; }
 private:
     void CreateObject();
     void DestroyObject();

src/Include/xrRender/KinematicsAnimated.h

@@ -91,11 +91,11 @@ class IKinematicsAnimated
     virtual MotionID ID_Cycle(shared_str N) = 0;
     virtual MotionID ID_Cycle_Safe(shared_str N) = 0;
     virtual CBlend* PlayCycle(
-        LPCSTR N, BOOL bMixIn = TRUE, PlayCallback Callback = 0, LPVOID CallbackParam = 0, u8 channel = 0) = 0;
+        LPCSTR N, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, LPVOID CallbackParam = nullptr, u8 channel = 0) = 0;
     virtual CBlend* PlayCycle(
-        MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = 0, LPVOID CallbackParam = 0, u8 channel = 0) = 0;
-    virtual CBlend* PlayCycle(u16 partition, MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = 0,
-        LPVOID CallbackParam = 0, u8 channel = 0) = 0;
+        MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr, LPVOID CallbackParam = nullptr, u8 channel = 0) = 0;
+    virtual CBlend* PlayCycle(u16 partition, MotionID M, BOOL bMixIn = TRUE, PlayCallback Callback = nullptr,
+        LPVOID CallbackParam = nullptr, u8 channel = 0) = 0;
     // fx'es
     virtual MotionID ID_FX(LPCSTR N) = 0;
     virtual MotionID ID_FX_Safe(LPCSTR N) = 0;

src/Include/xrRender/RenderVisual.h

@@ -18,9 +18,9 @@ class IRenderVisual
     virtual shared_str getDebugName() = 0;
 #endif
 
-    virtual IKinematics* dcast_PKinematics() { return 0; }
-    virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return 0; }
-    virtual IParticleCustom* dcast_ParticleCustom() { return 0; }
+    virtual IKinematics* dcast_PKinematics() { return nullptr; }
+    virtual IKinematicsAnimated* dcast_PKinematicsAnimated() { return nullptr; }
+    virtual IParticleCustom* dcast_ParticleCustom() { return nullptr; }
 };
 
 #endif //	RenderVisual_included

src/Include/xrRender/UIRender.h

@@ -50,7 +50,7 @@ class IUIRender
     //.	virtual void FlushLineStrip() = 0;
     //.	virtual void StartLineList(u32 iMaxVerts) = 0;
     //.	virtual void FlushLineList() = 0;
-    virtual void SetScissor(Irect* rect = NULL) = 0;
+    virtual void SetScissor(Irect* rect = nullptr) = 0;
     virtual void GetActiveTextureResolution(Fvector2& res) = 0;
 
     //.	virtual void PushPoint(float x, float y, u32 c, float u, float v) = 0;

src/Include/xrRender/UIShader.h

@@ -7,7 +7,7 @@ class IUIShader
 public:
     virtual ~IUIShader() { ; }
     virtual void Copy(IUIShader& _in) = 0;
-    virtual void create(LPCSTR sh, LPCSTR tex = 0) = 0;
+    virtual void create(LPCSTR sh, LPCSTR tex = nullptr) = 0;
     virtual bool inited() = 0;
     virtual void destroy() = 0;
 };

src/Include/xrRender/animation_blend.h

@@ -60,19 +60,19 @@ class CBlend
     IC void update_play(float dt, PlayCallback _Callback);
     IC bool update_falloff(float dt);
     IC bool update(float dt, PlayCallback _Callback);
-    IC ECurvature blend_state() const { return blend; }
-    IC void set_free_state() { blend = eFREE_SLOT; }
-    IC void set_accrue_state() { blend = eAccrue; }
-    IC void set_falloff_state() { blend = eFalloff; }
-    IC void set(const CBlend& r) { *this = r; }
+    ECurvature blend_state() const { return blend; }
+    void set_free_state() { blend = eFREE_SLOT; }
+    void set_accrue_state() { blend = eAccrue; }
+    void set_falloff_state() { blend = eFalloff; }
+    void set(const CBlend& r) { *this = r; }
 #ifdef DEBUG
     CBlend()
         :
 
           blendAmount(0),
           timeCurrent(0), timeTotal(0), motionID(), bone_or_part(0), channel(0), blend(eFREE_SLOT), blendAccrue(0),
           blendFalloff(0), blendPower(0), speed(0), playing(0), stop_at_end_callback(0), stop_at_end(0), fall_at_end(0),
-          Callback(0), CallbackParam(0), dwFrame(0)
+          Callback(nullptr), CallbackParam(nullptr), dwFrame(0)
     {
     }
 

src/Include/xrRender/animation_motion.h

@@ -37,7 +37,7 @@ struct MotionID
         if (valid())
             return &MotionID::get;
         else
-            return 0;
+            return nullptr;
         //		return(!valid()?0:&MotionID::get);
     }
 };

src/Layers/xrRender/Animation.h

@@ -37,8 +37,9 @@ class channels
     void set_factor(u16 channel, float factor);
 
 public:
-    IC const channal_rule& rule(u16 channel) { return rules[channel]; }
-    IC void get_def(u16 channel, channel_def& def)
+    const channal_rule& rule(u16 channel) { return rules[channel]; }
+
+    void get_def(u16 channel, channel_def& def)
     {
         VERIFY(channel < max);
         def.rule = rules[channel];

src/Layers/xrRender/AnimationKeyCalculate.h

@@ -14,7 +14,7 @@ struct ConsistantKey
     const CKey* K;
     float w;
 
-    IC void set(const CKey* _K, float _w)
+    void set(const CKey* _K, float _w)
     {
         K = _K;
         w = _w;