Apple-2gs-SW/BuGS
1
0
Fork 0
mirror of https://github.com/jeremysrand/BuGS.git synced 2024-05-28 16:41:35 +00:00
Code Issues Projects Releases Wiki Activity

More global high score rework towards making it generic.

Browse Source
This commit is contained in:
Jeremy Rand 2023-06-07 19:53:14 -04:00
parent 37faafb698
commit 0ae5fa1b54
4 changed files with 396 additions and 330 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BUGS.md
View File

@ -2,6 +2,7 @@ BUGS
======= =======
This is a list of the software bugs (as opposed to the bugs in the game that you shoot) that still need attention: This is a list of the software bugs (as opposed to the bugs in the game that you shoot) that still need attention:
* Should detect when running on system 5 or lower and quit gracefully. Today, the game crashes.
FIXED FIXED

4
BuGS.xcodeproj/xcuserdata/jrand.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -12,7 +12,7 @@
<key>Binary.xcscheme_^#shared#^_</key> <key>Binary.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>4</integer> <integer>1</integer>
</dict> </dict>
<key>BuGS.xcscheme_^#shared#^_</key> <key>BuGS.xcscheme_^#shared#^_</key>
<dict> <dict>
@ -22,7 +22,7 @@
<key>DiskImage.xcscheme_^#shared#^_</key> <key>DiskImage.xcscheme_^#shared#^_</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>1</integer> <integer>4</integer>
</dict> </dict>
<key>doNotBuild.xcscheme_^#shared#^_</key> <key>doNotBuild.xcscheme_^#shared#^_</key>
<dict> <dict>

259
BuGS/globalScores.c
View File

@ -76,7 +76,7 @@ typedef struct tHelloResponse {
typedef struct tScoresResponse { typedef struct tScoresResponse {
uint16_t responseType; uint16_t responseType;
tHighScore highScores[10]; tHighScores highScores;
} tScoresResponse; } tScoresResponse;
@ -135,8 +135,11 @@ typedef enum tGameNetworkState {
GAME_NETWORK_WAITING_FOR_SCORE_ACK, GAME_NETWORK_WAITING_FOR_SCORE_ACK,
GAME_NETWORK_CLOSING_TCP, GAME_NETWORK_CLOSING_TCP,
NUM_GAME_NETWORK_STATES
} tGameNetworkState; } tGameNetworkState;
typedef void (*tGameNetworkStateHandler)(void);
typedef struct tGameNetworkGlobals { typedef struct tGameNetworkGlobals {
Boolean networkStartedConnected; Boolean networkStartedConnected;
@ -157,9 +160,52 @@ typedef struct tGameNetworkGlobals {
uint16_t timeout; uint16_t timeout;
} tGameNetworkGlobals; } tGameNetworkGlobals;
// Forward declarations
static void handleConnectFailed(void);
static void handleUnconnected(void);
static void handleConnected(void);
static void handleResolvingName(void);
static void handleLookupFailed(void);
static void handleSocketError(void);
static void handleProtocolFailed(void);
static void handleFailure(void);
static void handleTcpUnconnected(void);
static void handleWaitingForTcp(void);
static void handleWaitingForHello(void);
static void handleRequestScores(void);
static void handleWaitingForScores(void);
static void handleSetHighScore(void);
static void handleWaitingForScoreAck(void);
static void handleClosingTcp(void);
// Globals // Globals
static tGameNetworkStateHandler handlers[NUM_GAME_NETWORK_STATES] = {
handleConnectFailed,
handleUnconnected,
handleConnected,
handleResolvingName,
handleLookupFailed,
handleSocketError,
handleProtocolFailed,
handleFailure,
handleTcpUnconnected,
handleWaitingForTcp,
handleWaitingForHello,
handleRequestScores,
handleWaitingForScores,
handleSetHighScore,
handleWaitingForScoreAck,
handleClosingTcp
};
// I am running out of space in the main segment so I am moving these globals into // I am running out of space in the main segment so I am moving these globals into
// a dynamically allocated struct. It is only allocated if network capabilities are // a dynamically allocated struct. It is only allocated if network capabilities are
// detected. // detected.
@ -299,7 +345,7 @@ static char hexDigitToAscii(Word digit)
static void displayString(Word row, char * string) static void displayString(Word row, char * string)
{ {
strcpy(&(highScoreResponse.highScores[row].scoreText[2]), string); strcpy(&(highScoreResponse.highScores.score[row].scoreText[2]), string);
} }
static void displayNetworkError(char * line1, char * line2) static void displayNetworkError(char * line1, char * line2)
@ -309,16 +355,16 @@ static void displayNetworkError(char * line1, char * line2)
networkGlobals->gameNetworkState = GAME_NETWORK_FAILURE; networkGlobals->gameNetworkState = GAME_NETWORK_FAILURE;
for (row = 0; row < sizeof(highScoreResponse.highScores) / sizeof(highScoreResponse.highScores[0]); row++) { for (row = 0; row < sizeof(highScoreResponse.highScores) / sizeof(highScoreResponse.highScores.score[0]); row++) {
for (column = 0; for (column = 0;
column < sizeof(highScoreResponse.highScores[0].scoreText) / sizeof(highScoreResponse.highScores[0].scoreText[0]); column < sizeof(highScoreResponse.highScores.score[0].scoreText) / sizeof(highScoreResponse.highScores.score[0].scoreText[0]);
column++) { column++) {
highScoreResponse.highScores[row].scoreText[column] = ' '; highScoreResponse.highScores.score[row].scoreText[column] = ' ';
} }
for (column = 0; for (column = 0;
column < sizeof(highScoreResponse.highScores[0].who) / sizeof(highScoreResponse.highScores[0].who[0]); column < sizeof(highScoreResponse.highScores.score[0].who) / sizeof(highScoreResponse.highScores.score[0].who[0]);
column++) { column++) {
highScoreResponse.highScores[row].who[column] = ' '; highScoreResponse.highScores.score[row].who[column] = ' ';
} }
} }
@ -328,60 +374,28 @@ static void displayNetworkError(char * line1, char * line2)
displayString(4, line1); displayString(4, line1);
displayString(5, line2); displayString(5, line2);
highScoreResponse.highScores[7].scoreText[0] = 'C'; highScoreResponse.highScores.score[7].scoreText[0] = 'C';
highScoreResponse.highScores[7].scoreText[1] = 'O'; highScoreResponse.highScores.score[7].scoreText[1] = 'O';
highScoreResponse.highScores[7].scoreText[2] = 'D'; highScoreResponse.highScores.score[7].scoreText[2] = 'D';
highScoreResponse.highScores[7].scoreText[3] = 'E'; highScoreResponse.highScores.score[7].scoreText[3] = 'E';
highScoreResponse.highScores[7].scoreText[4] = ':'; highScoreResponse.highScores.score[7].scoreText[4] = ':';
highScoreResponse.highScores[7].scoreText[5] = ' '; highScoreResponse.highScores.score[7].scoreText[5] = ' ';
highScoreResponse.highScores[7].scoreText[6] = hexDigitToAscii(networkGlobals->errorCode >> 12); highScoreResponse.highScores.score[7].scoreText[6] = hexDigitToAscii(networkGlobals->errorCode >> 12);
highScoreResponse.highScores[7].scoreText[7] = hexDigitToAscii(networkGlobals->errorCode >> 8); highScoreResponse.highScores.score[7].scoreText[7] = hexDigitToAscii(networkGlobals->errorCode >> 8);
highScoreResponse.highScores[7].scoreText[8] = hexDigitToAscii(networkGlobals->errorCode >> 4); highScoreResponse.highScores.score[7].scoreText[8] = hexDigitToAscii(networkGlobals->errorCode >> 4);
highScoreResponse.highScores[7].scoreText[9] = hexDigitToAscii(networkGlobals->errorCode); highScoreResponse.highScores.score[7].scoreText[9] = hexDigitToAscii(networkGlobals->errorCode);
globalScoreAge = 0; globalScoreAge = 0;
hasGlobalHighScores = TRUE; hasGlobalHighScores = TRUE;
} }
static void handleConnectFailed(void)
void pollNetwork(void)
{ {
if (networkGlobals == NULL)
return;
TCPIPPoll();
switch (networkGlobals->gameNetworkState) {
case GAME_NETWORK_SOCKET_ERROR:
displayNetworkError("SOCKET", "ERROR");
networkGlobals->timeout = NETWORK_RETRY_TIMEOUT;
break;
case GAME_NETWORK_LOOKUP_FAILED:
displayNetworkError("LOOKUP", "FAILED");
break;
case GAME_NETWORK_CONNECT_FAILED:
displayNetworkError("CONNECT", "FAILED"); displayNetworkError("CONNECT", "FAILED");
break; }
case GAME_NETWORK_PROTOCOL_FAILED: static void handleUnconnected(void)
abortConnection(); {
displayNetworkError("PROTOCOL", "FAILED");
networkGlobals->timeout = NETWORK_RETRY_TIMEOUT;
break;
case GAME_NETWORK_FAILURE:
// All of the different failure modes except protocol failure above end up here ultimately. And the state
// machine stays here once it arrives here.
if (networkGlobals->timeout > 0) {
networkGlobals->timeout--;
if (networkGlobals->timeout == 0)
networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED;
}
break;
case GAME_NETWORK_UNCONNECTED:
if (networkGlobals->initParams.displayConnectionString != NULL) if (networkGlobals->initParams.displayConnectionString != NULL)
networkGlobals->initParams.displayConnectionString(TRUE); networkGlobals->initParams.displayConnectionString(TRUE);
TCPIPConnect(NULL); TCPIPConnect(NULL);
@ -393,59 +407,92 @@ void pollNetwork(void)
} }
if (networkGlobals->initParams.displayConnectionString != NULL) if (networkGlobals->initParams.displayConnectionString != NULL)
networkGlobals->initParams.displayConnectionString(FALSE); networkGlobals->initParams.displayConnectionString(FALSE);
break; }
case GAME_NETWORK_CONNECTED: static void handleConnected(void)
{
TCPIPDNRNameToIP(networkGlobals->initParams.scoreServer, &(networkGlobals->domainNameResolution)); TCPIPDNRNameToIP(networkGlobals->initParams.scoreServer, &(networkGlobals->domainNameResolution));
if (toolerror()) { if (toolerror()) {
networkGlobals->gameNetworkState = GAME_NETWORK_LOOKUP_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_LOOKUP_FAILED;
networkGlobals->errorCode = toolerror(); networkGlobals->errorCode = toolerror();
} else } else
networkGlobals->gameNetworkState = GAME_NETWORK_RESOLVING_NAME; networkGlobals->gameNetworkState = GAME_NETWORK_RESOLVING_NAME;
break; }
case GAME_NETWORK_RESOLVING_NAME: static void handleResolvingName(void)
{
if (networkGlobals->domainNameResolution.DNRstatus == DNR_Pending) if (networkGlobals->domainNameResolution.DNRstatus == DNR_Pending)
break; return;
if (networkGlobals->domainNameResolution.DNRstatus != DNR_OK) { if (networkGlobals->domainNameResolution.DNRstatus != DNR_OK) {
networkGlobals->gameNetworkState = GAME_NETWORK_LOOKUP_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_LOOKUP_FAILED;
networkGlobals->errorCode = networkGlobals->domainNameResolution.DNRstatus; networkGlobals->errorCode = networkGlobals->domainNameResolution.DNRstatus;
break; return;
} }
networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED; networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED;
break; }
case GAME_NETWORK_TCP_UNCONNECTED: static void handleLookupFailed(void)
{
displayNetworkError("LOOKUP", "FAILED");
}
static void handleSocketError(void)
{
displayNetworkError("SOCKET", "ERROR");
networkGlobals->timeout = NETWORK_RETRY_TIMEOUT;
}
static void handleProtocolFailed(void)
{
abortConnection();
displayNetworkError("PROTOCOL", "FAILED");
networkGlobals->timeout = NETWORK_RETRY_TIMEOUT;
}
static void handleFailure(void)
{
// All of the different failure modes except protocol failure above end up here ultimately. And the state
// machine stays here once it arrives here.
if (networkGlobals->timeout > 0) {
networkGlobals->timeout--;
if (networkGlobals->timeout == 0)
networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED;
}
}
static void handleTcpUnconnected(void)
{
if ((hasGlobalHighScores) && if ((hasGlobalHighScores) &&
(globalScoreAge > 0) && (globalScoreAge > 0) &&
(!networkGlobals->hasHighScoreToSend)) (!networkGlobals->hasHighScoreToSend))
break; return;
networkGlobals->ipid = TCPIPLogin(networkGlobals->initParams.userId, networkGlobals->domainNameResolution.DNRIPaddress, networkGlobals->initParams.scorePort, 0, 64); networkGlobals->ipid = TCPIPLogin(networkGlobals->initParams.userId, networkGlobals->domainNameResolution.DNRIPaddress, networkGlobals->initParams.scorePort, 0, 64);
if (toolerror()) { if (toolerror()) {
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
networkGlobals->errorCode = toolerror(); networkGlobals->errorCode = toolerror();
break; return;
} }
networkGlobals->errorCode = TCPIPOpenTCP(networkGlobals->ipid); networkGlobals->errorCode = TCPIPOpenTCP(networkGlobals->ipid);
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
TCPIPLogout(networkGlobals->ipid); TCPIPLogout(networkGlobals->ipid);
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_TCP; networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_TCP;
networkGlobals->timeout = TCP_CONNECT_TIMEOUT; networkGlobals->timeout = TCP_CONNECT_TIMEOUT;
break; }
case GAME_NETWORK_WAITING_FOR_TCP: static void handleWaitingForTcp(void)
{
networkGlobals->errorCode = TCPIPStatusTCP(networkGlobals->ipid, &(networkGlobals->tcpStatus)); networkGlobals->errorCode = TCPIPStatusTCP(networkGlobals->ipid, &(networkGlobals->tcpStatus));
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
if ((networkGlobals->tcpStatus.srState == TCPSSYNSENT) || if ((networkGlobals->tcpStatus.srState == TCPSSYNSENT) ||
(networkGlobals->tcpStatus.srState == TCPSSYNRCVD)) { (networkGlobals->tcpStatus.srState == TCPSSYNRCVD)) {
@ -455,22 +502,23 @@ void pollNetwork(void)
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = TCP_CONNECT_TIMEOUT_ERROR; networkGlobals->errorCode = TCP_CONNECT_TIMEOUT_ERROR;
} }
break; return;
} }
if (networkGlobals->tcpStatus.srState != TCPSESTABLISHED) { if (networkGlobals->tcpStatus.srState != TCPSESTABLISHED) {
abortConnection(); abortConnection();
networkGlobals->errorCode = networkGlobals->tcpStatus.srState | 0x8000; networkGlobals->errorCode = networkGlobals->tcpStatus.srState | 0x8000;
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_HELLO; networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_HELLO;
networkGlobals->timeout = READ_NETWORK_TIMEOUT; networkGlobals->timeout = READ_NETWORK_TIMEOUT;
networkGlobals->bytesRead = 0; networkGlobals->bytesRead = 0;
break; }
case GAME_NETWORK_WAITING_FOR_HELLO: static void handleWaitingForHello(void)
{
networkGlobals->errorCode = TCPIPReadTCP(networkGlobals->ipid, 0, networkGlobals->errorCode = TCPIPReadTCP(networkGlobals->ipid, 0,
((uint32_t)(&(networkGlobals->helloResponse))) + networkGlobals->bytesRead, ((uint32_t)(&(networkGlobals->helloResponse))) + networkGlobals->bytesRead,
sizeof(networkGlobals->helloResponse) - networkGlobals->bytesRead, sizeof(networkGlobals->helloResponse) - networkGlobals->bytesRead,
@ -478,7 +526,7 @@ void pollNetwork(void)
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->bytesRead += networkGlobals->readResponseBuf.rrBuffCount; networkGlobals->bytesRead += networkGlobals->readResponseBuf.rrBuffCount;
@ -489,19 +537,19 @@ void pollNetwork(void)
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = HELLO_TIMEOUT_ERROR; networkGlobals->errorCode = HELLO_TIMEOUT_ERROR;
} }
break; return;
} }
if (networkGlobals->bytesRead > sizeof(networkGlobals->helloResponse)) { if (networkGlobals->bytesRead > sizeof(networkGlobals->helloResponse)) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = HELLO_TOO_BIG_ERROR; networkGlobals->errorCode = HELLO_TOO_BIG_ERROR;
break; return;
} }
if (networkGlobals->helloResponse.responseType != RESPONSE_TYPE_HELLO) { if (networkGlobals->helloResponse.responseType != RESPONSE_TYPE_HELLO) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = HELLO_UNEXPECTED_RESPONSE_ERROR; networkGlobals->errorCode = HELLO_UNEXPECTED_RESPONSE_ERROR;
break; return;
} }
networkGlobals->secrets[2] = networkGlobals->helloResponse.nonce; networkGlobals->secrets[2] = networkGlobals->helloResponse.nonce;
@ -515,9 +563,10 @@ void pollNetwork(void)
networkGlobals->gameNetworkState = GAME_NETWORK_CLOSING_TCP; networkGlobals->gameNetworkState = GAME_NETWORK_CLOSING_TCP;
networkGlobals->timeout = SHUTDOWN_NETWORK_TIMEOUT; networkGlobals->timeout = SHUTDOWN_NETWORK_TIMEOUT;
} }
break; }
case GAME_NETWORK_REQUEST_SCORES: static void handleRequestScores(void)
{
networkGlobals->highScoreRequest.highScoreRequest.requestType = REQUEST_TYPE_GET_HIGH_SCORES; networkGlobals->highScoreRequest.highScoreRequest.requestType = REQUEST_TYPE_GET_HIGH_SCORES;
md5Init(&(networkGlobals->hashWorkBlock)); md5Init(&(networkGlobals->hashWorkBlock));
@ -529,15 +578,16 @@ void pollNetwork(void)
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_SCORES; networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_SCORES;
networkGlobals->timeout = READ_NETWORK_TIMEOUT; networkGlobals->timeout = READ_NETWORK_TIMEOUT;
networkGlobals->bytesRead = 0; networkGlobals->bytesRead = 0;
break; }
case GAME_NETWORK_WAITING_FOR_SCORES: static void handleWaitingForScores(void)
{
networkGlobals->errorCode = TCPIPReadTCP(networkGlobals->ipid, 0, networkGlobals->errorCode = TCPIPReadTCP(networkGlobals->ipid, 0,
((uint32_t)(&highScoreResponse)) + networkGlobals->bytesRead, ((uint32_t)(&highScoreResponse)) + networkGlobals->bytesRead,
sizeof(highScoreResponse) - networkGlobals->bytesRead, sizeof(highScoreResponse) - networkGlobals->bytesRead,
@ -545,7 +595,7 @@ void pollNetwork(void)
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->bytesRead += networkGlobals->readResponseBuf.rrBuffCount; networkGlobals->bytesRead += networkGlobals->readResponseBuf.rrBuffCount;
@ -556,19 +606,19 @@ void pollNetwork(void)
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = HIGH_SCORE_TIMEOUT_ERROR; networkGlobals->errorCode = HIGH_SCORE_TIMEOUT_ERROR;
} }
break; return;
} }
if (networkGlobals->bytesRead > sizeof(highScoreResponse)) { if (networkGlobals->bytesRead > sizeof(highScoreResponse)) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = HIGH_SCORE_TOO_BIG_ERROR; networkGlobals->errorCode = HIGH_SCORE_TOO_BIG_ERROR;
break; return;
} }
if (highScoreResponse.responseType != RESPONSE_TYPE_SCORES) { if (highScoreResponse.responseType != RESPONSE_TYPE_SCORES) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = HIGH_SCORE_UNEXPECTED_RESPONSE_ERROR; networkGlobals->errorCode = HIGH_SCORE_UNEXPECTED_RESPONSE_ERROR;
break; return;
} }
globalScoreAge = GLOBAL_SCORE_REFRESH_TIME; globalScoreAge = GLOBAL_SCORE_REFRESH_TIME;
@ -577,9 +627,10 @@ void pollNetwork(void)
TCPIPCloseTCP(networkGlobals->ipid); TCPIPCloseTCP(networkGlobals->ipid);
networkGlobals->gameNetworkState = GAME_NETWORK_CLOSING_TCP; networkGlobals->gameNetworkState = GAME_NETWORK_CLOSING_TCP;
networkGlobals->timeout = SHUTDOWN_NETWORK_TIMEOUT; networkGlobals->timeout = SHUTDOWN_NETWORK_TIMEOUT;
break; }
case GAME_NETWORK_SET_HIGH_SCORE: static void handleSetHighScore(void)
{
setHighScoreRequest.setHighScoreRequest.requestType = REQUEST_TYPE_SET_SCORE; setHighScoreRequest.setHighScoreRequest.requestType = REQUEST_TYPE_SET_SCORE;
setHighScoreRequest.setHighScoreRequest.who[3] = '\0'; setHighScoreRequest.setHighScoreRequest.who[3] = '\0';
@ -592,15 +643,16 @@ void pollNetwork(void)
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_SCORE_ACK; networkGlobals->gameNetworkState = GAME_NETWORK_WAITING_FOR_SCORE_ACK;
networkGlobals->timeout = READ_NETWORK_TIMEOUT; networkGlobals->timeout = READ_NETWORK_TIMEOUT;
networkGlobals->bytesRead = 0; networkGlobals->bytesRead = 0;
break; }
case GAME_NETWORK_WAITING_FOR_SCORE_ACK: static void handleWaitingForScoreAck(void)
{
networkGlobals->errorCode = TCPIPReadTCP(networkGlobals->ipid, 0, networkGlobals->errorCode = TCPIPReadTCP(networkGlobals->ipid, 0,
((uint32_t)(&(networkGlobals->setHighScoreResponse))) + networkGlobals->bytesRead, ((uint32_t)(&(networkGlobals->setHighScoreResponse))) + networkGlobals->bytesRead,
sizeof(networkGlobals->setHighScoreResponse) - networkGlobals->bytesRead, sizeof(networkGlobals->setHighScoreResponse) - networkGlobals->bytesRead,
@ -608,7 +660,7 @@ void pollNetwork(void)
if (networkGlobals->errorCode != tcperrOK) { if (networkGlobals->errorCode != tcperrOK) {
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR; networkGlobals->gameNetworkState = GAME_NETWORK_SOCKET_ERROR;
break; return;
} }
networkGlobals->bytesRead += networkGlobals->readResponseBuf.rrBuffCount; networkGlobals->bytesRead += networkGlobals->readResponseBuf.rrBuffCount;
@ -619,33 +671,34 @@ void pollNetwork(void)
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = SET_SCORE_TIMEOUT_ERROR; networkGlobals->errorCode = SET_SCORE_TIMEOUT_ERROR;
} }
break; return;
} }
if (networkGlobals->bytesRead > sizeof(networkGlobals->setHighScoreResponse)) { if (networkGlobals->bytesRead > sizeof(networkGlobals->setHighScoreResponse)) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = SET_SCORE_TOO_BIG_ERROR; networkGlobals->errorCode = SET_SCORE_TOO_BIG_ERROR;
break; return;
} }
if (networkGlobals->setHighScoreResponse.responseType != RESPONSE_TYPE_STATUS) { if (networkGlobals->setHighScoreResponse.responseType != RESPONSE_TYPE_STATUS) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = SET_SCORE_UNEXPECTED_RESPONSE_ERROR; networkGlobals->errorCode = SET_SCORE_UNEXPECTED_RESPONSE_ERROR;
break; return;
} }
if (!networkGlobals->setHighScoreResponse.success) { if (!networkGlobals->setHighScoreResponse.success) {
networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED; networkGlobals->gameNetworkState = GAME_NETWORK_PROTOCOL_FAILED;
networkGlobals->errorCode = SET_SCORE_FAILED_ERROR; networkGlobals->errorCode = SET_SCORE_FAILED_ERROR;
break; return;
} }
networkGlobals->hasHighScoreToSend = FALSE; networkGlobals->hasHighScoreToSend = FALSE;
globalScoreAge = 0; globalScoreAge = 0;
networkGlobals->gameNetworkState = GAME_NETWORK_REQUEST_SCORES; networkGlobals->gameNetworkState = GAME_NETWORK_REQUEST_SCORES;
break; }
case GAME_NETWORK_CLOSING_TCP: static void handleClosingTcp(void)
{
networkGlobals->errorCode = TCPIPStatusTCP(networkGlobals->ipid, &(networkGlobals->tcpStatus)); networkGlobals->errorCode = TCPIPStatusTCP(networkGlobals->ipid, &(networkGlobals->tcpStatus));
if ((networkGlobals->tcpStatus.srState != TCPSCLOSED) && if ((networkGlobals->tcpStatus.srState != TCPSCLOSED) &&
(networkGlobals->tcpStatus.srState != TCPSTIMEWAIT)) { (networkGlobals->tcpStatus.srState != TCPSTIMEWAIT)) {
@ -655,13 +708,21 @@ void pollNetwork(void)
abortConnection(); abortConnection();
networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED; networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED;
} }
break; return;
} }
TCPIPLogout(networkGlobals->ipid); TCPIPLogout(networkGlobals->ipid);
networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED; networkGlobals->gameNetworkState = GAME_NETWORK_TCP_UNCONNECTED;
break; }
}
void pollNetwork(void)
{
if (networkGlobals == NULL)
return;
TCPIPPoll();
handlers[networkGlobals->gameNetworkState]();
} }

4
BuGS/globalScores.h
View File

@ -20,6 +20,10 @@ typedef struct tHighScore
unsigned long score; unsigned long score;
} tHighScore; } tHighScore;
typedef struct tHighScores
{
tHighScore score[10];
} tHighScores;
typedef struct tHighScoreInitParams typedef struct tHighScoreInitParams
{ {