From 43da39dee8a1875d6c38b77876e08d8b1454adc0 Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Tue, 16 Jan 2024 08:41:55 +0100 Subject: [PATCH 1/2] Fix building on clang --- deps/datReader/bparse.h | 1 + deps/datReaderPs3/bparse.h | 1 + deps/mysqlConnector/ResultSetBase.h | 1 + deps/mysqlConnector/mysql_util.h | 1 + src/common/Crypt/base64.h | 1 + src/world/Action/ActionResult.cpp | 2 +- 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/deps/datReader/bparse.h b/deps/datReader/bparse.h index 6c722126..8d3be519 100644 --- a/deps/datReader/bparse.h +++ b/deps/datReader/bparse.h @@ -3,6 +3,7 @@ #include #include #include +#include namespace xiv::utils::bparse { diff --git a/deps/datReaderPs3/bparse.h b/deps/datReaderPs3/bparse.h index 71535263..39863895 100644 --- a/deps/datReaderPs3/bparse.h +++ b/deps/datReaderPs3/bparse.h @@ -5,6 +5,7 @@ #include #include #include +#include namespace xivps3::utils::bparse { diff --git a/deps/mysqlConnector/ResultSetBase.h b/deps/mysqlConnector/ResultSetBase.h index 235d8511..210924e0 100644 --- a/deps/mysqlConnector/ResultSetBase.h +++ b/deps/mysqlConnector/ResultSetBase.h @@ -4,6 +4,7 @@ #include #include #include +#include namespace Mysql { diff --git a/deps/mysqlConnector/mysql_util.h b/deps/mysqlConnector/mysql_util.h index e43a373b..028cf1ee 100644 --- a/deps/mysqlConnector/mysql_util.h +++ b/deps/mysqlConnector/mysql_util.h @@ -27,6 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include +#include #include //using MYSQL_FIELD = st_mysql_field; diff --git a/src/common/Crypt/base64.h b/src/common/Crypt/base64.h index a627067e..94d86c3b 100644 --- a/src/common/Crypt/base64.h +++ b/src/common/Crypt/base64.h @@ -1,6 +1,7 @@ #pragma once #include +#include namespace Sapphire::Common::Util { diff --git a/src/world/Action/ActionResult.cpp b/src/world/Action/ActionResult.cpp index 31d82aed..7895718e 100644 --- a/src/world/Action/ActionResult.cpp +++ b/src/world/Action/ActionResult.cpp @@ -85,7 +85,7 @@ void ActionResult::applyStatusEffectSelf( uint32_t id, int32_t duration, uint8_t m_result.Flag = static_cast< uint8_t >( ActionResultFlag::EffectOnSource ); m_bOverrideStatus = shouldOverride; - m_pStatus = StatusEffect::make_StatusEffect( id, m_target, m_target, duration, 3000 ); + m_pStatus = Sapphire::StatusEffect::make_StatusEffect( id, m_target, m_target, duration, 3000 ); m_pStatus->setParam( param ); } From fb7dd04f67e4ceaf8c78ec96ec69d25af4004d75 Mon Sep 17 00:00:00 2001 From: Rushi <44952533+Skyliegirl33@users.noreply.github.com> Date: Tue, 16 Jan 2024 09:18:30 +0100 Subject: [PATCH 2/2] Revert "Update login.html" This reverts commit 364c304d4a789dc3ab115078487d789aeeb670a8. --- web/login.html | 174 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 120 insertions(+), 54 deletions(-) diff --git a/web/login.html b/web/login.html index ba4c12ed..172a23f3 100644 --- a/web/login.html +++ b/web/login.html @@ -1,63 +1,129 @@ + - - - Sapphire - Login - - - - - + + + Sapphire - Login + + + + + +
+
+ + Join us on Discord! + + + Our Github repository + +
+

Recent Activity

+ +
+
+ + +
+ +
+
+
+
+ + + - - - + - + + \ No newline at end of file