diff options
Diffstat (limited to 'Stars45/MenuScreen.cpp')
| -rw-r--r-- | Stars45/MenuScreen.cpp | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/Stars45/MenuScreen.cpp b/Stars45/MenuScreen.cpp index 6b8e89a..f45d2c5 100644 --- a/Stars45/MenuScreen.cpp +++ b/Stars45/MenuScreen.cpp @@ -7,7 +7,6 @@ */ -#include "MemDebug.h" #include "MenuScreen.h" #include "FormDef.h" @@ -100,118 +99,118 @@ MenuScreen::Setup(Screen* s) FormDef menu_def("MenuDlg", 0); menu_def.Load("MenuDlg"); - menudlg = new(__FILE__,__LINE__) MenuDlg(screen, menu_def, this); + menudlg = new MenuDlg(screen, menu_def, this); FormDef exit_def("ExitDlg", 0); exit_def.Load("ExitDlg"); - exitdlg = new(__FILE__,__LINE__) ExitDlg(screen, exit_def, this); + exitdlg = new ExitDlg(screen, exit_def, this); FormDef aud_def("AudDlg", 0); aud_def.Load("AudDlg"); - auddlg = new(__FILE__,__LINE__) AudDlg(screen, aud_def, this); + auddlg = new AudDlg(screen, aud_def, this); FormDef ctl_def("CtlDlg", 0); ctl_def.Load("CtlDlg"); - ctldlg = new(__FILE__,__LINE__) CtlDlg(screen, ctl_def, this); + ctldlg = new CtlDlg(screen, ctl_def, this); FormDef opt_def("OptDlg", 0); opt_def.Load("OptDlg"); - optdlg = new(__FILE__,__LINE__) OptDlg(screen, opt_def, this); + optdlg = new OptDlg(screen, opt_def, this); FormDef vid_def("VidDlg", 0); vid_def.Load("VidDlg"); - viddlg = new(__FILE__,__LINE__) VidDlg(screen, vid_def, this); + viddlg = new VidDlg(screen, vid_def, this); FormDef mod_def("ModDlg", 0); mod_def.Load("ModDlg"); - modDlg = new(__FILE__,__LINE__) ModDlg(screen, mod_def, this); + modDlg = new ModDlg(screen, mod_def, this); FormDef tac_ref_def("TacRefDlg", 0); tac_ref_def.Load("TacRefDlg"); - tacRefDlg = new(__FILE__,__LINE__) TacRefDlg(screen, tac_ref_def, this); + tacRefDlg = new TacRefDlg(screen, tac_ref_def, this); FormDef cmp_sel_def("CmpSelectDlg", 0); cmp_sel_def.Load("CmpSelectDlg"); - cmpSelectDlg = new(__FILE__,__LINE__) CmpSelectDlg(screen, cmp_sel_def, this); + cmpSelectDlg = new CmpSelectDlg(screen, cmp_sel_def, this); FormDef net_lobby_def("NetLobbyDlg", 0); net_lobby_def.Load("NetLobbyDlg"); - netLobbyDlg = new(__FILE__,__LINE__) NetLobbyDlg(screen, net_lobby_def, this); + netLobbyDlg = new NetLobbyDlg(screen, net_lobby_def, this); FormDef net_client_def("NetClientDlg", 0); net_client_def.Load("NetClientDlg"); - netClientDlg = new(__FILE__,__LINE__) NetClientDlg(screen, net_client_def, this); + netClientDlg = new NetClientDlg(screen, net_client_def, this); FormDef net_server_def("NetServerDlg", 0); net_server_def.Load("NetServerDlg"); - netServerDlg = new(__FILE__,__LINE__) NetServerDlg(screen, net_server_def, this); + netServerDlg = new NetServerDlg(screen, net_server_def, this); FormDef net_unit_def("NetUnitDlg", 0); net_unit_def.Load("NetUnitDlg"); - netUnitDlg = new(__FILE__,__LINE__) NetUnitDlg(screen, net_unit_def, this); + netUnitDlg = new NetUnitDlg(screen, net_unit_def, this); FormDef net_addr_def("NetAddrDlg", 0); net_addr_def.Load("NetAddrDlg"); - netAddrDlg = new(__FILE__,__LINE__) NetAddrDlg(screen, net_addr_def, this); + netAddrDlg = new NetAddrDlg(screen, net_addr_def, this); FormDef net_pass_def("NetPassDlg", 0); net_pass_def.Load("NetPassDlg"); - netPassDlg = new(__FILE__,__LINE__) NetPassDlg(screen, net_pass_def, this); + netPassDlg = new NetPassDlg(screen, net_pass_def, this); FormDef msn_edit_def("MsnEditDlg", 0); msn_edit_def.Load("MsnEditDlg"); - msnEditDlg = new(__FILE__,__LINE__) MsnEditDlg(screen, msn_edit_def, this); + msnEditDlg = new MsnEditDlg(screen, msn_edit_def, this); FormDef msn_nav_def("MsnEditNavDlg", 0); msn_nav_def.Load("MsnEditNavDlg"); - msnEditNavDlg = new(__FILE__,__LINE__) MsnEditNavDlg(screen, msn_nav_def, this); + msnEditNavDlg = new MsnEditNavDlg(screen, msn_nav_def, this); FormDef msn_elem_def("MsnElemDlg", 0); msn_elem_def.Load("MsnElemDlg"); - msnElemDlg = new(__FILE__,__LINE__) MsnElemDlg(screen, msn_elem_def, this); + msnElemDlg = new MsnElemDlg(screen, msn_elem_def, this); FormDef msn_event_def("MsnEventDlg", 0); msn_event_def.Load("MsnEventDlg"); - msnEventDlg = new(__FILE__,__LINE__) MsnEventDlg(screen, msn_event_def, this); + msnEventDlg = new MsnEventDlg(screen, msn_event_def, this); FormDef msn_def("MsnSelectDlg", 0); msn_def.Load("MsnSelectDlg"); - msnSelectDlg = new(__FILE__,__LINE__) MsnSelectDlg(screen, msn_def, this); + msnSelectDlg = new MsnSelectDlg(screen, msn_def, this); FormDef player_def("PlayerDlg", 0); player_def.Load("PlayerDlg"); - playdlg = new(__FILE__,__LINE__) PlayerDlg(screen, player_def, this); + playdlg = new PlayerDlg(screen, player_def, this); FormDef award_def("AwardDlg", 0); award_def.Load("AwardDlg"); - awarddlg = new(__FILE__,__LINE__) AwardShowDlg(screen, award_def, this); + awarddlg = new AwardShowDlg(screen, award_def, this); FormDef joy_def("JoyDlg", 0); joy_def.Load("JoyDlg"); - joydlg = new(__FILE__,__LINE__) JoyDlg(screen, joy_def, this); + joydlg = new JoyDlg(screen, joy_def, this); FormDef key_def("KeyDlg", 0); key_def.Load("KeyDlg"); - keydlg = new(__FILE__,__LINE__) KeyDlg(screen, key_def, this); + keydlg = new KeyDlg(screen, key_def, this); FormDef first_def("FirstTimeDlg", 0); first_def.Load("FirstTimeDlg"); - firstdlg = new(__FILE__,__LINE__) FirstTimeDlg(screen, first_def, this); + firstdlg = new FirstTimeDlg(screen, first_def, this); FormDef mod_info_def("ModInfoDlg", 0); mod_info_def.Load("ModInfoDlg"); - modInfoDlg = new(__FILE__,__LINE__) ModInfoDlg(screen, mod_info_def, this); + modInfoDlg = new ModInfoDlg(screen, mod_info_def, this); FormDef confirm_def("ConfirmDlg", 0); confirm_def.Load("ConfirmDlg"); - confirmdlg = new(__FILE__,__LINE__) ConfirmDlg(screen, confirm_def, this); + confirmdlg = new ConfirmDlg(screen, confirm_def, this); FormDef load_def("LoadDlg", 0); load_def.Load("LoadDlg"); - loadDlg = new(__FILE__,__LINE__) LoadDlg(screen, load_def); + loadDlg = new LoadDlg(screen, load_def); - fadewin = new(__FILE__,__LINE__) Window(screen, 0, 0, 1, 1); - fadeview = new(__FILE__,__LINE__) FadeView(fadewin, 2, 0, 0); + fadewin = new Window(screen, 0, 0, 1, 1); + fadeview = new FadeView(fadewin, 2, 0, 0); fadewin->AddView(fadeview); screen->AddWindow(fadewin); |