summaryrefslogtreecommitdiffhomepage
path: root/Stars45/GameScreen.cpp
diff options
context:
space:
mode:
authorAki <please@ignore.pl>2022-03-27 17:42:26 +0200
committerAki <please@ignore.pl>2022-03-27 17:42:26 +0200
commita12e588079700d55a0b788fea2df7727c2e41f52 (patch)
tree690072569624c73af5043b3619acaab4d298b1fa /Stars45/GameScreen.cpp
parent72bb517271dad40a440533ad0796a88247011199 (diff)
downloadstarshatter-a12e588079700d55a0b788fea2df7727c2e41f52.zip
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.gz
starshatter-a12e588079700d55a0b788fea2df7727c2e41f52.tar.bz2
Removed MemDebug from FoundationEx
Diffstat (limited to 'Stars45/GameScreen.cpp')
-rw-r--r--Stars45/GameScreen.cpp43
1 files changed, 21 insertions, 22 deletions
diff --git a/Stars45/GameScreen.cpp b/Stars45/GameScreen.cpp
index 353db2d..87ce925 100644
--- a/Stars45/GameScreen.cpp
+++ b/Stars45/GameScreen.cpp
@@ -7,7 +7,6 @@
*/
-#include "MemDebug.h"
#include "GameScreen.h"
#include "Sim.h"
@@ -71,7 +70,7 @@ viddlg(0), moddlg(0), modInfoDlg(0),
flare1(0), flare2(0), flare3(0), flare4(0),
optdlg(0), cam_dir(0), sim(0)
{
- cam_dir = new(__FILE__,__LINE__) CameraDirector;
+ cam_dir = new CameraDirector;
sim = Sim::GetSim();
loader = DataLoader::GetLoader();
@@ -109,40 +108,40 @@ GameScreen::Setup(Screen* s)
loader->UseFileSystem(true);
// create windows
- gamewin = new(__FILE__,__LINE__) Window(screen, 0, 0, screen->Width(), screen->Height());
+ gamewin = new Window(screen, 0, 0, screen->Width(), screen->Height());
// attach views to windows (back to front)
// fade in:
- gamewin->AddView(new(__FILE__,__LINE__) FadeView(gamewin, 1, 0, 0));
+ gamewin->AddView(new FadeView(gamewin, 1, 0, 0));
// camera:
cam_dir = CameraDirector::GetInstance();
- cam_view = new(__FILE__,__LINE__) CameraView(gamewin, cam_dir->GetCamera(), 0);
+ cam_view = new CameraView(gamewin, cam_dir->GetCamera(), 0);
if (cam_view)
gamewin->AddView(cam_view);
// HUD:
- hud_view = new(__FILE__,__LINE__) HUDView(gamewin);
+ hud_view = new HUDView(gamewin);
gamewin->AddView(hud_view);
- wep_view = new(__FILE__,__LINE__) WepView(gamewin);
+ wep_view = new WepView(gamewin);
gamewin->AddView(wep_view);
- quantum_view = new(__FILE__,__LINE__) QuantumView(gamewin);
+ quantum_view = new QuantumView(gamewin);
gamewin->AddView(quantum_view);
- radio_view = new(__FILE__,__LINE__) RadioView(gamewin);
+ radio_view = new RadioView(gamewin);
gamewin->AddView(radio_view);
- tac_view = new(__FILE__,__LINE__) TacticalView(gamewin, this);
+ tac_view = new TacticalView(gamewin, this);
gamewin->AddView(tac_view);
disp_view = DisplayView::GetInstance();
// note: quit view must be last in chain
// so it can release window surface
- quit_view = new(__FILE__,__LINE__) QuitView(gamewin);
+ quit_view = new QuitView(gamewin);
gamewin->AddView(quit_view);
Starshatter* stars = Starshatter::GetInstance();
@@ -163,47 +162,47 @@ GameScreen::Setup(Screen* s)
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 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 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 nav_def("NavDlg", 0);
nav_def.Load("NavDlg");
- navdlg = new(__FILE__,__LINE__) NavDlg(screen, nav_def, this);
+ navdlg = new NavDlg(screen, nav_def, this);
FormDef eng_def("EngDlg", 0);
eng_def.Load("EngDlg");
- engdlg = new(__FILE__,__LINE__) EngDlg(screen, eng_def, this);
+ engdlg = new EngDlg(screen, eng_def, this);
FormDef flt_def("FltDlg", 0);
flt_def.Load("FltDlg");
- fltdlg = new(__FILE__,__LINE__) FltDlg(screen, flt_def, this);
+ fltdlg = new FltDlg(screen, flt_def, this);
if (engdlg) engdlg->Hide();
if (fltdlg) fltdlg->Hide();