From 0be5e9ead8ce63da7e55eaad526650e0a29d3441 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Wed, 4 Sep 2019 14:39:37 +0000 Subject: [PATCH] Restored the window icon and custom cursor --- Makefile | 1 + assets/resources/CSE2.rc | 6 -- assets/resources/CURSOR/CURSOR_IKA.cur | Bin 766 -> 0 bytes assets/resources/CURSOR/CURSOR_NORMAL.cur | Bin 766 -> 0 bytes assets/resources/ICON/ICON_MINI.ico | Bin 318 -> 0 bytes src/Main.cpp | 23 ++++++ src/Resource.cpp | 95 ++++++++++++---------- 7 files changed, 74 insertions(+), 51 deletions(-) delete mode 100644 assets/resources/CURSOR/CURSOR_IKA.cur delete mode 100644 assets/resources/CURSOR/CURSOR_NORMAL.cur delete mode 100644 assets/resources/ICON/ICON_MINI.ico diff --git a/Makefile b/Makefile index 9fac12b3..a24307bf 100644 --- a/Makefile +++ b/Makefile @@ -144,6 +144,7 @@ RESOURCES = \ BITMAP/Credit18.bmp \ CURSOR/CURSOR_IKA.bmp \ CURSOR/CURSOR_NORMAL.bmp \ + ICON/ICON_MINI.bmp \ ORG/Access.org \ ORG/Anzen.org \ ORG/Balcony.org \ diff --git a/assets/resources/CSE2.rc b/assets/resources/CSE2.rc index b61d32de..addcc418 100644 --- a/assets/resources/CSE2.rc +++ b/assets/resources/CSE2.rc @@ -58,14 +58,8 @@ BEGIN END END -CURSOR_IKA CURSOR "CURSOR\\CURSOR_IKA.cur" - -CURSOR_NORMAL CURSOR "CURSOR\\CURSOR_NORMAL.cur" - 0 ICON "ICON\\0.ico" -ICON_MINI ICON "ICON\\ICON_MINI.ico" - #endif // Japanese resources ///////////////////////////////////////////////////////////////////////////// diff --git a/assets/resources/CURSOR/CURSOR_IKA.cur b/assets/resources/CURSOR/CURSOR_IKA.cur deleted file mode 100644 index 488b84bf5c34a70167e88115e2fda22b70636665..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmd5)JF>zs5L18|m-{N}l-%NRq};$cn&&le2o6ApJE#y^Y=?y64J8}PyV{T9cmk}@ zq3`ju^9tB1+6ld|7dmXT%T#Ojqrg#Y1hg=Y#c5ZFl#;v`_*@`867+b=w{J9iJCx;R zBILJ@VeuhhK%5U45$2p+=o!7?m5bRMnt~zP{Gu#7We)X~#^9WYMbtQWd6F~UG+?~e z6No_NTRV`rD>e$n(i#?gYF5_ke3c7t;?vZ}fvf#%7gZ0!pO7Ls3Mjbi)=pUSD4*mL UIsw&t&V*k-v7L64+g-(4gdfE diff --git a/assets/resources/CURSOR/CURSOR_NORMAL.cur b/assets/resources/CURSOR/CURSOR_NORMAL.cur deleted file mode 100644 index a70f9c55087d747a5e08f9b38da81eaada938db2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 766 zcmds#u?@m76htop3CRsqw4`JU*evN-Bekc<2CM)=0=kUwxpM&hpN^J`pZ)Kj<0z7W z8WoxbMb8@8vf7h|97%;GXNuWJ8x~?x2XLV4riC+048y=xft3L>RfLaPn*KpK{zS@s zXv}@~`x6j-AGfER!*TNdba~$?-hID#_kz5OA@5>&AItlgKE(7PMv5^~jOUJb;5VJQ g{q$ySHj?|!>>>_iK~{wQZ?9!-W><0}4>A(z1%hj;TL1t6 diff --git a/assets/resources/ICON/ICON_MINI.ico b/assets/resources/ICON/ICON_MINI.ico deleted file mode 100644 index b540fd2fe52b760d991d476e09c811c429acc7b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmbtOyAHxI47^B4bj-xe$meyaRK(=bfq}J|;8XHR3>^@QIXmSGaN@i3Bc}j~C+7^0 zQvwdoOz#|-2|FSnfgOC-UwAEjC=xr4lxVGyDPVD7=8DPVErO~715vduL0W2OtM3pm vUt;|DzK;?ZeIRtPLG`(st)GoAdX>p+I_s?f^GxSbJt!XB4};BxANnJ{3z1#C diff --git a/src/Main.cpp b/src/Main.cpp index 2cf9ae66..204a57b4 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -19,6 +19,7 @@ #include "MyChar.h" #include "Organya.h" #include "Profile.h" +#include "Resource.h" #include "Sound.h" #include "Triangle.h" @@ -260,6 +261,24 @@ int main(int argc, char *argv[]) SDL_EventState(SDL_DROPFILE, SDL_ENABLE); #endif + // Set up the window icon and cursor + const unsigned char *resource_data; + size_t resource_size; + SDL_RWops *rwops; + + resource_data = FindResource("ICON_MINI", "ICON", &resource_size); + rwops = SDL_RWFromConstMem(resource_data, resource_size); + SDL_Surface *icon_surface = SDL_LoadBMP_RW(rwops, 1); + SDL_SetWindowIcon(window, icon_surface); + SDL_FreeSurface(icon_surface); + + resource_data = FindResource("CURSOR_NORMAL", "CURSOR", &resource_size); + rwops = SDL_RWFromConstMem(resource_data, resource_size); + SDL_Surface *cursor_surface = SDL_LoadBMP_RW(rwops, 1); + SDL_SetColorKey(cursor_surface, SDL_TRUE, SDL_MapRGB(cursor_surface->format, 0xFF, 0, 0xFF)); + SDL_Cursor *cursor = SDL_CreateColorCursor(cursor_surface, 0, 0); + SDL_SetCursor(cursor); + if (CheckFileExists("fps")) bFps = TRUE; @@ -279,6 +298,8 @@ int main(int argc, char *argv[]) // Draw to screen if (!Flip_SystemTask()) { + SDL_FreeCursor(cursor); + SDL_FreeSurface(cursor_surface); SDL_DestroyWindow(window); return 1; } @@ -306,6 +327,8 @@ int main(int argc, char *argv[]) EndTextObject(); EndDirectDraw(); + SDL_FreeCursor(cursor); + SDL_FreeSurface(cursor_surface); SDL_DestroyWindow(window); } diff --git a/src/Resource.cpp b/src/Resource.cpp index 95921cd5..2257b249 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -3,6 +3,31 @@ #include #include +#include "Resource/BITMAP/Credit01.bmp.h" +#include "Resource/BITMAP/Credit02.bmp.h" +#include "Resource/BITMAP/Credit03.bmp.h" +#include "Resource/BITMAP/Credit04.bmp.h" +#include "Resource/BITMAP/Credit05.bmp.h" +#include "Resource/BITMAP/Credit06.bmp.h" +#include "Resource/BITMAP/Credit07.bmp.h" +#include "Resource/BITMAP/Credit08.bmp.h" +#include "Resource/BITMAP/Credit09.bmp.h" +#include "Resource/BITMAP/Credit10.bmp.h" +#include "Resource/BITMAP/Credit11.bmp.h" +#include "Resource/BITMAP/Credit12.bmp.h" +#include "Resource/BITMAP/Credit14.bmp.h" +#include "Resource/BITMAP/Credit15.bmp.h" +#include "Resource/BITMAP/Credit16.bmp.h" +#include "Resource/BITMAP/Credit17.bmp.h" +#include "Resource/BITMAP/Credit18.bmp.h" +#ifdef JAPANESE +#include "Resource/BITMAP/pixel_jp.bmp.h" +#else +#include "Resource/BITMAP/pixel.bmp.h" +#endif +#include "Resource/CURSOR/CURSOR_IKA.bmp.h" +#include "Resource/CURSOR/CURSOR_NORMAL.bmp.h" +#include "Resource/ICON/ICON_MINI.bmp.h" #include "Resource/ORG/Access.org.h" #include "Resource/ORG/Anzen.org.h" #include "Resource/ORG/Balcony.org.h" @@ -46,28 +71,6 @@ #include "Resource/ORG/XXXX.org.h" #include "Resource/ORG/Zonbie.org.h" #include "Resource/WAVE/Wave.dat.h" -#include "Resource/BITMAP/Credit01.bmp.h" -#include "Resource/BITMAP/Credit02.bmp.h" -#include "Resource/BITMAP/Credit03.bmp.h" -#include "Resource/BITMAP/Credit04.bmp.h" -#include "Resource/BITMAP/Credit05.bmp.h" -#include "Resource/BITMAP/Credit06.bmp.h" -#include "Resource/BITMAP/Credit07.bmp.h" -#include "Resource/BITMAP/Credit08.bmp.h" -#include "Resource/BITMAP/Credit09.bmp.h" -#include "Resource/BITMAP/Credit10.bmp.h" -#include "Resource/BITMAP/Credit11.bmp.h" -#include "Resource/BITMAP/Credit12.bmp.h" -#include "Resource/BITMAP/Credit14.bmp.h" -#include "Resource/BITMAP/Credit15.bmp.h" -#include "Resource/BITMAP/Credit16.bmp.h" -#include "Resource/BITMAP/Credit17.bmp.h" -#include "Resource/BITMAP/Credit18.bmp.h" -#ifdef JAPANESE -#include "Resource/BITMAP/pixel_jp.bmp.h" -#else -#include "Resource/BITMAP/pixel.bmp.h" -#endif static const struct { @@ -76,6 +79,31 @@ static const struct const unsigned char *data; size_t size; } resources[] = { + {"BITMAP", "CREDIT01", rCredit01, sizeof(rCredit01)}, + {"BITMAP", "CREDIT02", rCredit02, sizeof(rCredit02)}, + {"BITMAP", "CREDIT03", rCredit03, sizeof(rCredit03)}, + {"BITMAP", "CREDIT04", rCredit04, sizeof(rCredit04)}, + {"BITMAP", "CREDIT05", rCredit05, sizeof(rCredit05)}, + {"BITMAP", "CREDIT06", rCredit06, sizeof(rCredit06)}, + {"BITMAP", "CREDIT07", rCredit07, sizeof(rCredit07)}, + {"BITMAP", "CREDIT08", rCredit08, sizeof(rCredit08)}, + {"BITMAP", "CREDIT09", rCredit09, sizeof(rCredit09)}, + {"BITMAP", "CREDIT10", rCredit10, sizeof(rCredit10)}, + {"BITMAP", "CREDIT11", rCredit11, sizeof(rCredit11)}, + {"BITMAP", "CREDIT12", rCredit12, sizeof(rCredit12)}, + {"BITMAP", "CREDIT14", rCredit14, sizeof(rCredit14)}, + {"BITMAP", "CREDIT15", rCredit15, sizeof(rCredit15)}, + {"BITMAP", "CREDIT16", rCredit16, sizeof(rCredit16)}, + {"BITMAP", "CREDIT17", rCredit17, sizeof(rCredit17)}, + {"BITMAP", "CREDIT18", rCredit18, sizeof(rCredit18)}, +#ifdef JAPANESE + {"BITMAP", "PIXEL", rpixel_jp, sizeof(rpixel_jp)}, +#else + {"BITMAP", "PIXEL", rpixel, sizeof(rpixel)}, +#endif + {"CURSOR", "CURSOR_IKA", rCURSOR_IKA, sizeof(rCURSOR_IKA)}, + {"CURSOR", "CURSOR_NORMAL", rCURSOR_NORMAL, sizeof(rCURSOR_NORMAL)}, + {"ICON", "ICON_MINI", rICON_MINI, sizeof(rICON_MINI)}, {"ORG", "ACCESS", rAccess, sizeof(rAccess)}, {"ORG", "ANZEN", rAnzen, sizeof(rAnzen)}, {"ORG", "BALCONY", rBalcony, sizeof(rBalcony)}, @@ -120,29 +148,6 @@ static const struct {"ORG", "ZONBIE", rZonbie, sizeof(rZonbie)}, {"WAVE", "WAVE100", rWave, sizeof(rWave)}, - - {"BITMAP", "CREDIT01", rCredit01, sizeof(rCredit01)}, - {"BITMAP", "CREDIT02", rCredit02, sizeof(rCredit02)}, - {"BITMAP", "CREDIT03", rCredit03, sizeof(rCredit03)}, - {"BITMAP", "CREDIT04", rCredit04, sizeof(rCredit04)}, - {"BITMAP", "CREDIT05", rCredit05, sizeof(rCredit05)}, - {"BITMAP", "CREDIT06", rCredit06, sizeof(rCredit06)}, - {"BITMAP", "CREDIT07", rCredit07, sizeof(rCredit07)}, - {"BITMAP", "CREDIT08", rCredit08, sizeof(rCredit08)}, - {"BITMAP", "CREDIT09", rCredit09, sizeof(rCredit09)}, - {"BITMAP", "CREDIT10", rCredit10, sizeof(rCredit10)}, - {"BITMAP", "CREDIT11", rCredit11, sizeof(rCredit11)}, - {"BITMAP", "CREDIT12", rCredit12, sizeof(rCredit12)}, - {"BITMAP", "CREDIT14", rCredit14, sizeof(rCredit14)}, - {"BITMAP", "CREDIT15", rCredit15, sizeof(rCredit15)}, - {"BITMAP", "CREDIT16", rCredit16, sizeof(rCredit16)}, - {"BITMAP", "CREDIT17", rCredit17, sizeof(rCredit17)}, - {"BITMAP", "CREDIT18", rCredit18, sizeof(rCredit18)}, -#ifdef JAPANESE - {"BITMAP", "PIXEL", rpixel_jp, sizeof(rpixel_jp)}, -#else - {"BITMAP", "PIXEL", rpixel, sizeof(rpixel)}, -#endif }; const unsigned char* FindResource(const char *name, const char *type, size_t *size)