@@ -1869,93 +1869,89 @@ void menuCheckButton()
1869
1869
}
1870
1870
case A:
1871
1871
{
1872
- switch (tempCurrentMenuOption)
1872
+ if ((tempCurrentMenuOption == 0 ) &&
1873
+ (tempSelectedOption == 0 ))
1873
1874
{
1874
- case 0 :
1875
- {
1876
- // Go back to the previous menu
1877
- CurrentMenu = tempPreviousMenu;
1878
- resetMenu ();
1879
- break ;
1880
- }
1881
- default :
1875
+ // Go back to the previous menu
1876
+ CurrentMenu = tempPreviousMenu;
1877
+ resetMenu ();
1878
+ }
1879
+ else
1880
+ {
1881
+ switch (tempSelectedOption)
1882
1882
{
1883
- switch (tempSelectedOption)
1883
+ case 0 :
1884
1884
{
1885
- case 0 :
1886
- {
1887
- SelectedOption = tempCurrentMenuOption ;
1888
- Timer = 0 ;
1889
- CurrentMenuOption = 0 ;
1890
- break ;
1891
- }
1892
- default :
1885
+ SelectedOption = tempCurrentMenuOption;
1886
+ Timer = 0 ;
1887
+ CurrentMenuOption = 0 ;
1888
+ break ;
1889
+ }
1890
+ default :
1891
+ {
1892
+ switch (tempCurrentMenuOption)
1893
1893
{
1894
- switch (tempCurrentMenuOption)
1894
+ case PIT_OF_100_TRIALS:
1895
1895
{
1896
- case PIT_OF_100_TRIALS:
1896
+ switch (tempMenuSelectedOption)
1897
1897
{
1898
- switch (tempMenuSelectedOption)
1898
+ case 0 :
1899
1899
{
1900
- case 0 :
1900
+ if ( checkIfInGame ())
1901
1901
{
1902
- if (checkIfInGame ())
1903
- {
1904
- Timer = 0 ;
1905
- MenuSelectedOption = SELECTING_VALUE;
1902
+ Timer = 0 ;
1903
+ MenuSelectedOption = SELECTING_VALUE;
1904
+
1905
+ SecondaryMenuOption = getHighestAdjustableValueDigit (
1906
+ tempCurrentMenu) - 1 ;
1906
1907
1907
- SecondaryMenuOption = getHighestAdjustableValueDigit (
1908
- tempCurrentMenu) - 1 ;
1909
-
1910
- MenuSecondaryValue = getCurrentPitFloor ();
1911
- }
1912
- else
1913
- {
1914
- FunctionReturnCode = NOT_IN_GAME;
1915
- Timer = secondsToFrames (3 );
1916
- }
1917
- break ;
1908
+ MenuSecondaryValue = getCurrentPitFloor ();
1918
1909
}
1919
- default :
1910
+ else
1920
1911
{
1921
- break ;
1912
+ FunctionReturnCode = NOT_IN_GAME;
1913
+ Timer = secondsToFrames (3 );
1922
1914
}
1915
+ break ;
1916
+ }
1917
+ default :
1918
+ {
1919
+ break ;
1923
1920
}
1924
- break ;
1925
1921
}
1926
- default :
1922
+ break ;
1923
+ }
1924
+ default :
1925
+ {
1926
+ // Warp to the currently selected map and close the menu
1927
+ int32_t ReturnCode = warpToMap (tempCurrentMenuOption);
1928
+ switch (ReturnCode)
1927
1929
{
1928
- // Warp to the currently selected map and close the menu
1929
- int32_t ReturnCode = warpToMap (tempCurrentMenuOption);
1930
- switch (ReturnCode)
1930
+ case UNKNOWN_BEHAVIOR:
1931
1931
{
1932
- case UNKNOWN_BEHAVIOR:
1933
- {
1934
- break ;
1935
- }
1936
- case SUCCESS:
1937
- {
1938
- closeMenu ();
1939
- return ;
1940
- }
1941
- case NOT_IN_GAME:
1942
- {
1943
- FunctionReturnCode = ReturnCode;
1944
- Timer = secondsToFrames (3 );
1945
- break ;
1946
- }
1947
- default :
1948
- {
1949
- break ;
1950
- }
1932
+ break ;
1933
+ }
1934
+ case SUCCESS:
1935
+ {
1936
+ closeMenu ();
1937
+ return ;
1938
+ }
1939
+ case NOT_IN_GAME:
1940
+ {
1941
+ FunctionReturnCode = ReturnCode;
1942
+ Timer = secondsToFrames (3 );
1943
+ break ;
1944
+ }
1945
+ default :
1946
+ {
1947
+ break ;
1951
1948
}
1952
- break ;
1953
1949
}
1950
+ break ;
1954
1951
}
1955
- break ;
1956
1952
}
1953
+ break ;
1957
1954
}
1958
- break ;
1959
1955
}
1960
1956
}
1961
1957
break ;
0 commit comments