diff --git a/Screens.cpp b/Screens.cpp index 62d90a0d..61e36800 100644 --- a/Screens.cpp +++ b/Screens.cpp @@ -57,7 +57,6 @@ Screens GameScreens[MAX_SCREENS] = { AutoResolveScreenInit, AutoResolveScreenHandle, AutoResolveScreenShutdown }, { SaveLoadScreenInit, SaveLoadScreenHandle, SaveLoadScreenShutdown }, { OptionsScreenInit, OptionsScreenHandle, OptionsScreenShutdown }, - { FeaturesScreen::Init, FeaturesScreen::Handle, FeaturesScreen::Shutdown }, { ShopKeeperScreenInit, ShopKeeperScreenHandle, ShopKeeperScreenShutdown }, { SexScreenInit, SexScreenHandle, SexScreenShutdown }, { GameInitOptionsScreenInit, GameInitOptionsScreenHandle, GameInitOptionsScreenShutdown }, @@ -71,6 +70,7 @@ Screens GameScreens[MAX_SCREENS] = { MPConnectScreenInit, MPConnectScreenHandle, MPConnectScreenShutdown }, // OJW - 20090422 { MiniGameScreenInit, MiniGameScreenHandle, MiniGameScreenShutdown }, // added by Flugente + { FeaturesScreen::Init, FeaturesScreen::Handle, FeaturesScreen::Shutdown }, //rftr #ifdef JA2BETAVERSION { AIViewerScreenInit, AIViewerScreenHandle, AIViewerScreenShutdown }, diff --git a/screenids.h b/screenids.h index 38907db7..047ad188 100644 --- a/screenids.h +++ b/screenids.h @@ -22,7 +22,6 @@ enum ScreenTypes AUTORESOLVE_SCREEN, SAVE_LOAD_SCREEN, OPTIONS_SCREEN, - FEATURES_SCREEN, SHOPKEEPER_SCREEN, SEX_SCREEN, GAME_INIT_OPTIONS_SCREEN, @@ -35,6 +34,7 @@ enum ScreenTypes MP_CHAT_SCREEN, // OJW - 20090315 MP_CONNECT_SCREEN, //OJW - 20090422 MINIGAME_SCREEN, // Flugente + FEATURES_SCREEN, //rftr #ifdef JA2BETAVERSION AIVIEWER_SCREEN,