Merge pull request #5 from cochrane/master

Various cleanup
opentomb · May 2, 2015 · bf7d9c6 · bf7d9c6
2 parents 2cf862c + 7194968
commit bf7d9c6
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 145 deletions.
diff --git a/OpenTomb.xcodeproj/project.pbxproj b/OpenTomb.xcodeproj/project.pbxproj
@@ -3450,7 +3450,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
@@ -3499,7 +3499,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
+				CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;

diff --git a/src/engine.cpp b/src/engine.cpp
@@ -3622,7 +3622,12 @@ int Engine_ExecCmd(char *ch)
             if(engine_lua)
             {
                 Con_AddLine(pch);
-                luaL_dostring(engine_lua, pch);
+                int code = luaL_dostring(engine_lua, pch);
+                if (code != LUA_OK)
+                {
+                    const char* error = lua_tostring(engine_lua, 1);
+                    Con_AddLine(error, FONTSTYLE_CONSOLE_WARNING);
+                }
             }
             else
             {

diff --git a/src/game.cpp b/src/game.cpp
@@ -487,18 +487,6 @@ void Cam_FollowEntity(struct camera_s *cam, struct entity_s *ent, btScalar dx, b
     }
     else
     {
-        btScalar temp[16], transform[16];
-        glGetFloatv (GL_MODELVIEW_MATRIX, temp);
-
-        glMatrixMode(GL_MODELVIEW);
-        glLoadIdentity();
-        glMultMatrixbt(ent->transform);
-        glMultMatrixbt(ent->bf.bone_tags->full_transform);
-        glGetFloatv (GL_MODELVIEW_MATRIX, transform);
-
-        glLoadIdentity();
-        glMultMatrixbt(temp);
-
         // bone_tags->mesh->centre[0] ent->bf.pos[0]*0.5 (ent->bf.bone_tags+ent->bf.bone_tag_count)->full_transform[12]  - 32.0 *  ent->transform[4 + 1]
         Mat4_vec3_mul(cam_pos.m_floats, ent->transform, ent->bf.bone_tags->full_transform+12);
         cam_pos.m_floats[2] += dz;