From 9ba30caeb3a506fc68c712c1fa97ef57b13ab5ee Mon Sep 17 00:00:00 2001
From: Misa <infoteddy@infoteddy.info>
Date: Sat, 17 Apr 2021 01:08:51 -0700
Subject: [PATCH] Remove default function args from createentity()

I have spelled out each overloaded version instead, and only the
overloads that are actually used - which just happens to be everything
except the 8-argument one. I don't want to deal with callers right now
(there are too many of them), so I'm not going to change the names that
the callers use, nor do I want to change the amount of arguments any
existing callers use right now - but we will have to deal with them in
one way or another when we move to C.
---
 desktop_version/src/Entity.cpp | 27 ++++++++++++++++++++++++++-
 desktop_version/src/Entity.h   | 11 +++++++++--
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/desktop_version/src/Entity.cpp b/desktop_version/src/Entity.cpp
index 36fc3c70..5f991618 100644
--- a/desktop_version/src/Entity.cpp
+++ b/desktop_version/src/Entity.cpp
@@ -1202,7 +1202,7 @@ int entityclass::crewcolour( int t )
     return 0;
 }
 
-void entityclass::createentity(int xp, int yp, int t, int vx /*= 0*/, int vy /*= 0*/, int p1 /*= 0*/, int p2 /*= 0*/, int p3 /*= 320*/, int p4 /*= 240 */)
+void entityclass::createentity(int xp, int yp, int t, int vx, int vy, int p1, int p2, int p3, int p4)
 {
     k = entities.size();
 
@@ -2120,6 +2120,31 @@ void entityclass::createentity(int xp, int yp, int t, int vx /*= 0*/, int vy /*=
     }
 }
 
+void entityclass::createentity(int xp, int yp, int t, int vx, int vy, int p1, int p2)
+{
+    createentity(xp, yp, t, vx, vy, p1, p2, 320, 240);
+}
+
+void entityclass::createentity(int xp, int yp, int t, int vx, int vy, int p1)
+{
+    createentity(xp, yp, t, vx, vy, p1, 0);
+}
+
+void entityclass::createentity(int xp, int yp, int t, int vx, int vy)
+{
+    createentity(xp, yp, t, vx, vy, 0);
+}
+
+void entityclass::createentity(int xp, int yp, int t, int vx)
+{
+    createentity(xp, yp, t, vx, 0);
+}
+
+void entityclass::createentity(int xp, int yp, int t)
+{
+    createentity(xp, yp, t, 0);
+}
+
 //Returns true if entity is removed
 bool entityclass::updateentities( int i )
 {
diff --git a/desktop_version/src/Entity.h b/desktop_version/src/Entity.h
index 9743c162..9164b285 100644
--- a/desktop_version/src/Entity.h
+++ b/desktop_version/src/Entity.h
@@ -74,8 +74,15 @@ public:
 
     int crewcolour(int t);
 
-    void createentity(int xp, int yp, int t, int vx = 0, int vy = 0,
-                      int p1 = 0, int p2 = 0, int p3 = 320, int p4 = 240);
+    void createentity(int xp, int yp, int t, int vx, int vy,
+                      int p1, int p2, int p3, int p4);
+    void createentity(int xp, int yp, int t, int vx, int vy,
+                      int p1, int p2);
+    void createentity(int xp, int yp, int t, int vx, int vy,
+                      int p1);
+    void createentity(int xp, int yp, int t, int vx, int vy);
+    void createentity(int xp, int yp, int t, int vx);
+    void createentity(int xp, int yp, int t);
 
     bool updateentities(int i);