diff options
Diffstat (limited to 'Stars45/HUDView.cpp')
| -rw-r--r-- | Stars45/HUDView.cpp | 55 |
1 files changed, 27 insertions, 28 deletions
diff --git a/Stars45/HUDView.cpp b/Stars45/HUDView.cpp index 6846b09..c280333 100644 --- a/Stars45/HUDView.cpp +++ b/Stars45/HUDView.cpp @@ -11,7 +11,6 @@ View class for Heads Up Display */ -#include "MemDebug.h" #include "HUDView.h" #include "HUDSounds.h" #include "Ship.h" @@ -426,23 +425,23 @@ show_warn(false), show_inst(false), inst_page(0) pitch_ladder_pos.SetType(Bitmap::BMP_TRANSLUCENT); pitch_ladder_neg.SetType(Bitmap::BMP_TRANSLUCENT); - hud_left_sprite = new(__FILE__,__LINE__) Sprite(&hud_left_fighter); - hud_right_sprite = new(__FILE__,__LINE__) Sprite(&hud_right_fighter); - instr_left_sprite = new(__FILE__,__LINE__) Sprite(&instr_left); - instr_right_sprite = new(__FILE__,__LINE__) Sprite(&instr_right); - warn_left_sprite = new(__FILE__,__LINE__) Sprite(&warn_left); - warn_right_sprite = new(__FILE__,__LINE__) Sprite(&warn_right); - icon_ship_sprite = new(__FILE__,__LINE__) Sprite(&icon_ship); - icon_target_sprite = new(__FILE__,__LINE__) Sprite(&icon_target); - fpm_sprite = new(__FILE__,__LINE__) Sprite(&fpm); - hpm_sprite = new(__FILE__,__LINE__) Sprite(&hpm); - lead_sprite = new(__FILE__,__LINE__) Sprite(&lead); - aim_sprite = new(__FILE__,__LINE__) Sprite(&cross); - tgt1_sprite = new(__FILE__,__LINE__) Sprite(&cross1); - tgt2_sprite = new(__FILE__,__LINE__) Sprite(&cross2); - tgt3_sprite = new(__FILE__,__LINE__) Sprite(&cross3); - tgt4_sprite = new(__FILE__,__LINE__) Sprite(&cross4); - chase_sprite = new(__FILE__,__LINE__) Sprite(&chase_left); + hud_left_sprite = new Sprite(&hud_left_fighter); + hud_right_sprite = new Sprite(&hud_right_fighter); + instr_left_sprite = new Sprite(&instr_left); + instr_right_sprite = new Sprite(&instr_right); + warn_left_sprite = new Sprite(&warn_left); + warn_right_sprite = new Sprite(&warn_right); + icon_ship_sprite = new Sprite(&icon_ship); + icon_target_sprite = new Sprite(&icon_target); + fpm_sprite = new Sprite(&fpm); + hpm_sprite = new Sprite(&hpm); + lead_sprite = new Sprite(&lead); + aim_sprite = new Sprite(&cross); + tgt1_sprite = new Sprite(&cross1); + tgt2_sprite = new Sprite(&cross2); + tgt3_sprite = new Sprite(&cross3); + tgt4_sprite = new Sprite(&cross4); + chase_sprite = new Sprite(&chase_left); ZeroMemory(hud_sprite, sizeof(hud_sprite)); @@ -468,7 +467,7 @@ show_warn(false), show_inst(false), inst_page(0) double UV[8]; for (i = 0; i < 15; i++) { - pitch_ladder[i] = new(__FILE__,__LINE__) Sprite(&pitch_ladder_pos); + pitch_ladder[i] = new Sprite(&pitch_ladder_pos); CopyMemory(UV, pitch_ladder_UV, sizeof(UV)); UV[1] = UV[3] = (pitch_ladder_UV[1] * (i )); @@ -482,7 +481,7 @@ show_warn(false), show_inst(false), inst_page(0) // zero mark at i=15 { - pitch_ladder[i] = new(__FILE__,__LINE__) Sprite(&pitch_ladder_pos); + pitch_ladder[i] = new Sprite(&pitch_ladder_pos); UV[0] = UV[6] = 0; UV[2] = UV[4] = 1; @@ -496,7 +495,7 @@ show_warn(false), show_inst(false), inst_page(0) } for (i = 16; i < 31; i++) { - pitch_ladder[i] = new(__FILE__,__LINE__) Sprite(&pitch_ladder_neg); + pitch_ladder[i] = new Sprite(&pitch_ladder_neg); CopyMemory(UV, pitch_ladder_UV, sizeof(UV)); UV[1] = UV[3] = (pitch_ladder_UV[1] * (30 - i )); @@ -509,7 +508,7 @@ show_warn(false), show_inst(false), inst_page(0) } for (i = 0; i < 3; i++) - mfd[i] = new(__FILE__,__LINE__) MFD(window, i); + mfd[i] = new MFD(window, i); mfd[0]->SetRect(Rect( 8, height - 136, 128, 128)); mfd[1]->SetRect(Rect(width - 136, height - 136, 128, 128)); @@ -604,10 +603,10 @@ show_warn(false), show_inst(false), inst_page(0) DataLoader* loader = DataLoader::GetLoader(); loader->SetDataPath("HUD/"); - az_ring = new(__FILE__,__LINE__) Solid; - az_pointer = new(__FILE__,__LINE__) Solid; - el_ring = new(__FILE__,__LINE__) Solid; - el_pointer = new(__FILE__,__LINE__) Solid; + az_ring = new Solid; + az_pointer = new Solid; + el_ring = new Solid; + el_pointer = new Solid; az_ring->Load("CompassRing.mag", compass_scale); az_pointer->Load("CompassPointer.mag", compass_scale); @@ -4155,7 +4154,7 @@ HUDView::PrepareBitmap(const char* name, Bitmap& img, BYTE*& shades) int w = img.Width(); int h = img.Height(); - shades = new(__FILE__,__LINE__) BYTE[w*h]; + shades = new BYTE[w*h]; for (int y = 0; y < h; y++) for (int x = 0; x < w; x++) @@ -4177,7 +4176,7 @@ HUDView::TransferBitmap(const Bitmap& src, Bitmap& img, BYTE*& shades) int w = img.Width(); int h = img.Height(); - shades = new(__FILE__,__LINE__) BYTE[w*h]; + shades = new BYTE[w*h]; for (int y = 0; y < h; y++) for (int x = 0; x < w; x++) |