64-bit fixes, and fixing new delegate dispatch system.

Author: eezstreet

CMakeLists.txt

@@ -50,7 +50,11 @@ if(BUILD_GAME)
 		set(LIBRARY_SRC ${SDL_SRC} ${ADPCM_SRC} ${HUFFMAN_SRC} ${PKWARE_SRC} ${GLEW_SRC})
 
 		set(ENGINE_SRC ${ENGINE_SRC} ${SHARED_SRC} ${LIBRARY_SRC})
-		set(SDL2_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/sdl/x86")
+		if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "4")
+			set(SDL2_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/sdl/x86")
+		else()
+			set(SDL2_LIBRARY_DIR "${CMAKE_CURRENT_SOURCE_DIR}/Libraries/sdl/x64")
+		endif()
 		set(SDL2_LIBRARIES "${SDL2_LIBRARY_DIR}/SDL2.lib" "${SDL2_LIBRARY_DIR}/SDL2main.lib"
 			"${SDL2_LIBRARY_DIR}/SDL2main.lib" "${SDL2_LIBRARY_DIR}/SDL2test.lib"
 			"${SDL2_LIBRARY_DIR}/SDL2_net.lib" "${SDL2_LIBRARY_DIR}/SDL2_mixer.lib"

Engine/Diablo2.hpp

@@ -22,7 +22,7 @@ struct D2CmdArgStrc
 	char szKeyName[16];		// +10
 	char szCmdName[16];		// +20
 	DWORD dwType;			// +30 ( 0 use GetProfInt - write bool, 1 DWORD , 2 string, 3 BYTE, 4 WORD)
-	int nOffset;			// +34
+	DWORD nOffset;			// +34
 	DWORD dwDefault;		// +38
 };							// +3C
 

Engine/INI.cpp

@@ -152,7 +152,7 @@ namespace INI
 			{
 			case CMD_BOOLEAN:
 #ifdef _WIN32
-				pField->fieldValues.bValue = *(bool*)((DWORD)pData + pCurrent->nOffset);
+				pField->fieldValues.bValue = *(bool*)((BYTE*)pData + pCurrent->nOffset);
 #else
 				pField->fieldValues.bValue = *(bool*)(pData + pCurrent->nOffset);
 #endif
@@ -168,7 +168,7 @@ namespace INI
 			case CMD_WORD:
 			case CMD_DWORD:
 #ifdef _WIN32
-				pField->fieldValues.nValue = *(int*)((DWORD)pData + pCurrent->nOffset);
+				pField->fieldValues.nValue = *(int*)((BYTE*)pData + pCurrent->nOffset);
 #else
 				pField->fieldValues.nValue = *(int*)(pData + pCurrent->nOffset);
 #endif
@@ -181,7 +181,7 @@ namespace INI
 
 			case CMD_STRING:
 #ifdef _WIN32
-				D2Lib::strncpyz(pField->fieldValues.szValue, (char*)((DWORD)pData + pCurrent->nOffset), INI_MAX_STRINGLEN);
+				D2Lib::strncpyz(pField->fieldValues.szValue, (char*)((BYTE*)pData + pCurrent->nOffset), INI_MAX_STRINGLEN);
 #else
 				D2Lib::strncpyz(pField->fieldValues.szValue, (char*)(pData + pCurrent->nOffset), INI_MAX_STRINGLEN);
 #endif

Engine/Platform_Windows.cpp

@@ -308,6 +308,7 @@ namespace Sys
 		Log_ErrorAssertReturn(bModuleFound, nullptr);
 
 		gModules[nModule].dwModule = LoadLibrary(szModulePath);
+		DWORD error = GetLastError();
 		Log_ErrorAssertReturn(gModules[nModule].dwModule != 0, nullptr);
 
 		GetAPIType ModuleAPI;

Modcode/Client/CMakeLists.txt

@@ -15,7 +15,16 @@ add_library(D2Client SHARED
     "${D2CLIENT_FILES}"
     "${SHARED_SRC}"
 )
-set_target_properties(D2Client PROPERTIES OUTPUT_NAME D2Client)
+set_target_properties(D2Client 
+    PROPERTIES 
+    OUTPUT_NAME D2Client
+    ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug"
+    LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug"
+    RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug"
+    ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release"
+    LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release"
+    RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release"
+)
 set_target_properties(D2Client PROPERTIES LINKER_LANGUAGE CXX)
 
 target_link_libraries(D2Client ${STATIC_LIBRARIES} D2Common)

Modcode/Client/UI/D2Menu.cpp

@@ -120,6 +120,17 @@ void D2Menu::HidePanel(D2Panel* pPanel)
 		pCurrent = pCurrent->m_pNextVisible;
 	}
 
+	if (pLast == nullptr)
+	{
+		return;
+	}
+
+	if (pCurrent == nullptr)
+	{
+		pLast->m_pNextVisible = nullptr;
+		return;
+	}
+
 	pLast->m_pNextVisible = pCurrent->m_pNextVisible;
 }
 

Modcode/Client/UI/Menus/CharCreate.cpp

@@ -61,7 +61,7 @@ void CharCreateData::OnCharacterSteppedBack(class IRenderObject* caller, void* e
  */
 namespace D2Menus
 {
-	CharCreate::CharCreate(bool bFromCharSelect)
+	CharCreate::CharCreate(bool bFromCharSelect) : D2Menu()
 	{
 		engine->renderer->SetGlobalPalette(PAL_FECHAR);
 		backgroundTexture = engine->renderer->AllocateObject(0);

Modcode/Client/UI/Menus/CharSelect.cpp

@@ -9,7 +9,7 @@ namespace D2Menus
 	/*
 	 *	Creates the CharSelect menu.
 	 */
-	CharSelect::CharSelect(char** pszSavePaths, int nNumFiles)
+	CharSelect::CharSelect(char** pszSavePaths, int nNumFiles) : D2Menu()
 	{
 		bool bPreloadedSave = (pszSavePaths != nullptr);
 		D2SaveHeader header{ 0 };

Modcode/Client/UI/Menus/Main.cpp

@@ -8,6 +8,8 @@ namespace D2Menus
 	 */
 	Main::Main() : D2Menu()
 	{
+		m_visiblePanels = nullptr;
+
 		IGraphicsReference* flameTexLeft = engine->graphics->CreateReference(
 			"data\\global\\ui\\FrontEnd\\D2LogoFireLeft.dc6",
 			UsagePolicy_Permanent
@@ -69,7 +71,14 @@ namespace D2Menus
 	Main::~Main()
 	{
 		// We don't kill the game select background, because we might need it again later
+		engine->renderer->Remove(backgroundObject);
+		engine->renderer->Remove(flameLeft);
+		engine->renderer->Remove(flameRight);
+		engine->renderer->Remove(blackLeft);
+		engine->renderer->Remove(blackRight);
 		delete pMainPanel;
+		pMainPanel = nullptr;
+		m_visiblePanels = nullptr;
 	}
 
 	/*

Modcode/Client/UI/Menus/Trademark.cpp

@@ -73,7 +73,7 @@ namespace D2Menus
 		trademark->SetTextColor(TextColor_Gold);
 		allRightsReserved->SetTextColor(TextColor_Gold);
 
-		m_dwTimeRemaining = 10000;
+		m_timeRemaining = 10000;
 	}
 
 	/*
@@ -100,8 +100,8 @@ namespace D2Menus
 	{
 		D2Menu::Tick(dwDeltaMs);
 
-		m_dwTimeRemaining -= dwDeltaMs;
-		if (m_dwTimeRemaining <= 0)
+		m_timeRemaining -= dwDeltaMs;
+		if (m_timeRemaining <= 0)
 		{
 			delete cl.pActiveMenu;
 			cl.pActiveMenu = new Main();
@@ -130,7 +130,7 @@ namespace D2Menus
 	bool Trademark::HandleMouseClicked(DWORD dwX, DWORD dwY)
 	{
 		// if mouse is clicked, go to main menu
-		m_dwTimeRemaining = 0;
+		m_timeRemaining = 0;
 		return true;
 	}
 }

Modcode/Client/UI/Menus/Trademark.hpp

@@ -8,7 +8,7 @@ namespace D2Menus
 	private:
 		char16_t* szCopyrightText;
 		char16_t* szAllRightsReservedText;
-		DWORD m_dwTimeRemaining;
+		int m_timeRemaining;
 
 		IRenderObject* backgroundObject;
 		IRenderObject* flameLeft;

Modcode/Client/UI/Panels/CharCreate.cpp

@@ -28,6 +28,11 @@ namespace D2Panels
 		pCancelButton->AttachIdentifier("cc_cancel");
 		pOKButton->AttachIdentifier("cc_ok");
 
+		pCancelButton->AddEventListener(Clicked, [] {
+			delete cl.pActiveMenu;
+			cl.pActiveMenu = new D2Menus::CharSelect();
+			});
+
 		pOKButton->Disable();
 	}
 

Modcode/Client/UI/Panels/CharSelect.cpp

@@ -45,6 +45,10 @@ namespace D2Panels
 		okButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_OK));
 		exitButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_EXIT));
 
+		exitButton->AddEventListener(Clicked, [] {
+			delete cl.pActiveMenu;
+			cl.pActiveMenu = new D2Menus::Main();
+			});
 
 		characterDisplayName->AttachFontResource(cl.font42);
 	}

Modcode/Client/UI/Panels/Debug.cpp

@@ -1,5 +1,6 @@
 #include "Debug.hpp"
 #include "../D2Menu.hpp"
+#include "../Menus/Main.hpp"
 
 #define MAIN_BUTTON_DC6			"data\\global\\ui\\FrontEnd\\3WideButtonBlank.dc6"
 
@@ -17,8 +18,7 @@ namespace D2Panels
 		m_exitButton->AttachText(u"EXIT");
 		m_exitButton->AddEventListener(Clicked, [] {
 			delete cl.pActiveMenu;
-			D2Client_GoToContextMenu();
-			return;
+			cl.pActiveMenu = new D2Menus::Main();
 			});
 	}
 

Modcode/Client/UI/Panels/Main.cpp

@@ -18,6 +18,14 @@
 #define SMALL_BUTTON_DC6		"data\\global\\ui\\FrontEnd\\MediumButtonBlank.dc6"
 #define THIN_BUTTON_DC6			"data\\global\\ui\\FrontEnd\\NarrowButtonBlank.dc6"
 
+/**	Tries to advance to the character select screen.
+	 *	If there's no save files present, it advances to the character creation screen instead.
+	 */
+void D2Client_AdvanceToCharSelect()
+{
+	
+}
+
 namespace D2Panels
 {
 	/*
@@ -59,6 +67,42 @@ namespace D2Panels
 		m_cinematicsButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_CINEMATICS));
 		m_exitButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_EXIT));
 
+		m_singleplayerButton->AddEventListener(Clicked, [] {
+			cl.szCurrentIPDestination[0] = '\0'; // set IP to blank
+			engine->NET_SetPlayerCount(1);
+			cl.charSelectContext = CSC_SINGLEPLAYER;
+			
+			int nNumFiles = 0;
+			char** szFileList = engine->FS_ListFilesInDirectory("Save", "*.d2s", &nNumFiles);
+
+			delete cl.pActiveMenu;
+			if (nNumFiles <= 0)
+			{
+				cl.pActiveMenu = new D2Menus::CharCreate();
+			}
+			else
+			{
+				cl.pActiveMenu = new D2Menus::CharSelect(szFileList, nNumFiles);
+				engine->FS_FreeFileList(szFileList, nNumFiles);
+			}
+			});
+
+		m_multiplayerButton->AddEventListener(Clicked, [] {
+			delete cl.pActiveMenu;
+			cl.pActiveMenu = new D2Menus::OtherMultiplayer();
+			});
+
+		m_exitButton->AddEventListener(Clicked, [] {
+			cl.bKillGame = true;
+			});
+
+#ifdef _DEBUG
+		m_debugMapButton->AddEventListener(Clicked, [] {
+			delete cl.pActiveMenu;
+			cl.pActiveMenu = new D2Menus::Debug();
+			});
+#endif
+
 		// Disable the battle.net button and the gateway button.
 		// Closed Battle.net is not allowed in OpenD2.
 		m_battleNetButton->Disable();
@@ -86,25 +130,4 @@ namespace D2Panels
 	{
 		DrawAllWidgets();
 	}
-
-	/*
-	 *	Tries to advance to the character select screen.
-	 *	If there's no save files present, it advances to the character creation screen instead.
-	 */
-	void D2Client_AdvanceToCharSelect()
-	{
-		int nNumFiles = 0;
-		char** szFileList = engine->FS_ListFilesInDirectory("Save", "*.d2s", &nNumFiles);
-
-		delete cl.pActiveMenu;
-		if (nNumFiles <= 0)
-		{
-			cl.pActiveMenu = new D2Menus::CharCreate();
-		}
-		else
-		{
-			cl.pActiveMenu = new D2Menus::CharSelect(szFileList, nNumFiles);
-			engine->FS_FreeFileList(szFileList, nNumFiles);
-		}
-	}
 }

Modcode/Client/UI/Panels/OtherMultiplayer.cpp

@@ -32,6 +32,15 @@ namespace D2Panels
 		m_openBattleNetButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_OPENBNET));
 		m_TCPIPButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_TCPIP));
 		m_cancelButton->AttachText(engine->TBL_FindStringFromIndex(TBLTEXT_CANCEL));
+
+		m_TCPIPButton->AddEventListener(Clicked, [] {
+			delete cl.pActiveMenu;
+			cl.pActiveMenu = new D2Menus::TCPIP();
+			});
+		m_cancelButton->AddEventListener(Clicked, [] {
+			delete cl.pActiveMenu;
+			cl.pActiveMenu = new D2Menus::Main();
+			});
 	}
 
 	/*

Shared/D2Shared.hpp

@@ -964,11 +964,18 @@ class UnorderedDelegateList
 
 	void Dispatch(Args... args)
 	{
+		// TODO: find a workaround for this.
+		// Basically if we fire off a delegate that alters its containing object = this goes boom!
+		void (*bindList[MAX_BOUND_TO_DELEGATELIST])(Args...);
 		for (int i = 0; i < MAX_BOUND_TO_DELEGATELIST; i++)
 		{
-			if (m_bound[i] != nullptr)
+			bindList[i] = m_bound[i];
+		}
+		for (int i = 0; i < MAX_BOUND_TO_DELEGATELIST; i++)
+		{
+			if (bindList[i] != nullptr)
 			{
-				m_bound[i](args...);
+				bindList[i](args...);
 			}
 		}
 	}