Merge b902b5484e into 817cec99fe

src/glue/CGlueMgr.cpp

@@ -39,6 +39,7 @@
 #include <cstdio>
 
 int32_t CGlueMgr::m_acceptedEULA = 1; // TODO
+int32_t CGlueMgr::m_acceptedScanning = 1; // TODO
 int32_t CGlueMgr::m_acceptedTerminationWithoutNotice;
 int32_t CGlueMgr::m_acceptedTOS = 1; // TODO
 int32_t CGlueMgr::m_accountMsgAvailable;

src/glue/CGlueMgr.hpp

@@ -33,6 +33,7 @@ class CGlueMgr {
 
         // Static variables
         static int32_t m_acceptedEULA;
+        static int32_t m_acceptedScanning;
         static int32_t m_acceptedTerminationWithoutNotice;
         static int32_t m_acceptedTOS;
         static int32_t m_accountMsgAvailable;

src/glue/GlueScript.cpp

@@ -216,7 +216,14 @@ int32_t Script_ShowScanningNotice(lua_State* L) {
 }
 
 int32_t Script_ScanningAccepted(lua_State* L) {
-    WHOA_UNIMPLEMENTED(0);
+    if (CGlueMgr::m_acceptedScanning) {
+        lua_pushnumber(L, 1.0);
+    }
+    else {
+        lua_pushnil(L);
+    }
+
+    return 1;
 }
 
 int32_t Script_AcceptScanning(lua_State* L) {

src/ui/game/CGCamera.cpp

@@ -80,6 +80,10 @@ void CGCamera::SetupWorldProjection(const CRect& projRect) {
     this->SetGxProjectionAndView(projRect);
 }
 
+C3Vector CGCamera::Target() const {
+    return this->m_position + this->Forward();
+}
+
 C3Vector CGCamera::Up() const {
     if (this->m_relativeTo) {
         return this->CSimpleCamera::Up() * this->ParentToWorld();

src/ui/game/CGCamera.hpp

@@ -27,6 +27,7 @@ class CGCamera : public CSimpleCamera {
         CGCamera();
         C33Matrix ParentToWorld() const;
         void SetupWorldProjection(const CRect& projRect);
+        C3Vector Target() const;
 
     private:
         // Private member variables

src/ui/simple/CSimpleCamera.cpp

@@ -84,6 +84,10 @@ C3Vector CSimpleCamera::Right() const {
     return { this->m_facing.b0, this->m_facing.b1, this->m_facing.b2 };
 }
 
+const C3Vector& CSimpleCamera::Position() const {
+    return this->m_position;
+}
+
 void CSimpleCamera::SetFacing(const C3Vector& forward) {
     BuildBillboardMatrix(forward, this->m_facing);
 }

src/ui/simple/CSimpleCamera.hpp

@@ -18,6 +18,7 @@ class CSimpleCamera {
         // Public member functions
         CSimpleCamera(float nearZ, float farZ, float fov);
         CM2Scene* GetScene();
+        const C3Vector& Position() const;
         void SetFacing(const C3Vector& forward);
         void SetFacing(const C3Vector& forward, const C3Vector& up);
         void SetFacing(float yaw, float pitch, float roll);