1.5 Release

shonumi · Apr 1, 2021 · 63880a7 · 63880a7
1 parent 6f9d369
commit 63880a7
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/src/docs/manual.odt b/src/docs/manual.odt
diff --git a/src/docs/manual.pdf b/src/docs/manual.pdf
diff --git a/src/main.cpp b/src/main.cpp
@@ -18,7 +18,7 @@
 
 int main(int argc, char* args[])
 {
-	std::cout<<"GBE+ 1.4 [SDL]\n";
+	std::cout<<"GBE+ 1.5 [SDL]\n";
 
 	core_emu* gbe_plus = NULL;
 

diff --git a/src/nds/gx_render.cpp b/src/nds/gx_render.cpp
@@ -267,7 +267,7 @@ void NTR_LCD::render_geometry()
 			xy_end = plot_x[next_index];
 		}
 
-		xy_len = abs(xy_end - xy_start);
+		xy_len = std::abs(xy_end - xy_start);
 
 		if(xy_len != 0)
 		{
@@ -615,39 +615,39 @@ void NTR_LCD::fill_poly_textured()
 			//Wrap horizontally, if necessary
 			if(lcd_3D_stat.repeat_tex_x)
 			{
-				u8 x_flip = u32(abs(tx1 / tw)) & 0x1;
+				u8 x_flip = u32(std::abs(tx1 / tw)) & 0x1;
 
 				//No flipping horizontally
 				if(!lcd_3D_stat.flip_tex_x || !x_flip)
 				{
-					if(tx1 < 0) { real_tx = (tx1 + (tw * (abs(s32(tx1 / tw)) + 1))); }
+					if(tx1 < 0) { real_tx = (tx1 + (tw * (std::abs(s32(tx1 / tw)) + 1))); }
 					else if(tx1 >= tw) { real_tx = (tx1 - (tw * (s32(tx1 / tw)))); }
 				}
 
 				//Flip horizontally
 				else
 				{
-					if(tx1 < 0) { real_tx = tw - (tx1 + (tw * (abs(s32(tx1 / tw)) + 1))); }
+					if(tx1 < 0) { real_tx = tw - (tx1 + (tw * (std::abs(s32(tx1 / tw)) + 1))); }
 					else if(tx1 >= tw) { real_tx = tw - (tx1 - (tw * (s32(tx1 / tw)))); }
 				}
 			}
 
 			//Wrap vertically, if necessary
 			if(lcd_3D_stat.repeat_tex_y)
 			{
-				u8 y_flip = u32(abs(ty1 / th)) & 0x1;
+				u8 y_flip = u32(std::abs(ty1 / th)) & 0x1;
 
 				//No flipping vertically
 				if(!lcd_3D_stat.flip_tex_y || !y_flip)
 				{
-					if(ty1 < 0) { real_ty = (ty1 + (th * (abs(s32(ty1 / th)) + 1))); }
+					if(ty1 < 0) { real_ty = (ty1 + (th * (std::abs(s32(ty1 / th)) + 1))); }
 					else if(ty1 >= th) { real_ty = (ty1 - (th * s32(ty1 / th))); }
 				}
 
 				//Flip vertically
 				else
 				{
-					if(ty1 < 0) { real_ty = th - (ty1 + (th * (abs(s32(ty1 / th)) + 1))); }
+					if(ty1 < 0) { real_ty = th - (ty1 + (th * (std::abs(s32(ty1 / th)) + 1))); }
 					else if(ty1 >= th) { real_ty = th - (ty1 - (th * s32(ty1 / th))); }
 				}
 			}
@@ -2389,7 +2389,7 @@ void NTR_LCD::update_clip_matrix()
 			float raw_value = clip_matrix[(y << 2) + x];
 			u32 index = 4 * ((y * 4) + x);
 
-			integral = abs(raw_value);
+			integral = std::abs(raw_value);
 
 			//Negative values
 			if(raw_value < 0)
@@ -2438,7 +2438,7 @@ void NTR_LCD::update_vector_matrix()
 			float raw_value = gx_vector_matrix[(y << 2) + x];
 			u32 index = 4 * ((y * 4) + x);
 
-			integral = abs(raw_value);
+			integral = std::abs(raw_value);
 
 			//Negative values
 			if(raw_value < 0)
@@ -2498,7 +2498,7 @@ u32 NTR_LCD::get_u32_fixed(float raw_value)
 	u32 fractal = 0;
 	float sub_fractal = 0.0;
 
-	integral = abs(raw_value);
+	integral = std::abs(raw_value);
 
 	//Negative values
 	if(raw_value < 0)

diff --git a/src/qt/main.cpp b/src/qt/main.cpp
@@ -14,7 +14,7 @@
 
 int main(int argc, char* args[]) 
 {
-	std::cout<<"GBE+ 1.4 [Qt]\n";
+	std::cout<<"GBE+ 1.5 [Qt]\n";
 
 	config::use_external_interfaces = true;
 

diff --git a/src/qt/main_menu.cpp b/src/qt/main_menu.cpp
@@ -295,7 +295,7 @@ main_menu::main_menu(QWidget *parent) : QWidget(parent)
 	QDialogButtonBox* about_button = new QDialogButtonBox(QDialogButtonBox::Close);
 	connect(about_button->button(QDialogButtonBox::Close), SIGNAL(clicked()), about_box, SLOT(close()));
 
-	QLabel* emu_title = new QLabel("GBE+ 1.4");
+	QLabel* emu_title = new QLabel("GBE+ 1.5");
 	QFont font = emu_title->font();
 	font.setPointSize(18);
 	font.setBold(true);
@@ -304,8 +304,8 @@ main_menu::main_menu(QWidget *parent) : QWidget(parent)
 	QImage logo(QString::fromStdString(config::cfg_path + "data/icons/gbe_plus.png"));
 	logo = logo.scaled(128, 128);
 	QLabel* emu_desc = new QLabel("A GB/GBC/GBA/NDS emulator with enhancements");
-	QLabel* emu_copyright = new QLabel("Copyright D.S. Baxter 2014-2020");
-	QLabel* emu_proj_copyright = new QLabel("Copyright GBE+ Team 2014-2020");
+	QLabel* emu_copyright = new QLabel("Copyright D.S. Baxter 2014-2021");
+	QLabel* emu_proj_copyright = new QLabel("Copyright GBE+ Team 2014-2021");
 	QLabel* emu_license = new QLabel("This program is licensed under the GNU GPLv2");
 	QLabel* emu_site = new QLabel("<a href=\"https://github.com/shonumi/gbe-plus/\">GBE+ on GitHub</a>");
 	emu_site->setOpenExternalLinks(true);