Final stuff for today.

diff --git a/daphne/citclient.cpp b/daphne/citclient.cpp
index 2668e9e6b16e8e6f55956a1c9826475583674ff2..2b7b4b7f748aedd12c7c4ef125b0e7003501892e 100644 (file)
--- a/daphne/citclient.cpp
+++ b/daphne/citclient.cpp
@@ -220,7 +220,7 @@ bool CitClient::GotoRoom(wxString roomname, wxString password,
 
        if (retval != 2) return FALSE;
 
-       extract(CurrentRoom, recvcmd.Mid(4, 255), 0);
+       extract(CurrentRoom, recvcmd.Mid(4), 0);
        BigMDI->SetStatusText(CurrentRoom, 2);
        return TRUE;
 }

diff --git a/daphne/roomview.cpp b/daphne/roomview.cpp
index 9fe65a0b36034b940aa6f7c8561e185308dabc5d..b5cda7905b0c5c89f32b338932a7a4b9bd673c7f 100644 (file)
--- a/daphne/roomview.cpp
+++ b/daphne/roomview.cpp
@@ -31,7 +31,7 @@ RoomView::RoomView(
        message_window = NULL;
 
 
-       if (citsock->GotoRoom(roomname, "", recvcmd) != 2) {
+        if (citsock->GotoRoom(roomname, "", recvcmd) != TRUE) {
                delete this;
        }
 

diff --git a/daphne/userlogin.cpp b/daphne/userlogin.cpp
index 9206652be87ecd038ffb284937b5a6bb37c95630..530e6341c22917549f6b18590f669196ffe63501 100644 (file)
--- a/daphne/userlogin.cpp
+++ b/daphne/userlogin.cpp
@@ -295,7 +295,7 @@ void UserLogin::OnButtonPressed(wxCommandEvent& whichbutton) {
 void UserLogin::BeginSession(wxString serv_response) {
        wxString junk, username;
 
-       extract(username, serv_response.Mid(4, 255), 0);
+       extract(username, serv_response.Mid(4), 0);
        BigMDI->SetStatusText(username, 1);
        citsock->GotoRoom("_BASEROOM_", "", junk);