* Remove most unused WIN32 stuff.

[matthijs/ABM2.git] / ABM2 / Playground.cpp

diff --git a/ABM2/Playground.cpp b/ABM2/Playground.cpp
index 358262fa400dffc85e9324dfcd52694f6c1362ef..38c905f9907d117325c924dfadf071b1888c7440 100755 (executable)
--- a/ABM2/Playground.cpp
+++ b/ABM2/Playground.cpp
@@ -4,71 +4,10 @@
 #include "Engine/VideoUpdate.h"\r
 #include "SchemeReader.h"\r
 \r
-#if WIN32\r
-LPD3DXSPRITE d3dspt;\r
-LPD3DXFONT font;\r
-\r
-#endif\r
-\r
 Playground::Playground(CKernel* kernel) : ITask(kernel) { }\r
 \r
 bool Playground::Start()\r
 {\r
-       #if WIN32\r
-       background = NULL;\r
-       foreground = NULL;\r
-       font = NULL;\r
-       HRESULT res;\r
-\r
-       D3DXCreateSprite(d3ddev, &d3dspt);    // create the Direct3D Sprite object\r
-       res = D3DXCreateFont(d3ddev, 15, 10, 0, 1, false, 0, OUT_TT_ONLY_PRECIS, 0, 0, L"times new roman", &font);\r
-       if (res != S_OK)\r
-       {\r
-               switch (res)\r
-               {\r
-                       case D3DERR_INVALIDCALL:\r
-                               foreground = NULL;\r
-                               break;\r
-                       case D3DXERR_INVALIDDATA:\r
-                               foreground = NULL;\r
-                               break;\r
-                       case E_OUTOFMEMORY:\r
-                               foreground = NULL;\r
-                               break;\r
-                       default:\r
-                               foreground = NULL;\r
-               }\r
-       }\r
-\r
-       res = D3DXCreateTextureFromFile(d3ddev, L"data/field0.png", &background);\r
-       //res = D3DXCreateTextureFromFile(d3ddev, L"data/tiles0.png", &foreground);\r
-       res = D3DXCreateTextureFromFileEx(d3ddev, L"data/tiles0.png", D3DX_DEFAULT, D3DX_DEFAULT, 1, 0, D3DFMT_UNKNOWN,\r
-               D3DPOOL_DEFAULT ,D3DX_DEFAULT, D3DX_DEFAULT, D3DCOLOR_ARGB(0, 248, 0, 248), NULL, NULL, &foreground);\r
-       if (res != D3D_OK)\r
-       {\r
-               switch (res)\r
-               {\r
-                       case D3DERR_NOTAVAILABLE:\r
-                               foreground = NULL;\r
-                               break;\r
-                       case D3DERR_OUTOFVIDEOMEMORY:\r
-                               foreground = NULL;\r
-                               break;\r
-                       case D3DERR_INVALIDCALL:\r
-                               foreground = NULL;\r
-                               break;\r
-                       case D3DXERR_INVALIDDATA:\r
-                               foreground = NULL;\r
-                               break;\r
-                       case E_OUTOFMEMORY:\r
-                               foreground = NULL;\r
-                               break;\r
-                       default:\r
-                               foreground = NULL;\r
-               }\r
-       }\r
-\r
-       #endif\r
        // init playing field\r
        SchemeReader *scheme = new SchemeReader("Data/schemes/BASIC.SCH");\r
 \r
@@ -182,12 +121,6 @@ void Playground::Stop()
                        if (field[i][j] != NULL) delete field[i][j];\r
 \r
        if (bomberman != NULL) delete bomberman;\r
-       #ifdef WIN32\r
-       if (background != NULL) background->Release();\r
-       if (foreground != NULL) foreground->Release();\r
-       if (d3dspt != NULL) d3dspt->Release();\r
-       if (font != NULL) font->Release();\r
-       #endif // WIN32\r
 }\r
 \r
 void Playground::move_down()\r
@@ -507,11 +440,5 @@ void Tile::Draw()
                PLAYGROUND_BORDER_TOP + this->row * FIELD_UNIT_HEIGHT,\r
                1.0, 1.0, this->subsprite, 0, COLOUR_RGBA(255, 255, 255, 255)\r
        );\r
-#ifdef WIN32\r
-       D3DXVECTOR3 center(0.0f, 0.0f, 0.0f);    // center at the upper-left corner\r
-       D3DXVECTOR3 position((FLOAT)PLAYGROUND_BORDER_LEFT+subitem_width*col, (FLOAT)PLAYGROUND_BORDER_TOP+subitem_height*row, 0.0f);    // position at 50, 50 with no depth\r
-       RECT rect = {tex_num*subitem_width,0,(tex_num+1)*subitem_width,subitem_height};\r
-       d3dspt->Draw(texture, &rect, &center, &position, D3DCOLOR_ARGB(255, 255,255,255));\r
-#endif // WIN32\r
 }\r
 \r