shithub: cstory

Info  •  Files  •  Log  •  Branches

Merge pull request #50 from Clownacy/master

Cleanup and a fix

--- a/src/Draw.cpp

+++ b/src/Draw.cpp

@@ -66,18 +66,15 @@

 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)

--- a/src/Organya.cpp

+++ b/src/Organya.cpp

@@ -305,8 +305,7 @@

 void PlayDramObject(unsigned char key, int mode,char track)

 {

-	

-    switch(mode)

+	switch(mode)

 	{

 		case 0:

 			lpDRAMBUFFER[track]->Stop();

@@ -319,7 +318,7 @@

 			lpDRAMBUFFER[track]->Play(false);

 			break;

 		case 2:

-            break;

+			break;

 		case -1:

 			break;

 	}

@@ -341,7 +340,7 @@

 	//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 @@

 bool ChangeOrganyaVolume(signed int volume)

 {

-	if ( volume >= 0 && volume <= 100 )

+	if (volume >= 0 && volume <= 100)

 	{

 		gOrgVolume = volume;

 		return true;