aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/math
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sword25/math')
-rw-r--r--engines/sword25/math/geometry.h3
-rw-r--r--engines/sword25/math/geometry_script.cpp3
-rw-r--r--engines/sword25/math/line.h3
-rw-r--r--engines/sword25/math/polygon.cpp5
-rw-r--r--engines/sword25/math/polygon.h9
-rw-r--r--engines/sword25/math/region.cpp5
-rw-r--r--engines/sword25/math/region.h7
-rw-r--r--engines/sword25/math/regionregistry.cpp3
-rw-r--r--engines/sword25/math/regionregistry.h3
-rw-r--r--engines/sword25/math/vertex.cpp3
-rw-r--r--engines/sword25/math/vertex.h6
-rw-r--r--engines/sword25/math/walkregion.cpp9
-rw-r--r--engines/sword25/math/walkregion.h3
13 files changed, 12 insertions, 50 deletions
diff --git a/engines/sword25/math/geometry.h b/engines/sword25/math/geometry.h
index 60898df635..bdbd5b2052 100644
--- a/engines/sword25/math/geometry.h
+++ b/engines/sword25/math/geometry.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/engines/sword25/math/geometry_script.cpp b/engines/sword25/math/geometry_script.cpp
index 4b5e0550fe..70798f7692 100644
--- a/engines/sword25/math/geometry_script.cpp
+++ b/engines/sword25/math/geometry_script.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/engines/sword25/math/line.h b/engines/sword25/math/line.h
index d57fce68f7..9eaa2d3c8c 100644
--- a/engines/sword25/math/line.h
+++ b/engines/sword25/math/line.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/engines/sword25/math/polygon.cpp b/engines/sword25/math/polygon.cpp
index e8385c60c8..2e7836ff77 100644
--- a/engines/sword25/math/polygon.cpp
+++ b/engines/sword25/math/polygon.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -62,7 +59,7 @@ Polygon::~Polygon() {
}
bool Polygon::init(int vertexCount_, const Vertex *vertices_) {
- // Rember the old obstate to restore it if an error occurs whilst initialising it with the new data
+ // Rember the old obstate to restore it if an error occurs whilst initializing it with the new data
int oldvertexCount = this->vertexCount;
Vertex *oldvertices = this->vertices;
diff --git a/engines/sword25/math/polygon.h b/engines/sword25/math/polygon.h
index 4bb28f827a..ffdbf14f6b 100644
--- a/engines/sword25/math/polygon.h
+++ b/engines/sword25/math/polygon.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -81,15 +78,15 @@ public:
virtual ~Polygon();
/**
- * Initialises the BS_Polygon with a list of Vertecies.
+ * Initializes the BS_Polygon with a list of Vertecies.
*
* The Vertices need to define a polygon must not have self-intersections.
- * If a polygon already has verticies, this will re-initialise it with the new list.
+ * If a polygon already has verticies, this will re-initialize it with the new list.
*
* @param VertexCount The number of vertices being passed
* @param Vertecies An array of BS_Vertex objects representing the vertices in the polygon.
* @return Returns false if the Vertecies have self-intersections. In this case,
- * the object is not initialised.
+ * the object is not initialized.
*/
bool init(int vertexCount_, const Vertex *vertices_);
diff --git a/engines/sword25/math/region.cpp b/engines/sword25/math/region.cpp
index 5d08b0c14e..7681ef6d9f 100644
--- a/engines/sword25/math/region.cpp
+++ b/engines/sword25/math/region.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -118,7 +115,7 @@ bool Region::init(const Polygon &contour, const Common::Array<Polygon> *pHoles)
}
- // Initialise bounding box
+ // Initialize bounding box
updateBoundingBox();
_valid = true;
diff --git a/engines/sword25/math/region.h b/engines/sword25/math/region.h
index fa65b4b7ad..0fd7223631 100644
--- a/engines/sword25/math/region.h
+++ b/engines/sword25/math/region.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -76,12 +73,12 @@ public:
virtual ~Region();
/**
- * Initialises a BS_Region object
+ * Initializes a BS_Region object
* @param Contour A polygon indicating the outline of the region
* @param pHoles A pointer to an array of polygons representing the hole state in the region.
* If the region has no holes, it must be passed as NULL. The default value is NULL.
* @return Returns true if the initialisation was successful, otherwise false.
- * @remark If the region was already initialised, the old state will be deleted.
+ * @remark If the region was already initialized, the old state will be deleted.
*/
virtual bool init(const Polygon &contour, const Common::Array<Polygon> *pHoles = NULL);
diff --git a/engines/sword25/math/regionregistry.cpp b/engines/sword25/math/regionregistry.cpp
index 978a1807f7..dff8560205 100644
--- a/engines/sword25/math/regionregistry.cpp
+++ b/engines/sword25/math/regionregistry.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/engines/sword25/math/regionregistry.h b/engines/sword25/math/regionregistry.h
index db3e021e25..9e0a28bea7 100644
--- a/engines/sword25/math/regionregistry.h
+++ b/engines/sword25/math/regionregistry.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/engines/sword25/math/vertex.cpp b/engines/sword25/math/vertex.cpp
index 3746ec9410..b486d35e7e 100644
--- a/engines/sword25/math/vertex.cpp
+++ b/engines/sword25/math/vertex.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
diff --git a/engines/sword25/math/vertex.h b/engines/sword25/math/vertex.h
index 0e6d14502c..4cb0eaca30 100644
--- a/engines/sword25/math/vertex.h
+++ b/engines/sword25/math/vertex.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -46,7 +43,8 @@
#include <math.h>
#include "common/rect.h"
#include "sword25/kernel/common.h"
-#include "sword25/util/lua/lua.h"
+
+struct lua_State;
#if defined(MACOSX) || defined(SOLARIS) || defined(__MINGW32__)
#define sqrtf(x) ((float)sqrt(x))
diff --git a/engines/sword25/math/walkregion.cpp b/engines/sword25/math/walkregion.cpp
index 8306553f7b..bace4d54bc 100644
--- a/engines/sword25/math/walkregion.cpp
+++ b/engines/sword25/math/walkregion.cpp
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
@@ -104,7 +101,7 @@ static void initDijkstraNodes(DijkstraNode::Container &dijkstraNodes, const Regi
// Allocate sufficient space in the array
dijkstraNodes.resize(nodes.size());
- // Initialise all the nodes which are visible from the starting node
+ // Initialize all the nodes which are visible from the starting node
DijkstraNode::Iter dijkstraIter = dijkstraNodes.begin();
for (Common::Array<Vertex>::const_iterator nodesIter = nodes.begin();
nodesIter != nodes.end(); nodesIter++, dijkstraIter++) {
@@ -176,7 +173,7 @@ void reverseArray(Common::Array<T> &arr) {
bool WalkRegion::findPath(const Vertex &start, const Vertex &end, BS_Path &path) const {
// This is an implementation of Dijkstra's algorithm
- // Initialise edge node list
+ // Initialize edge node list
DijkstraNode::Container dijkstraNodes;
initDijkstraNodes(dijkstraNodes, *this, start, _nodes);
@@ -250,7 +247,7 @@ void WalkRegion::initNodeVector() {
}
void WalkRegion::computeVisibilityMatrix() {
- // Initialise visibility matrix
+ // Initialize visibility matrix
_visibilityMatrix = Common::Array< Common::Array <int> >();
for (uint idx = 0; idx < _nodes.size(); ++idx) {
Common::Array<int> arr;
diff --git a/engines/sword25/math/walkregion.h b/engines/sword25/math/walkregion.h
index e8bf40becc..7dded1980b 100644
--- a/engines/sword25/math/walkregion.h
+++ b/engines/sword25/math/walkregion.h
@@ -18,9 +18,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL$
- * $Id$
- *
*/
/*
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-11 03:31:28 +0000