diff --git a/src/ClientCMakeLists.txt b/src/ClientCMakeLists.txt index 6e2a6a1..063a956 100644 --- 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 index 1fd0726..dda4679 100644 --- 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 index 6e47d1b..9810c3f 100644 --- 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 deleted file mode 100644 index 1e17e69..0000000 --- a/src/fpsgame/baseplayer.h +++ /dev/null @@ -1,4 +0,0 @@ -#include "entbase.h" - -// TODO: for now just a stub -class BubePlayer : public BasePlayer {}; \ No newline at end of file diff --git a/src/fpsgame/bubeplayer.cpp b/src/fpsgame/bubeplayer.cpp deleted file mode 100644 index a8ac893..0000000 --- a/src/fpsgame/bubeplayer.cpp +++ /dev/null @@ -1,3 +0,0 @@ -// FPS Game player -#include "entbase.h" -#include "game.h" \ No newline at end of file