fixes

diff --git a/daphne/Makefile b/daphne/Makefile
index baa2127ef4bd010b00b711e4c7305177575db2d6..064df364216a1c0f4922dc90f45bd58371f7ab26 100644 (file)
--- a/daphne/Makefile
+++ b/daphne/Makefile
@@ -3,10 +3,10 @@ LFLAGS=`wx-config --libs`
 
 daphne: main.o citclient.o userlogin.o testwindow.o who.o \
        utils.o express_message.o send_express.o \
-       roomtree.o roomview.o
+       roomtree.o roomview.o tcp_sockets.o
        c++ main.o citclient.o userlogin.o testwindow.o who.o \
        utils.o express_message.o send_express.o \
-       roomtree.o roomview.o \
+       roomtree.o roomview.o tcp_sockets.o \
        $(LFLAGS) -o daphne
 
 main.o: main.cpp includes.hpp
@@ -38,3 +38,6 @@ roomtree.o: roomtree.cpp includes.hpp
 
 roomview.o: roomview.cpp includes.hpp
        c++ -c $(CFLAGS) roomview.cpp
+
+tcp_sockets.o: tcp_sockets.cpp includes.hpp
+       c++ -c $(CFLAGS) tcp_sockets.cpp

diff --git a/daphne/utils.cpp b/daphne/utils.cpp
index faba536e6adcecdfc4c53cd7c09812f4e1897fb1..0f8405ccbc26249822bf80470d13ae22561e5016 100644 (file)
--- a/daphne/utils.cpp
+++ b/daphne/utils.cpp
@@ -31,17 +31,17 @@ void MultilineToList(wxStringList& outputlist, wxString inputbuf) {
                // First try to locate a line break
                pos = buf.Find('\n', FALSE);
                if ( (pos >=0) && (pos < 256) ) {
-                       outputlist.Add(buf.Mid(0, pos-1));
+                       outputlist.Add(buf.Left(pos-1));
                        buf = buf.Mid(pos+1);
                } else {
                // Otherwise, try to find a space
                        pos = buf.Mid(0, 256).Find(' ', TRUE);
                        if ( (pos >=0) && (pos < 256) ) {
-                               outputlist.Add(buf.Mid(0, pos-1));
+                               outputlist.Add(buf.Left(pos-1));
                                buf = buf.Mid(pos+1);
                        } else {
                                pos = 255;
-                               outputlist.Add(buf.Mid(0, pos-1));
+                               outputlist.Add(buf.Left(pos-1));
                                buf = buf.Mid(pos);
                        }
                }
@@ -67,7 +67,7 @@ void extract(wxString& outputbuf, wxString inputbuf, int parmnum) {
 
        p = outputbuf.First('|');
        if (p > 0) {
-               outputbuf = outputbuf.Mid(0, p);
+               outputbuf = outputbuf.Left(p);
        }
 }
 
@@ -75,6 +75,6 @@ int extract_int(wxString inputbuf, int parmnum) {
        wxString buf;
 
        extract(buf, inputbuf, parmnum);
-       return atoi(buf);
+       return atoi((const char *)buf);
 }