From 31acc0d002dec223ea4cefa13c7896d1f1ce841e Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Sun, 17 Mar 2019 01:17:19 +0100 Subject: [PATCH] Prepair for 0.2.0 --- README.md | 2 +- SourceX/DiabloUI/selgame.cpp | 2 +- SourceX/dvlnet/packet.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a051f6b64..03b7d3b41 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ make -j$(nproc) *Arguments to cmake:* -The default build type is `Debug`. This can be changed with `-DCMAKE_BUILD_TYPE=Release`. Independently of this, the debug mode of the Diablo engine is always enabled by default. It can be disabled with `-DDEBUG=OFF`. Finally, in debug builds the address sanitizer is enabled by default. This can be disabled with `-DASAN=OFF`. +The default build type is `Debug`. This can be changed with `-DBINARY_RELEASE=ON`. Independently of this, the debug mode of the Diablo engine is always enabled by default. It can be disabled with `-DDEBUG=OFF`. Finally, in debug builds the address sanitizer is enabled by default. This can be disabled with `-DASAN=OFF`. *To run the game:* diff --git a/SourceX/DiabloUI/selgame.cpp b/SourceX/DiabloUI/selgame.cpp index 2abcd5215..9f46e8d02 100644 --- a/SourceX/DiabloUI/selgame.cpp +++ b/SourceX/DiabloUI/selgame.cpp @@ -186,7 +186,7 @@ void selgame_Password_Select(int value) if (selgame_selectedGame) { SRegSaveString("Phone Book", "Entry1", 0, selgame_Ip); if (!SNetJoinGame(selgame_selectedGame, selgame_Ip, selgame_Password, NULL, NULL, gdwPlayerId)) { - DrawDlg("Unable to establish a connection. A game of Devilution 0.1.0 was not detected at the specified IP address."); + DrawDlg("Unable to establish a connection. A game of Devilution 0.2.0 was not detected at the specified IP address."); selgame_Password_Init(selgame_selectedGame); } return; diff --git a/SourceX/dvlnet/packet.cpp b/SourceX/dvlnet/packet.cpp index c05974cfd..e6dfd5b26 100644 --- a/SourceX/dvlnet/packet.cpp +++ b/SourceX/dvlnet/packet.cpp @@ -163,7 +163,7 @@ packet_factory::packet_factory(std::string pw) ABORT(); pw.resize(std::min(pw.size(), crypto_pwhash_argon2id_PASSWD_MAX)); pw.resize(std::max(pw.size(), crypto_pwhash_argon2id_PASSWD_MIN), 0); - std::string salt("devilution-salt 0.1.0"); + std::string salt("devilution-salt 0.2.0"); salt.resize(crypto_pwhash_argon2id_SALTBYTES, 0); if (crypto_pwhash(key.data(), crypto_secretbox_KEYBYTES, pw.data(), pw.size(),