From dc34b2554251811dcb36570db2408f8fa5f073b2 Mon Sep 17 00:00:00 2001 From: "e.bovendeur" Date: Sun, 20 Dec 2009 18:28:30 +0000 Subject: [PATCH] Fixed online gaming. Removed some warnings when compiling with R19 --- source/libwiigui/gui.h | 10 +++++----- source/menu.cpp | 2 +- source/unzip/unzip.c | 4 ++-- source/usbloader/apploader.c | 4 +--- source/usbloader/wbfs_fat.c | 4 ++-- 5 files changed, 11 insertions(+), 13 deletions(-) diff --git a/source/libwiigui/gui.h b/source/libwiigui/gui.h index 9d9f8854..83b62db9 100644 --- a/source/libwiigui/gui.h +++ b/source/libwiigui/gui.h @@ -1014,7 +1014,7 @@ class GuiNumpad : public GuiWindow char kbtextstr[256]; protected: u32 kbtextmaxlen; - char keys[10]; + char keys[11]; GuiText * kbText; GuiImage * keyTextboxImg; @@ -1026,10 +1026,10 @@ class GuiNumpad : public GuiWindow GuiImage * keyClearImg; GuiImage * keyClearOverImg; GuiButton * keyClear; - GuiButton * keyBtn[10]; - GuiImage * keyImg[10]; - GuiImage * keyImgOver[10]; - GuiText * keyTxt[10]; + GuiButton * keyBtn[11]; + GuiImage * keyImg[11]; + GuiImage * keyImgOver[11]; + GuiText * keyTxt[11]; GuiImageData * keyTextbox; GuiImageData * keyMedium; GuiImageData * keyMediumOver; diff --git a/source/menu.cpp b/source/menu.cpp index 09aecc6f..4b268cd3 100644 --- a/source/menu.cpp +++ b/source/menu.cpp @@ -466,7 +466,7 @@ int MainMenu(int menu) { if (load_from_fs != PART_FS_WBFS && ios2 == 249) { ios2 = 222; } - bool onlinefix = load_from_fs != PART_FS_WBFS && ShutdownWC24(); + bool onlinefix = ShutdownWC24(); // You cannot reload ios when loading from fat if (IOS_GetVersion() != ios2 || onlinefix) { diff --git a/source/unzip/unzip.c b/source/unzip/unzip.c index d473c429..2d30ea9b 100644 --- a/source/unzip/unzip.c +++ b/source/unzip/unzip.c @@ -198,7 +198,7 @@ voidpf filestream; uLong *pX; { uLong x ; - int i; + int i = 0; int err; err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); @@ -226,7 +226,7 @@ voidpf filestream; uLong *pX; { uLong x ; - int i; + int i = 0; int err; err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i); diff --git a/source/usbloader/apploader.c b/source/usbloader/apploader.c index 76debeb8..a6e37831 100644 --- a/source/usbloader/apploader.c +++ b/source/usbloader/apploader.c @@ -346,9 +346,7 @@ void gamepatches(void * dst, int len, u8 videoSelected, u8 patchcountrystring, u NewSuperMarioBrosPatch(dst, len); - //gprintf("\nLoading WIP Patch..."); - u32 ret = do_wip_code((u8 *)0x80000000); - //gprintf("done\n", ret); + do_wip_code((u8 *)0x80000000); //if(Settings.anti002fix == on) diff --git a/source/usbloader/wbfs_fat.c b/source/usbloader/wbfs_fat.c index 1ad2f839..4006d22d 100644 --- a/source/usbloader/wbfs_fat.c +++ b/source/usbloader/wbfs_fat.c @@ -53,7 +53,7 @@ bool is_gameid(char *id) { int i; for (i=0; i<6; i++) { - if (!isalnum(id[i])) return false; + if (!isalnum((u32) id[i])) return false; } return true; } @@ -339,7 +339,7 @@ void mk_gameid_title(struct discHdr *header, char *name, int re_space) // replace silly chars with '_' len = strlen(name); for (i = 0; i < len; i++) { - if(strchr("\\/:<>|\"", name[i]) || iscntrl(name[i])) { + if(strchr("\\/:<>|\"", name[i]) || iscntrl((u32) name[i])) { name[i] = '_'; } if(re_space && name[i]==' ') {