diff options
Diffstat (limited to 'Stars45/VideoDX9Enum.cpp')
| -rw-r--r-- | Stars45/VideoDX9Enum.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Stars45/VideoDX9Enum.cpp b/Stars45/VideoDX9Enum.cpp index 96f938a..c254513 100644 --- a/Stars45/VideoDX9Enum.cpp +++ b/Stars45/VideoDX9Enum.cpp @@ -11,7 +11,6 @@ Direct3D Video class for DirectX 9 */ -#include "MemDebug.h" #include "VideoDX9Enum.h" #include "VideoSettings.h" #include "Color.h" @@ -267,7 +266,7 @@ VideoDX9Enum::Enumerate() UINT num_adapters = d3d->GetAdapterCount(); for (UINT ordinal = 0; ordinal < num_adapters; ordinal++) { - adapter_info = new(__FILE__,__LINE__) VideoDX9AdapterInfo; + adapter_info = new VideoDX9AdapterInfo; if (!adapter_info) return E_OUTOFMEMORY; @@ -292,7 +291,7 @@ VideoDX9Enum::Enumerate() continue; } - VideoDX9DisplayMode* dx9_display_mode = new(__FILE__,__LINE__) VideoDX9DisplayMode(display_mode); + VideoDX9DisplayMode* dx9_display_mode = new VideoDX9DisplayMode(display_mode); if (!dx9_display_mode) { delete adapter_info; @@ -365,7 +364,7 @@ VideoDX9Enum::EnumerateDevices(VideoDX9AdapterInfo* adapter_info, std::vector<D3 VideoDX9DeviceInfo* device_info = 0; for (int i = 0; i < 3; i++ ) { - device_info = new(__FILE__,__LINE__) VideoDX9DeviceInfo; + device_info = new VideoDX9DeviceInfo; if (!device_info) return E_OUTOFMEMORY; @@ -455,7 +454,7 @@ VideoDX9Enum::EnumerateDeviceCombos(VideoDX9DeviceInfo* device_info, std::vector // multisample type, vertex processing type, and present interval. VideoDX9DeviceCombo* device_combo = 0; - device_combo = new(__FILE__,__LINE__) VideoDX9DeviceCombo; + device_combo = new VideoDX9DeviceCombo; if (!device_combo) return E_OUTOFMEMORY; @@ -593,7 +592,7 @@ VideoDX9Enum::BuildDSMSConflictList(VideoDX9DeviceCombo* device_combo) multisample_type, NULL))) { - VideoDX9FormatConflict* conflict = new(__FILE__,__LINE__) VideoDX9FormatConflict; + VideoDX9FormatConflict* conflict = new VideoDX9FormatConflict; conflict->ds_format = depth_format; conflict->multisample_type = multisample_type; |