Feature: configurable Ufopaedia facilities preview

WarStalkeR · Feb 4, 2024 · 7ebed32 · 7ebed32
1 parent 91fc083
commit 7ebed32
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 9 deletions.
diff --git a/src/Engine/Options.cpp b/src/Engine/Options.cpp
@@ -276,6 +276,10 @@ void create()
 	_info.push_back(OptionInfo("oxceShowBaseNameInPopups", &oxceShowBaseNameInPopups, false, "", "HIDDEN"));
 	_info.push_back(OptionInfo("oxceGeoscapeDebugLogMaxEntries", &oxceGeoscapeDebugLogMaxEntries, 1000, "", "HIDDEN"));
 	_info.push_back(OptionInfo("oxceGeoscapeEventsInstantDelivery", &oxceGeoscapeEventsInstantDelivery, true, "", "HIDDEN"));
+	_info.push_back(OptionInfo("oxcePediaFacilityMaxWidth", &oxcePediaFacilityMaxWidth, 2, "", "HIDDEN"));
+	_info.push_back(OptionInfo("oxcePediaFacilityMaxHeight", &oxcePediaFacilityMaxHeight, 2, "", "HIDDEN"));
+	_info.push_back(OptionInfo("oxcePediaFacilityOffsetX", &oxcePediaFacilityOffsetX, 0, "", "HIDDEN"));
+	_info.push_back(OptionInfo("oxcePediaFacilityOffsetY", &oxcePediaFacilityOffsetY, 0, "", "HIDDEN"));
 
 	// controls
 	_info.push_back(OptionInfo("keyOk", &keyOk, SDLK_RETURN, "STR_OK", "STR_GENERAL"));

diff --git a/src/Engine/Options.inc.h b/src/Engine/Options.inc.h
@@ -127,6 +127,10 @@ OPT bool oxceDisableInventoryTuCost;
 OPT bool oxceShowBaseNameInPopups;
 OPT int oxceGeoscapeDebugLogMaxEntries;
 OPT bool oxceGeoscapeEventsInstantDelivery;
+OPT int oxcePediaFacilityMaxWidth;
+OPT int oxcePediaFacilityMaxHeight;
+OPT int oxcePediaFacilityOffsetX;
+OPT int oxcePediaFacilityOffsetY;
 
 // Flags and other stuff that don't need OptionInfo's.
 OPT bool mute, reload, newOpenGL, newScaleFilter, newHQXFilter, newXBRZFilter, newRootWindowedMode, newFullscreen, newAllowResize, newBorderless;

diff --git a/src/Ufopaedia/ArticleStateBaseFacility.cpp b/src/Ufopaedia/ArticleStateBaseFacility.cpp
@@ -64,7 +64,11 @@ namespace OpenXcom
 
 		// build preview image
 		int tile_size = 32;
-		_image = new Surface(tile_size*2, tile_size*2, 232, 16);
+		_image = new Surface(
+			tile_size * std::max(1, Options::oxcePediaFacilityMaxWidth),
+			tile_size * std::max(1, Options::oxcePediaFacilityMaxHeight),
+			232 + Options::oxcePediaFacilityOffsetX,
+			16 + Options::oxcePediaFacilityOffsetY);
 		add(_image);
 
 		SurfaceSet *graphic = _game->getMod()->getSurfaceSet("BASEBITS.PCK");
@@ -73,15 +77,11 @@ namespace OpenXcom
 		int x_pos, y_pos;
 		int num;
 
-		if (facility->getSize()==1)
-		{
-			x_offset = y_offset = tile_size/2;
-		}
-		else
-		{
-			x_offset = y_offset = 0;
-		}
+		// calculate preview offset
+		x_offset = (tile_size * std::max(0, Options::oxcePediaFacilityMaxWidth - facility->getSize())) / 2;
+		y_offset = (tile_size * std::max(0, Options::oxcePediaFacilityMaxHeight - facility->getSize())) / 2;
 
+		// render build preview
 		num = 0;
 		y_pos = y_offset;
 		for (int y = 0; y < facility->getSize(); ++y)