Merge pull request #957 from arieshi255/fix-clang-and-launcher

[3.x] Fix clang compilation and launcher script
SapphireServer · Jun 20, 2024 · 80b11c7 · 80b11c7
2 parents 989630b + fb7dd04
commit 80b11c7
Show file tree

Hide file tree

Showing 7 changed files with 127 additions and 56 deletions.
diff --git a/deps/datReader/bparse.h b/deps/datReader/bparse.h
@@ -3,6 +3,7 @@
 #include <iomanip>
 #include <sstream>
 #include <vector>
+#include <cstdint>
 
 namespace xiv::utils::bparse
 {

diff --git a/deps/datReaderPs3/bparse.h b/deps/datReaderPs3/bparse.h
@@ -5,6 +5,7 @@
 #include <iomanip>
 #include <sstream>
 #include <vector>
+#include <cstdint>
 
 namespace xivps3::utils::bparse
 {

diff --git a/deps/mysqlConnector/ResultSetBase.h b/deps/mysqlConnector/ResultSetBase.h
@@ -4,6 +4,7 @@
 #include <list>
 #include <map>
 #include <iostream>
+#include <cstdint>
 
 namespace Mysql
 {

diff --git 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 <iostream>
 #include <sstream>
+#include <cstdint>
 #include <mysql.h>
 
 //using MYSQL_FIELD = st_mysql_field;

diff --git a/src/common/Crypt/base64.h b/src/common/Crypt/base64.h
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <string>
+#include <cstdint>
 
 namespace Sapphire::Common::Util
 {

diff --git 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 );
 }
 

diff --git a/web/login.html b/web/login.html
@@ -1,63 +1,129 @@
 <!DOCTYPE html>
 <html>
+
 <head>
- <meta charset="utf-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0">
- <title>Sapphire - Login</title>
- <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
- <link rel="stylesheet" href="assets/css/styles.css">
- <link rel="stylesheet" href="assets/css/global.css">
- <script src="//cdnjs.cloudflare.com/ajax/libs/json3/3.3.2/json3.min.js"></script>
- <script src="assets/js/login.js"></script>
+ <meta charset="utf-8">
+ <meta name="viewport" content="width=device-width, initial-scale=1.0">
+ <title>Sapphire - Login</title>
+ <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css">
+ <link rel="stylesheet" href="assets/css/styles.css">
+ <link rel="stylesheet" href="assets/css/global.css">
+ <script src="//cdnjs.cloudflare.com/ajax/libs/json3/3.3.2/json3.min.js"></script>
+ <script>
+ function doLogin(){
+ var url = "sapphire-api/lobby/login";
+ var params = "{\"username\":\"" + document.getElementsByName('username')[0].value + "\",\"pass\":\"" + document.getElementsByName('password')[0].value + "\"}";
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", url, true);
+
+ xhr.onreadystatechange = function() {
+ if (xhr.readyState == 4) {
+ try {
+ var response = readBody(xhr);
+ var parsed = JSON.parse(response);
+ window.external.Boot(parsed.sId, parsed.lobbyHost, parsed.frontierHost);
+ } catch(err) {
+ document.getElementById("Error").innerHTML = "Login failed.";
+ }
+ }
+ }
+
+ xhr.send(params);
+ }
+
+ function readBody(xhr) {
+ var data;
+ if (!xhr.responseType || xhr.responseType === "text") {
+ data = xhr.responseText;
+ } else if (xhr.responseType === "document") {
+ data = xhr.responseXML;
+ } else {
+ data = xhr.response;
+ }
+ return data;
+ }
+
+ function keypressing(e) {
+ if (!e) e = window.event;
+ var keyCode = e.keyCode || e.which;
+ if (keyCode == '13'){
+ doLogin();
+ return false;
+ }
+ }
+
+
+ </script>
 </head>
 
 <body scroll="no">
+ <div class="s-full-split s-left-half col-xs-7">
+ <div class="clearfix s-link-badge-wrapper">
+ <a href="https://discord.gg/KfrZCkx" class="s-link-badge s-link-badge-discord col-xs-5">
+ Join us on Discord!
+ </a>
+ <a href="https://github.com/SapphireMordred/Sapphire" class="s-link-badge s-link-badge-github col-xs-5 pull-right">
+ Our Github repository
+ </a>
+ </div>
+ <h2>Recent Activity</h2>
+ <ul id="commit-log" class="commit-history">
+
+ </ul>
+ </div>
+ <div class="s-full-split s-right-half col-xs-5">
+ <div class="s-logo">
+ <img src="assets/img/sapphire_logo_resize.png">
+ </div>
+ <div class="s-login-box col-xs-12">
+ <div class="s-login-box-form">
+ <h1 class="text-center s-login-call">Login to Account</h1>
+ <div class="input-control">
+ <label class="s-login-input-wrapper">
+ Username
+ <input type="text" name="username" autofocus>
+ </label>
+ </div>
+ <div class="input-control">
+ <label class="s-login-input-wrapper">
+ Password
+ <input type="password" name="password" onkeypress="return keypressing(event)">
+ </label>
+ </div>
+ <button class="btn btn-default s-login-btn pull-right" id="submitButton" onclick="doLogin()">Login</button>
+ <p id="Error" class="s-error-text"></p>
+ </div>
+ <a class="btn btn-default s-acc-btn" href="createUser.html">Create Account</a>
+ </div>
+ <div class="s-gears">
+ <img class="s-gears" src="assets/img/graffletopia-gears.png" alt="">
+ </div>
+ </div>
+ <div id="TopDiv"></div>
+ <div class="container"></div>
+
+ <script src="assets/js/jquery.min.js"></script>
+ <script src="assets/bootstrap/js/bootstrap.min.js"></script>
 
- <div class="s-full-split s-left-half col-xs-7">
- <div class="clearfix s-link-badge-wrapper">
- <a href="https://discord.gg/KfrZCkx" class="s-link-badge s-link-badge-discord col-xs-5">
- Join us on Discord!
- </a>
- <a href="https://github.com/SapphireMordred/Sapphire" class="s-link-badge s-link-badge-github col-xs-5 pull-right">
- Our Github repository
- </a>
- </div>
- <h2>Recent Activity</h2>
- <ul id="commit-log" class="commit-history"></ul>
- </div>
- <div class="s-full-split s-right-half col-xs-5">
- <div class="s-logo">
- <img src="assets/img/sapphire_logo_resize.png">
- </div>
- <div class="s-login-box col-xs-12">
- <div class="s-login-box-form">
- <h1 class="text-center s-login-call">Login to Account</h1>
- <div class="input-control">
- <label class="s-login-input-wrapper">
- Username
- <input type="text" name="username" autofocus>
- </label>
- </div>
- <div class="input-control">
- <label class="s-login-input-wrapper">
- Password
- <input type="password" name="password">
- </label>
- </div>
- <button class="btn btn-default s-login-btn pull-right" id="submitButton">Login</button>
- <p id="Error" class="s-error-text"></p>
- </div>
- <a class="btn btn-default s-acc-btn" href="createUser.html">Create Account</a>
- </div>
- <div class="s-gears">
- <img class="s-gears" src="assets/img/graffletopia-gears.png" alt="">
- </div>
- </div>
- <div id="TopDiv"></div>
- <div class="container"></div>
-
- <script src="assets/js/jquery.min.js"></script>
- <script src="assets/bootstrap/js/bootstrap.min.js"></script>
- <script src="assets/js/github.js"></script>
+ <script>
+ fetch( "https://api.github.com/repos/SapphireMordred/Sapphire/events" ).then( function( resp ) {
+ return resp.json();
+ }).then( function( data ) {
+ data = data.filter( function( e ) {
+ return e.type == "PushEvent";
+ });
+
+ let commitContainer = document.getElementById( 'commit-log' );
+ for ( var evnt of data ) {
+ for ( var commit of evnt.payload.commits ) {
+ let e = document.createElement( 'li' );
+ e.innerHTML = '<a href="https://github.com/SapphireMordred/Sapphire/commit/' + commit.sha + '">' + commit.message + '</a>';
+
+ commitContainer.appendChild( e );
+ }
+ }
+ });
+ </script>
 </body>
-</html>
+
+</html>