- re-enable dvd_motor_off on GC

source/ngc/dvd.cpp

@@ -507,7 +507,7 @@ void uselessinquiry ()
  * dvd_motor_off( )
  * Turns off DVD drive motor so it doesn't make noise (Gamecube only)
  ***************************************************************************/
-void dvd_motor_off( )
+void dvd_motor_off ()
 {
 	dvd[0] = 0x2e;
 	dvd[1] = 0;

source/ngc/dvd.h

@@ -10,8 +10,8 @@
  * DVD I/O functions
  ***************************************************************************/
 
-#ifndef _NGCDVD_
-#define _NGCDVD_
+#ifndef _NGCDVD_H_
+#define _NGCDVD_H_
 
 int getpvd ();
 int ParseDVDdirectory ();
@@ -20,5 +20,8 @@ bool TestDVD();
 int dvd_read (void *dst, unsigned int len, u64 offset);
 bool SwitchDVDFolder(char dir[]);
 void SetDVDDriveType();
+#ifdef HW_DOL
+void dvd_motor_off ();
+#endif
 
 #endif

source/ngc/menu.cpp

@@ -1023,7 +1023,7 @@ ConfigureControllers ()
 /****************************************************************************
  * Main Menu
  ***************************************************************************/
-int menucount = 8;
+int menucount = 9;
 char menuitems[][50] = {
   "Choose Game", 
   "Controller Configuration", 
@@ -1031,6 +1031,7 @@ char menuitems[][50] = {
   "Game Menu",
   "Video Options",
   "Credits", 
+  "DVD Motor Off",
   "Reset System", 
   "Return to Loader"
 };
@@ -1046,6 +1047,11 @@ mainmenu (int selectedMenu)
     	menuitems[3][0] = '\0';
 	else
 		sprintf (menuitems[3], "Game Menu");
+		
+	#ifndef HW_DOL
+	// don't show dvd motor off on the wii
+	menuitems[6][0] = '\0';
+	#endif
 
 	VIDEO_WaitVSync ();
 
@@ -1093,13 +1099,20 @@ mainmenu (int selectedMenu)
 				Credits ();
 				WaitButtonA ();
                 break;
-
+				
 			case 6:
+				// turn the dvd motor off (GC only)
+				#ifdef HW_DOL
+				dvd_motor_off ();
+				#endif
+				break;
+
+			case 7:
 				// Reset the Gamecube/Wii
 			    Reboot();
                 break;
 
-			case 7:
+			case 8:
 				// Exit to Loader
 				#ifdef HW_RVL
 					#ifdef WII_DVD