From 51e6cb5a6cf6698e53d8ceac975dada5c5bbf4ee Mon Sep 17 00:00:00 2001
From: Clownacy <Clownacy@users.noreply.github.com>
Date: Fri, 25 Sep 2020 13:48:10 +0100
Subject: [PATCH] Convert cursors and icon to PNG

No point using BMP, since they're way bigger, and they're not
required for authenticity, since the original files were .cur and
.ico files. At some point, I'd like to support those formats, so this
branch can use the original files.
---
 CMakeLists.txt                            |   6 +++---
 assets/resources/CURSOR/CURSOR_IKA.bmp    | Bin 654 -> 0 bytes
 assets/resources/CURSOR/CURSOR_IKA.png    | Bin 0 -> 225 bytes
 assets/resources/CURSOR/CURSOR_NORMAL.bmp | Bin 258 -> 0 bytes
 assets/resources/CURSOR/CURSOR_NORMAL.png | Bin 0 -> 131 bytes
 assets/resources/ICON/ICON_MINI.bmp       | Bin 2202 -> 0 bytes
 assets/resources/ICON/ICON_MINI.png       | Bin 0 -> 231 bytes
 src/Resource.cpp                          |   6 +++---
 8 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 assets/resources/CURSOR/CURSOR_IKA.bmp
 create mode 100644 assets/resources/CURSOR/CURSOR_IKA.png
 delete mode 100644 assets/resources/CURSOR/CURSOR_NORMAL.bmp
 create mode 100644 assets/resources/CURSOR/CURSOR_NORMAL.png
 delete mode 100644 assets/resources/ICON/ICON_MINI.bmp
 create mode 100644 assets/resources/ICON/ICON_MINI.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5772889..70bcd7cb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -199,8 +199,8 @@ set(RESOURCES
 	"BITMAP/Credit16.bmp"
 	"BITMAP/Credit17.bmp"
 	"BITMAP/Credit18.bmp"
-	"CURSOR/CURSOR_IKA.bmp"
-	"CURSOR/CURSOR_NORMAL.bmp"
+	"CURSOR/CURSOR_IKA.png"
+	"CURSOR/CURSOR_NORMAL.png"
 	"ORG/Access.org"
 	"ORG/Anzen.org"
 	"ORG/Balcony.org"
@@ -442,7 +442,7 @@ endif()
 
 # On Windows, we use native icons instead
 if(NOT WIN32)
-	list(APPEND RESOURCES "ICON/ICON_MINI.bmp")
+	list(APPEND RESOURCES "ICON/ICON_MINI.png")
 endif()
 
 
diff --git a/assets/resources/CURSOR/CURSOR_IKA.bmp b/assets/resources/CURSOR/CURSOR_IKA.bmp
deleted file mode 100644
index 6c14d1a20daeb6f858c3ff53b4585fc4e727b32c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 654
zcmd5(F%H5o40MUv+aDmYqYQmO6i#Ad;T>#zpfBi~`m=B*NoiOR8<t$<eD<B?#_PP3
zSIqq0nTL{{C|?Zn$5YNdp=G?>9!C8V#ikial4P1DS(ZgoN;3RI^dC!T*A_Ii9WFE-
zy?AUVoR@Kn72-Cy2Lf+WD&3&4288S>{TQsFDyWPKfCHJ=U=YC-ONBEG8MA=G8%>35
spoj`OoQofUkdF28#HLsww=pfh9>8#{%d%=1Z#v^DPQLu@b^goa3E=5Ej{pDw

diff --git a/assets/resources/CURSOR/CURSOR_IKA.png b/assets/resources/CURSOR/CURSOR_IKA.png
new file mode 100644
index 0000000000000000000000000000000000000000..0e559544010233d44d5fe8f33ac43e5c0cfb6a6f
GIT binary patch
literal 225
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnF3?v&v(vJfv{s5m4S0MeL;eSIz!+`?_{{R2K
zT20^qP^j0_#W6(V{LzUQd5<XYIQLFsOc1t{IFPmZzmIs72Cw?v_pXngC%#cxkkgvq
zuv;wPv(;s`tj-4qmN~3uyug2t!L5Glfrmcn0qj>}GxqdaPmp_aOr{}RU1T=b7VXNC
z_nV)%i7)WI{6sHH;IVPtJ0^v-wIz;K`W~-JBor1$F}SV})F_VmRBZ3~?<a3Pqx=ga
W-HMzgdLclEF?hQAxvX<aXaWEsD^=eB

literal 0
HcmV?d00001

diff --git a/assets/resources/CURSOR/CURSOR_NORMAL.bmp b/assets/resources/CURSOR/CURSOR_NORMAL.bmp
deleted file mode 100644
index 702deaf0937558f7ce3efbe483a685c876414791..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 258
zcmZ?rWnyFigC-!E1H=kY%*X(dXaMq+^&prD$Od62_n=}RMG^q%Lk9mD{xg6O$-n@p
xqXLRQFfa%JvE%~=26+%Z0K|WQ_y-UJ#o=NNKsEydgB%dc0I>uR3ji?)005oz6I=iQ

diff --git a/assets/resources/CURSOR/CURSOR_NORMAL.png b/assets/resources/CURSOR/CURSOR_NORMAL.png
new file mode 100644
index 0000000000000000000000000000000000000000..600fb001bd06f1c6212d30b3cd967f8f58d0bf5a
GIT binary patch
literal 131
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnL3?x0byx0z;*aCb)T>mqGAWzfF2B3(Ar;B3<
z$Mxg{21Z5!MMk9*hZdQR3GBkW3Xd2%Dj1aP8am_^9`SdzsB{Q0oHT0a<g!RS;2_Ar
ZaOx(Hy6ykMML;tcJYD@<);T3K0RZgmBJ}_O

literal 0
HcmV?d00001

diff --git a/assets/resources/ICON/ICON_MINI.bmp b/assets/resources/ICON/ICON_MINI.bmp
deleted file mode 100644
index fe259a4137fd98651049afa4d9b6f656048cf49b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2202
zcmds%F%H5o3`GrMVC@yk&XNnDDiRY5lCRK-jUj8#(bM#1!9Qt~s4bO{YLKv+#Lctv
z<Hk*M>yH$ym;NE`GPWHZ#1j*KI>&}kwB~w$0)1lph2SpCdFndxJkc-=GJ1JDnZiO?
z=!(h0)#i1uLU7`0b7Qm>*4KAph;VL_`1q>N;|VXT8{^!6^Ozy?yZkkI`nQ;uzp*YS
zLT!~slbfMr@VDgFLcglA27GJNIsAe%uj_Bep+m%+^M{|SP@A_c?!8=J9IUR>*VpFI
diTC2XPkWe?II|VU4s!LuODm^Qn<t%bk1x=R$aeq$

diff --git a/assets/resources/ICON/ICON_MINI.png b/assets/resources/ICON/ICON_MINI.png
new file mode 100644
index 0000000000000000000000000000000000000000..7bb9f9a062a073ab0c8f73c2b0e6d410fa9c1541
GIT binary patch
literal 231
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0J3?w7mbKU|ei2$DvS0K&6(C{CK8yXn?GaNW@
z;QxPy|NsAU&DEL-l<D$xaSZV|{`AU0-UbC8)(h(naIJa3wdR6o#KPC7`9oY5&HE$s
zN8IC=566{L--HyKByu_AkIdfSaE{^9B3+Gb&O#1eshX_<e<p1RPh}Di+|0Kj{Ahc2
zqonwQMQ?;AF3jX)I3m4l-R1eN45k)ywx5z}`1G^kKWmyqY;Dh{M*b`9*Z;_zNwu4x
b9I}D=$<rMbFaPFk1UcB#)z4*}Q$iB}h%j4F

literal 0
HcmV?d00001

diff --git a/src/Resource.cpp b/src/Resource.cpp
index 68ef4d48..794c437c 100644
--- a/src/Resource.cpp
+++ b/src/Resource.cpp
@@ -80,16 +80,16 @@ static const unsigned char rpixel[] = {
 };
 
 static const unsigned char rCURSOR_IKA[] = {
-	#include "Resource/CURSOR/CURSOR_IKA.bmp.h"
+	#include "Resource/CURSOR/CURSOR_IKA.png.h"
 };
 
 static const unsigned char rCURSOR_NORMAL[] = {
-	#include "Resource/CURSOR/CURSOR_NORMAL.bmp.h"
+	#include "Resource/CURSOR/CURSOR_NORMAL.png.h"
 };
 
 #ifndef _WIN32
 static const unsigned char rICON_MINI[] = {
-	#include "Resource/ICON/ICON_MINI.bmp.h"
+	#include "Resource/ICON/ICON_MINI.png.h"
 };
 #endif