shithub: cstory

Download patch

ref: 4e61be56d03d46953d480329325b4173f117bd83
parent: d4c0cde7488eace1e177aea488e433b6836f829a
author: Clownacy <Clownacy@users.noreply.github.com>
date: Sun Feb 10 12:03:55 EST 2019 

Renamed the SDL icon file

Turns out it has an actual name in the original EXE


--- a/Makefile
+++ b/Makefile
@@ -182,7 +182,7 @@
 endif

 

 ifneq ($(WINDOWS), 1)

-	RESOURCES += ICON/4.bmp

+	RESOURCES += ICON/ICON_MINI.bmp

 endif

 

 OBJECTS = $(addprefix obj/$(FILENAME)/, $(addsuffix .o, $(SOURCES)))

binary files a/res/ICON/4.bmp /dev/null differ
binary files /dev/null b/res/ICON/ICON_MINI.bmp differ
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -104,9 +104,9 @@
 	memcpy(&gDataPath[strlen(gDataPath)], "/data", 6); //Pixel didn't use a strcat

 

 #ifdef WINDOWS

-		// Set the window icons. See icon.rc.

-		SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101");

-		SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102");

+	// Set the window icons. See res/ICON/ICON.rc.

+	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON, "101");

+	SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102");

 #endif

 

 	//Initialize SDL

@@ -293,7 +293,7 @@
 			

 #ifndef WINDOWS

 			//Load icon

-			SDL_RWops *fp = FindResource("ICON4");

+			SDL_RWops *fp = FindResource("ICON_MINI");

 			

 			if (fp)

 			{

--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -70,7 +70,7 @@
 #include "Resource/BITMAP/PIXEL.bmp.h"
 #endif
 #ifndef WINDOWS
-#include "Resource/ICON/4.bmp.h"
+#include "Resource/ICON/ICON_MINI.bmp.h"
 #endif
 #include "Resource/CURSOR/CURSOR_IKA.bmp.h"
 #include "Resource/CURSOR/CURSOR_NORMAL.bmp.h"
@@ -395,10 +395,10 @@
 	
 #ifndef WINDOWS
 	//ICON
-	if (!strcmp(name, "ICON4"))
+	if (!strcmp(name, "ICON_MINI"))
 	{
-		*size = sizeof(r4);
-		return r4;
+		*size = sizeof(rICON_MINI);
+		return rICON_MINI;
 	}
 #endif
 
--- a/src/Resource/ICON/4.bmp.h
+++ /dev/null
@@ -1,22 +1,0 @@
-#pragma once
-
-const unsigned char r4[0x11A] = {
-	0x42, 0x4D, 0x1A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x6C, 0x00,
-	0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x08, 0x00,
-	0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x42, 0x47, 0x52, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
-	0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xC0, 0xC0,
-	0xC0, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x33, 0x33, 0x33, 0x00, 0x00, 0x03,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x22, 0x23, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x32, 0x22, 0x33,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x77, 0x22, 0x73, 0x33, 0x33, 0x33, 0x33, 0x33, 0x70, 0x00, 0x33,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x70, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x37, 0x05, 0x33,
-	0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x50, 0x00, 0x33, 0x33, 0x33, 0x30, 0x77, 0x77, 0x77, 0x77,
-	0x03, 0x33, 0x33, 0x40, 0x71, 0x77, 0x77, 0x71, 0x74, 0x33, 0x33, 0x40, 0x71, 0x77, 0x77, 0x71,
-	0x54, 0x33, 0x34, 0x30, 0x51, 0x77, 0x77, 0x51, 0x53, 0x33, 0x36, 0x32, 0x00, 0x00, 0x55, 0x55,
-	0x23, 0x33, 0x33, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23, 0x33, 0x33, 0x27, 0x77, 0x77, 0x77,
-	0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33
-};
--- /dev/null
+++ b/src/Resource/ICON/ICON_MINI.bmp.h
@@ -1,0 +1,22 @@
+#pragma once
+
+const unsigned char rICON_MINI[0x11A] = {
+	0x42, 0x4D, 0x1A, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x9A, 0x00, 0x00, 0x00, 0x6C, 0x00,
+	0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x04, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x80, 0x00, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x23, 0x2E, 0x00, 0x00, 0x08, 0x00,
+	0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x42, 0x47, 0x52, 0x73, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x80, 0x80, 0x80, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xC0, 0xC0,
+	0xC0, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0x00, 0x33, 0x33, 0x33, 0x00, 0x00, 0x03,
+	0x33, 0x33, 0x33, 0x33, 0x33, 0x22, 0x23, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x32, 0x22, 0x33,
+	0x33, 0x33, 0x33, 0x33, 0x33, 0x77, 0x22, 0x73, 0x33, 0x33, 0x33, 0x33, 0x33, 0x70, 0x00, 0x33,
+	0x33, 0x33, 0x33, 0x33, 0x33, 0x70, 0x00, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x37, 0x05, 0x33,
+	0x33, 0x33, 0x33, 0x33, 0x00, 0x00, 0x50, 0x00, 0x33, 0x33, 0x33, 0x30, 0x77, 0x77, 0x77, 0x77,
+	0x03, 0x33, 0x33, 0x40, 0x71, 0x77, 0x77, 0x71, 0x74, 0x33, 0x33, 0x40, 0x71, 0x77, 0x77, 0x71,
+	0x54, 0x33, 0x34, 0x30, 0x51, 0x77, 0x77, 0x51, 0x53, 0x33, 0x36, 0x32, 0x00, 0x00, 0x55, 0x55,
+	0x23, 0x33, 0x33, 0x32, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23, 0x33, 0x33, 0x27, 0x77, 0x77, 0x77,
+	0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33, 0x33
+};
-- 
⑨