From bad26c2b4caa2dc3d40e086d1b8470adaf9c653a Mon Sep 17 00:00:00 2001 From: Robosturm Date: Wed, 13 Dec 2023 17:01:14 +0100 Subject: [PATCH] some fixed and replay record downloader work --- CMakeLists.txt | 3 ++- general.qrc | 1 + maps/2_player/Where Giants Have Fallen.map | Bin 0 -> 123449 bytes mapsupport/refactorMap.cpp | 1 - menue/editormenue.cpp | 5 ++-- network/filepeer.cpp | 22 +++++++++++++++++ network/filepeer.h | 26 +++++++++++++++++++++ network/mainserver.cpp | 4 ++-- network/replayrecordfileserver.cpp | 5 ++-- network/replayrecordfileserver.h | 2 +- resources/scripts/units/cruiser.js | 2 +- 11 files changed, 60 insertions(+), 11 deletions(-) create mode 100644 maps/2_player/Where Giants Have Fallen.map create mode 100644 network/filepeer.cpp create mode 100644 network/filepeer.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 4f89b646c..f3edf0236 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -647,7 +647,8 @@ set(${PROJECT_NAME}_SRCS network/networkgame.cpp network/networkgame.h network/matchmakingcoordinator.h network/matchmakingcoordinator.cpp network/mapfileserver.h network/mapfileserver.cpp - network/replayrecordfileserver.h network/replayrecordfileserver.cpp + network/replayrecordfileserver.h network/replayrecordfileserver.cpp + network/filepeer.h network/filepeer.cpp network/JsonKeys.h # game diff --git a/general.qrc b/general.qrc index 520a8dee4..047d6975e 100644 --- a/general.qrc +++ b/general.qrc @@ -2069,5 +2069,6 @@ templates/serverscript/matchMaking/automatchmaker.json resources/scripts/building/field_base.js resources/scripts/actions/ACTION_FOCUSMAP.js + maps/2_player/Where Giants Have Fallen.map diff --git a/maps/2_player/Where Giants Have Fallen.map b/maps/2_player/Where Giants Have Fallen.map new file mode 100644 index 0000000000000000000000000000000000000000..80d6b4e65c26919369d565327e490b1b1b344474 GIT binary patch literal 123449 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 literal 0 HcmV?d00001 diff --git a/mapsupport/refactorMap.cpp b/mapsupport/refactorMap.cpp index 0974db56c..15c2be683 100644 --- a/mapsupport/refactorMap.cpp +++ b/mapsupport/refactorMap.cpp @@ -647,7 +647,6 @@ void GameMap::rotateY90() Mainapp::getInstance()->continueRendering(); } - void GameMap::flipY() { Mainapp::getInstance()->pauseRendering(); diff --git a/menue/editormenue.cpp b/menue/editormenue.cpp index 5383c6f9e..138c81237 100644 --- a/menue/editormenue.cpp +++ b/menue/editormenue.cpp @@ -141,8 +141,6 @@ EditorMenue::EditorMenue() m_Topbar->addItem(tr("Export AWDS Aws"), "EXPORTAWDSAWS", 3, tr("Exports the map to an AWS Map Editor file")); m_Topbar->addItem(tr("Import AW4 Aw4"), "IMPORTAW4AW4", 3, tr("Deletes the current map and imports an AW 4 map editor file.")); m_Topbar->addItem(tr("Import AW by Web"), "IMPORTAWBYWEB", 3, tr("Deletes the current map and imports an Advance Wars by Web Map from https://awbw.amarriner.com/")); - m_Topbar->finishCreation(); - addChild(m_Topbar); ObjectManager* pObjectManager = ObjectManager::getInstance(); oxygine::ResAnim* pAnim = pObjectManager->getResAnim("panel"); @@ -191,6 +189,9 @@ EditorMenue::EditorMenue() } }); + m_Topbar->finishCreation(); + addChild(m_Topbar); + // connecting stuff connect(this, &EditorMenue::sigLeftClick, this, &EditorMenue::onMapClickedLeft, Qt::QueuedConnection); connect(this, &EditorMenue::sigLeftClickDown, this, &EditorMenue::onMapClickedLeftDown, Qt::QueuedConnection); diff --git a/network/filepeer.cpp b/network/filepeer.cpp new file mode 100644 index 000000000..08925e812 --- /dev/null +++ b/network/filepeer.cpp @@ -0,0 +1,22 @@ +#include "network/filepeer.h" + +FilePeer::FilePeer(MainServer* pOwner, const QString & filePath, qint64 socketId) + : m_pOwner{pOwner}, + m_file{filePath}, + m_connectSocket{socketId} +{ +} + + +void FilePeer::startUpload() +{ + m_file.open(QIODevice::ReadOnly); + +} + +void FilePeer::startDownload() +{ + m_file.remove(); + m_file.open(QIODevice::WriteOnly); + +} diff --git a/network/filepeer.h b/network/filepeer.h new file mode 100644 index 000000000..88fc7521d --- /dev/null +++ b/network/filepeer.h @@ -0,0 +1,26 @@ +#pragma once + +#include +#include +class MainServer; + +class FilePeer : public QObject +{ + Q_OBJECT +public: + explicit FilePeer(MainServer* pOwner, const QString & filePath, qint64 socketId); + + void startUpload(); + void startDownload(); +signals: + +public slots: + //void onRequestNextData(); + +private: + MainServer* m_pOwner; + QFile m_file; + QDataStream m_fileStream{&m_file}; + qint64 m_connectSocket; +}; + diff --git a/network/mainserver.cpp b/network/mainserver.cpp index 6cbe7ac5b..062226e74 100644 --- a/network/mainserver.cpp +++ b/network/mainserver.cpp @@ -219,7 +219,7 @@ void MainServer::startDatabase() SQL_MAPWIDTH + " INTEGER, " + SQL_MAPHEIGHT + " INTEGER, " + SQL_MAPFLAGS + " BIGINT," + - SQL_MAPAUTHOR + " TEXT, " + + SQL_MAPAUTHOR + " TEXT" + + ")"); if (sqlQueryFailed(query)) { @@ -262,7 +262,7 @@ bool MainServer::sqlQueryFailed(const QSqlQuery &query) bool failed = !query.isActive() && type != QSqlError::NoError; if (failed) { - CONSOLE_PRINT("Sql query failed with " + error.text(), GameConsole::eERROR); + CONSOLE_PRINT("Sql query failed with " + error.text() + " Query: " + query.lastQuery(), GameConsole::eERROR); } return failed; } diff --git a/network/replayrecordfileserver.cpp b/network/replayrecordfileserver.cpp index cb9f27be5..085ae9f1f 100644 --- a/network/replayrecordfileserver.cpp +++ b/network/replayrecordfileserver.cpp @@ -1,7 +1,6 @@ -#include "replayrecordfileserver.h" +#include "network/replayrecordfileserver.h" -ReplayRecordFileserver::ReplayRecordFileserver(QObject *parent) - : QObject{parent} +ReplayRecordFileserver::ReplayRecordFileserver() { } diff --git a/network/replayrecordfileserver.h b/network/replayrecordfileserver.h index d60fb4352..f2443ffd5 100644 --- a/network/replayrecordfileserver.h +++ b/network/replayrecordfileserver.h @@ -6,7 +6,7 @@ class ReplayRecordFileserver : public QObject { Q_OBJECT public: - explicit ReplayRecordFileserver(QObject *parent = nullptr); + explicit ReplayRecordFileserver(); signals: diff --git a/resources/scripts/units/cruiser.js b/resources/scripts/units/cruiser.js index 4c33f5c24..9b7264d4d 100644 --- a/resources/scripts/units/cruiser.js +++ b/resources/scripts/units/cruiser.js @@ -95,7 +95,7 @@ var Constructor = function() this.getDescription = function() { - return qsTr("Naval Unit. Strong against air units and submarines.
Transports X 2
Helis."); + return qsTr("Naval Unit. Strong against air units and submarines.
Transports X 2
Helis. Cruisers can get remove mines and take no damge from them."); }; this.getUnitType = function()