refactor: convert more if-else chains to switch statements

[bobtista]

Refactored:

• Recorder::readArgument(): 11-deep enum dispatch for argument types
• UDP::GetStatus(): Windows (11-deep) and Unix (12-deep) error code mapping
• NAT::allConnectionsDone(): 7-deep player count logic

[johnneijzen]

Can't this just be simplified to this, or is there a reason why it was coded this way?

Bool NAT::allConnectionsDone() {
	if ((m_numNodes == 2 && m_connectionRound >= 1) ||
	    (m_numNodes == 3 && m_connectionRound >= 3) ||
	    (m_numNodes == 4 && m_connectionRound >= 3) ||
	    (m_numNodes == 5 && m_connectionRound >= 5) ||
	    (m_numNodes == 6 && m_connectionRound >= 5) ||
	    (m_numNodes == 7 && m_connectionRound >= 7) ||
	    (m_numNodes == 8 && m_connectionRound >= 7)) {
		return TRUE;
	}
	return FALSE;
}

[bobtista]

I had the same thought, so yeah I've added your version.

[Caball009]

Could maybe even do something like this:

Bool NAT::allConnectionsDone()
{
	switch (m_numNodes)
	{
		case 2:
			return m_connectionRound >= 1;
		case 3:
			return m_connectionRound >= 3;
		case 4:
			return m_connectionRound >= 3;
		case 5:
			return m_connectionRound >= 5;
		case 6:
			return m_connectionRound >= 5;
		case 7:
			return m_connectionRound >= 7;
		case 8:
			return m_connectionRound >= 7;
		default:
			return FALSE;
	}
}

I'm not sure if VC6 will warn for a missing return statement, but if it does, you can make the default case break and add a return statement outside the switch statement.

[Skyaero42]

more compact, not sure if it is more performant.

    if (m_numNodes < 2 || m_numNodes > 8) {
        return FALSE;
    }
    
    int requiredRounds = (m_numNodes % 2 == 0) ? m_numNodes - 1 : m_numNodes;
    return m_connectionRound >= requiredRounds;

[Caball009]

more compact, not sure if it is more performant.

    if (m_numNodes < 2 || m_numNodes > 8) {
        return FALSE;
    }
    
    int requiredRounds = (m_numNodes % 2 == 0) ? m_numNodes - 1 : m_numNodes;
    return m_connectionRound >= requiredRounds;

This generates better code with modern compilers, not sure about VC6. I'd suggest to make it unsigned, though, to avoid a warning for comparison with unsigned in the return statement.

I don't know if VC6 optimizes % 2 == 1 to & 1, which modern compilers do (for unsigned integers).

[bobtista]

I like your first suggestion if ((m_numNodes == 2 && m_connectionRound >= 1) ||....