diff options
| author | lupoDharkael <izhe@hotmail.es> | 2020-04-02 01:20:12 +0200 |
|---|---|---|
| committer | lupoDharkael <izhe@hotmail.es> | 2020-04-02 13:38:00 +0200 |
| commit | 95a1400a2ac9de1a29fa305f45b928ce8e3044bd (patch) | |
| tree | be0cd59e5a90926e9d653fed9f3b1b77e735ca2f /servers/physics_3d/gjk_epa.cpp | |
| parent | 5f11e1557156617366d2c316a97716172103980d (diff) | |
| download | redot-engine-95a1400a2ac9de1a29fa305f45b928ce8e3044bd.tar.gz | |
Replace NULL with nullptr
Diffstat (limited to 'servers/physics_3d/gjk_epa.cpp')
| -rw-r--r-- | servers/physics_3d/gjk_epa.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/servers/physics_3d/gjk_epa.cpp b/servers/physics_3d/gjk_epa.cpp index bd0d429e7b..db37f261ce 100644 --- a/servers/physics_3d/gjk_epa.cpp +++ b/servers/physics_3d/gjk_epa.cpp @@ -515,14 +515,14 @@ struct GJK { sFace* root; U count; - sList() : root(0),count(0) {} + sList() : root(nullptr),count(0) {} }; struct sHorizon { sFace* cf; sFace* ff; U nf; - sHorizon() : cf(0),ff(0),nf(0) {} + sHorizon() : cf(nullptr),ff(nullptr),nf(0) {} }; struct eStatus { enum _ { Valid, @@ -559,7 +559,7 @@ struct GJK } static inline void append(sList& list,sFace* face) { - face->l[0] = 0; + face->l[0] = nullptr; face->l[1] = list.root; if(list.root) list.root->l[0]=face; list.root = face; @@ -720,13 +720,13 @@ struct GJK } else m_status=eStatus::Degenerated; remove(m_hull,face); append(m_stock,face); - return(0); + return(nullptr); } // -- GODOT start -- //m_status=m_stock.root?eStatus::OutOfVertices:eStatus::OutOfFaces; m_status=eStatus::OutOfFaces; // -- GODOT end -- - return(0); + return(nullptr); } sFace* findbest() { |