len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Doom: * Fix voicing numerous options as 'yes'. voice_id is an id, not a pointer. *Fix struct menu_item <-> struct opt_items messup (caused no problems but still...).

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14960 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Jens Arnold 2007-10-02 19:53:35 +00:00
parent 36a69c7a98
commit a4f0de0f9d
1 changed files with 20 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

40
apps/plugins/doom/rockdoom.c
View file

@ -309,7 +309,7 @@ int Dbuild_base (struct opt_items *names)
if ( !fileexists (wads_builtin[j]) ) if ( !fileexists (wads_builtin[j]) )
{ {
names[i].string=versions_builtin[j]; names[i].string=versions_builtin[j];
names[i].voice_id=0; names[i].voice_id=-1;
namemap[i]=j; namemap[i]=j;
i++; i++;
} }
@ -333,7 +333,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory
if(filedir==NULL) if(filedir==NULL)
{ {
temp=malloc(sizeof(struct opt_items)); temp=malloc(sizeof(struct menu_item));
temp[0].desc=firstentry; temp[0].desc=firstentry;
temp[0].function=0; temp[0].function=0;
*names=temp; *names=temp;
@ -349,7 +349,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory
filedir=rb->opendir(directory); filedir=rb->opendir(directory);
i++; i++;
temp=malloc(i*sizeof(struct opt_items)); temp=malloc(i*sizeof(struct menu_item));
temp[0].desc=firstentry; temp[0].desc=firstentry;
temp[0].function=0; temp[0].function=0;
i=1; i=1;
@ -447,23 +447,23 @@ int Oset_keys()
static const struct opt_items doomkeys[] = { static const struct opt_items doomkeys[] = {
{ "Unmapped", NULL }, { "Unmapped", -1 },
{ "Key Right", NULL }, { "Key Right", -1 },
{ "Key Left", NULL }, { "Key Left", -1 },
{ "Key Up", NULL }, { "Key Up", -1 },
{ "Key Down", NULL }, { "Key Down", -1 },
{ "Key Select", NULL }, { "Key Select", -1 },
#if defined(TOSHIBA_GIGABEAT_F) #if defined(TOSHIBA_GIGABEAT_F)
{ "Key A", NULL }, { "Key A", -1 },
{ "Key Menu", NULL }, { "Key Menu", -1 },
{ "Key Power", NULL }, { "Key Power", -1 },
{ "Key Volume Down", NULL }, { "Key Volume Down", -1 },
{ "Key Volume Up", NULL }, { "Key Volume Up", -1 },
#else #else
{ "Key Record", NULL }, { "Key Record", -1 },
{ "Key Mode", NULL }, { "Key Mode", -1 },
{ "Key Off", NULL }, { "Key Off", -1 },
{ "Key On", NULL }, { "Key On", -1 },
#endif #endif
}; };
@ -519,8 +519,8 @@ extern int fake_contrast;
static bool Doptions() static bool Doptions()
{ {
static const struct opt_items onoff[2] = { static const struct opt_items onoff[2] = {
{ "Off", NULL }, { "Off", -1 },
{ "On", NULL }, { "On", -1 },
}; };
int m, result; int m, result;