From 84db90c7949fcb6c422d9bcbb0e1b53b0a2e2783 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sun, 10 Feb 2019 15:28:05 +0000 Subject: [PATCH 1/2] Minor Organya.cpp cleanup --- src/Organya.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/Organya.cpp b/src/Organya.cpp index 29ae4323..a4f05035 100644 --- a/src/Organya.cpp +++ b/src/Organya.cpp @@ -305,8 +305,7 @@ void ChangeDramVolume(int32_t volume, int8_t track) void PlayDramObject(unsigned char key, int mode,char track) { - - switch(mode) + switch(mode) { case 0: lpDRAMBUFFER[track]->Stop(); @@ -319,7 +318,7 @@ void PlayDramObject(unsigned char key, int mode,char track) lpDRAMBUFFER[track]->Play(false); break; case 2: - break; + break; case -1: break; } @@ -341,7 +340,7 @@ void OrganyaPlayData() //Play melody for(int i = 0; i < MAXMELODY; i++) { - if (play_np[i] != NULL &&play_p == play_np[i]->x) + if (play_np[i] != NULL && play_p == play_np[i]->x) { if(play_np[i]->y != KEYDUMMY) { @@ -555,7 +554,7 @@ void PlayOrganyaMusic() bool ChangeOrganyaVolume(signed int volume) { - if ( volume >= 0 && volume <= 100 ) + if (volume >= 0 && volume <= 100) { gOrgVolume = volume; return true; From 38b846487af9ce861a17e1068d3eb679d762f853 Mon Sep 17 00:00:00 2001 From: Clownacy Date: Sun, 10 Feb 2019 15:59:48 +0000 Subject: [PATCH 2/2] Fixed (C)Pixel .pbm protection on 32-bit builds --- src/Draw.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Draw.cpp b/src/Draw.cpp index 7f424d64..3425b022 100644 --- a/src/Draw.cpp +++ b/src/Draw.cpp @@ -66,18 +66,15 @@ bool Flip_SystemTask() static bool IsEnableBitmap(SDL_RWops *fp) { - return true; - /* char str[16]; const char *extra_text = "(C)Pixel"; const size_t len = strlen(extra_text); - fp->seek(fp, -len, RW_SEEK_END); + fp->seek(fp, -(Sint64)len, RW_SEEK_END); fp->read(fp, str, 1, len); fp->seek(fp, 0, RW_SEEK_SET); return memcmp(str, extra_text, len) == 0; - */ } void ReleaseSurface(int s)