aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Socket.h
diff options
context:
space:
mode:
authorvoid_17 <heroerror3@gmail.com>2026-03-02 15:53:32 +0700
committervoid_17 <heroerror3@gmail.com>2026-03-02 15:53:32 +0700
commitd63f79325f85e014361eb8cf1e41eaebedb1ae71 (patch)
treed9f28714afd516bc2450f33b0a77c5e05ff4de90 /Minecraft.World/Socket.h
parentd6ec138710461294c3ffd2723bc8a9f212d3471f (diff)
Get rid of MSVC's __int64
Use either int64_t, uint64_t or long long and unsigned long long, defined as per C++11 standard
Diffstat (limited to 'Minecraft.World/Socket.h')
-rw-r--r--Minecraft.World/Socket.h10
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/Socket.h b/Minecraft.World/Socket.h
index 0019f984..c4ec9fc8 100644
--- a/Minecraft.World/Socket.h
+++ b/Minecraft.World/Socket.h
@@ -36,7 +36,7 @@ private:
virtual int read(byteArray b);
virtual int read(byteArray b, unsigned int offset, unsigned int length);
virtual void close();
- virtual __int64 skip(__int64 n) { return n; } // 4J Stu - Not implemented
+ virtual int64_t skip(int64_t n) { return n; } // 4J Stu - Not implemented
virtual void flush() {}
};
@@ -68,7 +68,7 @@ private:
virtual int read(byteArray b);
virtual int read(byteArray b, unsigned int offset, unsigned int length);
virtual void close();
- virtual __int64 skip(__int64 n) { return n; } // 4J Stu - Not implemented
+ virtual int64_t skip(int64_t n) { return n; } // 4J Stu - Not implemented
virtual void flush() {}
};
class SocketOutputStreamNetwork : public SocketOutputStream
@@ -86,13 +86,13 @@ private:
virtual void close();
virtual void flush() {}
};
-
+
bool m_hostServerConnection; // true if this is the connection between the host player and server
bool m_hostLocal; // true if this player on the same machine as the host
int m_end; // 0 for client side or 1 for host side
// For local connections between the host player and the server
- static CRITICAL_SECTION s_hostQueueLock[2];
+ static CRITICAL_SECTION s_hostQueueLock[2];
static std::queue<byte> s_hostQueue[2];
static SocketOutputStreamLocal *s_hostOutStream[2];
static SocketInputStreamLocal *s_hostInStream[2];
@@ -108,7 +108,7 @@ private:
static ServerConnection *s_serverConnection;
BYTE networkPlayerSmallId;
-public:
+public:
C4JThread::Event* m_socketClosedEvent;
INetworkPlayer *getPlayer();