From 38847094f04f1f808653f0b6f66bb3438d3389ca Mon Sep 17 00:00:00 2001
From: DjWarmonger
Date: Sat, 9 Dec 2023 08:15:36 +0100
Subject: [PATCH 1/4] Update Readme.md
Added some vanilla screenshots
---
docs/Readme.md | 19 ++++++++++++++++++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/docs/Readme.md b/docs/Readme.md
index 6902f1bf6..a9b93d8a2 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -4,7 +4,16 @@
# VCMI Project
-VCMI is work-in-progress attempt to recreate engine for Heroes III, giving it new and extended possibilities.
+VCMI is an open-source recreation of Heroes of Might & Magic III engine, giving it new and extended possibilities.
+
+
+
+
+
+
+
+
+
## Links
@@ -27,6 +36,14 @@ Please see corresponding installation guide articles for details for your platfo
- [Android](players/Installation_Android.md)
- [iOS](players/Installation_iOS.md)
+
+
+
+
+
+
+
+
## Documentation and guidelines for players
- [General information about VCMI Project](players/Manual.md)
From 842856f79a44081eb1919ce95e7231428168ffc9 Mon Sep 17 00:00:00 2001
From: DjWarmonger
Date: Sat, 9 Dec 2023 08:21:37 +0100
Subject: [PATCH 2/4] Update Readme.md
---
docs/Readme.md | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/docs/Readme.md b/docs/Readme.md
index a9b93d8a2..38631e529 100644
--- a/docs/Readme.md
+++ b/docs/Readme.md
@@ -9,7 +9,6 @@ VCMI is an open-source recreation of Heroes of Might & Magic III engine, giving
-
@@ -40,8 +39,7 @@ Please see corresponding installation guide articles for details for your platfo
-
-
+
## Documentation and guidelines for players
From 91ebac3c2eb636f812e29885a2f948e75c694c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Zieli=C5=84ski?=
Date: Sun, 10 Dec 2023 09:46:20 +0100
Subject: [PATCH 3/4] Fix incorrect check
---
lib/rmg/CMapGenOptions.cpp | 6 ------
1 file changed, 6 deletions(-)
diff --git a/lib/rmg/CMapGenOptions.cpp b/lib/rmg/CMapGenOptions.cpp
index 72d9e786c..0e147a621 100644
--- a/lib/rmg/CMapGenOptions.cpp
+++ b/lib/rmg/CMapGenOptions.cpp
@@ -730,12 +730,6 @@ std::vector CMapGenOptions::getPossibleTemplates() const
return true;
}
- if(compOnlyPlayerCount != CMapGenOptions::RANDOM_SIZE)
- {
- if (!tmpl->getHumanPlayers().isInRange(compOnlyPlayerCount))
- return true;
- }
-
return false;
});
From d0e100c1bbf582c8dd5d1426946fed6c98bcb73e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomasz=20Zieli=C5=84ski?=
Date: Sun, 10 Dec 2023 09:50:25 +0100
Subject: [PATCH 4/4] Fix unused variable
---
lib/rmg/CMapGenOptions.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/rmg/CMapGenOptions.cpp b/lib/rmg/CMapGenOptions.cpp
index 0e147a621..4f89f7398 100644
--- a/lib/rmg/CMapGenOptions.cpp
+++ b/lib/rmg/CMapGenOptions.cpp
@@ -580,7 +580,7 @@ void CMapGenOptions::finalize(CRandomGenerator & rand)
}
logGlobal->trace("Player %d: %s", player.second.getColor(), playerType);
}
- logGlobal->info("Final player config: %d total, %d cpu-only", players.size(), static_cast(getCompOnlyPlayerCount()));
+ logGlobal->info("Final player config: %d total, %d cpu-only", players.size(), cpuOnlyPlayers);
}
void CMapGenOptions::updatePlayers()