games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'upstream/develop' into enet

Browse Source
This commit is contained in:
nordsoft
2023-01-14 23:53:43 +04:00
parent 03c3fa9e1a 5e72ef76cf
commit f765112798
4 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CI/mxe/before_install.sh
View File

@@ -14,8 +14,8 @@ sudo add-apt-repository 'deb http://security.ubuntu.com/ubuntu bionic-security m
sudo apt-get install -qq nsis ninja-build libssl1.0.0 sudo apt-get install -qq nsis ninja-build libssl1.0.0
# MXE repository was too slow for Travis far too often # MXE repository was too slow for Travis far too often
wget -nv https://github.com/vcmi/vcmi-deps-mxe/releases/download/2022-12-26/mxe-i686-w64-mingw32.shared-2022-12-26.tar wget -nv https://github.com/vcmi/vcmi-deps-mxe/releases/download/2021-02-20/mxe-i686-w64-mingw32.shared-2021-01-22.tar
tar -xvf mxe-i686-w64-mingw32.shared-2022-12-26.tar tar -xvf mxe-i686-w64-mingw32.shared-2021-01-22.tar
sudo dpkg -i mxe-*.deb sudo dpkg -i mxe-*.deb
sudo apt-get install -f --yes sudo apt-get install -f --yes

4
config/widgets/battleWindow.json
View File

@@ -115,7 +115,7 @@
{ {
"type": "button", "type": "button",
"name": "tacticNext", "name": "tacticNext",
"position": {"x": 213, "y": 4}, "position": {"x": 213, "y": 560},
"image": "icm011", "image": "icm011",
"callback": "tacticNext", "callback": "tacticNext",
"hotkey": "space" "hotkey": "space"
@@ -124,7 +124,7 @@
{ {
"type": "button", "type": "button",
"name": "tacticEnd", "name": "tacticEnd",
"position": {"x": 419, "y": 4}, "position": {"x": 419, "y": 560},
"image": "icm012", "image": "icm012",
"callback": "tacticEnd", "callback": "tacticEnd",
"hotkey": "enter" "hotkey": "enter"

2
lib/CGeneralTextHandler.cpp
View File

@@ -374,6 +374,8 @@ CGeneralTextHandler::CGeneralTextHandler():
readToVector("core.restypes", "DATA/RESTYPES.TXT" ); readToVector("core.restypes", "DATA/RESTYPES.TXT" );
readToVector("core.terrname", "DATA/TERRNAME.TXT" ); readToVector("core.terrname", "DATA/TERRNAME.TXT" );
readToVector("core.randsign", "DATA/RANDSIGN.TXT" ); readToVector("core.randsign", "DATA/RANDSIGN.TXT" );
readToVector("core.crgen1", "DATA/CRGEN1.TXT" );
readToVector("core.crgen4", "DATA/CRGEN4.TXT" );
readToVector("core.overview", "DATA/OVERVIEW.TXT" ); readToVector("core.overview", "DATA/OVERVIEW.TXT" );
readToVector("core.arraytxt", "DATA/ARRAYTXT.TXT" ); readToVector("core.arraytxt", "DATA/ARRAYTXT.TXT" );
readToVector("core.priskill", "DATA/PRISKILL.TXT" ); readToVector("core.priskill", "DATA/PRISKILL.TXT" );

2
lib/mapObjects/CQuest.cpp
View File

@@ -588,7 +588,7 @@ void CGSeerHut::initObj(CRandomGenerator & rand)
quest->progress = CQuest::NOT_ACTIVE; quest->progress = CQuest::NOT_ACTIVE;
if(quest->missionType) if(quest->missionType)
{ {
std::string questName = quest->missionName(CQuest::Emission(quest->missionType-1)); std::string questName = quest->missionName(quest->missionType);
if(!quest->isCustomFirst) if(!quest->isCustomFirst)
quest->firstVisitText = VLC->generaltexth->translate("core.seerhut.quest." + questName + "." + quest->missionState(0), quest->textOption); quest->firstVisitText = VLC->generaltexth->translate("core.seerhut.quest." + questName + "." + quest->missionState(0), quest->textOption);