Rename Box::WithinBox methods to IsWithinBox

MaximDude · MaximDude · commit 820f8183f932 · 2020-03-18T10:35:50.000+02:00
Nothing in the data repo is using the lua bindings so no extra work there
diff --git a/Activities/GATutorial.cpp b/Activities/GATutorial.cpp
@@ -705,7 +705,7 @@ void GATutorial::Update()
         for (int area = 0; area < AREACOUNT; ++area)
         {
             // Switch if within the trigger box of a new area
-            if (area != m_CurrentArea && m_TriggerBoxes[area].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
+            if (area != m_CurrentArea && m_TriggerBoxes[area].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
             {
                 // Change to the new area
                 m_PrevArea = m_CurrentArea;
@@ -722,7 +722,7 @@ void GATutorial::Update()
         {
 
             // Switch if within the trigger box of a new area
-            if (area != m_CurrentArea && m_TriggerBoxes[area].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
+            if (area != m_CurrentArea && m_TriggerBoxes[area].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
             {
 
             if (m_FightTriggers[stage].Reset();
@@ -843,7 +843,7 @@ void GATutorial::Update()
     if (m_pControlledActor[m_TutorialPlayer])
     {
         // Triggered defending stage
-        if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
+        if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))
         {
             // Take over control of screen messages
             m_MsgTimer[m_TutorialPlayer].Reset();
diff --git a/Activities/GameActivity.cpp b/Activities/GameActivity.cpp
@@ -2271,7 +2271,7 @@ void GameActivity::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int w
             for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
             {
                 // See if we found the point to be within the screen or not
-                if (wItr->WithinBox((*itr).m_ScenePos))
+                if (wItr->IsWithinBox((*itr).m_ScenePos))
                 {
                     nearestBoxItr = wItr;
                     withinAny = true;
diff --git a/Entities/Deployment.cpp b/Entities/Deployment.cpp
@@ -669,7 +669,7 @@ bool Deployment::IsOnScenePoint(Vector &scenePoint) const
     for (int i = 0; i < passes; ++i)
     {
 
-        if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
+        if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
         {
             if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor ||
                (m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) ||
diff --git a/Entities/MOSRotating.cpp b/Entities/MOSRotating.cpp
@@ -1363,7 +1363,7 @@ bool MOSRotating::IsOnScenePoint(Vector &scenePoint) const
     // Check all the passes needed
     for (int i = 0; i < passes; ++i)
     {
-        if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
+        if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
         {
             if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor ||
                (m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) ||
diff --git a/Entities/MOSprite.cpp b/Entities/MOSprite.cpp
@@ -399,7 +399,7 @@ bool MOSprite::IsOnScenePoint(Vector &scenePoint) const
     // Check all the passes needed
     for (int i = 0; i < passes; ++i)
     {
-        if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
+        if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
         {
             if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor ||
                (m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) ||
diff --git a/Entities/Scene.cpp b/Entities/Scene.cpp
@@ -185,7 +185,7 @@ bool Scene::Area::IsInside(const Vector &point) const
         // Iterate through the wrapped boxes - will only be one if there's no wrapping
         for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
         {
-            if (wItr->WithinBox(point))
+            if (wItr->IsWithinBox(point))
                 return true;
         }
     }
@@ -211,7 +211,7 @@ bool Scene::Area::IsInsideX(float pointX) const
         // Iterate through the wrapped boxes - will only be one if there's no wrapping
         for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
         {
-            if (wItr->WithinBoxX(pointX))
+            if (wItr->IsWithinBoxX(pointX))
                 return true;
         }
     }
@@ -237,7 +237,7 @@ bool Scene::Area::IsInsideY(float pointY) const
         // Iterate through the wrapped boxes - will only be one if there's no wrapping
         for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
         {
-            if (wItr->WithinBoxY(pointY))
+            if (wItr->IsWithinBoxY(pointY))
                 return true;
         }
     }
@@ -324,7 +324,7 @@ Box * Scene::Area::GetBoxInside(const Vector &point)
         for (list<Box>::const_iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
         {
             // Return the BoxList box, not the inconsequential wrapped copy
-            if (wItr->WithinBox(point))
+            if (wItr->IsWithinBox(point))
                 return &(*aItr);
         }
     }
@@ -351,7 +351,7 @@ Box Scene::Area::RemoveBoxInside(const Vector &point)
         // Iterate through the wrapped boxes - will only be one if there's no wrapping
         for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
         {
-            if (wItr->WithinBox(point))
+            if (wItr->IsWithinBox(point))
             {
                 // Remove the BoxList box, not the inconsequential wrapped copy
                 returnBox = (*aItr);
diff --git a/Entities/TerrainObject.cpp b/Entities/TerrainObject.cpp
@@ -327,7 +327,7 @@ bool TerrainObject::IsOnScenePoint(Vector &scenePoint) const
     for (int i = 0; i < passes; ++i)
     {
 
-        if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
+        if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))
         {
             if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor ||
                (m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) ||
diff --git a/Managers/LuaMan.cpp b/Managers/LuaMan.cpp
@@ -514,9 +514,9 @@ int LuaMan::Create()
             .property("Area", &Box::GetArea)
             .def("GetRandomPoint", &Box::GetRandomPoint)
             .def("Unflip", &Box::Unflip)
-            .def("WithinBox", &Box::WithinBox)
-            .def("WithinBoxX", &Box::WithinBoxX)
-            .def("WithinBoxY", &Box::WithinBoxY)
+            .def("IsWithinBox", &Box::IsWithinBox)
+            .def("IsWithinBoxX", &Box::IsWithinBoxX)
+            .def("IsWithinBoxY", &Box::IsWithinBoxY)
             .def("GetWithinBoxX", &Box::GetWithinBoxX)
             .def("GetWithinBoxY", &Box::GetWithinBoxY)
             .def("GetWithinBox", &Box::GetWithinBox),
diff --git a/Menus/MainMenuGUI.cpp b/Menus/MainMenuGUI.cpp
@@ -681,7 +681,7 @@ void MainMenuGUI::Update()
 				m_pGUIInput->GetMousePosition(&mouseX, &mouseY);
 				Vector mouse(mouseX, mouseY);
 
-				if (m_PioneerPromoBox.WithinBox(mouse))
+				if (m_PioneerPromoBox.IsWithinBox(mouse))
 				{
 					OpenBrowserToURL("http://store.steampowered.com/app/300260/");
 				}
diff --git a/Menus/PieMenuGUI.cpp b/Menus/PieMenuGUI.cpp
@@ -1159,7 +1159,7 @@ void PieMenuGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const
         for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)
         {
             // See if we found the point to be within the screen or not
-            if (wItr->WithinBox(m_CenterPos))
+            if (wItr->IsWithinBox(m_CenterPos))
             {
                 nearestBoxItr = wItr;
                 withinAny = true;
diff --git a/System/Box.cpp b/System/Box.cpp
@@ -90,7 +90,7 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool Box::WithinBox(const Vector &point) const {
+	bool Box::IsWithinBox(const Vector &point) const {
 		return !IsEmpty() && (((m_Width > 0 && point.m_X >= m_Corner.m_X && point.m_X < (m_Corner.m_X + m_Width)) ||
 			(m_Width < 0 && point.m_X < m_Corner.m_X && point.m_X >= (m_Corner.m_X + m_Width))) &&
 			(m_Height > 0 && point.m_Y >= m_Corner.m_Y && point.m_Y < (m_Corner.m_Y + m_Height)) ||
@@ -99,14 +99,14 @@ namespace RTE {
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool Box::WithinBoxX(float pointX) const {
+	bool Box::IsWithinBoxX(float pointX) const {
 		return !IsEmpty() && ((m_Width > 0 && pointX >= m_Corner.m_X && pointX < (m_Corner.m_X + m_Width)) ||
 			(m_Width < 0 && pointX < m_Corner.m_X && pointX >= (m_Corner.m_X + m_Width)));
 	}
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-	bool Box::WithinBoxY(float pointY) const {
+	bool Box::IsWithinBoxY(float pointY) const {
 		return !IsEmpty() && ((m_Height > 0 && pointY >= m_Corner.m_Y && pointY < (m_Corner.m_Y + m_Height)) ||
 			(m_Height < 0 && pointY < m_Corner.m_Y && pointY <= (m_Corner.m_Y + m_Height)));
 	}
diff --git a/System/Box.h b/System/Box.h
@@ -205,21 +205,21 @@ namespace RTE {
 		/// </summary>
 		/// <param name="point">The Vector describing the point to test for within box bounds.</param>
 		/// <returns>Inside the box or not. False if the box IsEmpty()</returns>
-		bool WithinBox(const Vector &point) const;
+		bool IsWithinBox(const Vector &point) const;
 
 		/// <summary>
 		/// Tells whether an X coordinate is within the Box's X-range or not, taking potential flipping into account.
 		/// </summary>
 		/// <param name="pointX">The coordinate describing the X value to test for within box bounds.</param>
 		/// <returns>Inside the box or not in the X axis. False if the box IsEmpty()</returns>
-		bool WithinBoxX(float pointX) const;
+		bool IsWithinBoxX(float pointX) const;
 
 		/// <summary>
 		/// Tells whether an Y coordinate is within the Box's Y-range or not, taking potential flipping into account.
 		/// </summary>
 		/// <param name="pointY">The coordinate describing the Y value to test for within box bounds.</param>
 		/// <returns>Inside the box or not in the Y axis. False if the box IsEmpty()</returns>
-		bool WithinBoxY(float pointY) const;
+		bool IsWithinBoxY(float pointY) const;
 
 		/// <summary>
 		/// Returns a copy of a point constrained inside this box.

Original file line number	Diff line number	Diff line change
`@@ -705,7 +705,7 @@ void GATutorial::Update()`
`705`	`705`	`for (int area = 0; area < AREACOUNT; ++area)`
`706`	`706`	`{`
`707`	`707`	`// Switch if within the trigger box of a new area`
`708`		`- if (area != m_CurrentArea && m_TriggerBoxes[area].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))`
	`708`	`+ if (area != m_CurrentArea && m_TriggerBoxes[area].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))`
`709`	`709`	`{`
`710`	`710`	`// Change to the new area`
`711`	`711`	`m_PrevArea = m_CurrentArea;`
`@@ -722,7 +722,7 @@ void GATutorial::Update()`
`722`	`722`	`{`
`723`	`723`
`724`	`724`	`// Switch if within the trigger box of a new area`
`725`		`- if (area != m_CurrentArea && m_TriggerBoxes[area].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))`
	`725`	`+ if (area != m_CurrentArea && m_TriggerBoxes[area].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))`
`726`	`726`	`{`
`727`	`727`
`728`	`728`	`if (m_FightTriggers[stage].Reset();`
`@@ -843,7 +843,7 @@ void GATutorial::Update()`
`843`	`843`	`if (m_pControlledActor[m_TutorialPlayer])`
`844`	`844`	`{`
`845`	`845`	`// Triggered defending stage`
`846`		`- if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].WithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))`
	`846`	`+ if (m_CurrentFightStage == NOFIGHT && m_FightTriggers[DEFENDING].IsWithinBox(m_pControlledActor[m_TutorialPlayer]->GetPos()))`
`847`	`847`	`{`
`848`	`848`	`// Take over control of screen messages`
`849`	`849`	`m_MsgTimer[m_TutorialPlayer].Reset();`
Original file line number	Diff line number	Diff line change
`@@ -2271,7 +2271,7 @@ void GameActivity::DrawGUI(BITMAP *pTargetBitmap, const Vector &targetPos, int w`
`2271`	`2271`	`for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`2272`	`2272`	`{`
`2273`	`2273`	`// See if we found the point to be within the screen or not`
`2274`		`- if (wItr->WithinBox((*itr).m_ScenePos))`
	`2274`	`+ if (wItr->IsWithinBox((*itr).m_ScenePos))`
`2275`	`2275`	`{`
`2276`	`2276`	`nearestBoxItr = wItr;`
`2277`	`2277`	`withinAny = true;`
Original file line number	Diff line number	Diff line change
`@@ -669,7 +669,7 @@ bool Deployment::IsOnScenePoint(Vector &scenePoint) const`
`669`	`669`	`for (int i = 0; i < passes; ++i)`
`670`	`670`	`{`
`671`	`671`
`672`		`- if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
	`672`	`+ if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
`673`	`673`	`{`
`674`	`674`	`if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor \|\|`
`675`	`675`	`(m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -1363,7 +1363,7 @@ bool MOSRotating::IsOnScenePoint(Vector &scenePoint) const`
`1363`	`1363`	`// Check all the passes needed`
`1364`	`1364`	`for (int i = 0; i < passes; ++i)`
`1365`	`1365`	`{`
`1366`		`- if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
	`1366`	`+ if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
`1367`	`1367`	`{`
`1368`	`1368`	`if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor \|\|`
`1369`	`1369`	`(m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ bool MOSprite::IsOnScenePoint(Vector &scenePoint) const`
`399`	`399`	`// Check all the passes needed`
`400`	`400`	`for (int i = 0; i < passes; ++i)`
`401`	`401`	`{`
`402`		`- if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
	`402`	`+ if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
`403`	`403`	`{`
`404`	`404`	`if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor \|\|`
`405`	`405`	`(m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -185,7 +185,7 @@ bool Scene::Area::IsInside(const Vector &point) const`
`185`	`185`	`// Iterate through the wrapped boxes - will only be one if there's no wrapping`
`186`	`186`	`for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`187`	`187`	`{`
`188`		`- if (wItr->WithinBox(point))`
	`188`	`+ if (wItr->IsWithinBox(point))`
`189`	`189`	`return true;`
`190`	`190`	`}`
`191`	`191`	`}`
`@@ -211,7 +211,7 @@ bool Scene::Area::IsInsideX(float pointX) const`
`211`	`211`	`// Iterate through the wrapped boxes - will only be one if there's no wrapping`
`212`	`212`	`for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`213`	`213`	`{`
`214`		`- if (wItr->WithinBoxX(pointX))`
	`214`	`+ if (wItr->IsWithinBoxX(pointX))`
`215`	`215`	`return true;`
`216`	`216`	`}`
`217`	`217`	`}`
`@@ -237,7 +237,7 @@ bool Scene::Area::IsInsideY(float pointY) const`
`237`	`237`	`// Iterate through the wrapped boxes - will only be one if there's no wrapping`
`238`	`238`	`for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`239`	`239`	`{`
`240`		`- if (wItr->WithinBoxY(pointY))`
	`240`	`+ if (wItr->IsWithinBoxY(pointY))`
`241`	`241`	`return true;`
`242`	`242`	`}`
`243`	`243`	`}`
`@@ -324,7 +324,7 @@ Box * Scene::Area::GetBoxInside(const Vector &point)`
`324`	`324`	`for (list<Box>::const_iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`325`	`325`	`{`
`326`	`326`	`// Return the BoxList box, not the inconsequential wrapped copy`
`327`		`- if (wItr->WithinBox(point))`
	`327`	`+ if (wItr->IsWithinBox(point))`
`328`	`328`	`return &(*aItr);`
`329`	`329`	`}`
`330`	`330`	`}`
`@@ -351,7 +351,7 @@ Box Scene::Area::RemoveBoxInside(const Vector &point)`
`351`	`351`	`// Iterate through the wrapped boxes - will only be one if there's no wrapping`
`352`	`352`	`for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`353`	`353`	`{`
`354`		`- if (wItr->WithinBox(point))`
	`354`	`+ if (wItr->IsWithinBox(point))`
`355`	`355`	`{`
`356`	`356`	`// Remove the BoxList box, not the inconsequential wrapped copy`
`357`	`357`	`returnBox = (*aItr);`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ bool TerrainObject::IsOnScenePoint(Vector &scenePoint) const`
`327`	`327`	`for (int i = 0; i < passes; ++i)`
`328`	`328`	`{`
`329`	`329`
`330`		`- if (WithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
	`330`	`+ if (IsWithinBox(aScenePoint[i], m_Pos + m_BitmapOffset, m_pFGColor->w, m_pFGColor->h))`
`331`	`331`	`{`
`332`	`332`	`if (getpixel(m_pFGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor \|\|`
`333`	`333`	`(m_pBGColor && getpixel(m_pBGColor, aScenePoint[i].m_X, aScenePoint[i].m_Y) != g_KeyColor) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -681,7 +681,7 @@ void MainMenuGUI::Update()`
`681`	`681`	`m_pGUIInput->GetMousePosition(&mouseX, &mouseY);`
`682`	`682`	`Vector mouse(mouseX, mouseY);`
`683`	`683`
`684`		`- if (m_PioneerPromoBox.WithinBox(mouse))`
	`684`	`+ if (m_PioneerPromoBox.IsWithinBox(mouse))`
`685`	`685`	`{`
`686`	`686`	`OpenBrowserToURL("http://store.steampowered.com/app/300260/");`
`687`	`687`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1159,7 +1159,7 @@ void PieMenuGUI::Draw(BITMAP *pTargetBitmap, const Vector &targetPos) const`
`1159`	`1159`	`for (list<Box>::iterator wItr = wrappedBoxes.begin(); wItr != wrappedBoxes.end(); ++wItr)`
`1160`	`1160`	`{`
`1161`	`1161`	`// See if we found the point to be within the screen or not`
`1162`		`- if (wItr->WithinBox(m_CenterPos))`
	`1162`	`+ if (wItr->IsWithinBox(m_CenterPos))`
`1163`	`1163`	`{`
`1164`	`1164`	`nearestBoxItr = wItr;`
`1165`	`1165`	`withinAny = true;`