mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: Use small function to get check handler for content type. (#13988) 

This reduces a long switch block with (multiple) breaks with the power of early return.
pull/13989/head
Peter Nelson 2025-04-10 21:45:43 +01:00 committed by GitHub
parent 936d78fefc
commit 413087df9d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 24 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/network/network_content.cpp
View File

@ -56,7 +56,29 @@ static bool HasGRFConfig(const ContentInfo *ci, bool md5sum)
* @param md5sum also match the MD5 checksum? * @param md5sum also match the MD5 checksum?
* @return true iff it's known * @return true iff it's known
*/ */
typedef bool (*HasProc)(const ContentInfo *ci, bool md5sum); using HasContentProc = bool(const ContentInfo *ci, bool md5sum);
/**
* Get the has-content check function for the given content type.
* @param type Content type to get check function for.
* @return Check function pointer.
*/
static HasContentProc *GetHasContentProcforContentType(ContentType type)
{
switch (type) {
case CONTENT_TYPE_NEWGRF: return HasGRFConfig;
case CONTENT_TYPE_BASE_GRAPHICS: return BaseGraphics::HasSet;
case CONTENT_TYPE_BASE_MUSIC: return BaseMusic::HasSet;
case CONTENT_TYPE_BASE_SOUNDS: return BaseSounds::HasSet;
case CONTENT_TYPE_AI: return AI::HasAI;
case CONTENT_TYPE_AI_LIBRARY: return AI::HasAILibrary;
case CONTENT_TYPE_GAME: return Game::HasGame;
case CONTENT_TYPE_GAME_LIBRARY: return Game::HasGameLibrary;
case CONTENT_TYPE_SCENARIO: return HasScenario;
case CONTENT_TYPE_HEIGHTMAP: return HasScenario;
default: return nullptr;
}
}
bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet &p) bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet &p)
{ {
@ -91,50 +113,7 @@ bool ClientNetworkContentSocketHandler::Receive_SERVER_INFO(Packet &p)
return false; return false;
} }
/* Find the appropriate check function */ HasContentProc *proc = GetHasContentProcforContentType(ci->type);
HasProc proc = nullptr;
switch (ci->type) {
case CONTENT_TYPE_NEWGRF:
proc = HasGRFConfig;
break;
case CONTENT_TYPE_BASE_GRAPHICS:
proc = BaseGraphics::HasSet;
break;
case CONTENT_TYPE_BASE_MUSIC:
proc = BaseMusic::HasSet;
break;
case CONTENT_TYPE_BASE_SOUNDS:
proc = BaseSounds::HasSet;
break;
case CONTENT_TYPE_AI:
proc = AI::HasAI; break;
break;
case CONTENT_TYPE_AI_LIBRARY:
proc = AI::HasAILibrary; break;
break;
case CONTENT_TYPE_GAME:
proc = Game::HasGame; break;
break;
case CONTENT_TYPE_GAME_LIBRARY:
proc = Game::HasGameLibrary; break;
break;
case CONTENT_TYPE_SCENARIO:
case CONTENT_TYPE_HEIGHTMAP:
proc = HasScenario;
break;
default:
break;
}
if (proc != nullptr) { if (proc != nullptr) {
if (proc(ci, true)) { if (proc(ci, true)) {
ci->state = ContentInfo::ALREADY_HERE; ci->state = ContentInfo::ALREADY_HERE;