From 42e1b36fd8da124d245d7a2ab644984fb5c88832 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 5 Sep 2019 14:05:27 +0100 Subject: [PATCH 1/3] Restore the Windows-style path separators --- src/Back.cpp | 2 +- src/Config.cpp | 2 +- src/Ending.cpp | 2 +- src/Game.cpp | 2 +- src/GenericLoad.cpp | 4 ++-- src/Map.cpp | 4 ++-- src/MycParam.cpp | 4 ++-- src/NpChar.cpp | 2 +- src/Profile.cpp | 8 ++++---- src/Stage.cpp | 14 +++++++------- src/TextScr.cpp | 6 +++--- 11 files changed, 25 insertions(+), 25 deletions(-) diff --git a/src/Back.cpp b/src/Back.cpp index 6470910e..5fd0e760 100644 --- a/src/Back.cpp +++ b/src/Back.cpp @@ -25,7 +25,7 @@ BOOL InitBack(const char *fName, int type) // Get width and height char path[MAX_PATH]; - sprintf(path, "%s/%s.pbm", gDataPath, fName); + sprintf(path, "%s\\%s.pbm", gDataPath, fName); FILE *fp = fopen(path, "rb"); if (fp == NULL) diff --git a/src/Config.cpp b/src/Config.cpp index cb185a35..9c30d537 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -17,7 +17,7 @@ BOOL LoadConfigData(CONFIG *conf) // Get path char path[MAX_PATH]; - sprintf(path, "%s/%s", gModulePath, config_filename); + sprintf(path, "%s\\%s", gModulePath, config_filename); // Open file FILE *fp = fopen(path, "rb"); diff --git a/src/Ending.cpp b/src/Ending.cpp index a1eaf3d7..4491ed24 100644 --- a/src/Ending.cpp +++ b/src/Ending.cpp @@ -190,7 +190,7 @@ BOOL StartCreditScript() // Open file char path[MAX_PATH]; - sprintf(path, "%s/%s", gDataPath, credit_script); + sprintf(path, "%s\\%s", gDataPath, credit_script); Credit.size = GetFileSizeLong(path); if (Credit.size == -1) diff --git a/src/Game.cpp b/src/Game.cpp index 771664ff..d28f21c8 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -689,7 +689,7 @@ BOOL Game(HWND hWnd) PlaySoundObject(7, -1); char path[MAX_PATH]; - sprintf(path, "%s/npc.tbl", gDataPath); + sprintf(path, "%s\\npc.tbl", gDataPath); if (!LoadNpcTable(path)) { diff --git a/src/GenericLoad.cpp b/src/GenericLoad.cpp index eb22e3e6..07bdab33 100644 --- a/src/GenericLoad.cpp +++ b/src/GenericLoad.cpp @@ -174,9 +174,9 @@ BOOL LoadGenericData() bError = TRUE; if (!MakeSurface_File("StageImage", SURFACE_ID_STAGE_ITEM)) bError = TRUE; - if (!MakeSurface_File("Npc/NpcSym", SURFACE_ID_NPC_SYM)) + if (!MakeSurface_File("Npc\\NpcSym", SURFACE_ID_NPC_SYM)) bError = TRUE; - if (!MakeSurface_File("Npc/NpcRegu", SURFACE_ID_NPC_REGU)) + if (!MakeSurface_File("Npc\\NpcRegu", SURFACE_ID_NPC_REGU)) bError = TRUE; if (!MakeSurface_File("TextBox", SURFACE_ID_TEXT_BOX)) bError = TRUE; diff --git a/src/Map.cpp b/src/Map.cpp index 028d9885..ebcf8394 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -30,7 +30,7 @@ BOOL LoadMapData2(const char *path_map) // Get path char path[MAX_PATH]; - sprintf(path, "%s/%s", gDataPath, path_map); + sprintf(path, "%s\\%s", gDataPath, path_map); // Open file FILE *fp = fopen(path, "rb"); @@ -75,7 +75,7 @@ BOOL LoadAttributeData(const char *path_atrb) { // Open file char path[MAX_PATH]; - sprintf(path, "%s/%s", gDataPath, path_atrb); + sprintf(path, "%s\\%s", gDataPath, path_atrb); FILE *fp = fopen(path, "rb"); if (fp == NULL) diff --git a/src/MycParam.cpp b/src/MycParam.cpp index 73177fcd..13b882c5 100644 --- a/src/MycParam.cpp +++ b/src/MycParam.cpp @@ -443,7 +443,7 @@ BOOL SaveTimeCounter() // Get last time char path[MAX_PATH]; - sprintf(path, "%s/290.rec", gModulePath); + sprintf(path, "%s\\290.rec", gModulePath); FILE *fp = fopen(path, "rb"); if (fp) @@ -492,7 +492,7 @@ int LoadTimeCounter() // Open file char path[MAX_PATH]; - sprintf(path, "%s/290.rec", gModulePath); + sprintf(path, "%s\\290.rec", gModulePath); FILE *fp = fopen(path, "rb"); if (!fp) diff --git a/src/NpChar.cpp b/src/NpChar.cpp index 536cd9f2..846dc54c 100644 --- a/src/NpChar.cpp +++ b/src/NpChar.cpp @@ -59,7 +59,7 @@ BOOL LoadEvent(const char *path_event) EVENT eve; char path[MAX_PATH]; - sprintf(path, "%s/%s", gDataPath, path_event); + sprintf(path, "%s\\%s", gDataPath, path_event); fp = fopen(path, "rb"); if (fp == NULL) diff --git a/src/Profile.cpp b/src/Profile.cpp index c5d35591..1012067d 100644 --- a/src/Profile.cpp +++ b/src/Profile.cpp @@ -27,7 +27,7 @@ const char *gProfileCode = "Do041220"; BOOL IsProfile() { char path[MAX_PATH]; - sprintf(path, "%s/%s", gModulePath, gDefaultName); + sprintf(path, "%s\\%s", gModulePath, gDefaultName); FILE *fp = fopen(path, "rb"); if (fp == NULL) @@ -46,9 +46,9 @@ BOOL SaveProfile(const char *name) // Get path if (name) - sprintf(path, "%s/%s", gModulePath, name); + sprintf(path, "%s\\%s", gModulePath, name); else - sprintf(path, "%s/%s", gModulePath, gDefaultName); + sprintf(path, "%s\\%s", gModulePath, gDefaultName); // Open file fp = fopen(path, "wb"); @@ -93,7 +93,7 @@ BOOL LoadProfile(const char *name) if (name) sprintf(path, "%s", name); else - sprintf(path, "%s/%s", gModulePath, gDefaultName); + sprintf(path, "%s\\%s", gModulePath, gDefaultName); // Open file PROFILE profile; diff --git a/src/Stage.cpp b/src/Stage.cpp index 1e68fe40..30f8dd76 100644 --- a/src/Stage.cpp +++ b/src/Stage.cpp @@ -139,26 +139,26 @@ BOOL TransferStage(int no, int w, int x, int y) //Load tileset char path[MAX_PATH]; - sprintf(path, "%s/Prt%s", path_dir, gTMT[no].parts); + sprintf(path, "%s\\Prt%s", path_dir, gTMT[no].parts); if (!ReloadBitmap_File(path, SURFACE_ID_LEVEL_TILESET)) bError = TRUE; - sprintf(path, "%s/%s.pxa", path_dir, gTMT[no].parts); + sprintf(path, "%s\\%s.pxa", path_dir, gTMT[no].parts); if (!LoadAttributeData(path)) bError = TRUE; //Load tilemap - sprintf(path, "%s/%s.pxm", path_dir, gTMT[no].map); + sprintf(path, "%s\\%s.pxm", path_dir, gTMT[no].map); if (!LoadMapData2(path)) bError = TRUE; //Load NPCs - sprintf(path, "%s/%s.pxe", path_dir, gTMT[no].map); + sprintf(path, "%s\\%s.pxe", path_dir, gTMT[no].map); if (!LoadEvent(path)) bError = TRUE; //Load script - sprintf(path, "%s/%s.tsc", path_dir, gTMT[no].map); + sprintf(path, "%s\\%s.tsc", path_dir, gTMT[no].map); if (!LoadTextScript_Stage(path)) bError = TRUE; @@ -171,11 +171,11 @@ BOOL TransferStage(int no, int w, int x, int y) strcpy(path_dir, "Npc"); //Load NPC sprite sheets - sprintf(path, "%s/Npc%s", path_dir, gTMT[no].npc); + sprintf(path, "%s\\Npc%s", path_dir, gTMT[no].npc); if (!ReloadBitmap_File(path, SURFACE_ID_LEVEL_SPRITESET_1)) bError = TRUE; - sprintf(path, "%s/Npc%s", path_dir, gTMT[no].boss); + sprintf(path, "%s\\Npc%s", path_dir, gTMT[no].boss); if (!ReloadBitmap_File(path, SURFACE_ID_LEVEL_SPRITESET_2)) bError = TRUE; diff --git a/src/TextScr.cpp b/src/TextScr.cpp index b8933e49..6675c8df 100644 --- a/src/TextScr.cpp +++ b/src/TextScr.cpp @@ -116,7 +116,7 @@ BOOL LoadTextScript2(const char *name) { //Get path char path[260]; - sprintf(path, "%s/%s", gDataPath, name); + sprintf(path, "%s\\%s", gDataPath, name); gTS.size = GetFileSizeLong(path); if (gTS.size == -1) @@ -145,7 +145,7 @@ BOOL LoadTextScript_Stage(const char *name) { //Open Head.tsc char path[MAX_PATH]; - sprintf(path, "%s/%s", gDataPath, "Head.tsc"); + sprintf(path, "%s\\%s", gDataPath, "Head.tsc"); long head_size = GetFileSizeLong(path); if (head_size == -1) @@ -162,7 +162,7 @@ BOOL LoadTextScript_Stage(const char *name) fclose(fp); //Open stage's .tsc - sprintf(path, "%s/%s", gDataPath, name); + sprintf(path, "%s\\%s", gDataPath, name); long body_size = GetFileSizeLong(path); if (body_size == -1) From b24d212e8246ee8c57ea999585b99dc996a6c29c Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 5 Sep 2019 14:08:03 +0100 Subject: [PATCH 2/3] Convert resource file to forward-slash path separators MSVC2003 seems fine with them, and doesn't seem to automatically revert them either. --- assets/resources/CSE2.rc | 141 +++++++++++++++++++++------------------ 1 file changed, 75 insertions(+), 66 deletions(-) diff --git a/assets/resources/CSE2.rc b/assets/resources/CSE2.rc index 15c07aa4..dd49fe8e 100644 --- a/assets/resources/CSE2.rc +++ b/assets/resources/CSE2.rc @@ -64,88 +64,97 @@ END // Bitmap // -CREDIT01 BITMAP "BITMAP\\Credit01.bmp" -CREDIT02 BITMAP "BITMAP\\Credit02.bmp" -CREDIT03 BITMAP "BITMAP\\Credit03.bmp" -CREDIT04 BITMAP "BITMAP\\Credit04.bmp" -CREDIT05 BITMAP "BITMAP\\Credit05.bmp" -CREDIT06 BITMAP "BITMAP\\Credit06.bmp" -CREDIT07 BITMAP "BITMAP\\Credit07.bmp" -CREDIT08 BITMAP "BITMAP\\Credit08.bmp" -CREDIT09 BITMAP "BITMAP\\Credit09.bmp" -CREDIT10 BITMAP "BITMAP\\Credit10.bmp" -CREDIT11 BITMAP "BITMAP\\Credit11.bmp" -CREDIT12 BITMAP "BITMAP\\Credit12.bmp" -CREDIT14 BITMAP "BITMAP\\Credit14.bmp" -CREDIT15 BITMAP "BITMAP\\Credit15.bmp" -CREDIT16 BITMAP "BITMAP\\Credit16.bmp" -CREDIT17 BITMAP "BITMAP\\Credit17.bmp" -CREDIT18 BITMAP "BITMAP\\Credit18.bmp" -PIXEL BITMAP "BITMAP\\pixel.bmp" +CREDIT01 BITMAP "BITMAP/Credit01.bmp" +CREDIT02 BITMAP "BITMAP/Credit02.bmp" +CREDIT03 BITMAP "BITMAP/Credit03.bmp" +CREDIT04 BITMAP "BITMAP/Credit04.bmp" +CREDIT05 BITMAP "BITMAP/Credit05.bmp" +CREDIT06 BITMAP "BITMAP/Credit06.bmp" +CREDIT07 BITMAP "BITMAP/Credit07.bmp" +CREDIT08 BITMAP "BITMAP/Credit08.bmp" +CREDIT09 BITMAP "BITMAP/Credit09.bmp" +CREDIT10 BITMAP "BITMAP/Credit10.bmp" +CREDIT11 BITMAP "BITMAP/Credit11.bmp" +CREDIT12 BITMAP "BITMAP/Credit12.bmp" +CREDIT14 BITMAP "BITMAP/Credit14.bmp" +CREDIT15 BITMAP "BITMAP/Credit15.bmp" +CREDIT16 BITMAP "BITMAP/Credit16.bmp" +CREDIT17 BITMAP "BITMAP/Credit17.bmp" +CREDIT18 BITMAP "BITMAP/Credit18.bmp" +PIXEL BITMAP "BITMAP/pixel.bmp" ///////////////////////////////////////////////////////////////////////////// // // ORG // -ACCESS ORG "ORG\\Access.org" -ANZEN ORG "ORG\\Anzen.org" -BALCONY ORG "ORG\\Balcony.org" -BALLOS ORG "ORG\\Ballos.org" -BDOWN ORG "ORG\\BreakDown.org" -CEMETERY ORG "ORG\\Cemetery.org" -CURLY ORG "ORG\\Curly.org" -DR ORG "ORG\\Dr.org" -ENDING ORG "ORG\\Ending.org" -ESCAPE ORG "ORG\\Escape.org" -FANFALE1 ORG "ORG\\Fanfale1.org" -FANFALE2 ORG "ORG\\Fanfale2.org" -FANFALE3 ORG "ORG\\Fanfale3.org" -FIREEYE ORG "ORG\\FireEye.org" -GAMEOVER ORG "ORG\\Gameover.org" -GINSUKE ORG "ORG\\Ginsuke.org" -GRAND ORG "ORG\\Grand.org" -GRAVITY ORG "ORG\\Gravity.org" -HELL ORG "ORG\\Hell.org" -IRONH ORG "ORG\\ironH.org" -JENKA ORG "ORG\\Jenka.org" -JENKA2 ORG "ORG\\Jenka2.org" -KODOU ORG "ORG\\Kodou.org" -LASTBTL ORG "ORG\\LastBtl.org" -LASTBT3 ORG "ORG\\LastBtl3.org" -LASTCAVE ORG "ORG\\LastCave.org" -MARINE ORG "ORG\\Marine.org" -MAZE ORG "ORG\\Maze.org" -MDOWN2 ORG "ORG\\MDown2.org" -OSIDE ORG "ORG\\Oside.org" -MURA ORG "ORG\\Mura.org" -PLANT ORG "ORG\\Plant.org" -QUIET ORG "ORG\\quiet.org" -REQUIEM ORG "ORG\\Requiem.org" -TOROKO ORG "ORG\\Toroko.org" -VIVI ORG "ORG\\Vivi.org" -WANPAK2 ORG "ORG\\Wanpak2.org" -WANPAKU ORG "ORG\\Wanpaku.org" -WEED ORG "ORG\\Weed.org" -WHITE ORG "ORG\\White.org" -XXXX ORG "ORG\\XXXX.org" -ZONBIE ORG "ORG\\Zonbie.org" +ACCESS ORG "ORG/Access.org" +ANZEN ORG "ORG/Anzen.org" +BALCONY ORG "ORG/Balcony.org" +BALLOS ORG "ORG/Ballos.org" +BDOWN ORG "ORG/BreakDown.org" +CEMETERY ORG "ORG/Cemetery.org" +CURLY ORG "ORG/Curly.org" +DR ORG "ORG/Dr.org" +ENDING ORG "ORG/Ending.org" +ESCAPE ORG "ORG/Escape.org" +FANFALE1 ORG "ORG/Fanfale1.org" +FANFALE2 ORG "ORG/Fanfale2.org" +FANFALE3 ORG "ORG/Fanfale3.org" +FIREEYE ORG "ORG/FireEye.org" +GAMEOVER ORG "ORG/Gameover.org" +GINSUKE ORG "ORG/Ginsuke.org" +GRAND ORG "ORG/Grand.org" +GRAVITY ORG "ORG/Gravity.org" +HELL ORG "ORG/Hell.org" +IRONH ORG "ORG/ironH.org" +JENKA ORG "ORG/Jenka.org" +JENKA2 ORG "ORG/Jenka2.org" +KODOU ORG "ORG/Kodou.org" +LASTBTL ORG "ORG/LastBtl.org" +LASTBT3 ORG "ORG/LastBtl3.org" +LASTCAVE ORG "ORG/LastCave.org" +MARINE ORG "ORG/Marine.org" +MAZE ORG "ORG/Maze.org" +MDOWN2 ORG "ORG/MDown2.org" +OSIDE ORG "ORG/Oside.org" +MURA ORG "ORG/Mura.org" +PLANT ORG "ORG/Plant.org" +QUIET ORG "ORG/quiet.org" +REQUIEM ORG "ORG/Requiem.org" +TOROKO ORG "ORG/Toroko.org" +VIVI ORG "ORG/Vivi.org" +WANPAK2 ORG "ORG/Wanpak2.org" +WANPAKU ORG "ORG/Wanpaku.org" +WEED ORG "ORG/Weed.org" +WHITE ORG "ORG/White.org" +XXXX ORG "ORG/XXXX.org" +ZONBIE ORG "ORG/Zonbie.org" ///////////////////////////////////////////////////////////////////////////// // // WAVE // -WAVE100 WAVE "WAVE\\Wave.dat" +WAVE100 WAVE "WAVE/Wave.dat" -CURSOR_IKA CURSOR "CURSOR\\CURSOR_IKA.cur" +///////////////////////////////////////////////////////////////////////////// +// +// Cursor +// -CURSOR_NORMAL CURSOR "CURSOR\\CURSOR_NORMAL.cur" +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" +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +0 ICON "ICON/0.ico" +ICON_MINI ICON "ICON/ICON_MINI.ico" #endif // Japanese resources ///////////////////////////////////////////////////////////////////////////// From c6f074c2b9698f989f32fe67ca7c8ffd4eafc13b Mon Sep 17 00:00:00 2001 From: Clownacy Date: Thu, 5 Sep 2019 14:14:57 +0100 Subject: [PATCH 3/3] Add cursors and icons to the MSVC2003 project --- CSE2.vcproj | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/CSE2.vcproj b/CSE2.vcproj index 8848e3a8..44194eeb 100644 --- a/CSE2.vcproj +++ b/CSE2.vcproj @@ -696,6 +696,26 @@ RelativePath="assets\resources\Bitmap\pixel.bmp"> + + + + + + + + + + + +