Fetch last change from original repo

.gitignore

@@ -34,6 +34,9 @@
 /server/catchchallenger-server-cli-epoll
 /client/catchchallenger
 
+# generated output
+/tools/map-procedural-generation/dest
+
 ### Qt ###
 # C++ objects and libs
 *.so.*
@@ -94,4 +97,4 @@ tools/to-pack/data/windows-x*
 # Configurations
 /server/server-properties.xml
 /client/datapack
-/server/datapack
+/server/datapack

README.md

@@ -6,20 +6,20 @@ http://catchchallenger.first-world.info/
 ## Description
 This game is a MMORPG, Lan game and a single player game. It's mix of pokemon for the RPG part, lineage for the crafting/clan/MMORPG, X3 for the commerce/fabric/industry. With mod possibility, and datapack.
 
-It's a pixel art game. The work is concentrated on the gameplay/performance/security/creativity/accessibility. The income is to paid the developping and the artwork. The game is fully open source (GPL3).
+It's a pixel art game. The work is concentrated on the gameplay/performance/security/creativity/accessibility. The income is to paid the developing and the artwork. The game is fully open source (GPL3).
 
-The gameplay have strong team part, but remain interresting in single player. Have clear advantage on 3G/wifi/TOR connexion or into the tiers world.
+The gameplay have strong team part, but remain interesting in single player. Have clear advantage on 3G/wifi/TOR connexion or into the tiers world.
 
 ## License
 client/tiled/ is extracted version of http://www.mapeditor.org/, https://github.com/bjorn/tiled
 libogg and fileopus is extracted from other project
-Interface UI is from buyed template (then under copyright)
+Interface UI is from bought template (then under copyright)
 
-## Programing
+## Programming
 
 Asynchronous protocol with no influence of internet and server latency. Thread isolation for the important or heavy server task. It can be hosted on ADSL connection.
 
-SGBD for Qt version: Mysql 5+, SQLite, PostgreSQL 9+. SGBD for epoll version (async to high performance): Mysql 5.5+, PostgreSQL 9+.
+DBMS for Qt version: Mysql 5+, SQLite, PostgreSQL 9+. DBMS for epoll version (async to high performance): Mysql 5.5+, PostgreSQL 9+.
 
 ## Prerequisites
 
@@ -63,9 +63,9 @@ Dependency:
   * curl to download datapack via http
 
 ### Linux distro
-**Ubuntu**: apt-get install build-essential gcc automake qt5-qmake qt5-default libzstd-dev zlib1g-dev libssl-dev libpq-dev libqt5sql5-psql libqt5websockets5-dev libqt5sql5-sqlite libqt5sql5-mysql qtdeclarative5-dev qtscript5-dev
+**Ubuntu**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev libqt5sql5-psql libqt5websockets5-dev libqt5sql5-sqlite libqt5sql5-mysql qtdeclarative5-dev qtscript5-dev
 
-**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qt5-default libqt5sql5-psql libqt5websockets5-dev libqt5sql5-psql libqt5sql5-sqlite libqt5sql5-mysql qtdeclarative5-dev qtscript5-dev
+**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev libqt5sql5-psql libqt5websockets5-dev libqt5sql5-psql libqt5sql5-sqlite libqt5sql5-mysql qtdeclarative5-dev qtscript5-dev
 
 ### Gui server
 ```sh
@@ -86,7 +86,7 @@ git clone --depth=1 https://github.com/alphaonex86/CatchChallenger-datapack data
 ### Epoll server (linux only, high performance)
 **Ubuntu**: apt-get install libzstd-dev zlib1g-dev libssl-dev libpq-dev
 
-**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qt5-default
+**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev
 
 ```sh
 cd server/
@@ -98,7 +98,7 @@ chmod a+x catchchallenger-server-cli-epoll
 ```
 
 ### Client
-**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qt5-default qtdeclarative5-dev qtscript5-dev
+**Debian stretch**: apt-get install build-essential gcc automake qt5-qmake libzstd-dev zlib1g-dev libssl-dev libpq-dev qttools5-dev qtdeclarative5-dev qtscript5-dev
 
 ```sh
 cd client/
@@ -114,7 +114,15 @@ chmod a+x catchchallenger
 * The sources of the datapack: https://github.com/alphaonex86/CatchChallenger-datapack
 * The sources of the site: https://github.com/alphaonex86/CatchChallenger-site
 
-# Hardware
-You need CPU with support of unaligned access on 8/16/32Bits for the server at least (plan to support all CPU)
-
-The server is actually 10-20MB of memory (1MB measured by massif) and 2KB by player
+# Hardware server
+Tested on physical hardware:
+* Intel i486DX2-66 at 66Mhz for x86
+* Geode LX800 (i486/i586 like) at 500MHz for x86
+* RISC-V (without SIMD)
+* MIPS2 big endian a 200MHz
+* RPI1 at 700MHz 32-bit for ARM11
+* Pentium 3 at 750MHz for x86
+Without problem with 200 players.
+And of course more modern CPU like AMD Ryzen 9 7950X3D 16-Core Processor in x86_64, all qemu arch
+
+The server is actually 10-20MB of memory (3MB measured by massif) and 1-4KB by player

client/catchchallenger-2.2.0.0.recipe

@@ -1,6 +1,6 @@
 SUMMARY="Game MMORPG/single player game. You can fight, farming, crafting, trading"
 DESCRIPTION="This game is a independent MMORPG or a single player game."
-HOMEPAGE="https://catchchallenger.first-world.info/"
+HOMEPAGE="https://catchchallenger.herman-brule.com/"
 COPYRIGHT="2011-2019 BRULE Herman Jacques Roger (alpha_one_x86)"
 LICENSE="GNU GPL v3"
 REVISION="1"

client/catchchallenger.pro

@@ -1,9 +1,5 @@
-include(qtopengl/client.pri)
-include(../general/general.pri)
-include(qt/qt.pri)
-
-linux:QMAKE_CXXFLAGS+="-Wno-deprecated-declarations"
-linux:QMAKE_CFLAGS+="-Wno-deprecated-declarations"
-
-DEFINES += OPENGL CATCHCHALLENGER_CACHE_HPS
-TARGET = catchchallenger
+include(qtopengl/catchchallenger-qtopengl.pro)
+#DEFINES += DEBUG_PROTOCOLPARSING_RAW_NETWORK
+#DEFINES += DEBUG_MESSAGE_CLIENT_SQL
+DEFINES += CATCHCHALLENGER_CACHE_HPS
+linux:QMAKE_LFLAGS += -fuse-ld=mold