From e9d6bfc2d85f5d4f8cbe3f2da2a41cef3c4d3f59 Mon Sep 17 00:00:00 2001 From: Twinaphex Date: Fri, 9 Sep 2016 08:09:38 +0200 Subject: [PATCH] Silence warnings --- src/fceu.c | 2 +- src/ines-bad.h | 78 +++++++++++++++++++++++----------------------- src/ines.c | 2 +- src/input/bworld.c | 4 +-- 4 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/fceu.c b/src/fceu.c index 7b8f3b7..124971f 100644 --- a/src/fceu.c +++ b/src/fceu.c @@ -303,7 +303,7 @@ FCEUGI *FCEUI_CopyFamiStart(void) GameInfo->soundchan = 0; GameInfo->soundrate = 0; - GameInfo->name = "copyfami"; + GameInfo->name = (uint8_t*)"copyfami"; GameInfo->type = GIT_CART; GameInfo->vidsys = GIV_USER; GameInfo->input[0] = GameInfo->input[1] = -1; diff --git a/src/ines-bad.h b/src/ines-bad.h index a27b8dc..7e19d43 100644 --- a/src/ines-bad.h +++ b/src/ines-bad.h @@ -1,45 +1,45 @@ #ifndef _FCEU_INES_BAD_H #define _FCEU_INES_BAD_H -{ 0xecf78d8a13a030a6LL, "Ai Sensei no Oshiete", INESB_HACKED }, -{ 0x4712856d3e12f21fLL, "Akumajou Densetsu", INESB_HACKED }, -{ 0x10f90ba5bd55c22eLL, "Alien Syndrome", INESB_HACKED }, -{ 0x0d69ab3ad28ad1c2LL, "Banana", INESB_INCOMPLETE }, -{ 0x85d2c348a161cdbfLL, "Bio Senshi Dan", INESB_HACKED }, -{ 0x18fdb7c16aa8cb5cLL, "Bucky O'Hare", INESB_CORRUPT }, -{ 0xe27c48302108d11bLL, "Chibi Maruko Chan", INESB_HACKED }, -{ 0x9d1f505c6ba507bfLL, "Contra", INESB_HACKED }, -{ 0x60936436d3ea0ab6LL, "Crisis Force", INESB_HACKED }, -{ 0xcf31097ddbb03c5dLL, "Crystalis (Prototype)", INESB_CORRUPT }, -{ 0x92080a8ce94200eaLL, "Digital Devil Story II", INESB_HACKED }, -{ 0x6c2a2f95c2fe4b6eLL, "Dragon Ball", INESB_HACKED }, -{ 0x767aaff62963c58fLL, "Dragon Ball", INESB_HACKED }, -{ 0x97f133d8bc1c28dbLL, "Dragon Ball", INESB_HACKED }, -{ 0x500b267abb323005LL, "Dragon Warrior 4", INESB_CORRUPT }, -{ 0x02bdcf375704784bLL, "Erika to Satoru no Yume Bouken", INESB_HACKED }, -{ 0xd4fea9d2633b9186LL, "Famista 91", INESB_HACKED }, -{ 0xfdf8c812839b61f0LL, "Famista 92", INESB_HACKED }, -{ 0xb5bb1d0fb47d0850LL, "Famista 93", INESB_HACKED }, -{ 0x30471e773f7cdc89LL, "Famista 94", INESB_HACKED }, -{ 0x76c5c44ffb4a0bd7LL, "Fantasy Zone", INESB_HACKED }, -{ 0xb470bfb90e2b1049LL, "Fire Emblem Gaiden", INESB_HACKED }, -{ 0x27da2b0c500dc346LL, "Fire Emblem", INESB_HACKED }, -{ 0x23214fe456fba2ceLL, "Ganbare Goemon 2", INESB_HACKED }, -{ 0xbf8b22524e8329d9LL, "Ganbare Goemon Gaiden", INESB_HACKED }, -{ 0xa97041c3da0134e3LL, "Gegege no Kitarou 2", INESB_INCOMPLETE }, -{ 0x805db49a86db5449LL, "Goonies", INESB_HACKED }, -{ 0xc5abdaa65ac49b6bLL, "Gradius 2", INESB_HACKED }, -{ 0x04afae4ad480c11cLL, "Gradius 2", INESB_HACKED }, -{ 0x9b4bad37b5498992LL, "Gradius 2", INESB_HACKED }, -{ 0xb068d4ac10ef848eLL, "Highway Star", INESB_HACKED }, -{ 0xbf5175271e5019c3LL, "Kaiketsu Yanchamaru 3", INESB_HACKED }, -{ 0xfb4b508a236bbba3LL, "Salamander", INESB_HACKED }, -{ 0x1895afc6eef26c7dLL, "Super Mario Bros.", INESB_HACKED }, -{ 0x3716c4bebf885344LL, "Super Mario Bros.", INESB_HACKED }, -{ 0xfffda4407d80885aLL, "Sweet Home", INESB_CORRUPT }, -{ 0x103fc85d978b861bLL, "Sweet Home", INESB_CORRUPT }, -{ 0x7979dc51da86f19fLL, "110-in-1", INESB_CORRUPT }, -{ 0x001c0bb9c358252aLL, "110-in-1", INESB_CORRUPT }, +{ 0xecf78d8a13a030a6LL, (uint8_t*)"Ai Sensei no Oshiete", INESB_HACKED }, +{ 0x4712856d3e12f21fLL, (uint8_t*)"Akumajou Densetsu", INESB_HACKED }, +{ 0x10f90ba5bd55c22eLL, (uint8_t*)"Alien Syndrome", INESB_HACKED }, +{ 0x0d69ab3ad28ad1c2LL, (uint8_t*)"Banana", INESB_INCOMPLETE }, +{ 0x85d2c348a161cdbfLL, (uint8_t*)"Bio Senshi Dan", INESB_HACKED }, +{ 0x18fdb7c16aa8cb5cLL, (uint8_t*)"Bucky O'Hare", INESB_CORRUPT }, +{ 0xe27c48302108d11bLL, (uint8_t*)"Chibi Maruko Chan", INESB_HACKED }, +{ 0x9d1f505c6ba507bfLL, (uint8_t*)"Contra", INESB_HACKED }, +{ 0x60936436d3ea0ab6LL, (uint8_t*)"Crisis Force", INESB_HACKED }, +{ 0xcf31097ddbb03c5dLL, (uint8_t*)"Crystalis (Prototype)", INESB_CORRUPT }, +{ 0x92080a8ce94200eaLL, (uint8_t*)"Digital Devil Story II", INESB_HACKED }, +{ 0x6c2a2f95c2fe4b6eLL, (uint8_t*)"Dragon Ball", INESB_HACKED }, +{ 0x767aaff62963c58fLL, (uint8_t*)"Dragon Ball", INESB_HACKED }, +{ 0x97f133d8bc1c28dbLL, (uint8_t*)"Dragon Ball", INESB_HACKED }, +{ 0x500b267abb323005LL, (uint8_t*)"Dragon Warrior 4", INESB_CORRUPT }, +{ 0x02bdcf375704784bLL, (uint8_t*)"Erika to Satoru no Yume Bouken", INESB_HACKED }, +{ 0xd4fea9d2633b9186LL, (uint8_t*)"Famista 91", INESB_HACKED }, +{ 0xfdf8c812839b61f0LL, (uint8_t*)"Famista 92", INESB_HACKED }, +{ 0xb5bb1d0fb47d0850LL, (uint8_t*)"Famista 93", INESB_HACKED }, +{ 0x30471e773f7cdc89LL, (uint8_t*)"Famista 94", INESB_HACKED }, +{ 0x76c5c44ffb4a0bd7LL, (uint8_t*)"Fantasy Zone", INESB_HACKED }, +{ 0xb470bfb90e2b1049LL, (uint8_t*)"Fire Emblem Gaiden", INESB_HACKED }, +{ 0x27da2b0c500dc346LL, (uint8_t*)"Fire Emblem", INESB_HACKED }, +{ 0x23214fe456fba2ceLL, (uint8_t*)"Ganbare Goemon 2", INESB_HACKED }, +{ 0xbf8b22524e8329d9LL, (uint8_t*)"Ganbare Goemon Gaiden", INESB_HACKED }, +{ 0xa97041c3da0134e3LL, (uint8_t*)"Gegege no Kitarou 2", INESB_INCOMPLETE }, +{ 0x805db49a86db5449LL, (uint8_t*)"Goonies", INESB_HACKED }, +{ 0xc5abdaa65ac49b6bLL, (uint8_t*)"Gradius 2", INESB_HACKED }, +{ 0x04afae4ad480c11cLL, (uint8_t*)"Gradius 2", INESB_HACKED }, +{ 0x9b4bad37b5498992LL, (uint8_t*)"Gradius 2", INESB_HACKED }, +{ 0xb068d4ac10ef848eLL, (uint8_t*)"Highway Star", INESB_HACKED }, +{ 0xbf5175271e5019c3LL, (uint8_t*)"Kaiketsu Yanchamaru 3", INESB_HACKED }, +{ 0xfb4b508a236bbba3LL, (uint8_t*)"Salamander", INESB_HACKED }, +{ 0x1895afc6eef26c7dLL, (uint8_t*)"Super Mario Bros.", INESB_HACKED }, +{ 0x3716c4bebf885344LL, (uint8_t*)"Super Mario Bros.", INESB_HACKED }, +{ 0xfffda4407d80885aLL, (uint8_t*)"Sweet Home", INESB_CORRUPT }, +{ 0x103fc85d978b861bLL, (uint8_t*)"Sweet Home", INESB_CORRUPT }, +{ 0x7979dc51da86f19fLL, (uint8_t*)"110-in-1", INESB_CORRUPT }, +{ 0x001c0bb9c358252aLL, (uint8_t*)"110-in-1", INESB_CORRUPT }, { 0, 0, 0 } #endif diff --git a/src/ines.c b/src/ines.c index 50910c3..cc4d13e 100644 --- a/src/ines.c +++ b/src/ines.c @@ -367,7 +367,7 @@ static void CheckHInfo(void) { if (tofix & 1) sprintf(gigastr + strlen(gigastr), "The mapper number should be set to %d. ", MapperNo); if (tofix & 2) { - uint8 *mstr[3] = { "Horizontal", "Vertical", "Four-screen" }; + uint8 *mstr[3] = { (uint8_t*)"Horizontal", (uint8_t*)"Vertical", (uint8_t*)"Four-screen" }; sprintf(gigastr + strlen(gigastr), "Mirroring should be set to \"%s\". ", mstr[Mirroring & 3]); } if (tofix & 4) diff --git a/src/input/bworld.c b/src/input/bworld.c index d1bf57c..16e861d 100644 --- a/src/input/bworld.c +++ b/src/input/bworld.c @@ -52,8 +52,8 @@ static void FP_FASTAPASS(2) Update(void *data, int arg) { *(uint8*)data = 0; seq = ptr = 0; have = 1; - strcpy(bdata, (uint8*)data + 1); - strcpy(&bdata[13], "SUNSOFT"); + strcpy((char*)bdata, (const char*)((uint8*)data + 1)); + strcpy((char*)&bdata[13], "SUNSOFT"); } }