From 55142cbe41589c2d4fd2c971541d3cb6623c18da Mon Sep 17 00:00:00 2001
From: aurhat <szyk@vivaldi.net>
Date: Sat, 19 Nov 2016 18:18:58 +0100
Subject: [PATCH] Add transparent 32x32 icon to AC window

It bases on .../docs/images/icon.png from AC website repository,
just removed empty space, edges changed to more noticeable.
Note: on Mac an icon from assaultcube.icns is used.
---
 packages/misc/icon.png | Bin 0 -> 1316 bytes
 source/src/main.cpp    |   8 ++++++--
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 packages/misc/icon.png

diff --git a/packages/misc/icon.png b/packages/misc/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9338d28d7ff189d6bfc51d46bada7ed7197a940a
GIT binary patch
literal 1316
zcmV+<1>5?GP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru;0qHFHV|iFS|b1e1hGj(
zK~z}7t(Q?~6jv06zcaguNj64OEXJDXLj#4fsak!oB3Xr4ENF#3RRZ<FRHZHSp|uhy
zNNEj7TWW2vi9yhZBE&a^8nsb^3G}Hk5QIu#Lt|@GW7j0>Cf&`>>BHQe&aN}NNy&Yg
zJ9p;Z|J-x_^WSq}iS4Wiog#T-og$no7&}w&9@J#9z&#>N1FJxD6URXsKrQqBH%J5s
zgC0?J*FFrK3s~0*0?h5`E%SU=m1+YHPA3PRd#?p8H)Gu*+9jd@+eG+2z#~OH&?Q0{
zXcl-1QUhu)F=QE_3`hW<c)U{50~lA@#>#3R@Qf;|TGW6tGym6s&00b62FQZ=Ex({j
zbxR9-<8c~JoFEyAV3#l?yjT);iEvbv9uYDoo*~b76=6e12d^JLo;UA&Yb%-FUc%X|
zFOY3`@(;*|9%ChlfZ`#XgRG?M>Ui_U4eFbkd_n$<#~D0zit+AlYDFmYiJHvmC}lvm
zh|6wN$pY&R9%S!@3yUJ&?_*>1x3!VHbBA&RCcp&nSpgBP0Oq<s*_D;NF+99zaDa7<
zjl6UFHcdBgGUM58$Y;Z0pWTx-{cK$wuUxvs`c0dblzOA1qa+duUfs2eKA^^UVAhF(
zc=;9v_(p^XkOYo61XO@*RTZzrV)XU(QD0wAG#V`lJ~A@G^z<~%&CO26c;X-NaLfjd
zsyZQvfC^|e=vnzM^PWC>1i+p>djPn8{W{qImIGY9dKJJ02au{Nw_gpM7r_EuFeG<F
zkTjx^HECx7^D{H<<Y+WXG#X`SXb6CciVC)D*#f}u@Gw(TQ|#Nf?-`?>YiNM`_gxPh
zQspZV#!V>XTM@i@c?Pt~q|g&p-czN@XSaicgQU}GR<2x0CX-?N_U*o2>1=MMVsOya
zg3m!7c<`(oc$Wx0B3kLm-xa{D2}5Dqv1122ckX0%b~X?kVAa~Sc`5f%kQ9e`MmGon
zsmaN}#VyMs91a&HWyP8`?!rb1`M`5BT3(g%J19~Q9~K2Dbr_}Q=iRkKKnm#eh5+ES
z2zNmeAW1{S+{gH>Tg4BV01qS*2~NjiO!f5ODOgwl+C3g9DaG@u%r-Xi_T|fL*tij^
zps*Mi7$6pl<&E9#@8^e>7G4Cx1^-Wjd|c=OpCi(pRUyLau`zz!x|Q!XZ|1?oL_SYK
zp}fQ9>;3!rY4>hk5^=$E@+ZLLV(NiHsSy!Y*fx=o5iYJ@&&AeO;-jOE(k(bzH-7IP
z9ZgM?U%5i9XKoretSWzj#6cbct))VMqgX}DucRt9ZEd`K=nzlG#~C<qfO<#eo@rA+
zyH7b*j01$A1iziiC{<Yrb92-b#M&~#lLL7K((bdOZwP)f#bl`#7NKT--UZLaISu>*
zlJ&@Zd%$*lbLgb=vwR^!-6A}Z1Ak)DEC~`;<$24JYqrhf|4}PCg#~EFh)0=`W^qy}
zS1G%@e(Y0r-?we9nf^B5=cV2YPCEAjUI6AmQ$Vk(44LnrIt7KMfO3!_Rc<fw-VkWO
zmm(Zf%_~rCQ{RuM($Dg=z>CQ-6Zt|iu7+g;FL^Wa*7UjO9Lw8E8t}d<e}GIn2bJhD
a8}KiPHMz6cs09rG0000<MNUMnLSTZ!xl;!K

literal 0
HcmV?d00001

diff --git a/source/src/main.cpp b/source/src/main.cpp
index 7439856d..96139ed1 100644
--- a/source/src/main.cpp
+++ b/source/src/main.cpp
@@ -1116,6 +1116,11 @@ int main(int argc, char **argv)
     initlog("video: sdl");
     if(SDL_InitSubSystem(SDL_INIT_VIDEO)<0) fatal("Unable to initialize SDL Video");
 
+#ifndef __APPLE__
+    SDL_Surface *icon = IMG_Load("packages/misc/icon.png");
+    SDL_WM_SetIcon(icon, NULL);
+#endif
+
     initlog("video: mode");
     const SDL_VideoInfo *video = SDL_GetVideoInfo();
     if(video)
@@ -1132,8 +1137,7 @@ int main(int argc, char **argv)
 
     initlog("video: misc");
     SDL_WM_SetCaption("AssaultCube", NULL);
-    SDL_Surface *icon = IMG_Load("packages/misc/icon.bmp");
-    SDL_WM_SetIcon(icon, NULL);
+
     keyrepeat(false);
     SDL_ShowCursor(0);