fixed layout of main menu and added exit button to the options menu. Checkbox screenobjects now exist but are never used.

Author: Sploder12

Globals.h

@@ -20,6 +20,8 @@ class globals {
 	static Button* Options;
 	static Button* Exit;
 
+	static Button* ExitOps;
+
 	static std::vector<screenObject*> g_ScreenObjects;
 	static level* g_level;
 	static player* g_player;

globals.cpp

@@ -16,6 +16,9 @@ Button* globals::Resume;
 Button* globals::Options;
 Button* globals::Exit;
 
+//option buttons
+Button* globals::ExitOps;
+
 std::vector<screenObject*> globals::g_ScreenObjects;
 level* globals::g_level;
 player* globals::g_player;

paint.cpp

@@ -70,6 +70,12 @@ void pnt(HWND hWnd, RECT* region)
 		temprect.top = ((temprect.bottom + temprect.top) / 2) - 8;
 		drawText(&buffer, globals::End->text, temprect, globals::End->txtFlag, tempCol);
 		break;
+	case 1:
+		tempCol = globals::ExitOps->draw(&buffer, globals::g_mouseX, globals::g_mouseY, globals::g_mouseDown);
+		temprect = globals::ExitOps->rect;
+		temprect.top = ((temprect.bottom + temprect.top) / 2) - 8;
+		drawText(&buffer, globals::ExitOps->text, temprect, globals::ExitOps->txtFlag, tempCol);
+		break;
 	case 2:
 		tempCol = globals::Resume->draw(&buffer, globals::g_mouseX, globals::g_mouseY, globals::g_mouseDown);
 		temprect = globals::Resume->rect;

screenObjects.cpp

@@ -98,6 +98,68 @@ struct Button : public screenObject
 	}
 };
 
+struct CheckBox : public screenObject
+{
+	bool* valPtr;
+
+	CheckBox(RECT rect, COLORREF color, bool * valPtr, std::string txt = "", unsigned int txtFlag = 1, bool debug = false) :
+		screenObject(rect, color, txt, txtFlag, debug), valPtr(valPtr) {}
+
+	void screenObject::press(int n)
+	{
+		*this->valPtr = !*(this->valPtr);
+	}
+
+	COLORREF screenObject::draw(HDC* hdc, long mousX, long mouseY, bool mouseDown)
+	{
+		COLORREF tempcolor = this->color;
+		HBRUSH brush = NULL;
+		if (this->active)
+		{
+			if (this->Touching(mousX, mouseY))
+			{
+				if (mouseDown)
+				{
+					tempcolor = RGB(GetRValue(this->color) - 20, GetGValue(this->color) - 20, GetBValue(this->color) - 20);
+					brush = CreateSolidBrush(tempcolor);
+					if (*this->valPtr)
+						FillRect(*hdc, &this->rect, brush);
+					else
+						FrameRect(*hdc, &this->rect, brush);
+				}
+				else
+				{
+					tempcolor = RGB(GetRValue(this->color) + 15, GetGValue(this->color) + 15, GetBValue(this->color) + 15);
+					brush = CreateSolidBrush(tempcolor);
+					if (*this->valPtr)
+						FillRect(*hdc, &this->rect, brush);
+					else
+						FrameRect(*hdc, &this->rect, brush);
+				}
+			}
+			else
+			{
+				brush = CreateSolidBrush(this->color);
+				if (*this->valPtr)
+					FillRect(*hdc, &this->rect, brush);
+				else
+					FrameRect(*hdc, &this->rect, brush);
+			}
+		}
+		else
+		{
+			tempcolor = RGB(GetRValue(this->color) - 25, GetGValue(this->color) - 25, GetBValue(this->color) - 25);
+			brush = CreateSolidBrush(tempcolor);
+			if (*this->valPtr)
+				FillRect(*hdc, &this->rect, brush);
+			else
+				FrameRect(*hdc, &this->rect, brush);
+		}
+		DeleteObject(brush);
+		return tempcolor;
+	}
+};
+
 struct Text : public screenObject
 {
 	Text(RECT rect, COLORREF color, std::string txt, unsigned int txtFlag = 1, bool debug = false) :
@@ -279,7 +341,6 @@ struct level : public screenObject
 {
 	stage* foreground = nullptr; //THESE ARE POINTERS TO ARRAYS
 	stage* background = nullptr;
-	unsigned int varienceFactor = 1;
 	unsigned char lw = 0; //width of level (in stages)
 	unsigned char lh = 0; //height of level (in stages)
 	unsigned char startCX;
@@ -535,7 +596,7 @@ struct player : public screenObject
 		file.open("player.dt");
 		if (file.is_open())
 		{
-			file << "LVL:" + std::to_string(this->lvl);
+			file << "LVL:" << this->lvl;
 			file.close();
 			return true;
 		}

taptapsound.cpp

@@ -12,6 +12,10 @@ HWND wnd;                                      // current window
 WCHAR szTitle[MAX_LOADSTRING];                  // The title bar text
 WCHAR szWindowClass[MAX_LOADSTRING];            // the main window class name
 
+HBITMAP MMenu;
+HBITMAP Paused;
+HBITMAP Options;
+
 HBITMAP TSimg;
 HBITMAP TSmask;
 HBITMAP playerSprite;
@@ -177,9 +181,10 @@ Text* modtxt1 = new Text(createRECT(0, 75, 250, 18), RGB(255, 255, 255), "Shifti
 Text* modtxt2 = new Text(createRECT(0, 92, 250, 18), RGB(255, 255, 255), "Control: " + std::to_string(globals::g_modKeys.at(VK_CONTROL)), DT_LEFT, true);
 Text* modtxt3 = new Text(createRECT(0, 109, 250, 18), RGB(255, 255, 255), "Tab: " + std::to_string(globals::g_modKeys.at(VK_TAB)), DT_LEFT, true);
 
-Text* debugtxt = new Text(createRECT(0, 140, 250, 18), RGB(255, 255, 255), "Debug: " + std::to_string(globals::g_debug), DT_LEFT, true);
+Text* debugtxt = new Text(createRECT(0, 130, 250, 18), RGB(255, 255, 255), "Debug: " + std::to_string(globals::g_debug), DT_LEFT, true);
 
-Text* fpstxt = new Text(createRECT(0, 165, 250, 18), RGB(255, 255, 255), "FPS: " + std::to_string(globals::g_fps), DT_LEFT, true);
+Text* fpstxt = new Text(createRECT(0, 150, 250, 18), RGB(255, 255, 255), "FPS: " + std::to_string(globals::g_fps), DT_LEFT, true);
+Text* Afpstxt = new Text(createRECT(0, 168, 250, 18), RGB(255, 255, 255), "AFPS: " + std::to_string(globals::g_fps), DT_LEFT, true);
 
 Image* mousebox = new Image(createRECT(0, 0, 64, 64), mouseSpriteU);
 
@@ -217,6 +222,8 @@ void end(int n)
     delete globals::Options;
     delete globals::Exit;
 
+    delete globals::ExitOps;
+
     delete globals::g_player;
     if(!globals::g_level->uninit)delete globals::g_level;
 
@@ -235,17 +242,24 @@ void end(int n)
     exit(0);
 }
 
+void exitOptions(int i)
+{
+    globals::curScreen = globals::prevScreen;
+}
+
 void buildScreenObjects()
 {
-    globals::NewGame = new Button(createRECT(225, 0, 300, 100), RGB(70, 125, 150), &startN, "New Game");
-    globals::Continue = new Button(createRECT(225, 90, 300, 100), RGB(70, 125, 150), &cont, "Continue");
-    globals::Options0 = new Button(createRECT(225, 240, 300, 100), RGB(70, 125, 150), &options, "Options");
-    globals::End = new Button(createRECT(225, 390, 300, 100), RGB(70, 125, 150), &end, "Exit");
+    globals::NewGame = new Button(createRECT(225, 35, 300, 100), RGB(70, 125, 150), &startN, "New Game");
+    globals::Continue = new Button(createRECT(225, 165, 300, 100), RGB(70, 125, 150), &cont, "Continue");
+    globals::Options0 = new Button(createRECT(225, 295, 300, 100), RGB(70, 125, 150), &options, "Options");
+    globals::End = new Button(createRECT(225, 425, 300, 100), RGB(70, 125, 150), &end, "Exit");
 
     globals::Resume = new Button(createRECT(225, 90, 300, 100), RGB(70, 125, 150), &resume, "Resume");
     globals::Options = new Button(createRECT(225, 240, 300, 100), RGB(70, 125, 150), &options, "Options");
     globals::Exit = new Button(createRECT(225, 390, 300, 100), RGB(70, 125, 150), &quit, "Exit");
 
+    globals::ExitOps = new Button(createRECT(225, 390, 300, 100), RGB(70, 125, 150), &exitOptions, "Exit");
+
     tilesets.reserve(1);
     tileset->source = TSimg;
     tileset->sourceMask = TSmask;
@@ -269,7 +283,7 @@ void buildScreenObjects()
 
     globals::g_mousebox = mousebox;
 
-    globals::g_ScreenObjects.reserve(12);
+    globals::g_ScreenObjects.reserve(13);
 
     globals::g_ScreenObjects.push_back(mouseXtxt);
     globals::g_ScreenObjects.push_back(mouseYtxt);
@@ -287,6 +301,7 @@ void buildScreenObjects()
     globals::g_ScreenObjects.push_back(debugtxt);
 
     globals::g_ScreenObjects.push_back(fpstxt);
+    globals::g_ScreenObjects.push_back(Afpstxt);
 
     globals::g_ScreenObjects.push_back(globals::g_mousebox);
 }
@@ -303,6 +318,10 @@ BOOL InitInstance(HINSTANCE hInstance, int nCmdShow)
       return FALSE;
    }
 
+   //MMenu = LoadBitmap(hInst, MAKEINTRESOURCE(@TODO));
+   //Paused = LoadBitmap(hInst, MAKEINTRESOURCE(@TODO));
+   //Options = LoadBitmap(hInst, MAKEINTRESOURCE(@TODO));
+
    TSimg = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_TILESET1));
    TSmask = CreateBitmapMask(TSimg, RGB(0,0,1));
    playerSprite = LoadBitmap(hInst, MAKEINTRESOURCE(IDB_PLAYER1));
@@ -328,7 +347,7 @@ void pressed(WPARAM key)
         {
             if (globals::curScreen == 1)
             {
-                globals::curScreen = globals::prevScreen;
+                exitOptions(0);
             }
             else
             {
@@ -387,6 +406,7 @@ void depressed(WPARAM key)
 
 unsigned long long fpsTimer = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
 unsigned int times = 0;
+unsigned int Atimes = 0;
 
 LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
 {
@@ -411,15 +431,20 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         RECT temp;
         GetUpdateRect(hWnd, &temp, true);
         pnt(hWnd, &temp);
+        Atimes++;
         }
         break;
     case WM_ERASEBKGND:
         return TRUE;
     case WM_MOUSEMOVE:
         globals::g_mouseX = GET_X_LPARAM(lParam);
         globals::g_mouseY = GET_Y_LPARAM(lParam);
-        mouseXtxt->text = "Mouse X: " + std::to_string(globals::g_mouseX);
-        mouseYtxt->text = "Mouse Y: " + std::to_string(globals::g_mouseY);
+        if (globals::g_debug)
+        {
+            mouseXtxt->text = "Mouse X: " + std::to_string(globals::g_mouseX);
+            mouseYtxt->text = "Mouse Y: " + std::to_string(globals::g_mouseY);
+        }
+
         if(globals::curScreen == 3)
             if (globals::g_mousebox->rect.left + 32 > 34 && globals::g_mousebox->rect.left + 32 < 734 && globals::g_mousebox->rect.top+32 > 35 && !globals::g_player->collideMouseX(float(mousebox->rect.left), float(mousebox->rect.top), false) && !globals::g_player->collideMouseY(float(mousebox->rect.left), float(mousebox->rect.top), false))
                 if (globals::g_modKeys.at(VK_SHIFT) || globals::g_mouseDown) globals::g_player->mousebox = true;
@@ -451,6 +476,13 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
                 InvalidateRect(hWnd, &createRECT(0, 0, SWIDTH, SHEIGHT), true);
             }
             break;
+        case 1:
+            if (globals::ExitOps->active && globals::ExitOps->Touching(globals::g_mouseX, globals::g_mouseY))
+            {
+                globals::ExitOps->press(0);
+                InvalidateRect(hWnd, &createRECT(0, 0, SWIDTH, SHEIGHT), true);
+            }
+            break;
         case 2:
             if (globals::Resume->active && globals::Resume->Touching(globals::g_mouseX, globals::g_mouseY))
             {
@@ -508,9 +540,12 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         default:
             pressed(wParam);
         }
-        modtxt1->text = "Shifting: " + std::to_string(globals::g_modKeys.at(VK_SHIFT));
-        modtxt2->text = "Control: " + std::to_string(globals::g_modKeys.at(VK_CONTROL));
-        modtxt3->text = "Tab: " + std::to_string(globals::g_modKeys.at(VK_TAB));
+        if (globals::g_debug)
+        {
+            modtxt1->text = "Shifting: " + std::to_string(globals::g_modKeys.at(VK_SHIFT));
+            modtxt2->text = "Control: " + std::to_string(globals::g_modKeys.at(VK_CONTROL));
+            modtxt3->text = "Tab: " + std::to_string(globals::g_modKeys.at(VK_TAB));
+        }
         break;
     case WM_KEYUP:
         switch (wParam)
@@ -529,22 +564,30 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
         default:
             depressed(wParam);
         }
-        modtxt1->text = "Shifting: " + std::to_string(globals::g_modKeys.at(VK_SHIFT));
-        modtxt2->text = "Control: " + std::to_string(globals::g_modKeys.at(VK_CONTROL));
-        modtxt3->text = "Tab: " + std::to_string(globals::g_modKeys.at(VK_TAB));
+        if (globals::g_debug)
+        {
+            modtxt1->text = "Shifting: " + std::to_string(globals::g_modKeys.at(VK_SHIFT));
+            modtxt2->text = "Control: " + std::to_string(globals::g_modKeys.at(VK_CONTROL));
+            modtxt3->text = "Tab: " + std::to_string(globals::g_modKeys.at(VK_TAB));
+        }
         break;
     case WM_TIMER:
         switch (wParam)
         {
         case 1:
             globals::timeNow = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch()).count();
-            timetxt->text = "Time Now: " + std::to_string(globals::timeNow);
+            if(globals::g_debug) timetxt->text = "Time Now: " + std::to_string(globals::timeNow);
             if (globals::timeNow - fpsTimer >= 1000)
             {
                 fpsTimer += 1000;
                 globals::g_fps = times;
-                fpstxt->text = "FPS: " + std::to_string(globals::g_fps);
+                if (globals::g_debug) 
+                {
+                    fpstxt->text = "FPS: " + std::to_string(globals::g_fps);
+                    Afpstxt->text = "AFPS: " + std::to_string(Atimes);
+                }
                 times = 1;
+                Atimes = 0;
             }
             else {
                 times++;