diff options
Diffstat (limited to 'apps')
-rw-r--r-- | apps/plugins/doom/rockdoom.c | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/apps/plugins/doom/rockdoom.c b/apps/plugins/doom/rockdoom.c index a9e348160f..104d3227f6 100644 --- a/apps/plugins/doom/rockdoom.c +++ b/apps/plugins/doom/rockdoom.c | |||
@@ -309,7 +309,7 @@ int Dbuild_base (struct opt_items *names) | |||
309 | if ( !fileexists (wads_builtin[j]) ) | 309 | if ( !fileexists (wads_builtin[j]) ) |
310 | { | 310 | { |
311 | names[i].string=versions_builtin[j]; | 311 | names[i].string=versions_builtin[j]; |
312 | names[i].voice_id=0; | 312 | names[i].voice_id=-1; |
313 | namemap[i]=j; | 313 | namemap[i]=j; |
314 | i++; | 314 | i++; |
315 | } | 315 | } |
@@ -333,7 +333,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory | |||
333 | 333 | ||
334 | if(filedir==NULL) | 334 | if(filedir==NULL) |
335 | { | 335 | { |
336 | temp=malloc(sizeof(struct opt_items)); | 336 | temp=malloc(sizeof(struct menu_item)); |
337 | temp[0].desc=firstentry; | 337 | temp[0].desc=firstentry; |
338 | temp[0].function=0; | 338 | temp[0].function=0; |
339 | *names=temp; | 339 | *names=temp; |
@@ -349,7 +349,7 @@ int Dbuild_filelistm(struct menu_item **names, char *firstentry, char *directory | |||
349 | filedir=rb->opendir(directory); | 349 | filedir=rb->opendir(directory); |
350 | 350 | ||
351 | i++; | 351 | i++; |
352 | temp=malloc(i*sizeof(struct opt_items)); | 352 | temp=malloc(i*sizeof(struct menu_item)); |
353 | temp[0].desc=firstentry; | 353 | temp[0].desc=firstentry; |
354 | temp[0].function=0; | 354 | temp[0].function=0; |
355 | i=1; | 355 | i=1; |
@@ -447,23 +447,23 @@ int Oset_keys() | |||
447 | 447 | ||
448 | 448 | ||
449 | static const struct opt_items doomkeys[] = { | 449 | static const struct opt_items doomkeys[] = { |
450 | { "Unmapped", NULL }, | 450 | { "Unmapped", -1 }, |
451 | { "Key Right", NULL }, | 451 | { "Key Right", -1 }, |
452 | { "Key Left", NULL }, | 452 | { "Key Left", -1 }, |
453 | { "Key Up", NULL }, | 453 | { "Key Up", -1 }, |
454 | { "Key Down", NULL }, | 454 | { "Key Down", -1 }, |
455 | { "Key Select", NULL }, | 455 | { "Key Select", -1 }, |
456 | #if defined(TOSHIBA_GIGABEAT_F) | 456 | #if defined(TOSHIBA_GIGABEAT_F) |
457 | { "Key A", NULL }, | 457 | { "Key A", -1 }, |
458 | { "Key Menu", NULL }, | 458 | { "Key Menu", -1 }, |
459 | { "Key Power", NULL }, | 459 | { "Key Power", -1 }, |
460 | { "Key Volume Down", NULL }, | 460 | { "Key Volume Down", -1 }, |
461 | { "Key Volume Up", NULL }, | 461 | { "Key Volume Up", -1 }, |
462 | #else | 462 | #else |
463 | { "Key Record", NULL }, | 463 | { "Key Record", -1 }, |
464 | { "Key Mode", NULL }, | 464 | { "Key Mode", -1 }, |
465 | { "Key Off", NULL }, | 465 | { "Key Off", -1 }, |
466 | { "Key On", NULL }, | 466 | { "Key On", -1 }, |
467 | #endif | 467 | #endif |
468 | }; | 468 | }; |
469 | 469 | ||
@@ -519,8 +519,8 @@ extern int fake_contrast; | |||
519 | static bool Doptions() | 519 | static bool Doptions() |
520 | { | 520 | { |
521 | static const struct opt_items onoff[2] = { | 521 | static const struct opt_items onoff[2] = { |
522 | { "Off", NULL }, | 522 | { "Off", -1 }, |
523 | { "On", NULL }, | 523 | { "On", -1 }, |
524 | }; | 524 | }; |
525 | 525 | ||
526 | int m, result; | 526 | int m, result; |