- custom map support WIP

- fix for unpassworded lobbies

Author: x64-dev

GeneralsMD/Code/GameEngine/Include/GameClient/MapUtil.h

@@ -98,8 +98,8 @@ class MapCache : public std::map<AsciiString, MapMetaData>
 	MapCache() {}
 	void updateCache( void );
 
-	AsciiString getMapDir() const;
-	AsciiString getUserMapDir() const;
+	AsciiString getMapDir(bool bCustomMapDebug = false) const;
+	AsciiString getUserMapDir(bool bCustomMapDebug = false) const;
 	AsciiString getMapExtension() const;
 
 	const MapMetaData *findMap(AsciiString mapName);

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/NextGenMP_defines.h

@@ -31,4 +31,6 @@
 #define GENERALS_ONLINE_SERVICE_VERSION 1
 
 // annoying game assertions, we'll catch real things in the debugger
-#define DISABLE_DEBUG_CRASHING 1
+#define DISABLE_DEBUG_CRASHING 1
+
+#define GENERALS_ONLINE_TEST_MAP_TRANSFER 1

GeneralsMD/Code/GameEngine/Include/GameNetwork/GeneralsOnline/OnlineServices_LobbyInterface.h

@@ -16,6 +16,7 @@ struct LobbyMemberEntry : public NetworkMemberBase
 	int color = -1;
 	int team = -1;
 	int startpos = -1;
+	bool has_map = false;
 
 	bool IsValid() const { return user_id != -1; }
 };
@@ -28,6 +29,7 @@ struct LobbyEntry
 	std::string name;
 	std::string map_name;
 	std::string map_path;
+	bool map_official;
 	int current_players;
 	int max_players;
 	bool vanilla_teams;
@@ -78,10 +80,12 @@ class NGMP_OnlineServices_LobbyInterface
 	}
 
 	// updates
-	void UpdateCurrentLobby_Map(AsciiString strMap, AsciiString strMapPath, int newMaxPlayers);
+	void UpdateCurrentLobby_Map(AsciiString strMap, AsciiString strMapPath, bool bIsOfficial, int newMaxPlayers);
 	void UpdateCurrentLobby_LimitSuperweapons(bool bLimitSuperweapons);
 	void UpdateCurrentLobby_StartingCash(UnsignedInt startingCashValue);
 
+	void UpdateCurrentLobby_HasMap();
+
 	void UpdateCurrentLobby_MySide(int side, int updatedStartPos);
 	void UpdateCurrentLobby_MyColor(int side);
 	void UpdateCurrentLobby_MyStartPos(int side);
@@ -114,7 +118,7 @@ class NGMP_OnlineServices_LobbyInterface
 	UnicodeString m_PendingCreation_LobbyName;
 	UnicodeString m_PendingCreation_InitialMapDisplayName;
 	AsciiString m_PendingCreation_InitialMapPath;
-	void CreateLobby(UnicodeString strLobbyName, UnicodeString strInitialMapName, AsciiString strInitialMapPath, int initialMaxSize, bool bVanillaTeamsOnly, bool bTrackStats, uint32_t startingCash, bool bPassworded, const char* szPassword);
+	void CreateLobby(UnicodeString strLobbyName, UnicodeString strInitialMapName, AsciiString strInitialMapPath, bool bIsOfficial, int initialMaxSize, bool bVanillaTeamsOnly, bool bTrackStats, uint32_t startingCash, bool bPassworded, const char* szPassword);
 
 	void OnJoinedOrCreatedLobby(bool bAlreadyUpdatedDetails = false);
 
@@ -246,6 +250,12 @@ class NGMP_OnlineServices_LobbyInterface
 
 	void UpdateRoomDataCache(std::function<void(void)> fnCallback = nullptr);
 
+	std::function<void(LobbyMemberEntry)> m_cbPlayerDoesntHaveMap = nullptr;
+	void RegisterForPlayerDoesntHaveMapCallback(std::function<void(LobbyMemberEntry)> cb)
+	{
+		m_cbPlayerDoesntHaveMap = cb;
+	}
+
 	std::function<void(UnicodeString strMessage)> m_OnChatCallback = nullptr;
 	void RegisterForChatCallback(std::function<void(UnicodeString strMessage)> cb)
 	{

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/PopupHostGame.cpp

@@ -598,8 +598,9 @@ void createGame( void )
 	AsciiString passwd;
 	passwd.translate(GadgetTextEntryGetText(textEntryGamePassword));
 
+
 	// NGMP:NOTE: We count money here because mods etc sometimes change the starting money, so we dont want to hard code it, just create with whatever the client is telling us is a sensible amount
-	NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->CreateLobby(gameName, md->m_displayName, md->m_fileName, md->m_numPlayers, limitArmies, useStats, TheGlobalData->m_defaultStartingCash.countMoney(), passwd.isNotEmpty(), passwd.str());
+	NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->CreateLobby(gameName, md->m_displayName, md->m_fileName, md->m_isOfficial, md->m_numPlayers, limitArmies, useStats, TheGlobalData->m_defaultStartingCash.countMoney(), passwd.isNotEmpty(), passwd.str());
 
 	GSMessageBoxCancel(UnicodeString(L"Creating Lobby"), UnicodeString(L"Lobby Creation is in progress..."), nullptr);
 

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLGameSetupMenu.cpp

@@ -1398,6 +1398,37 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 			GadgetListBoxAddEntryText(listboxGameSetupChat, strMessage, GameMakeColor(255, 255, 255, 255), -1, -1);
 		});
 
+	// player doesnt have map events
+	NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->RegisterForPlayerDoesntHaveMapCallback([](LobbyMemberEntry lobbyMember)
+		{
+			// tell the host the user doesn't have the map
+			UnicodeString mapDisplayName;
+			const MapMetaData* mapData = TheMapCache->findMap(TheNGMPGame->getMap());
+			Bool willTransfer = TRUE;
+			if (mapData)
+			{
+				mapDisplayName.format(L"%ls", mapData->m_displayName.str());
+				willTransfer = !mapData->m_isOfficial;
+			}
+			else
+			{
+				mapDisplayName.format(L"%hs", TheNGMPGame->getMap().str());
+				willTransfer = WouldMapTransfer(TheNGMPGame->getMap());
+			}
+
+			UnicodeString strDisplayName;
+			strDisplayName.format(L"%hs", lobbyMember.display_name.c_str());
+
+			UnicodeString text;
+			if (willTransfer)
+				text.format(TheGameText->fetch("GUI:PlayerNoMapWillTransfer"), strDisplayName.str(), mapDisplayName.str());
+			else
+				text.format(TheGameText->fetch("GUI:PlayerNoMap"), strDisplayName.str(), mapDisplayName.str());
+			GadgetListBoxAddEntryText(listboxGameSetupChat, text, GameSpyColor[GSCOLOR_DEFAULT], -1, -1);
+		});
+
+	
+
 	// register for roster events
 	NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->RegisterForRosterNeedsRefreshCallback([]()
 		{
@@ -1550,7 +1581,7 @@ void WOLGameSetupMenuInit( WindowLayout *layout, void *userData )
 		}
 
 		// TODO_NGMP: preferred map support
-		AsciiString lowerMap = getDefaultMap(true);
+		AsciiString lowerMap = getDefaultOfficialMap();
 		//AsciiString lowerMap = customPref.getPreferredMap();
 		lowerMap.toLower();
 		std::map<AsciiString, MapMetaData>::iterator it = TheMapCache->find(lowerMap);

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/GUICallbacks/Menus/WOLMapSelectMenu.cpp

@@ -150,11 +150,11 @@ void WOLMapSelectMenuInit( WindowLayout *layout, void *userData )
 		usesSystemMapDir = mmd->m_isOfficial;
 	}
 
+	// TODO_NGMP: Perhaps we should enforce this on the service too for extra security? base game didnt though.
 	//if stats are enabled, only official maps can be used
-	// TODO_NGMP: Reimpl this
-	bool bUseStats = true;
-	//if( TheGameSpyInfo->getCurrentStagingRoom()->getUseStats() )
-	//	usesSystemMapDir = true;
+	bool bUseStats = TheNGMPGame->getUseStats();
+	if(bUseStats)
+		usesSystemMapDir = true;
 
 	buttonBack = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonBack") );
 	buttonOK = TheNameKeyGenerator->nameToKey( AsciiString("WOLMapSelectMenu.wnd:ButtonOK") );
@@ -454,6 +454,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 					int newMaxPlayers = -1;
 					AsciiString strMapName;
+					bool bOfficialMap = false;
 
 					TheNGMPGame->setMap(asciiMap);
 					asciiMap.toLower();
@@ -466,6 +467,8 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 
 						newMaxPlayers = it->second.m_numPlayers;
 						strMapName.translate(it->second.m_displayName);
+
+						bOfficialMap = it->second.m_isOfficial;
 					}
 
 					TheNGMPGame->adjustSlotsForMap(); // BGC- adjust the slots for the new map.
@@ -479,7 +482,7 @@ WindowMsgHandledType WOLMapSelectMenuSystem( GameWindow *window, UnsignedInt msg
 					WOLDisplayGameOptions();
 
 					// NGMP: Update lobby
-					NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->UpdateCurrentLobby_Map(strMapName, TheNGMPGame->getMap(), newMaxPlayers);
+					NGMP_OnlineServicesManager::GetInstance()->GetLobbyInterface()->UpdateCurrentLobby_Map(strMapName, TheNGMPGame->getMap(), bOfficialMap, newMaxPlayers);
 
 					WOLMapSelectLayout->destroyWindows();
 					WOLMapSelectLayout->deleteInstance();

GeneralsMD/Code/GameEngine/Source/GameClient/GUI/LoadScreen.cpp

@@ -2064,6 +2064,12 @@ void MapTransferLoadScreen::update( Int percent )
 		TheNetwork->liteupdate();
 	}
 
+	// GENERALS ONLINE: this is ticked in game engine, but game engine doesnt tick for MP loads and map transfers are while(true)... when the host is complete and remotes arent... do a liteupdate like TheNetwork does
+	if (NGMP_OnlineServicesManager::GetInstance() != nullptr)
+	{
+		NGMP_OnlineServicesManager::GetInstance()->Tick();
+	}
+
 	TheMouse->setCursorTooltip(UnicodeString::TheEmptyString);
 
 	// Do this last!

GeneralsMD/Code/GameEngine/Source/GameClient/MapUtil.cpp

@@ -61,6 +61,9 @@
 #include "GameNetwork/GameInfo.h"
 #include "GameNetwork/NetworkDefs.h"
 
+#include "../NextGenMP_defines.h"
+#include "../NGMP_interfaces.h"
+
 #ifdef _INTERNAL
 // for occasional debugging...
 //#pragma optimize("", off)
@@ -352,15 +355,34 @@ void WaypointMap::update( void )
 
 const char * MapCache::m_mapCacheName = "MapCache.ini";
 
-AsciiString MapCache::getMapDir() const 
+AsciiString MapCache::getMapDir(bool bCustomMapDebug) const
 { 
+#if defined(GENERALS_ONLINE_TEST_MAP_TRANSFER)
+	
+	if (NGMP_OnlineServicesManager::GetInstance() != nullptr && NGMP_OnlineServicesManager::GetInstance()->GetAuthInterface()->GetUserID() == -2) // dev account 1 doesnt have custom maps, always transfer
+	{
+		if (bCustomMapDebug)
+		{
+			return AsciiString("MapsEmpty");
+		}
+		else
+		{
+			return AsciiString("Maps");
+		}
+	}
+	else
+	{
+		return AsciiString("Maps");
+	}
+#else
 	return AsciiString("Maps"); 
+#endif
 }
 
-AsciiString MapCache::getUserMapDir() const
+AsciiString MapCache::getUserMapDir(bool bCustomMapDebug) const
 {
 	AsciiString tmp = TheGlobalData->getPath_UserData();
-	tmp.concat(getMapDir());
+	tmp.concat(getMapDir(bCustomMapDebug));
 	return tmp;
 }
 

GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NGMPGame.cpp

@@ -129,6 +129,9 @@ void NGMPGame::UpdateSlotsFromCurrentLobby()
 				slot->unAccept();
 			}
 
+			// has map?
+			slot->setMapAvailability(pLobbyMember.has_map);
+
 			// store EOS ID
 			slot->m_userID = pLobbyMember.user_id;