From 33e6b9627e6a46d388d46f2c5b4d15ba7e9f9904 Mon Sep 17 00:00:00 2001
From: Alexander Pickering <alexandermpickering@gmail.com>
Date: Wed, 18 Oct 2017 21:34:55 -0400
Subject: Started refactoring

* Finished a basic server
* Changed from ZMQ to nanomsg (basically the same though)
* Moved some repeated code from the client/server directories into
"shared"
* Edited makefile to reflect new dependencies
---
 src/client/lua_api/phys/bphysbox.cpp   | 3 ++-
 src/client/lua_api/phys/bphysmodel.cpp | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/client/lua_api/phys')

diff --git a/src/client/lua_api/phys/bphysbox.cpp b/src/client/lua_api/phys/bphysbox.cpp
index 80cd2eb..a03b488 100644
--- a/src/client/lua_api/phys/bphysbox.cpp
+++ b/src/client/lua_api/phys/bphysbox.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <map>
 #include <functional>
+#include <list>
 extern "C" {
   #include <lua.h>
   #include <lauxlib.h>
@@ -24,7 +25,7 @@ using namespace video;
 extern IrrlichtDevice* device;
 
 extern btDiscreteDynamicsWorld* World;
-extern core::list<btRigidBody*> Objects;
+extern std::list<btRigidBody*> Objects;
 
 static LBPhysNode* checkisbphysbox(lua_State* L, int index){
   void* ud = luaL_checkudata(L,index,"phys.physbox");
diff --git a/src/client/lua_api/phys/bphysmodel.cpp b/src/client/lua_api/phys/bphysmodel.cpp
index 7bdc483..b76b336 100644
--- a/src/client/lua_api/phys/bphysmodel.cpp
+++ b/src/client/lua_api/phys/bphysmodel.cpp
@@ -5,6 +5,7 @@
 #include <memory>
 #include <map>
 #include <functional>
+#include <list>
 extern "C" {
   #include <lua.h>
   #include <lauxlib.h>
@@ -25,7 +26,7 @@ using namespace video;
 extern IrrlichtDevice* device;
 
 extern btDiscreteDynamicsWorld* World;
-extern core::list<btRigidBody*> Objects;
+extern std::list<btRigidBody*> Objects;
 
 static LBPhysNode* checkisbphysmodel(lua_State* L, int index){
   void* ud = luaL_checkudata(L,index,"phys.physmodel");
-- 
cgit v1.2.3-70-g09d2