duuqnd/cave-story-solaris
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #50 from Clownacy/master

Browse source 
Cleanup and a fix
This commit is contained in:
Cucky 2019-02-10 11:12:42 -05:00 • committed by GitHub
commit 0b231fa2b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Draw.cpp
View file

@ -66,18 +66,15 @@ bool Flip_SystemTask()
static bool IsEnableBitmap(SDL_RWops *fp) static bool IsEnableBitmap(SDL_RWops *fp)
{ {
return true;
/*
char str[16]; char str[16];
const char *extra_text = "(C)Pixel"; const char *extra_text = "(C)Pixel";
const size_t len = strlen(extra_text); 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->read(fp, str, 1, len);
fp->seek(fp, 0, RW_SEEK_SET); fp->seek(fp, 0, RW_SEEK_SET);
return memcmp(str, extra_text, len) == 0; return memcmp(str, extra_text, len) == 0;
*/
} }
void ReleaseSurface(int s) void ReleaseSurface(int s)

9
src/Organya.cpp
View file

@ -305,8 +305,7 @@ void ChangeDramVolume(int32_t volume, int8_t track)
void PlayDramObject(unsigned char key, int mode,char track) void PlayDramObject(unsigned char key, int mode,char track)
{ {
switch(mode)
switch(mode)
{ {
case 0: case 0:
lpDRAMBUFFER[track]->Stop(); lpDRAMBUFFER[track]->Stop();
@ -319,7 +318,7 @@ void PlayDramObject(unsigned char key, int mode,char track)
lpDRAMBUFFER[track]->Play(false); lpDRAMBUFFER[track]->Play(false);
break; break;
case 2: case 2:
break; break;
case -1: case -1:
break; break;
} }
@ -341,7 +340,7 @@ void OrganyaPlayData()
//Play melody //Play melody
for(int i = 0; i < MAXMELODY; i++) 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) if(play_np[i]->y != KEYDUMMY)
{ {
@ -555,7 +554,7 @@ void PlayOrganyaMusic()
bool ChangeOrganyaVolume(signed int volume) bool ChangeOrganyaVolume(signed int volume)
{ {
if ( volume >= 0 && volume <= 100 ) if (volume >= 0 && volume <= 100)
{ {
gOrgVolume = volume; gOrgVolume = volume;
return true; return true;