Merge pull request #515 from Aidoneus/master

HD versions of loadscreens + HD backdrop selection fix for main menu + HD resources artist added to credits
KranX · Nov 21, 2021 · 60b4dec · 60b4dec
2 parents 4d6eb2a + 5b9e875
commit 60b4dec
Show file tree

Hide file tree

Showing 19 changed files with 2,272 additions and 30 deletions.
diff --git a/data/game.lst b/data/game.lst
diff --git a/data/resource/iscreen/text/eng/credits7.txt b/data/resource/iscreen/text/eng/credits7.txt
@@ -12,6 +12,7 @@ updating of the game in Steam and GOG
 Dmitry "AMDmi3" Marakasov, rework of the source code
 
 Nikita "lpenguin" Prianichnikov, HD support
+Egor V.D., artist for HD resources
 
 Aigars "Zuzon" Zeiza, 60 FPS support
 

diff --git a/data/resource/iscreen/text/rus/credits7.txt b/data/resource/iscreen/text/rus/credits7.txt
@@ -13,6 +13,7 @@
 ����਩ "AMDmi3" ��ࠪ�ᮢ, ���ࠡ�⪠ ��室���� ���� ����
 
 ����� "lpenguin" ��ﭨ筨���, �����প� HD � ���
+���� �.�., �㤮���� ��䨪� ��� HD
 
 Aigars "Zuzon" Zeiza, �����প� 60 FPS � ���
 

diff --git a/data/resource/video/svs/20.svs b/data/resource/video/svs/20.svs
diff --git a/data/resource/video/svs/21.svs b/data/resource/video/svs/21.svs
diff --git a/data/resource/video/svs/22.svs b/data/resource/video/svs/22.svs
diff --git a/data/resource/video/svs/23.svs b/data/resource/video/svs/23.svs
diff --git a/data/resource/video/svs/24.svs b/data/resource/video/svs/24.svs
diff --git a/data/resource/video/svs/25.svs b/data/resource/video/svs/25.svs
diff --git a/data/resource/video/svs/26.svs b/data/resource/video/svs/26.svs
diff --git a/data/resource/video/svs/27.svs b/data/resource/video/svs/27.svs
diff --git a/data/resource/video/svs/28.svs b/data/resource/video/svs/28.svs
diff --git a/data/resource/video/svs/29.svs b/data/resource/video/svs/29.svs
diff --git a/data/resource/video/svs/291.svs b/data/resource/video/svs/291.svs
diff --git a/data/resource/video/svs/292.svs b/data/resource/video/svs/292.svs
diff --git a/lib/xgraph/xside.cpp b/lib/xgraph/xside.cpp
@@ -2,15 +2,16 @@
 // Created by caiiiycuk on 25.06.2021.
 //
 
-#include <utility>
-#include <functional>
 #include "xbmp.h"
+#include <functional>
+#include <utility>
 
 extern int xgrScreenSizeX;
 extern int xgrScreenSizeY;
 
 extern int getCurRtoId();
 extern int getCurIScreenId();
+extern int getCurIScreenX();
 extern int CurrentWorld;
 
 namespace {
@@ -23,6 +24,7 @@ int currentIScreenId = 0;
 std::pair<const char *, const char *> getSideNames() {
 	int activeRtoId = getCurRtoId();
 	int activeIScreenId = getCurIScreenId();
+	int activeIScreenX = getCurIScreenX();
 
 	if (activeRtoId == 0) {
 		return activeSides;
@@ -37,30 +39,7 @@ std::pair<const char *, const char *> getSideNames() {
 	currentIScreenId = activeIScreenId;
 
 	if (currentRto == 5 /*RTO_MAIN_MENU_ID*/) {
-		if (activeIScreenId == 20 /* Genesis */ ||
-			activeIScreenId == 27 /* Main menu */ ||
-			activeIScreenId == 41 /* Graphics */ ||
-			activeIScreenId == 59 /* Sound */ ||
-			activeIScreenId == 123 /* Join */ ||
-			activeIScreenId == 128 /* Create Server */ ||
-			activeIScreenId == 358 /* Network Game Type */ ||
-			activeIScreenId == 467 /* Identification */ ||
-			activeIScreenId == 508 /* Chat */ ||
-			activeIScreenId == 528 /* Game Result */ ||
-			activeIScreenId == 654 /* Player Setup */ ||
-			activeIScreenId == 662 /* Controls */ ||
-			activeIScreenId == 678 /* Internet */ ||
-			activeIScreenId == 698 /* Hall of Fame */ ||
-			activeIScreenId == 770 /* Set Server Port */ ||
-			activeIScreenId == 788 /* Addons (Web Version) */ ||
-			activeIScreenId == 1126 /* Credits (2013+ Page 1) */ ||
-			activeIScreenId == 1134 /* Credits (2013+ Page 3) */ ||
-			activeIScreenId == 1139 /* Credits (2002 - 2013) */ ||
-			activeIScreenId == 1143 /* Credits (IM) */ ||
-			activeIScreenId == 1148 /* Credits (Buka) */ ||
-			activeIScreenId == 1153 /* Credits (KD-Lab Page 1) */ ||
-			activeIScreenId == 1161 /* Credits (KD-Lab Page 2) */ ||
-			activeIScreenId == 0) {
+		if (activeIScreenX == 0) {
 			return std::make_pair<>(
 				"resource/actint/hd/side/main_menu_left.bmp",
 				"resource/actint/hd/side/main_menu_right.bmp");

diff --git a/src/iscreen/iscreen.cpp b/src/iscreen/iscreen.cpp
@@ -131,6 +131,10 @@ int getCurIScreenId() {
 	return iScrDisp == nullptr || iScrDisp->curScr == nullptr ? 0 : iScrDisp->curScr->ID;
 }
 
+int getCurIScreenX() {
+	return iScrDisp == nullptr || iScrDisp->curScr == nullptr ? 0 : iScrDisp->curScr->ScreenOffs;
+}
+
 iListElement::iListElement(void)
 {
 	//ID_ptr = new char[256];

diff --git a/src/units/hobj.cpp b/src/units/hobj.cpp
@@ -2625,7 +2625,6 @@ extern int camera_Y_prev;
 
 void ChangeWorld(int world,int flag)
 {
-	const int passImageMinSize = 800;
 	int t,i;
 	if(CurrentWorld == WORLD_KHOX)
 		scale_general *= 2.;
@@ -2635,17 +2634,17 @@ void ChangeWorld(int world,int flag)
 
 	PassageBmpPrev = -1;
 	t = RND(PassageBmpNum);
-	if(PassageImageData[t].xSize < passImageMinSize || PassageImageData[t].xSize > XGR_MAXX){
+	if(PassageImageData[t].xSize != XGR_MAXX){
 		for(i = t;i < PassageBmpNum;i++){
-			if(PassageImageData[i].xSize >= passImageMinSize && PassageImageData[i].xSize <= XGR_MAXX) {
+			if(PassageImageData[i].xSize == XGR_MAXX){
 				PassageBmpPrev = i;
 				break;
 			};
 		};
 
 		if(PassageBmpPrev == -1){
 			for(i = 0;i < PassageBmpNum;i++){
-				if(PassageImageData[i].xSize >= passImageMinSize && PassageImageData[i].xSize <= XGR_MAXX){
+				if(PassageImageData[i].xSize == XGR_MAXX){
 					PassageBmpPrev = i;
 					break;
 				};

diff --git a/surmap/missed.cpp b/surmap/missed.cpp
@@ -263,3 +263,7 @@ int CurrentWorld = -1;
 int getCurIScreenId() {
 	return 0;
 }
+
+int getCurIScreenX() {
+	return 0;
+}