Scrap whatever the hell I was doing

see notes at issue #3
ACBob · Apr 9, 2021 · 86e5779 · 86e5779
1 parent 79544ee
commit 86e5779
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 9 deletions.
diff --git a/src/ClientCMakeLists.txt b/src/ClientCMakeLists.txt
@@ -59,7 +59,6 @@ set(clientSources
 	fpsgame/weapon.cpp
 
 	# entities
-	fpsgame/bubeplayer.cpp
 
 	engine/scriptapi.cpp
 )

diff --git a/src/ServerCMakeLists.txt b/src/ServerCMakeLists.txt
@@ -14,7 +14,6 @@ set(serverSources
 	engine/scriptapi.cpp
 
 	# entities
-	fpsgame/bubeplayer.cpp
 )
 list(TRANSFORM serverSources PREPEND "src/")
 

diff --git a/src/engine/entbase.h b/src/engine/entbase.h
@@ -20,6 +20,7 @@ class BaseEntity {
 
 
 		// Ported from physent
+		{
 			vec o, vel, falling;  // origin, velocity
 			vec deltapos, newpos; // movement interpolation
 			float yaw, pitch, roll;
@@ -80,6 +81,7 @@ class BaseEntity {
 				return timeinair || physstate < PHYS_FLOOR || vel.squaredlen() > 1e-4f || deltapos.squaredlen() > 1e-4f;
 			}
 		// End ported from physent
+		}
 
 	protected:
 		vec position; // Position in 3d space

diff --git a/src/fpsgame/baseplayer.h b/src/fpsgame/baseplayer.h
diff --git a/src/fpsgame/bubeplayer.cpp b/src/fpsgame/bubeplayer.cpp