Implement merge review requests

Author: gijsgroenewegen

CubeModLoader/CWSDK

@@ -1 +1 @@
-Subproject commit e42dab995860553cfdf78a3c0d8ee8da9738ee83
+Subproject commit 6a8ea237e2351dc296ba43d7f5093bb97fe1aa5b

CubeModLoader/ModWidget.cpp

@@ -4,6 +4,7 @@
 #include <process.h>
 
 static std::string file_name = "mods-settings.cwb";
+static const int MODS_PER_PAGE = 7;
 void* VTABLE[43];
 
 mod::ModWidget* mod::ModWidget::ctor(cube::Game* game, plasma::Node* node, plasma::Node* background, std::vector<DLL*>* mods)
@@ -50,7 +51,8 @@ void mod::ModWidget::MouseUp(cube::MouseButton mouse_button)
 		this->node->SetVisibility(false);
 		if (this->changed)
 		{
-			char* argument_list[] = { "cubeworld.exe", NULL };
+			// Restart the game
+			char* argument_list[] = { (char *)"cubeworld.exe", NULL };
 			_execvp("cubeworld.exe", argument_list);
 		}
 		break;
@@ -83,23 +85,14 @@ void mod::ModWidget::MouseUp(cube::MouseButton mouse_button)
 
 bool mod::ModWidget::NextPageAvailable()
 {
-	return (this->page + 1) * 7 < this->mods->size();
+	return (this->page + 1) * MODS_PER_PAGE < this->mods->size();
 }
 
 bool mod::ModWidget::PreviousPageAvailable()
 {
 	return this->page > 0;
 }
 
-bool BtnIsHovered(FloatVector2* mouse_pos, float min_x, float max_x, int height)
-{
-	if (mouse_pos->x < min_x || max_x <= mouse_pos->x || mouse_pos->y < height - 20 || height + 10 <= mouse_pos->y)
-	{
-		return false;
-	}
-	return true;
-}
-
 void mod::ModWidget::Draw(ModWidget* widget)
 {
 	const static float text_size = 18.0f; // Original	18.0f
@@ -151,7 +144,7 @@ void mod::ModWidget::Draw(ModWidget* widget)
 
 	// Draw x to exit
 	widget->SetTextPivot(plasma::TextPivot::Right);
-	if (BtnIsHovered(&mouse_pos, size.x - 30, size.x - 10, 20 + text_size))
+	if (plasma::Widget::IsSquareHovered(&mouse_pos, size.x - 30, 20, 20, 30))
 	{
 		widget->SetTextColor(&hover_color);
 		widget->hover_state = ModWidget::HoverState::Exit;
@@ -178,7 +171,7 @@ void mod::ModWidget::Draw(ModWidget* widget)
 		}
 
 		int y_pos = (4 + 2 * y_count) * (10 + text_size);
-		if (BtnIsHovered(&mouse_pos, 0, size.x, y_pos))
+		if (plasma::Widget::IsSquareHovered(&mouse_pos, 0, y_pos - 20, size.x, 30))
 		{
 			widget->SetTextColor(&hover_color);
 			widget->hover_state = HoverState::Toggle;
@@ -204,7 +197,7 @@ void mod::ModWidget::Draw(ModWidget* widget)
 	{
 		widget->SetTextColor(&disabled_color);
 	}
-	else if (BtnIsHovered(&mouse_pos, 20, 20 + text_size, size.y - text_size))
+	else if (plasma::Widget::IsSquareHovered(&mouse_pos, 20, size.y - text_size - 20, 20, 30))
 	{
 		widget->hover_state = HoverState::Previous;
 		widget->SetTextColor(&hover_color);
@@ -219,7 +212,7 @@ void mod::ModWidget::Draw(ModWidget* widget)
 	{
 		widget->SetTextColor(&disabled_color);
 	}
-	else if (BtnIsHovered(&mouse_pos, size.x - text_size - 20, size.x -20, size.y - text_size))
+	else if (plasma::Widget::IsSquareHovered(&mouse_pos, size.x - text_size - 20, size.y - text_size - 20, 20, 30))
 	{
 		widget->hover_state = HoverState::Next;
 		widget->SetTextColor(&hover_color);
@@ -229,7 +222,7 @@ void mod::ModWidget::Draw(ModWidget* widget)
 	// Draw current page
 	widget->SetTextColor(&text_color);
 	widget->SetTextPivot(plasma::TextPivot::Center);
-	std::wstring page = std::to_wstring(widget->page + 1) + L"/" + std::to_wstring((int)(widget->mods->size() / 7) + 1);
+	std::wstring page = std::to_wstring(widget->page + 1) + L"/" + std::to_wstring((int)(widget->mods->size() / MODS_PER_PAGE) + 1);
 	widget->DrawString(&pos, &page, size.x / 2, size.y - text_size);
 }
 

CubeModLoader/callbacks/gui/cube__StartMenuWidget__Draw.h

@@ -1,16 +1,6 @@
 #pragma once
 #include "../../CWSDK/cwsdk.h"
 
-bool BtnIsHovered(FloatVector2* mouse_pos, float width, int height)
-{
-	if (mouse_pos->x < 0 || width <= mouse_pos->x || mouse_pos->y < height - 20 || height + 10 <= mouse_pos->y)
-	{
-		return false;
-	}
-	return true;
-}
-
-// Todo: Using time constraints and not instructions
 void DrawModdedText(cube::StartMenuWidget* widget)
 {
 	// Color rotation of the modded text
@@ -54,21 +44,14 @@ void DrawModdedText(cube::StartMenuWidget* widget)
 
 extern "C" void cube__StartMenuWidget__Draw(cube::StartMenuWidget * widget)
 {
-	/*std::wstring wstr_mod_node(L"mod-node");
-	plasma::Node* node = widget->game->plasma_engine->root_node->FindChildByName(&wstr_mod_node);
-	if (node != nullptr && node->IsVisible())
-	{
-		return;
-	}*/
-
 	const static float text_size = 36.0f; // Original	18.0f
 	const static float border_size = 4.0f; // Original	4.0f
 	const int num_btns = 5;
 
 	float width;
 	int y_offset = -20;
 	int btn_height = 50;
-	bool options_active;
+	bool other_widget_active;
 
 	FloatVector2 pos = FloatVector2(0, 0);
 	FloatVector2 mouse_pos;
@@ -108,7 +91,18 @@ extern "C" void cube__StartMenuWidget__Draw(cube::StartMenuWidget * widget)
 
 	mouse_pos = *widget->GetRelativeMousePosition(&mouse_pos);
 	width = widget->GetXSize();
-	options_active = widget->game->gui.options_widget->node->display->IsVisible();
+	other_widget_active = widget->game->gui.options_widget->node->display->IsVisible();
+
+	// If options widget is not active, check if the mod widget is active
+	if (!other_widget_active)
+	{
+		std::wstring wstr_mod_node(L"mod-node");
+		plasma::Node* node = widget->game->plasma_engine->root_node->FindChildByName(&wstr_mod_node);
+		if (node != nullptr && node->IsVisible())
+		{
+			other_widget_active = true;
+		}
+	}
 
 	widget->SetTextSize(text_size);
 	widget->SetBorderSize(border_size);
@@ -120,7 +114,7 @@ extern "C" void cube__StartMenuWidget__Draw(cube::StartMenuWidget * widget)
 	for (int i = 0; i < num_btns; i++)
 	{
 		int btn_y = y_offset + i * btn_height;
-		if (!BtnIsHovered(&mouse_pos, width, btn_y) || options_active)
+		if (!plasma::Widget::IsSquareHovered(&mouse_pos, 0, btn_y - 20, width, 30))
 		{
 			widget->SetTextColor(&text_color);
 		}
@@ -137,7 +131,7 @@ extern "C" void cube__StartMenuWidget__Draw(cube::StartMenuWidget * widget)
 
 			if (character_slot < 0 || character_slot >= character_count)
 			{
-				if (BtnIsHovered(&mouse_pos, width, btn_y))
+				if (plasma::Widget::IsSquareHovered(&mouse_pos, 0, btn_y - 20, width, 30))
 				{
 					widget->hover_state = cube::StartMenuWidget::HoverState::None;
 				}