Refactor GUI

VS.2015/Barony/Barony.vcxproj.filters

@@ -294,9 +294,6 @@
     <ClCompile Include="..\..\src\actsummontrap.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\cursors.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\entity_shared.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -324,9 +321,6 @@
     <ClCompile Include="..\..\src\interface\drawstatus.cpp">
       <Filter>Source Files\interface</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\interface\identify_and_appraise.cpp">
-      <Filter>Source Files\interface</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\interface\interface.cpp">
       <Filter>Source Files\interface</Filter>
     </ClCompile>
@@ -336,9 +330,6 @@
     <ClCompile Include="..\..\src\interface\playerinventory.cpp">
       <Filter>Source Files\interface</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\interface\removecurse.cpp">
-      <Filter>Source Files\interface</Filter>
-    </ClCompile>
     <ClCompile Include="..\..\src\interface\screenshot.cpp">
       <Filter>Source Files\interface</Filter>
     </ClCompile>
@@ -369,6 +360,12 @@
     <ClCompile Include="..\..\src\magic\spell.cpp">
       <Filter>Source Files\magic</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\interface\AppraisalGUI.cpp">
+      <Filter>Source Files\interface</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\src\interface\ItemModifyingGUI.cpp">
+      <Filter>Source Files\interface</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\src\book.hpp">
@@ -443,26 +440,32 @@
     <ClInclude Include="..\..\src\player.hpp">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\collision.hpp">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\src\interface\interface.hpp">
+      <Filter>Header Files\interface</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\colors.hpp">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\src\magic\magic.hpp">
+      <Filter>Header Files\magic</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\cppfuncs.hpp">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\src\interface\AppraisalGUI.hpp">
+      <Filter>Header Files\interface</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\hash.hpp">
-      <Filter>Source Files</Filter>
+    <ClInclude Include="..\..\src\interface\ItemModifyingGUI.hpp">
+      <Filter>Header Files\interface</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\paths.hpp">
-      <Filter>Source Files</Filter>
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\interface\interface.hpp">
-      <Filter>Header Files\interface</Filter>
+    <ClInclude Include="..\..\src\collision.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\magic\magic.hpp">
-      <Filter>Header Files\magic</Filter>
+    <ClInclude Include="..\..\src\colors.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\cppfuncs.hpp">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\src\hash.hpp">
+      <Filter>Header Files</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>

lang/en.txt

@@ -2909,6 +2909,8 @@ client (player %d) (direct ip)#
 2281 spellbook#
 2282 blank spellbook 5#
 2283 spellbook#
+2284 empty bottle#
+2285 empty bottle#
 
 #Additional ingame text.
 2350 A fragment breaks away from your %s.#
@@ -2976,5 +2978,31 @@ dominate the %s into your service!#
 2476 You feel the reflect magic spell fail as the
 last of your magic is drained!#
 
-
-2499 end#
+2499 Repair an Item#
+2500 There are no valid items to use this on!#
+2501 This is a scroll of remove curse!#
+2502 This is a scroll of repair!#
+2503 This is a scroll of enchant weapon!#
+2504 This is a scroll of enchant armor!#
+2505 Oh no! The scroll was cursed!#
+2506 Your %s was unidentified!#
+2507 Your %s was cursed!#
+2508 Your %s is now broken!#
+2509 Your %s was disenchanted!#
+2510 You have no remaining items for the scroll's blessing...#
+2511 Wow! Your %s was identified too!#
+2512 Wow! Your %s was uncursed too!#
+2513 You have no items for the scroll's curse...#
+2514 Oh no! Your %s was unidentified too!#
+2515 Oh no! Your %s was cursed too!#
+2516 Oh no! Your %s was broken too!#
+2517 Your %s looks perfect now!#
+2518 Enchant a Weapon#
+2519 Enchant an Armor Piece#
+2520 Your %s glows blue!#
+2521 Your %s glows violently blue!#
+2522 Your %s radiates power!#
+2523 Oh no! Your %s was disenchanted too!#
+2524 You have no remaining items for the scroll's curse...#
+
+2525 end#

src/actchest.cpp

@@ -494,11 +494,13 @@ void Entity::actChest()
 				messagePlayer(chestclicked, language[459]);
 				chestOpener = chestclicked;
 				openedChest[chestclicked] = this;
-				if ( removecursegui_active )
+
+				// If the ItemModifyingGUI is open, close it
+				if ( itemModifyingGUI->IsGUIOpen() == true )
 				{
-					closeRemoveCurseGUI();
+					itemModifyingGUI->CloseGUI();
 				}
-				identifygui_active = false;
+
 				if (chestclicked != 0 && multiplayer == SERVER)
 				{
 					//Send all of the items to the client.

src/actplayer.cpp

@@ -618,79 +618,11 @@ void actPlayer(Entity* my)
 		}
 	}
 
-	if (PLAYER_NUM == clientnum && appraisal_timer > 0)
+	if ( PLAYER_NUM == clientnum )
 	{
-		Item* tempItem = uidToItem(appraisal_item);
-		if ( tempItem )
+		if ( appraisalGUI->IsGUIOpen() == true )
 		{
-			if ( tempItem->identified )
-			{
-				appraisal_timer = 0;
-				appraisal_item = 0;
-			}
-			else if ( tempItem->type == GEM_ROCK )
-			{
-				//Auto-succeed on rocks.
-				tempItem->identified = true;
-				messagePlayer(clientnum, language[570], tempItem->description());
-				appraisal_item = 0;
-				appraisal_timer = 0;
-			}
-			else
-			{
-				appraisal_timer -= 1; //De-increment appraisal timer.
-				if (appraisal_timer <= 0)
-				{
-					appraisal_timer = 0;
-
-					//Cool. Time to identify the item.
-					bool success = false;
-					if ( stats[PLAYER_NUM]->PROFICIENCIES[PRO_APPRAISAL] < 100 )
-					{
-						if ( tempItem->type != GEM_GLASS )
-						{
-							success = (stats[PLAYER_NUM]->PROFICIENCIES[PRO_APPRAISAL] + my->getPER() * 5 >= items[tempItem->type].value / 10);
-						}
-						else
-						{
-							success = (stats[PLAYER_NUM]->PROFICIENCIES[PRO_APPRAISAL] + my->getPER() * 5 >= 100);
-						}
-					}
-					else
-					{
-						success = true; // always succeed when appraisal is maxed out
-					}
-					if ( success )
-					{
-						tempItem->identified = true;
-						messagePlayer(clientnum, language[570], tempItem->description());
-					}
-					else
-					{
-						messagePlayer(clientnum, language[571], tempItem->description());
-					}
-
-					//Attempt a level up.
-					if ( items[tempItem->type].value > 0 )
-					{
-						if ( tempItem->identified )
-						{
-							my->increaseSkill(PRO_APPRAISAL);
-						}
-						else if ( rand() % 5 == 0 )
-						{
-							my->increaseSkill(PRO_APPRAISAL);
-						}
-					}
-
-					appraisal_item = 0;
-				}
-			}
-		}
-		else
-		{
-			appraisal_timer = 0;
-			appraisal_item = 0;
+			appraisalGUI->UpdateGUI();
 		}
 	}
 

src/collision.cpp

@@ -57,55 +57,63 @@ Entity* entityClicked()
 
 	if ( !(*inputPressed(impulses[IN_USE])) && !(*inputPressed(joyimpulses[INJOY_GAME_USE])) )
 	{
-		return NULL;
+		return nullptr;
 	}
 	if ( !shootmode )
 	{
 		if ( itemMenuOpen )
 		{
-			return NULL;
+			return nullptr;
 		}
 		if ( omousex < camera.winx || omousex >= camera.winx + camera.winw || omousey < camera.winy || omousey >= camera.winy + camera.winh )
 		{
-			return NULL;
+			return nullptr;
 		}
-		if (openedChest[clientnum])
-			if (omousex > CHEST_INVENTORY_X && omousex < CHEST_INVENTORY_X + inventoryChest_bmp->w && omousey > CHEST_INVENTORY_Y && omousey < CHEST_INVENTORY_Y + inventoryChest_bmp->h)
+		if ( openedChest[clientnum] )
+		{
+			if ( omousex > CHEST_INVENTORY_X && omousex < CHEST_INVENTORY_X + inventoryChest_bmp->w && omousey > CHEST_INVENTORY_Y && omousey < CHEST_INVENTORY_Y + inventoryChest_bmp->h )
 			{
-				return NULL;    //Click falls inside the chest inventory GUI.
+				return nullptr;    //Click falls inside the chest inventory GUI.
 			}
-		if (identifygui_active)
-			if (omousex > IDENTIFY_GUI_X && omousex < IDENTIFY_GUI_X + identifyGUI_img->w && omousey > IDENTIFY_GUI_Y && omousey < IDENTIFY_GUI_Y + identifyGUI_img->h)
+		}
+		if ( itemModifyingGUI->IsGUIOpen() == true )
+		{
+			if ( itemModifyingGUI->IsMouseWithinGUIBounds() == true )
 			{
-				return NULL;    //Click falls inside the identify item gui.
+				return nullptr; // Click falls within the itemModifyingGUI's bounds
 			}
-		if (book_open)
-			if (mouseInBounds(BOOK_GUI_X, BOOK_GUI_X + bookgui_img->w, BOOK_GUI_Y, BOOK_GUI_Y + bookgui_img->h))
+		}
+		if ( book_open )
+		{
+			if ( mouseInBounds(BOOK_GUI_X, BOOK_GUI_X + bookgui_img->w, BOOK_GUI_Y, BOOK_GUI_Y + bookgui_img->h) )
 			{
-				return NULL;    //Click falls inside the book GUI.
+				return nullptr;    //Click falls inside the book GUI.
 			}
-		if (gui_mode == GUI_MODE_INVENTORY || gui_mode == GUI_MODE_SHOP)
+		}
+		if ( gui_mode == GUI_MODE_INVENTORY || gui_mode == GUI_MODE_SHOP )
 		{
 			if ( gui_mode == GUI_MODE_INVENTORY )
-				if (mouseInBounds(RIGHTSIDEBAR_X, RIGHTSIDEBAR_X + rightsidebar_titlebar_img->w, RIGHTSIDEBAR_Y, RIGHTSIDEBAR_Y + rightsidebar_height))
+			{
+				if ( mouseInBounds(RIGHTSIDEBAR_X, RIGHTSIDEBAR_X + rightsidebar_titlebar_img->w, RIGHTSIDEBAR_Y, RIGHTSIDEBAR_Y + rightsidebar_height) )
 				{
-					return NULL;    //Click falls inside the right sidebar.
+					return nullptr;    //Click falls inside the right sidebar.
 				}
+			}
 			//int x = std::max(character_bmp->w, xres/2-inventory_bmp->w/2);
 			//if (mouseInBounds(x,x+inventory_bmp->w,0,inventory_bmp->h))
 			//return NULL;
 			if ( mouseInBounds(INVENTORY_STARTX, INVENTORY_STARTX + INVENTORY_SIZEX * INVENTORY_SLOTSIZE, INVENTORY_STARTY, INVENTORY_STARTY + INVENTORY_SIZEY * INVENTORY_SLOTSIZE) )
 			{
 				// clicked in inventory
-				return NULL;
+				return nullptr;
 			}
 			if ( gui_mode == GUI_MODE_SHOP )
 			{
 				int x1 = xres / 2 - SHOPWINDOW_SIZEX / 2, x2 = xres / 2 + SHOPWINDOW_SIZEX / 2;
 				int y1 = yres / 2 - SHOPWINDOW_SIZEY / 2, y2 = yres / 2 + SHOPWINDOW_SIZEY / 2;
 				if (mouseInBounds(x1, x2, y1, y2))
 				{
-					return NULL;
+					return nullptr;
 				}
 			}
 		}
@@ -117,7 +125,7 @@ Entity* entityClicked()
 				int height = spell_list_titlebar_bmp->h;
 				int numspells = 0;
 				node_t* node;
-				for (node = spellList.first; node != NULL; node = node->next)
+				for (node = spellList.first; node != nullptr; node = node->next)
 				{
 					numspells++;
 				}
@@ -128,18 +136,18 @@ Entity* entityClicked()
 
 				if (mouseInBounds(MAGICSPELL_LIST_X, MAGICSPELL_LIST_X + spell_list_titlebar_bmp->w, spelllist_y, spelllist_y + height))
 				{
-					return NULL;
+					return nullptr;
 				}
 			}
 		}
 		if (mouseInBounds(0, 224, 0, 420))   // character sheet
 		{
-			return NULL;
+			return nullptr;
 		}
 		int x = xres / 2 - (status_bmp->w / 2);
 		if (mouseInBounds(x, x + status_bmp->w, yres - status_bmp->h, yres))
 		{
-			return NULL;
+			return nullptr;
 		}
 		*inputPressed(impulses[IN_USE]) = 0;
 		*inputPressed(joyimpulses[INJOY_GAME_USE]) = 0;
@@ -173,7 +181,7 @@ Entity* entityClicked()
 	}
 	else
 	{
-		return NULL;
+		return nullptr;
 	}
 }