summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-07-27 15:43:03 +0200
committeraap <aap@papnet.eu>2020-07-27 15:43:03 +0200
commitc0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f (patch)
treef28925ccb58f364bb145e54eb26ac6877d0b7652
parentCCollision done and fixes (diff)
downloadre3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.tar
re3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.tar.gz
re3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.tar.bz2
re3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.tar.lz
re3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.tar.xz
re3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.tar.zst
re3-c0eb3d10e2650a4518fa5967a1ae9e2d60e56d4f.zip
-rw-r--r--src/core/Collision.cpp11
1 files changed, 2 insertions, 9 deletions
diff --git a/src/core/Collision.cpp b/src/core/Collision.cpp
index 639962d0..268e3c5e 100644
--- a/src/core/Collision.cpp
+++ b/src/core/Collision.cpp
@@ -23,6 +23,8 @@
#include "Camera.h"
#include "ColStore.h"
+//--MIAMI: file done
+
enum Direction
{
DIR_X_POS,
@@ -36,7 +38,6 @@ enum Direction
eLevelName CCollision::ms_collisionInMemory;
CLinkList<CColModel*> CCollision::ms_colModelCache;
-//--MIAMI: done
void
CCollision::Init(void)
{
@@ -45,7 +46,6 @@ CCollision::Init(void)
CColStore::Initialise();
}
-//--MIAMI: done
void
CCollision::Shutdown(void)
{
@@ -53,7 +53,6 @@ CCollision::Shutdown(void)
CColStore::Shutdown();
}
-//--MIAMI: done
void
CCollision::Update(void)
{
@@ -97,13 +96,11 @@ GetCollisionInSector(CSector &sect)
return (eLevelName)level;
}
-//--MIAMI: done
void
CCollision::LoadCollisionWhenINeedIt(bool forceChange)
{
}
-//--MIAMI: done
void
CCollision::SortOutCollisionAfterLoad(void)
{
@@ -111,7 +108,6 @@ CCollision::SortOutCollisionAfterLoad(void)
CStreaming::LoadAllRequestedModels(false);
}
-//--MIAMI: done
void
CCollision::LoadCollisionScreen(eLevelName level)
{
@@ -426,7 +422,6 @@ CCollision::TestSphereTriangle(const CColSphere &sphere,
return dist < sphere.radius;
}
-//--MIAMI: DONE
bool
CCollision::TestLineOfSight(const CColLine &line, const CMatrix &matrix, CColModel &model, bool ignoreSeeThrough, bool ignoreShootThrough)
{
@@ -1075,7 +1070,6 @@ CCollision::ProcessSphereTriangle(const CColSphere &sphere,
return true;
}
-//--MIAMI: TODO
bool
CCollision::ProcessLineOfSight(const CColLine &line,
const CMatrix &matrix, CColModel &model,
@@ -1121,7 +1115,6 @@ CCollision::ProcessLineOfSight(const CColLine &line,
return false;
}
-//--MIAMI: TODO
bool
CCollision::ProcessVerticalLine(const CColLine &line,
const CMatrix &matrix, CColModel &model,