Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStijn Buys <ingar@osirion.org>2008-02-13 00:40:59 +0000
committerStijn Buys <ingar@osirion.org>2008-02-13 00:40:59 +0000
commit1f95c377b2abfaa454b1f2298af10956d95ad941 (patch)
tree2715cf49a8de16921775eff0dc1ac0ceace145b2 /src/core/application.cc
parent468ab7f566ee493b8c7ff6a95763d99ed2ccc200 (diff)
split client from game module
Diffstat (limited to 'src/core/application.cc')
-rw-r--r--src/core/application.cc18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/core/application.cc b/src/core/application.cc
index 36d1c5a..c9239cf 100644
--- a/src/core/application.cc
+++ b/src/core/application.cc
@@ -4,15 +4,20 @@
the terms of the GNU General Public License version 2
*/
+#include <errno.h>
+#include <signal.h>
+
+#include <iostream>
+#include <vector>
+#include <sstream>
+
+#include "math/mathlib.h"
#include "sys/sys.h"
#include "filesystem/filesystem.h"
-#include "core/entity.h"
#include "core/application.h"
#include "core/core.h"
-
-#include <iostream>
-#include <errno.h>
-#include <signal.h>
+#include "core/entity.h"
+#include "core/func.h"
namespace core
{
@@ -211,6 +216,8 @@ void Application::frame(float seconds)
current_time += seconds;
if (game() && game()->connected) {
+ entity::frame(seconds);
+
game()->current_time += seconds;
game()->frame(seconds);
}
@@ -220,3 +227,4 @@ void Application::frame(float seconds)
}
}
+