summaryrefslogtreecommitdiff
path: root/games/xevil/files/patch-cmn::xetp.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'games/xevil/files/patch-cmn::xetp.cpp')
-rw-r--r--games/xevil/files/patch-cmn::xetp.cpp40
1 files changed, 33 insertions, 7 deletions
diff --git a/games/xevil/files/patch-cmn::xetp.cpp b/games/xevil/files/patch-cmn::xetp.cpp
index f16e557e83d0..ab2a4f22859d 100644
--- a/games/xevil/files/patch-cmn::xetp.cpp
+++ b/games/xevil/files/patch-cmn::xetp.cpp
@@ -1,24 +1,50 @@
---- cmn/xetp.cpp.orig 2000-01-19 12:54:30.000000000 +0100
-+++ cmn/xetp.cpp 2007-07-31 15:51:31.000000000 +0200
-@@ -29,9 +29,10 @@
+--- cmn/xetp.cpp.orig 2012-05-27 06:52:30.000000000 +0900
++++ cmn/xetp.cpp 2012-05-27 06:53:11.000000000 +0900
+@@ -29,9 +29,9 @@
#include "stdafx.h"
-#include <iostream.h>
+#include <iostream>
-+using namespace std;
#if X11
-#include <strstream.h>
-+#include <strstream>
++#include <sstream>
#endif
#if WIN32
#include <strstrea.h>
-@@ -159,7 +160,7 @@
+@@ -53,6 +53,8 @@
+ #include "xetp.h"
+
+
++using namespace std;
++
+
+ void XETP::check_sizes() {
+ XETPBasic::check_sizes();
+@@ -159,7 +161,7 @@
for (n = 0; n < physicals.length(); n++) {
PhysicalP p = (PhysicalP)physicals.get(n);
// computing object_length twice, but who cares.
- _send_object(out,p,turn,(TickType)tickTypes.get(n),
-+ _send_object(out,p,turn,(intptr_t)tickTypes.get(n),
++ _send_object(out,p,turn,(long)tickTypes.get(n),
compute_object_length(p));
}
+@@ -274,7 +276,7 @@
+
+
+
+-void XETP::send_message(OutStreamP out,char *msg) {
++void XETP::send_message(OutStreamP out,const char *msg) {
+ assert(msg);
+ u_int len = strlen(msg);
+
+@@ -293,7 +295,7 @@
+
+
+
+-void XETP::send_arena_message(OutStreamP out,int time,char *msg) {
++void XETP::send_arena_message(OutStreamP out,int time,const char *msg) {
+ assert(msg);
+ u_int len = sizeof(int) + // time
+ strlen(msg); // string body