The-Homebrew-Cloud/WiiFlow_Lite
2
0
Fork 0
mirror of https://github.com/Fledge68/WiiFlow_Lite.git synced 2024-11-23 19:59:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

-updated english help file that source menu now opens with

Browse Source 
holding B button
-included english.txt in wiiflow now, it will be displayed by 
default if no other help file is found
This commit is contained in:
fix94.1 2012-06-21 13:08:58 +00:00
parent 149b4fb685
commit 087d2dd4b3
4 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Makefile
View File

@ -41,7 +41,8 @@ SOURCES := source \
DATA := data \
data/images \
data/sounds
data/sounds \
data/help
INCLUDES := source \
source/cheats \
@ -109,6 +110,8 @@ export CPPFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.cpp)))
sFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.s)))
SFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.S)))
TXTFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.txt)))
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.bin)))
TTFFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.ttf)))
PNGFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.png)))
@ -134,7 +137,8 @@ export OFILES := $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) \
$(sFILES:.s=.o) $(SFILES:.S=.o) \
$(TTFFILES:.ttf=.ttf.o) $(PNGFILES:.png=.png.o) $(DOLFILES:.dol=.dol.o) \
$(OGGFILES:.ogg=.ogg.o) $(PCMFILES:.pcm=.pcm.o) $(MP3FILES:.mp3=.mp3.o) \
$(WAVFILES:.wav=.wav.o) $(ELFFILES:.elf=.elf.o) $(BINFILES:.bin=.bin.o)
$(WAVFILES:.wav=.wav.o) $(ELFFILES:.elf=.elf.o) $(BINFILES:.bin=.bin.o) \
$(TXTFILES:.txt=.txt.o)
#---------------------------------------------------------------------------------
# build a list of include paths
@ -196,6 +200,13 @@ $(OUTPUT).elf: $(OFILES) alt_ios_gen.o
#---------------------------------------------------------------------------------
$(BUILD)/alt_ios_gen.o: alt_ios_gen.c
#---------------------------------------------------------------------------------
# This rule links in binary data with the .txt extension
#---------------------------------------------------------------------------------
%.txt.o: %.txt
@echo $(notdir $<)
@bin2s -a 32 $< | $(AS) -o $(@)
#---------------------------------------------------------------------------------
# This rule links in binary data with the .png extension
#---------------------------------------------------------------------------------

2
wii/wiiflow/help/english.txt → data/help/english.txt
View File

@ -22,7 +22,7 @@ Controls:
-- A on USB, DML, Channels, Emu, or Homebrew Icon = Switch to that view
-- B on USB, DML, Channels, Emu, or Homebrew Icon = Enable/Disable Emu-NAND and switch to Channels view
-- A on Home Icon = Exit to Wii menu
-- B on Home Icon = Display Source menu
-- Hold B for 3 seconds = Display Source menu
-- A on Disc Icon (Game Disc in Drive) = Launch game disc
-- A on Question Mark Icon = Display credits and this help file, and update WiiFlow

4
source/defines.h
View File

@ -23,8 +23,8 @@
#define AGE_LOCK_DEFAULT 13
#define DEVELOPERS "r-win, OverjoY, FIX94"
#define PAST_DEVELOPERS "Hibernatus, Narolez, Hulk, Miigotu"
#define DEVELOPERS "OverjoY, FIX94"
#define PAST_DEVELOPERS "Hibernatus, Narolez, Hulk, Miigotu, r-win"
#define LOADER_AUTHOR "Kwiirk, Waninkoko, Hermes"
#define GUI_AUTHOR "Hibernatus"

25
source/menu/menu_about.cpp
View File

@ -10,6 +10,9 @@
const int pixels_to_skip = 10;
extern const u8 english_txt[];
extern const u32 english_txt_size;
void CMenu::_about(void)
{
int amount_of_skips = 0;
@ -130,23 +133,20 @@ void CMenu::_textAbout(void)
m_btnMgr.setText(m_aboutBtnSystem, _t("sys4", L"Update"));
m_btnMgr.setText(m_aboutLblTitle, wfmt(_fmt("appname", L"%s (%s-r%s)"), APP_NAME, APP_VERSION, SVN_REV), false);
char *help = (char*)MEM2_alloc(4096 * sizeof(char));
memset(help, 0, sizeof(help));
wstringEx help_text;
FILE * f = fopen(fmt("%s/%s.txt", m_helpDir.c_str(), m_curLanguage.c_str()), "r");
if (f == NULL)
f = fopen(fmt("%s/english.txt", m_helpDir.c_str()), "r");
if (f == NULL)
strcpy(help, "ERROR: No Help File Found");
else
if(f)
{
char *help = (char*)MEM2_alloc(4096 * sizeof(char));
memset(help, 0, sizeof(help));
fread(help, 4095, 1, f);
help[4095] = 0;
help[4095] = '\0';
help_text.fromUTF8(help);
MEM2_free(help);
fclose(f);
}
wstringEx help_text;
help_text.fromUTF8(help);
else
help_text.fromUTF8((char*)english_txt);
wstringEx developers(wfmt(_fmt("about6", L"\nCurrent Developers:\n%s"), DEVELOPERS));
wstringEx pDevelopers(wfmt(_fmt("about7", L"Past Developers:\n%s"), PAST_DEVELOPERS));
@ -175,7 +175,6 @@ void CMenu::_textAbout(void)
false
);
MEM2_free(help);
Nand::Instance()->Disable_Emu();
iosinfo_t * iosInfo = cIOSInfo::GetInfo(mainIOS);