From 3073af1d84d6b22fccdb67321b1280eae434f64d Mon Sep 17 00:00:00 2001 From: "simon.kagstrom" Date: Sun, 8 Nov 2009 09:04:48 +0000 Subject: [PATCH] Move network status updates to Network --- Src/C64_SDL.h | 3 --- Src/Network.cpp | 3 +++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Src/C64_SDL.h b/Src/C64_SDL.h index 73f2dfc..c849751 100644 --- a/Src/C64_SDL.h +++ b/Src/C64_SDL.h @@ -492,14 +492,11 @@ void C64::network_vblank() } else if (this->network_connection_type == CONNECT) { network_connection_error_t err = this->peer->ConnectFSM(); - TheDisplay->display_status_string("WAITING FOR CONNECTION...", 1); - if (err == OK) { if (this->peer->is_master) this->network_connection_type = MASTER; else this->network_connection_type = CLIENT; - TheDisplay->display_status_string("CONNECTED!", 1); } else if (err != AGAIN_ERROR) { diff --git a/Src/Network.cpp b/Src/Network.cpp index 3a52813..e8b0bd8 100644 --- a/Src/Network.cpp +++ b/Src/Network.cpp @@ -1162,6 +1162,7 @@ network_connection_error_t Network::ConnectFSM() this->network_connection_state = CONN_WAIT_FOR_PEER_LIST; } break; case CONN_WAIT_FOR_PEER_ADDRESS: + TheC64->TheDisplay->display_status_string((char*)"WAITING FOR CONNECTION...", 1); err = this->WaitForPeerAddress(); if (err == OK) this->network_connection_state = CONN_CONNECT_TO_PEER; @@ -1192,6 +1193,7 @@ network_connection_error_t Network::ConnectFSM() case CONN_WAIT_FOR_PEER_REPLY: /* Connect again in case the first sent was dropped on * its way to the peer */ + TheC64->TheDisplay->display_status_string((char*)"CONNECTING TO PEER", 1); if (this->ConnectToPeer() == false) return AGAIN_ERROR; if (this->WaitForPeerReply() == true) @@ -1200,6 +1202,7 @@ network_connection_error_t Network::ConnectFSM() return AGAIN_ERROR; break; case CONN_CONNECTED: + TheC64->TheDisplay->display_status_string((char*)"CONNECTED!", 1); /* The lowest number is the default master */ default: return OK;