From 1d0129e6818fbd6e84b858f58d827f762dbf3000 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 09:28:44 +0200 Subject: [PATCH 01/13] Corrected formatting in Map.cpp Signed-off-by: Gabriel Ravier --- src/Map.cpp | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/src/Map.cpp b/src/Map.cpp index 037bdc0e..097e10b4 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -29,16 +29,16 @@ BOOL LoadMapData2(const char *path_map) { unsigned char dum; - //Get path + // Get path char path[PATH_LENGTH]; sprintf(path, "%s/%s", gDataPath, path_map); - //Open file + // Open file FILE *fp = fopen(path, "rb"); if (fp == NULL) return FALSE; - //Make sure file begins with "PXM" + // Make sure file begins with "PXM" char check[3]; fread(check, 1, 3, fp); @@ -50,10 +50,9 @@ BOOL LoadMapData2(const char *path_map) else { fread(&dum, 1, 1, fp); - //Get width and height + // Get width and height #ifdef NONPORTABLE - // This fails on big-endian hardware, and platforms - // where short is not two bytes long. + // This fails on big-endian hardware, and platforms where short is not two bytes long. fread(&gMap.width, 2, 1, fp); fread(&gMap.length, 2, 1, fp); #else @@ -68,7 +67,7 @@ BOOL LoadMapData2(const char *path_map) } else { - //Read tiledata + // Read tiledata fread(gMap.data, 1, gMap.length * gMap.width, fp); fclose(fp); return TRUE; @@ -80,7 +79,7 @@ BOOL LoadMapData2(const char *path_map) BOOL LoadAttributeData(const char *path_atrb) { - //Open file + // Open file char path[PATH_LENGTH]; sprintf(path, "%s/%s", gDataPath, path_atrb); @@ -88,7 +87,7 @@ BOOL LoadAttributeData(const char *path_atrb) if (fp == NULL) return FALSE; - //Read data + // Read data fread(gMap.atrb, 1, 0x100, fp); fclose(fp); return TRUE; @@ -158,7 +157,7 @@ void PutStage_Back(int fx, int fy) RECT rect; int num_x; - //Get range to draw + // Get range to draw num_x = ((WINDOW_WIDTH + 0xF) / 0x10) + 1; num_y = ((WINDOW_HEIGHT + 0xF) / 0x10) + 1; put_x = (fx / 0x200 + 8) / 0x10; @@ -168,14 +167,14 @@ void PutStage_Back(int fx, int fy) { for (i = put_x; i < put_x + num_x; i++) { - //Get attribute + // Get attribute offset = i + j * gMap.width; atrb = GetAttribute(i, j); if (atrb >= 0x20) continue; - //Draw tile + // Draw tile rect.left = 16 * (gMap.data[offset] % 0x10); rect.top = 16 * (gMap.data[offset] / 0x10); rect.right = rect.left + 16; @@ -199,7 +198,7 @@ void PutStage_Front(int fx, int fy) RECT rect; int num_x; - //Get range to draw + // Get range to draw num_x = ((WINDOW_WIDTH + 0xF) >> 4) + 1; num_y = ((WINDOW_HEIGHT + 0xF) >> 4) + 1; put_x = (fx / 0x200 + 8) / 16; @@ -209,14 +208,14 @@ void PutStage_Front(int fx, int fy) { for (i = put_x; i < put_x + num_x; i++) { - //Get attribute + // Get attribute offset = i + j * gMap.width; atrb = GetAttribute(i, j); if (atrb < 0x40 || atrb >= 0x80) continue; - //Draw tile + // Draw tile rect.left = 16 * (gMap.data[offset] % 0x10); rect.top = 16 * (gMap.data[offset] / 0x10); rect.right = rect.left + 16; @@ -242,11 +241,11 @@ void PutMapDataVector(int fx, int fy) RECT rect; int num_x; - //Animate the wind + // Animate the wind static unsigned char count = 0; count += 2; - //Get range to draw + // Get range to draw num_x = ((WINDOW_WIDTH + 0xF) >> 4) + 1; num_y = ((WINDOW_HEIGHT + 0xF) >> 4) + 1; put_x = (fx / 0x200 + 8) / 16; @@ -256,7 +255,7 @@ void PutMapDataVector(int fx, int fy) { for (i = put_x; i < put_x + num_x; i++) { - //Get attribute + // Get attribute offset = i + j * gMap.width; atrb = GetAttribute(i, j); From b19733f47e6657ccaac7d4b22968dd33ba69cbe2 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 09:30:14 +0200 Subject: [PATCH 02/13] Correct formatting in Main.cpp Signed-off-by: Gabriel Ravier --- src/Main.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Main.cpp b/src/Main.cpp index c8d08769..61d6a3bf 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -50,12 +50,12 @@ static unsigned long int next = 1; int rep_rand() { next = ((next) * 214013 + 2531011); - return ((next) >> 16) & 0x7FFF; + return ((next) >> 16) & 0x7FFF; } void rep_srand(unsigned int seed) { - next = seed; + next = seed; } //Framerate stuff @@ -82,7 +82,7 @@ int GetFramePerSecound() current_tick = SDL_GetTicks(); ++current_frame; - if ( base_tick + 1000 <= current_tick ) + if (base_tick + 1000 <= current_tick) { base_tick += 1000; frames_this_second = current_frame; @@ -487,7 +487,7 @@ bool SystemTask() case SDL_KEYDOWN: case SDL_KEYUP: - #ifdef FIX_BUGS +#ifdef FIX_BUGS //BUG FIX: Pixel relied on key codes for input, but these differ based on keyboard layout. //This would break the alternate movement keys on typical English keyboards, since the '=' key //is in a completely different place to where it is on a Japanese keyboard. @@ -561,7 +561,7 @@ bool SystemTask() break; } break; - #else +#else switch (event.key.keysym.sym) { case SDLK_ESCAPE: @@ -627,7 +627,7 @@ bool SystemTask() break; } break; - #endif +#endif } } From 846d34eaf1b622a415c5b4dc09081e8d4c531f63 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 09:35:36 +0200 Subject: [PATCH 03/13] Corrected formatting in MapName.cpp Signed-off-by: Gabriel Ravier --- src/MapName.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/MapName.cpp b/src/MapName.cpp index 05c32d79..7f403a4c 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -15,8 +15,9 @@ void ReadyMapName(const char *str) int a; //Handle "Studio Pixel presents" text in the intro - unsigned char presentText[24] = { - #ifdef JAPANESE + unsigned char presentText[24] = + { +#ifdef JAPANESE // "ŠJ”­ŽºPixel presents" 0x8A - 1, // ŠJ 0x4A - 1, @@ -38,7 +39,7 @@ void ReadyMapName(const char *str) 'n' - 1, 't' - 1, 's' - 1, - #else +#else // " Studio Pixel presents" ' ' - 1, ' ' - 1, @@ -63,7 +64,7 @@ void ReadyMapName(const char *str) 'n' - 1, 't' - 1, 's' - 1, - #endif +#endif 0xFF }; From 2f15c23277664ad36c893162d6b3b180914a1249 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 09:37:06 +0200 Subject: [PATCH 04/13] Add note to comment and correct other comment Signed-off-by: Gabriel Ravier --- src/MapName.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MapName.cpp b/src/MapName.cpp index 7f403a4c..29e25722 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -14,7 +14,7 @@ void ReadyMapName(const char *str) { int a; - //Handle "Studio Pixel presents" text in the intro + //Handle "Studio Pixel presents" text in the intro, using an obfuscated string unsigned char presentText[24] = { #ifdef JAPANESE @@ -93,7 +93,7 @@ void ReadyMapName(const char *str) void PutMapName(BOOL bMini) { - // 'unused_rect' isn't the original name. The Linux port optimised this out, so there's no name for it. + // 'unused_rect' isn't the original name. The Linux port optimized this out, so there's no name for it. RECT unused_rect = {0, 0, 160, 16}; if (bMini) From 9ed2cdc9f1106681a24acd0f12f2e20a8821d59b Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 09:39:08 +0200 Subject: [PATCH 05/13] Correct comment spacing and convert MapName.cpp to UTF-8 Signed-off-by: Gabriel Ravier --- src/MapName.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/MapName.cpp b/src/MapName.cpp index 29e25722..490b8b40 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -14,16 +14,16 @@ void ReadyMapName(const char *str) { int a; - //Handle "Studio Pixel presents" text in the intro, using an obfuscated string + // Handle "Studio Pixel presents" text in the intro, using an obfuscated string unsigned char presentText[24] = { #ifdef JAPANESE - // "ŠJ”­ŽºPixel presents" - 0x8A - 1, // ŠJ + // "開発室Pixel presents" + 0x8A - 1, // é–‹ 0x4A - 1, - 0x94 - 1, // ”­ + 0x94 - 1, // 発 0xAD - 1, - 0x8E - 1, // Žº + 0x8E - 1, // 室 0xBA - 1, 'P' - 1, 'i' - 1, @@ -68,7 +68,7 @@ void ReadyMapName(const char *str) 0xFF }; - //Reset map name flags + // Reset map name flags gMapName.flag = 0; gMapName.wait = 0; @@ -80,10 +80,10 @@ void ReadyMapName(const char *str) str = (char*)presentText; } - //Copy map's name to the MapName + // Copy map's name to the MapName strcpy(gMapName.name, str); - //Draw the text to the surface + // Draw the text to the surface a = (int)strlen(gMapName.name); CortBox2(&rc, 0, SURFACE_ID_ROOM_NAME); @@ -98,7 +98,7 @@ void PutMapName(BOOL bMini) if (bMini) { - //Map system + // Map system RECT rcBack; rcBack.left = 0; rcBack.right = WINDOW_WIDTH; @@ -110,7 +110,7 @@ void PutMapName(BOOL bMini) } else if (gMapName.flag) { - //MNA + // MNA PutBitmap3(&grcGame, (WINDOW_WIDTH - 172) / 2, (WINDOW_HEIGHT - 80) / 2, &rc, SURFACE_ID_ROOM_NAME); if (++gMapName.wait > 160) gMapName.flag = 0; From 66a4805ceb52de2c66f59a0ddf85ccaedc43e11e Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 11:19:03 +0200 Subject: [PATCH 06/13] Corrected formatting in MyChar.cpp Signed-off-by: Gabriel Ravier --- src/MyChar.cpp | 108 ++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) diff --git a/src/MyChar.cpp b/src/MyChar.cpp index 5de6e64f..f453fee4 100644 --- a/src/MyChar.cpp +++ b/src/MyChar.cpp @@ -112,7 +112,7 @@ void AnimationMyChar(bool bKey) if (gMC.ani_no > 4 || gMC.ani_no < 1) gMC.ani_no = 1; } - else if ( gKey & gKeyUp && bKey ) + else if (gKey & gKeyUp && bKey) { if (gMC.cond & 4) PlaySoundObject(24, 1); @@ -137,7 +137,7 @@ void AnimationMyChar(bool bKey) { gMC.ani_no = 10; } - else if ( gMC.ym <= 0 ) + else if (gMC.ym <= 0) { gMC.ani_no = 3; } @@ -165,7 +165,7 @@ void PutMyChar(int fx, int fy) { if ((gMC.cond & 0x80) && !(gMC.cond & 2)) { - //Draw weapon + // Draw weapon gMC.rect_arms.left = 24 * (gArmsData[gSelectedArms].code % 13); gMC.rect_arms.right = gMC.rect_arms.left + 24; gMC.rect_arms.top = 96 * (gArmsData[gSelectedArms].code / 13); @@ -215,7 +215,7 @@ void PutMyChar(int fx, int fy) if (!((gMC.shock >> 1) & 1)) { - //Draw player + // Draw player RECT rect = gMC.rect; if (gMC.equip & 0x40) { @@ -225,7 +225,7 @@ void PutMyChar(int fx, int fy) PutBitmap3(&grcGame, (gMC.x - gMC.view.left) / 0x200 - fx / 0x200, (gMC.y - gMC.view.top) / 0x200 - fy / 0x200, &rect, SURFACE_ID_MY_CHAR); - //Draw airtank + // Draw airtank RECT rcBubble[2] = { {56, 96, 80, 120}, {80, 96, 104, 120}, @@ -244,7 +244,7 @@ void ActMyChar_Normal(bool bKey) { if (!(gMC.cond & 2)) { - //Get speeds and accelerations + // Get speeds and accelerations int max_dash; int gravity1; int gravity2; @@ -274,17 +274,17 @@ void ActMyChar_Normal(bool bKey) resist = 0x33; } - //Don't create "?" effect + // Don't create "?" effect gMC.ques = 0; - //If can't control player, stop boosting + // If can't control player, stop boosting if (!bKey) gMC.boost_sw = 0; - //Movement on the ground + // Movement on the ground if (gMC.flag & 8 || gMC.flag & 0x10 || gMC.flag & 0x20) { - //Stop boosting and refuel + // Stop boosting and refuel gMC.boost_sw = 0; if (gMC.equip & 1) @@ -300,7 +300,7 @@ void ActMyChar_Normal(bool bKey) gMC.boost_cnt = 0; } - //Move in direction held + // Move in direction held if (bKey) { if (gKeyTrg != gKeyDown || gKey != gKeyDown || (gMC.cond & 1) || g_GameFlags & 4) @@ -325,7 +325,7 @@ void ActMyChar_Normal(bool bKey) } } - //Friction + // Friction if (!(gMC.cond & 0x20)) { if (gMC.xm < 0) @@ -346,12 +346,12 @@ void ActMyChar_Normal(bool bKey) } else { - //Start boosting + // Start boosting if (bKey) { if (gMC.equip & 0x21 && gKeyTrg & gKeyJump && gMC.boost_cnt) { - //Booster 0.8 + // Booster 0.8 if (gMC.equip & 1) { gMC.boost_sw = 1; @@ -359,7 +359,7 @@ void ActMyChar_Normal(bool bKey) gMC.ym /= 2; } - //Booster 2.0 + // Booster 2.0 if (gMC.equip & 0x20) { if (gKey & gKeyUp) @@ -368,19 +368,19 @@ void ActMyChar_Normal(bool bKey) gMC.xm = 0; gMC.ym = -0x5FF; } - else if ( gKey & gKeyLeft ) + else if (gKey & gKeyLeft) { gMC.boost_sw = 1; gMC.ym = 0; gMC.xm = -0x5FF; } - else if ( gKey & gKeyRight ) + else if (gKey & gKeyRight) { gMC.boost_sw = 1; gMC.ym = 0; gMC.xm = 0x5FF; } - else if ( gKey & gKeyDown ) + else if (gKey & gKeyDown) { gMC.boost_sw = 3; gMC.xm = 0; @@ -395,19 +395,19 @@ void ActMyChar_Normal(bool bKey) } } - //Move left and right - if ( gKey & gKeyLeft && gMC.xm > -max_dash ) + // Move left and right + if (gKey & gKeyLeft && gMC.xm > -max_dash) gMC.xm -= dash2; - if ( gKey & gKeyRight && gMC.xm < max_dash ) + if (gKey & gKeyRight && gMC.xm < max_dash) gMC.xm += dash2; - if ( gKey & gKeyLeft ) + if (gKey & gKeyLeft) gMC.direct = 0; - if ( gKey & gKeyRight ) + if (gKey & gKeyRight) gMC.direct = 2; } - //Slow down when stopped boosting (Booster 2.0) + // Slow down when stopped boosting (Booster 2.0) if (gMC.equip & 0x20 && gMC.boost_sw && (!(gKey & gKeyJump) || !gMC.boost_cnt)) { if (gMC.boost_sw == 1) @@ -416,15 +416,15 @@ void ActMyChar_Normal(bool bKey) gMC.ym /= 2; } - //Stop boosting + // Stop boosting if (!gMC.boost_cnt || !(gKey & gKeyJump)) gMC.boost_sw = 0; } - //Jumping - if ( bKey ) + // Jumping + if (bKey) { - //Look up and down + // Look up and down gMC.up = (gKey & gKeyUp) != 0; gMC.down = gKey & gKeyDown && !(gMC.flag & 8); @@ -437,15 +437,15 @@ void ActMyChar_Normal(bool bKey) } } - //Stop interacting when moved + // Stop interacting when moved if (bKey && (gKeyShot | gKeyJump | gKeyUp | gKeyRight | gKeyLeft) & gKey) gMC.cond &= ~1; - //Booster losing fuel + // Booster losing fuel if (gMC.boost_sw && gMC.boost_cnt) --gMC.boost_cnt; - //Wind / current forces + // Wind / current forces if (gMC.flag & 0x1000) gMC.xm -= 0x88; if (gMC.flag & 0x2000) @@ -455,22 +455,22 @@ void ActMyChar_Normal(bool bKey) if (gMC.flag & 0x8000) gMC.ym += 0x55; - //Booster 2.0 forces and effects + // Booster 2.0 forces and effects if (gMC.equip & 0x20 && gMC.boost_sw) { if (gMC.boost_sw == 1) { - //Go up when going into a wall + // Go up when going into a wall if (gMC.flag & 5) gMC.ym = -0x100; - //Move in direction facing + // Move in direction facing if (!gMC.direct) gMC.xm -= 0x20; if (gMC.direct == 2) gMC.xm += 0x20; - //Boost particles (and sound) + // Boost particles (and sound) if (gKeyTrg & gKeyJump || gMC.boost_cnt % 3 == 1) { if (!gMC.direct) @@ -483,10 +483,10 @@ void ActMyChar_Normal(bool bKey) } else if (gMC.boost_sw == 2) { - //Move upwards + // Move upwards gMC.ym -= 0x20; - //Boost particles (and sound) + // Boost particles (and sound) if (gKeyTrg & gKeyJump || gMC.boost_cnt % 3 == 1) { SetCaret(gMC.x, gMC.y + 0xC00, 7, 3); @@ -495,20 +495,20 @@ void ActMyChar_Normal(bool bKey) } else if (gMC.boost_sw == 3 && (gKeyTrg & gKeyJump || gMC.boost_cnt % 3 == 1)) { - //Boost particles (and sound) + // Boost particles (and sound) SetCaret(gMC.x, gMC.y - 0xC00, 7, 1); PlaySoundObject(113, 1); } } - //Upwards wind/current + // Upwards wind/current else if (gMC.flag & 0x2000) { gMC.ym += gravity1; } - //Booster 0.8 + // Booster 0.8 else if (gMC.equip & 1 && gMC.boost_sw && gMC.ym > -0x400) { - //Upwards force + // Upwards force gMC.ym -= 0x20; if (!(gMC.boost_cnt % 3)) @@ -517,22 +517,22 @@ void ActMyChar_Normal(bool bKey) PlaySoundObject(113, 1); } - //Bounce off of ceiling + // Bounce off of ceiling if (gMC.flag & 2) gMC.ym = 0x200; } - //Gravity while jump is held + // Gravity while jump is held else if (gMC.ym < 0 && bKey && gKey & gKeyJump) { gMC.ym += gravity2; } - //Normal gravity + // Normal gravity else { gMC.ym += gravity1; } - //Keep player on slopes + // Keep player on slopes if (bKey && !(gKeyTrg & gKeyJump)) { if (gMC.flag & 0x10 && gMC.xm < 0) @@ -547,7 +547,7 @@ void ActMyChar_Normal(bool bKey) gMC.ym = 0x400; } - //Limit speed + // Limit speed if (!(gMC.flag & 0x100) || gMC.flag & 0xF000) { if (gMC.xm < -0x5FF) @@ -571,7 +571,7 @@ void ActMyChar_Normal(bool bKey) gMC.ym = 0x2FF; } - //Water splashing + // Water splashing if (!gMC.sprash && gMC.flag & 0x100) { int dir; @@ -604,11 +604,11 @@ void ActMyChar_Normal(bool bKey) if (!(gMC.flag & 0x100)) gMC.sprash = 0; - //Spike damage + // Spike damage if (gMC.flag & 0x400) DamageMyChar(10); - //Camera + // Camera if (gMC.direct) { gMC.index_x += 0x200; @@ -644,7 +644,7 @@ void ActMyChar_Normal(bool bKey) gMC.tgt_x = gMC.x + gMC.index_x; gMC.tgt_y = gMC.y + gMC.index_y; - //Change position + // Change position if (gMC.xm > resist || gMC.xm < -resist) gMC.x += gMC.xm; gMC.y += gMC.ym; @@ -791,12 +791,12 @@ void AirProcess() { if (GetNPCFlag(4000)) { - //Core cutscene + // Core cutscene StartTextScript(1100); } else { - //Drown + // Drown StartTextScript(41); if (gMC.direct) @@ -813,7 +813,7 @@ void AirProcess() gMC.air = 1000; } - if ( gMC.flag & 0x100 ) + if (gMC.flag & 0x100) { gMC.air_get = 60; } @@ -889,7 +889,7 @@ void MoveMyChar(int x, int y) void ZeroMyCharXMove() { - gMC.xm = 0; + gMC.xm = 0; } int GetUnitMyChar() From ee5f3e3ef71d80da41c308ac49822ca7de225ed2 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 11:25:17 +0200 Subject: [PATCH 07/13] Corrected formatting for MycHit.cpp Also changed regex to "((//|\;)[^ \t]|(for|while|if|while|do|void|int|bool)\(|(for|while|if|while|do)\ \(.*\)\;|\(\ |\ \)|//\ [a-z]|\ \ )" Signed-off-by: Gabriel Ravier --- src/MycHit.cpp | 146 ++++++++++++++++++++++++------------------------- 1 file changed, 73 insertions(+), 73 deletions(-) diff --git a/src/MycHit.cpp b/src/MycHit.cpp index 68994ed9..9809051d 100644 --- a/src/MycHit.cpp +++ b/src/MycHit.cpp @@ -35,79 +35,79 @@ int JudgeHitMyCharBlock(int x, int y) { int hit = 0; - //Left wall + // Left wall if (gMC.y - gMC.hit.top < (2 * (2 * y + 1) - 1) << 11 && gMC.y + gMC.hit.bottom > (2 * (2 * y - 1) + 1) << 11 && gMC.x - gMC.hit.left < (2 * x + 1) << 12 && gMC.x - gMC.hit.left > x << 13) { - //Clip + // Clip gMC.x = ((2 * x + 1) << 12) + gMC.hit.left; - //Halt momentum + // Halt momentum if (gMC.xm < -0x180) gMC.xm = -0x180; if (!(gKey & gKeyLeft) && gMC.xm < 0) gMC.xm = 0; - //Set that a left wall was hit + // Set that a left wall was hit hit |= 1; } - //Right wall + // Right wall if (gMC.y - gMC.hit.top < (2 * (2 * y + 1) - 1) << 11 && gMC.y + gMC.hit.bottom > (2 * (2 * y - 1) + 1) << 11 && gMC.x + gMC.hit.right > (2 * x - 1) << 12 && gMC.x + gMC.hit.left < x << 13) { - //Clip + // Clip gMC.x = ((2 * x - 1) << 12) - gMC.hit.right; - //Halt momentum + // Halt momentum if (gMC.xm > 0x180) gMC.xm = 0x180; if (!(gKey & gKeyRight) && gMC.xm > 0) gMC.xm = 0; - //Set that a right wall was hit + // Set that a right wall was hit hit |= 4; } - //Ceiling + // Ceiling if (gMC.x - gMC.hit.right < ((2 * x + 1) << 12) - 0x600 && gMC.x + gMC.hit.right > ((2 * x - 1) << 12) + 0x600 && gMC.y - gMC.hit.top < (2 * y + 1) << 12 && gMC.y - gMC.hit.top > y << 13) { - //Clip + // Clip gMC.y = ((2 * y + 1) << 12) + gMC.hit.top; - //Halt momentum + // Halt momentum if (!(gMC.cond & 2) && gMC.ym < -0x200) PutlittleStar(); if (gMC.ym < 0) gMC.ym = 0; - //Set that a ceiling was hit + // Set that a ceiling was hit hit |= 2; } - //Floor + // Floor if (gMC.x - gMC.hit.right < ((2 * x + 1) << 12) - 0x600 && gMC.x + gMC.hit.right > ((2 * x - 1) << 12) + 0x600 && gMC.y + gMC.hit.bottom > (2 * y - 1) << 12 && gMC.y + gMC.hit.bottom < y << 13) { - //Clip + // Clip gMC.y = ((2 * y - 1) << 12) - gMC.hit.bottom; - //Halt momentum + // Halt momentum if (gMC.ym > 0x400) PlaySoundObject(23, 1); if (gMC.ym > 0) gMC.ym = 0; - //Set that a floor was hit + // Set that a floor was hit hit |= 8; } @@ -123,16 +123,16 @@ int JudgeHitMyCharTriangleA(int x, int y) && gMC.y - gMC.hit.top < (y << 13) - (-0x2000 * x + gMC.x) / 2 + 0x800 && gMC.y + gMC.hit.bottom > (2 * y - 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) - (-0x2000 * x + gMC.x) / 2 + 0x800 + gMC.hit.top; - //Halt momentum + // Halt momentum if (!(gMC.cond & 2) && gMC.ym < -0x200) PutlittleStar(); if (gMC.ym < 0) gMC.ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -148,16 +148,16 @@ int JudgeHitMyCharTriangleB(int x, int y) && gMC.y - gMC.hit.top < (y << 13) - (-0x2000 * x + gMC.x) / 2 - 0x800 && gMC.y + gMC.hit.bottom > (2 * y - 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) - (-0x2000 * x + gMC.x) / 2 - 0x800 + gMC.hit.top; - //Halt momentum + // Halt momentum if (!(gMC.cond & 2) && gMC.ym < -0x200) PutlittleStar(); if (gMC.ym < 0) gMC.ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -173,16 +173,16 @@ int JudgeHitMyCharTriangleC(int x, int y) && gMC.y - gMC.hit.top < (y << 13) + (-0x2000 * x + gMC.x) / 2 - 0x800 && gMC.y + gMC.hit.bottom > (2 * y - 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) + (-0x2000 * x + gMC.x) / 2 - 0x800 + gMC.hit.top; - //Halt momentum + // Halt momentum if (!(gMC.cond & 2) && gMC.ym < -0x200) PutlittleStar(); if (gMC.ym < 0) gMC.ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -198,16 +198,16 @@ int JudgeHitMyCharTriangleD(int x, int y) && gMC.y - gMC.hit.top < (y << 13) + (-0x2000 * x + gMC.x) / 2 + 0x800 && gMC.y + gMC.hit.bottom > (2 * y - 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) + (-0x2000 * x + gMC.x) / 2 + 0x800 + gMC.hit.top; - //Halt momentum + // Halt momentum if (!(gMC.cond & 2) && gMC.ym < -0x200) PutlittleStar(); if (gMC.ym < 0) gMC.ym = 0; - //Set that hit a ceiling + // Set that hit a ceiling hit |= 2; } @@ -223,16 +223,16 @@ int JudgeHitMyCharTriangleE(int x, int y) && gMC.y + gMC.hit.bottom > (y << 13) + (-0x2000 * x + gMC.x) / 2 - 0x800 && gMC.y - gMC.hit.top < (2 * y + 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) + (-0x2000 * x + gMC.x) / 2 - 0x800 - gMC.hit.bottom; - //Halt momentum + // Halt momentum if (gMC.ym > 0x400) PlaySoundObject(23, 1); if (gMC.ym > 0) gMC.ym = 0; - //Set that hit this slope + // Set that hit this slope hit = 0x10028; } @@ -248,16 +248,16 @@ int JudgeHitMyCharTriangleF(int x, int y) && gMC.y + gMC.hit.bottom > (y << 13) + (-0x2000 * x + gMC.x) / 2 + 0x800 && gMC.y - gMC.hit.top < (2 * y + 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) + (-0x2000 * x + gMC.x) / 2 + 0x800 - gMC.hit.bottom; - //Halt momentum + // Halt momentum if (gMC.ym > 0x400) PlaySoundObject(23, 1); if (gMC.ym > 0) gMC.ym = 0; - //Set that hit this slope + // Set that hit this slope hit = 0x20028; } @@ -273,16 +273,16 @@ int JudgeHitMyCharTriangleG(int x, int y) && gMC.y + gMC.hit.bottom > (y << 13) - (-0x2000 * x + gMC.x) / 2 + 0x800 && gMC.y - gMC.hit.top < (2 * y + 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) - (-0x2000 * x + gMC.x) / 2 + 0x800 - gMC.hit.bottom; - //Halt momentum + // Halt momentum if (gMC.ym > 0x400) PlaySoundObject(23, 1); if (gMC.ym > 0) gMC.ym = 0; - //Set that hit this slope + // Set that hit this slope hit = 0x40018; } @@ -298,16 +298,16 @@ int JudgeHitMyCharTriangleH(int x, int y) && gMC.y + gMC.hit.bottom > (y << 13) - (-0x2000 * x + gMC.x) / 2 - 0x800 && gMC.y - gMC.hit.top < (2 * y + 1) << 12) { - //Clip + // Clip gMC.y = (y << 13) - (-0x2000 * x + gMC.x) / 2 - 0x800 - gMC.hit.bottom; - //Halt momentum + // Halt momentum if (gMC.ym > 0x400) PlaySoundObject(23, 1); if (gMC.ym > 0) gMC.ym = 0; - //Set that hit this slope + // Set that hit this slope hit = 0x80018; } @@ -424,12 +424,12 @@ void HitMyCharMap() switch (atrb[i]) { - //Water + // Water case 0x02: gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; - //Block + // Block case 0x05: case 0x41: case 0x43: @@ -437,12 +437,12 @@ void HitMyCharMap() gMC.flag |= JudgeHitMyCharBlock(x + offx[i], y + offy[i]); break; - //Spikes + // Spikes case 0x42: gMC.flag |= JudgeHitMyCharDamage(x + offx[i], y + offy[i]); break; - //Slopes + // Slopes case 0x50: gMC.flag |= JudgeHitMyCharTriangleA(x + offx[i], y + offy[i]); break; @@ -475,7 +475,7 @@ void HitMyCharMap() gMC.flag |= JudgeHitMyCharTriangleH(x + offx[i], y + offy[i]); break; - //Water and water blocks + // Water and water blocks case 0x60: gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; @@ -485,53 +485,53 @@ void HitMyCharMap() gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; - //Water spikes + // Water spikes case 0x62: gMC.flag |= JudgeHitMyCharDamageW(x + offx[i], y + offy[i]); break; - //Water slopes + // Water slopes case 0x70: - gMC.flag |= JudgeHitMyCharTriangleA(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleA(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x71: - gMC.flag |= JudgeHitMyCharTriangleB(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleB(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x72: - gMC.flag |= JudgeHitMyCharTriangleC(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleC(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x73: - gMC.flag |= JudgeHitMyCharTriangleD(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleD(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x74: - gMC.flag |= JudgeHitMyCharTriangleE(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleE(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x75: - gMC.flag |= JudgeHitMyCharTriangleF(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleF(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x76: - gMC.flag |= JudgeHitMyCharTriangleG(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleG(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; case 0x77: - gMC.flag |= JudgeHitMyCharTriangleH(x + offx[i], y + offy[i]); - gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharTriangleH(x + offx[i], y + offy[i]); + gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); break; - //Wind + // Wind case 0x80: gMC.flag |= JudgeHitMyCharVectLeft(x + offx[i], y + offy[i]); break; @@ -548,7 +548,7 @@ void HitMyCharMap() gMC.flag |= JudgeHitMyCharVectDown(x + offx[i], y + offy[i]); break; - //Water current + // Water current case 0xA0: gMC.flag |= JudgeHitMyCharVectLeft(x + offx[i], y + offy[i]); gMC.flag |= JudgeHitMyCharWater(x + offx[i], y + offy[i]); @@ -657,7 +657,7 @@ int JudgeHitMyCharNPC3(NPCHAR *npc) int JudgeHitMyCharNPC4(NPCHAR *npc) { - //TODO: comment this + // TODO: comment this int hit = 0; long double v1, v2; @@ -688,7 +688,7 @@ int JudgeHitMyCharNPC4(NPCHAR *npc) { if (gMC.x - gMC.hit.right < npc->x + npc->hit.back && gMC.x - gMC.hit.right > npc->x) { - if ( gMC.xm < npc->xm ) + if (gMC.xm < npc->xm) gMC.xm = npc->xm; gMC.x = npc->hit.back + npc->x + gMC.hit.right; hit |= 1; @@ -696,7 +696,7 @@ int JudgeHitMyCharNPC4(NPCHAR *npc) if (gMC.x + gMC.hit.right > npc->x - npc->hit.back && gMC.hit.right + gMC.x < npc->x) { - if ( gMC.xm > npc->xm ) + if (gMC.xm > npc->xm) gMC.xm = npc->xm; gMC.x = npc->x - npc->hit.back - gMC.hit.right; hit |= 4; @@ -774,7 +774,7 @@ void HitMyCharNpChar() hit = JudgeHitMyCharNPC3(&gNPC[i]); } - //Special NPCs (pickups) + // Special NPCs (pickups) if (hit && gNPC[i].code_char == 1) { PlaySoundObject(14, 1); @@ -796,11 +796,11 @@ void HitMyCharNpChar() gNPC[i].cond = 0; } - //Run event on contact + // Run event on contact if (!(g_GameFlags & 4) && hit && gNPC[i].bits & npc_eventTouch) StartTextScript(gNPC[i].code_event); - //NPC damage + // NPC damage if (g_GameFlags & 2 && !(gNPC[i].bits & npc_interact)) { if (gNPC[i].bits & npc_rearTop) @@ -820,7 +820,7 @@ void HitMyCharNpChar() } } - //Interaction + // Interaction if (!(g_GameFlags & 4) && hit && gMC.cond & 1 && gNPC[i].bits & npc_interact) { StartTextScript(gNPC[i].code_event); @@ -830,7 +830,7 @@ void HitMyCharNpChar() } } - //Create question mark when NPC hasn't been interacted with + // Create question mark when NPC hasn't been interacted with if (gMC.ques) SetCaret(gMC.x, gMC.y, 9, 0); } From 052e018063650134a340fd383b8069807084afb1 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 11:29:44 +0200 Subject: [PATCH 08/13] Corrected formatting for MycParam.cpp Signed-off-by: Gabriel Ravier --- src/MycParam.cpp | 53 ++++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/src/MycParam.cpp b/src/MycParam.cpp index 60b326e6..15d20f68 100644 --- a/src/MycParam.cpp +++ b/src/MycParam.cpp @@ -104,7 +104,7 @@ void DamageMyChar(int damage) { if (!gMC.shock) { - //Damage player + // Damage player PlaySoundObject(16, 1); gMC.cond &= ~1; gMC.shock = 128; @@ -112,11 +112,11 @@ void DamageMyChar(int damage) gMC.ym = -0x400; gMC.life -= damage; - //Lose a whimsical star + // Lose a whimsical star if (gMC.equip & 0x80 && gMC.star > 0) --gMC.star; - //Lose experience + // Lose experience if (gMC.equip & 4) gArmsData[gSelectedArms].exp -= damage; else @@ -136,10 +136,10 @@ void DamageMyChar(int damage) } } - //Tell player how much damage was taken + // Tell player how much damage was taken SetValueView(&gMC.x, &gMC.y, -damage); - //Death + // Death if (gMC.life <= 0) { PlaySoundObject(17, 1); @@ -161,7 +161,7 @@ void ZeroArmsEnergy_All() void AddBulletMyChar(int no, int val) { - //Missile Launcher + // Missile Launcher for (int a = 0; a < ARMS_MAX; a++) { if (gArmsData[a].code == 5) @@ -173,7 +173,7 @@ void AddBulletMyChar(int no, int val) } } - //Super Missile Launcher + // Super Missile Launcher for (int a = 0; a < ARMS_MAX; a++) { if (gArmsData[a].code == 10) @@ -215,7 +215,7 @@ void PutArmsEnergy(bool flash) if (gArmsEnergyX < 16) gArmsEnergyX += 2; - //Draw max ammo + // Draw max ammo if (gArmsData[gSelectedArms].max_num) { PutNumber4(gArmsEnergyX + 32, 16, gArmsData[gSelectedArms].num, 0); @@ -227,7 +227,7 @@ void PutArmsEnergy(bool flash) PutBitmap3(&rcView, gArmsEnergyX + 48, 24, &rcNone, SURFACE_ID_TEXT_BOX); } - //Draw experience and ammo + // Draw experience and ammo if (!flash || !((gMC.shock >> 1) & 1)) { PutBitmap3(&rcView, gArmsEnergyX + 32, 24, &rcPer, SURFACE_ID_TEXT_BOX); @@ -271,13 +271,14 @@ void PutActiveArmsList() RECT rect = {0, 0, 0, 16}; int arms_num; - for (arms_num = 0; gArmsData[arms_num].code != 0; ++arms_num); + for (arms_num = 0; gArmsData[arms_num].code != 0; ++arms_num) + ; if (arms_num) { for (int a = 0; a < arms_num; a++) { - //Get X position to draw at + // Get X position to draw at int x = 16 * (a - gSelectedArms) + gArmsEnergyX; if (x >= 8) @@ -295,7 +296,7 @@ void PutActiveArmsList() if (x < 72 && x >= 24) x -= 48; - //Draw icon + // Draw icon rect.left = 16 * gArmsData[a].code; rect.right = rect.left + 16; PutBitmap3(&grcGame, x, 16, &rect, SURFACE_ID_ARMS_IMAGE); @@ -319,7 +320,7 @@ void PutMyLife(bool flash) else if (++gMC.lifeBr_count > 30) --gMC.lifeBr; - //Draw bar + // Draw bar rcCase.right = 64; rcLife.right = 40 * gMC.life / gMC.max_life - 1; rcBr.right = 40 * gMC.lifeBr / gMC.max_life - 1; @@ -340,11 +341,11 @@ void PutMyAir(int x, int y) if (!(gMC.equip & 0x10) && gMC.air_get) { - //Draw how much air is left + // Draw how much air is left if (gMC.air_get % 6 <= 3) PutNumber4(x + 32, y, gMC.air / 10, 0); - //Draw "AIR" text + // Draw "AIR" text if (gMC.air % 30 <= 10) PutBitmap3(&grcGame, x, y, &rcAir[1], SURFACE_ID_TEXT_BOX); else @@ -362,7 +363,7 @@ void PutTimeCounter(int x, int y) if (gMC.equip & 0x100) { - //Draw clock and increase time + // Draw clock and increase time if (g_GameFlags & 2) { if (time_count < 300000) @@ -378,7 +379,7 @@ void PutTimeCounter(int x, int y) PutBitmap3(&grcGame, x, y, &rcTime[0], SURFACE_ID_TEXT_BOX); } - //Draw time + // Draw time PutNumber4(x, y, time_count / 3000, false); PutNumber4(x + 20, y, time_count / 50 % 60, true); PutNumber4(x + 32, y, time_count / 5 % 10, false); @@ -394,18 +395,18 @@ bool SaveTimeCounter() { REC rec; - //Quit if player doesn't have the Nikumaru Counter + // Quit if player doesn't have the Nikumaru Counter if (!(gMC.equip & 0x100)) return true; - //Get last time + // Get last time char path[PATH_LENGTH]; sprintf(path, "%s/290.rec", gModulePath); FILE *fp = fopen(path, "rb"); if (fp) { - //Read data + // Read data rec.counter[0] = File_ReadLE32(fp); rec.counter[1] = File_ReadLE32(fp); rec.counter[2] = File_ReadLE32(fp); @@ -422,12 +423,12 @@ bool SaveTimeCounter() p[2] -= rec.random[0]; p[3] -= (SDL_BYTEORDER == SDL_LIL_ENDIAN) ? (rec.random[0] >> 1) : (rec.random[0]); - //If this is faster than our new time, quit + // If this is faster than our new time, quit if (rec.counter[0] < time_count) return true; } - //Save new time + // Save new time for (int i = 0; i < 4; i++) { rec.counter[i] = time_count; @@ -457,7 +458,7 @@ bool SaveTimeCounter() int LoadTimeCounter() { - //Open file + // Open file char path[PATH_LENGTH]; sprintf(path, "%s/290.rec", gModulePath); @@ -467,7 +468,7 @@ int LoadTimeCounter() REC rec; - //Read data + // Read data rec.counter[0] = File_ReadLE32(fp); rec.counter[1] = File_ReadLE32(fp); rec.counter[2] = File_ReadLE32(fp); @@ -478,7 +479,7 @@ int LoadTimeCounter() rec.random[3] = fgetc(fp); fclose(fp); - //Decode from checksum + // Decode from checksum for (int i = 0; i < 4; i++) { uint8_t *p = (uint8_t*)&rec.counter[i]; @@ -488,7 +489,7 @@ int LoadTimeCounter() p[3] -= (SDL_BYTEORDER == SDL_LIL_ENDIAN) ? (rec.random[i] >> 1) : (rec.random[i]); } - //Verify checksum's result + // Verify checksum's result if (rec.counter[0] == rec.counter[1] && rec.counter[0] == rec.counter[2]) { time_count = rec.counter[0]; From 70818bd58c7c367d42c58693f2f5c6d922374d66 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 12:19:15 +0200 Subject: [PATCH 09/13] Some orthograph corrections Signed-off-by: Gabriel Ravier --- src/Main.cpp | 82 ++++++++++++++++++++++++------------------------- src/Map.cpp | 2 +- src/MapName.cpp | 3 +- src/MyChar.cpp | 2 +- 4 files changed, 43 insertions(+), 46 deletions(-) diff --git a/src/Main.cpp b/src/Main.cpp index 61d6a3bf..65e0abec 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -44,7 +44,7 @@ const char *lpWindowName = "洞窟物語エンジン2"; const char *lpWindowName = "Cave Story Engine 2 ~ Doukutsu Monogatari Enjin 2"; #endif -//A replication of MSVC's rand algorithm +// A replication of MSVC's rand algorithm static unsigned long int next = 1; int rep_rand() @@ -58,7 +58,7 @@ void rep_srand(unsigned int seed) next = seed; } -//Framerate stuff +// Framerate stuff void PutFramePerSecound() { if (bFps) @@ -94,12 +94,12 @@ int GetFramePerSecound() int main(int argc, char *argv[]) { - //Get executable's path + // Get executable's path strcpy(gModulePath, SDL_GetBasePath()); if (gModulePath[strlen(gModulePath) - 1] == '/' || gModulePath[strlen(gModulePath) - 1] == '\\') - gModulePath[strlen(gModulePath) - 1] = '\0'; //String cannot end in slash or stuff will probably break (original does this through a windows.h provided function) + gModulePath[strlen(gModulePath) - 1] = '\0'; // String cannot end in slash or stuff will probably break (original does this through a windows.h provided function) - //Get path of the data folder + // Get path of the data folder strcpy(gDataPath, gModulePath); strcat(gDataPath, "/data"); @@ -109,17 +109,17 @@ int main(int argc, char *argv[]) SDL_SetHint(SDL_HINT_WINDOWS_INTRESOURCE_ICON_SMALL, "102"); #endif - //Initialize SDL + // Initialize SDL if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_TIMER) >= 0) { - //Load configuration + // Load configuration CONFIG config; if (!LoadConfigData(&config)) DefaultConfigData(&config); - //Apply keybinds - //Swap X and Z buttons + // Apply keybinds + // Swap X and Z buttons if (config.attack_button_mode) { if (config.attack_button_mode == 1) @@ -134,7 +134,7 @@ int main(int argc, char *argv[]) gKeyShot = KEY_X; } - //Swap Okay and Cancel buttons + // Swap Okay and Cancel buttons if (config.ok_button_mode) { if (config.ok_button_mode == 1) @@ -149,14 +149,14 @@ int main(int argc, char *argv[]) gKeyCancel = gKeyShot; } - //Swap left and right weapon switch keys + // Swap left and right weapon switch keys if (CheckFileExists("s_reverse")) { gKeyArms = KEY_ARMSREV; gKeyArmsRev = KEY_ARMS; } - //Alternate movement keys + // Alternate movement keys if (config.move_button_mode) { if (config.move_button_mode == 1) @@ -175,7 +175,7 @@ int main(int argc, char *argv[]) gKeyDown = KEY_DOWN; } - //Set gamepad inputs + // Set gamepad inputs for (int i = 0; i < 8; i++) { switch (config.joystick_button[i]) @@ -211,7 +211,7 @@ int main(int argc, char *argv[]) RECT unused_rect = {0, 0, 320, 240}; - //Load cursor + // Load cursor size_t size; const unsigned char *data = FindResource("CURSOR_NORMAL", "CURSOR", &size); @@ -236,7 +236,7 @@ int main(int argc, char *argv[]) printf("Failed to load cursor\n"); } - //Get window dimensions and colour depth + // Get window dimensions and color depth int windowWidth; int windowHeight; int colourDepth; @@ -245,7 +245,7 @@ int main(int argc, char *argv[]) { case 1: case 2: - //Set window dimensions + // Set window dimensions if (config.display_mode == 1) { windowWidth = WINDOW_WIDTH; @@ -257,7 +257,7 @@ int main(int argc, char *argv[]) windowHeight = WINDOW_HEIGHT * 2; } - //Create window + // Create window gWindow = SDL_CreateWindow(lpWindowName, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, 0); if (gWindow) @@ -274,16 +274,16 @@ int main(int argc, char *argv[]) case 0: case 3: case 4: - //Set window dimensions + // Set window dimensions windowWidth = WINDOW_WIDTH * 2; windowHeight = WINDOW_HEIGHT * 2; - //Create window + // Create window gWindow = SDL_CreateWindow(lpWindowName, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, windowWidth, windowHeight, 0); if (gWindow) { - //Set colour depth + // Set color depth switch (config.display_mode) { case 0: @@ -306,17 +306,17 @@ int main(int argc, char *argv[]) break; } - //Create window + // Create window if (gWindow) { - //Check debug things + // Check debug things if (CheckFileExists("fps")) bFps = true; #ifndef WINDOWS - //Load icon + // Load icon size_t size; const unsigned char *data = FindResource("ICON_MINI", "ICON", &size); @@ -338,38 +338,38 @@ int main(int argc, char *argv[]) } #endif - //Set rects + // Set rects RECT loading_rect = {0, 0, 64, 8}; RECT clip_rect = {0, 0, windowWidth, windowHeight}; - //Load the "LOADING" text + // Load the "LOADING" text MakeSurface_File("Loading", SURFACE_ID_LOADING); - //Draw loading screen + // Draw loading screen CortBox(&clip_rect, 0x000000); PutBitmap3(&clip_rect, (WINDOW_WIDTH - 64) / 2, (WINDOW_HEIGHT - 8) / 2, &loading_rect, SURFACE_ID_LOADING); - //Draw to screen + // Draw to screen if (Flip_SystemTask()) { - //Initialize sound + // Initialize sound InitDirectSound(); - //Initialize joystick + // Initialize joystick if (config.bJoystick && InitDirectInput()) { ResetJoystickStatus(); gbUseJoystick = true; } - //Initialize stuff + // Initialize stuff InitTextObject(config.font_name); InitTriangleTable(); - //Run game code + // Run game code Game(); - //End stuff + // End stuff EndDirectSound(); EndTextObject(); EndDirectDraw(); @@ -417,10 +417,10 @@ void JoystickProc() if (GetJoystickStatus(&status)) { - //Clear held buttons + // Clear held buttons gKey &= (KEY_ESCAPE | KEY_F2 | KEY_F1); - //Set movement buttons + // Set movement buttons if (status.bLeft) gKey |= gKeyLeft; if (status.bRight) @@ -430,7 +430,7 @@ void JoystickProc() if (status.bDown) gKey |= gKeyDown; - //Set held buttons + // Set held buttons for (int i = 0; i < 8; i++) { if (status.bButton[i]) @@ -448,7 +448,7 @@ void JoystickProc() bool SystemTask() { - //Handle window events + // Handle window events bool focusGained = true; while (SDL_PollEvent(NULL) || !focusGained) @@ -488,11 +488,9 @@ bool SystemTask() case SDL_KEYDOWN: case SDL_KEYUP: #ifdef FIX_BUGS - //BUG FIX: Pixel relied on key codes for input, but these differ based on keyboard layout. - //This would break the alternate movement keys on typical English keyboards, since the '=' key - //is in a completely different place to where it is on a Japanese keyboard. - //To solve this, we use scancodes instead, which are based on the physical location of keys, - //rather than their meaning. + // BUG FIX: Pixel relied on key codes for input, but these differ based on keyboard layout. + // This would break the alternate movement keys on typical English keyboards, since the '=' key is in a completely different place to where it is on a Japanese keyboard. + // To solve this, we use scan codes instead, which are based on the physical location of keys, rather than their meaning. switch (event.key.keysym.scancode) { case SDL_SCANCODE_ESCAPE: @@ -631,7 +629,7 @@ bool SystemTask() } } - //Run joystick code + // Run joystick code if (gbUseJoystick) JoystickProc(); diff --git a/src/Map.cpp b/src/Map.cpp index 097e10b4..7d804764 100644 --- a/src/Map.cpp +++ b/src/Map.cpp @@ -67,7 +67,7 @@ BOOL LoadMapData2(const char *path_map) } else { - // Read tiledata + // Read tile data fread(gMap.data, 1, gMap.length * gMap.width, fp); fclose(fp); return TRUE; diff --git a/src/MapName.cpp b/src/MapName.cpp index 490b8b40..ac319bd9 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -80,12 +80,11 @@ void ReadyMapName(const char *str) str = (char*)presentText; } - // Copy map's name to the MapName + // Copy map's name to the global map name strcpy(gMapName.name, str); // Draw the text to the surface a = (int)strlen(gMapName.name); - CortBox2(&rc, 0, SURFACE_ID_ROOM_NAME); PutText2((160 - 6 * a) / 2 + 6, 1, gMapName.name, RGB(0x11, 0x00, 0x22), SURFACE_ID_ROOM_NAME); PutText2((160 - 6 * a) / 2 + 6, 0, gMapName.name, RGB(0xFF, 0xFF, 0xFE), SURFACE_ID_ROOM_NAME); diff --git a/src/MyChar.cpp b/src/MyChar.cpp index f453fee4..4872b5a0 100644 --- a/src/MyChar.cpp +++ b/src/MyChar.cpp @@ -225,7 +225,7 @@ void PutMyChar(int fx, int fy) PutBitmap3(&grcGame, (gMC.x - gMC.view.left) / 0x200 - fx / 0x200, (gMC.y - gMC.view.top) / 0x200 - fy / 0x200, &rect, SURFACE_ID_MY_CHAR); - // Draw airtank + // Draw air tank RECT rcBubble[2] = { {56, 96, 80, 120}, {80, 96, 104, 120}, From 953b2990ce47bccbbd935cc1f699c8e12cd03a93 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 17:43:27 +0200 Subject: [PATCH 10/13] Corrected new line mistake Signed-off-by: Gabriel Ravier --- src/MapName.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/MapName.cpp b/src/MapName.cpp index ac319bd9..a855f87c 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -15,8 +15,7 @@ void ReadyMapName(const char *str) int a; // Handle "Studio Pixel presents" text in the intro, using an obfuscated string - unsigned char presentText[24] = - { + unsigned char presentText[24] = { #ifdef JAPANESE // "開発室Pixel presents" 0x8A - 1, // é–‹ From c6bcbeab2f3faef7c2bbdc2cacd2af5ad1c913c0 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 18:01:15 +0200 Subject: [PATCH 11/13] Revert "corrections" of "colour" to "color", makes style inconsistent though :( Signed-off-by: Gabriel Ravier --- src/Main.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Main.cpp b/src/Main.cpp index 65e0abec..a8b3137c 100644 --- a/src/Main.cpp +++ b/src/Main.cpp @@ -236,7 +236,7 @@ int main(int argc, char *argv[]) printf("Failed to load cursor\n"); } - // Get window dimensions and color depth + // Get window dimensions and colour depth int windowWidth; int windowHeight; int colourDepth; @@ -283,7 +283,7 @@ int main(int argc, char *argv[]) if (gWindow) { - // Set color depth + // Set colour depth switch (config.display_mode) { case 0: From 0e5bcf26e08492f504af73d1941036af307f0cc8 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 19:38:11 +0200 Subject: [PATCH 12/13] Revert MapName.cpp to Shift-JIS Also "optimised" is valid english lol Signed-off-by: Gabriel Ravier --- src/MapName.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MapName.cpp b/src/MapName.cpp index a855f87c..4bcd80bc 100644 --- a/src/MapName.cpp +++ b/src/MapName.cpp @@ -17,12 +17,12 @@ void ReadyMapName(const char *str) // Handle "Studio Pixel presents" text in the intro, using an obfuscated string unsigned char presentText[24] = { #ifdef JAPANESE - // "開発室Pixel presents" - 0x8A - 1, // é–‹ + // "ŠJ”­ŽºPixel presents" + 0x8A - 1, // ŠJ 0x4A - 1, - 0x94 - 1, // 発 + 0x94 - 1, // ”­ 0xAD - 1, - 0x8E - 1, // 室 + 0x8E - 1, // Žº 0xBA - 1, 'P' - 1, 'i' - 1, @@ -91,7 +91,7 @@ void ReadyMapName(const char *str) void PutMapName(BOOL bMini) { - // 'unused_rect' isn't the original name. The Linux port optimized this out, so there's no name for it. + // 'unused_rect' isn't the original name. The Linux port optimised this out, so there's no name for it. RECT unused_rect = {0, 0, 160, 16}; if (bMini) From 2578302bb574d504f0356471967e89920cc0adc3 Mon Sep 17 00:00:00 2001 From: Gabriel Ravier Date: Wed, 8 May 2019 19:42:24 +0200 Subject: [PATCH 13/13] Reverted formatting change Clownacy didn't like Signed-off-by: Gabriel Ravier --- src/MycParam.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/MycParam.cpp b/src/MycParam.cpp index 15d20f68..481bbe64 100644 --- a/src/MycParam.cpp +++ b/src/MycParam.cpp @@ -271,8 +271,7 @@ void PutActiveArmsList() RECT rect = {0, 0, 0, 16}; int arms_num; - for (arms_num = 0; gArmsData[arms_num].code != 0; ++arms_num) - ; + for (arms_num = 0; gArmsData[arms_num].code != 0; ++arms_num); if (arms_num) {