Mercurial > zcinema / changeset

--- a/commonlib/types.h	Sun Nov 14 21:45:34 2021 +0200
+++ b/commonlib/types.h	Sun Nov 14 21:45:45 2021 +0200
@@ -22,15 +22,6 @@
 #include <QList>
 #include <QVariant>
 
-typedef qint8 int8;
-typedef qint16 int16;
-typedef qint32 int32;
-typedef qint64 int64;
-typedef quint8 uint8;
-typedef quint16 uint16;
-typedef quint32 uint32;
-typedef quint64 uint64;
-
 struct ZandronumVersion
 {
 	ZandronumVersion (QString name, bool isRelease, QString binaryPath) :

--- a/launcher/demo.cpp	Sun Nov 14 21:45:34 2021 +0200
+++ b/launcher/demo.cpp	Sun Nov 14 21:45:45 2021 +0200
@@ -134,7 +134,7 @@
 QString readString (QDataStream& stream)
 {
 	QString out;
-	uint8 ch;
+	quint8 ch;
 
 	for (stream >> ch; ch != 0; stream >> ch)
 		out += QChar (ch);
@@ -151,15 +151,15 @@
 	QString netname;
 	QString skin;
 	QString className;
-	uint32 color;
-	uint32 aimdist;
-	uint32 railcolor;
-	uint8 gender;
-	uint8 handicap;
-	uint8 unlagged;
-	uint8 respawnOnFire;
-	uint8 ticsPerUpdate;
-	uint8 connectionType;
+	quint32 color;
+	quint32 aimdist;
+	quint32 railcolor;
+	quint8 gender;
+	quint8 handicap;
+	quint8 unlagged;
+	quint8 respawnOnFire;
+	quint8 ticsPerUpdate;
+	quint8 connectionType;
 };
 
 //
@@ -168,11 +168,11 @@
 
 struct DemoHeaders
 {
-	uint8 length;
-	uint8 version;
-	uint8 userInfo;
-	uint8 bodyStart;
-	uint8 wads;
+	quint8 length;
+	quint8 version;
+	quint8 userInfo;
+	quint8 bodyStart;
+	quint8 wads;
 };
 
 //
@@ -193,9 +193,9 @@
 	stream.setByteOrder (QDataStream::LittleEndian);
 
 	DemoHeaders headers;
-	uint32 length;
-	uint16 zanversionID, numWads;
-	uint32 longSink;
+	quint32 length;
+	quint16 zanversionID, numWads;
+	quint32 longSink;
 	QString zanversion;
 	QStringList wads;
 	UserInfo userinfo;
@@ -209,7 +209,7 @@
 
 	// Check signature
 	{
-		uint32 demosignature;
+		quint32 demosignature;
 		stream >> demosignature;
 
 		if (demosignature != makeByteID ('Z', 'C', 'L', 'D'))
@@ -231,7 +231,7 @@
 	// Read the demo header and get data
 	for (;;)
 	{
-		uint8 header;
+		quint8 header;
 		stream >> header;
 
 		if (header == headers.bodyStart)
@@ -246,7 +246,7 @@
 
 			if (not zanversion.startsWith ("1.1-") and not zanversion.startsWith ("1.1.1-"))
 			{
-				uint8 a;
+				quint8 a;
 				stream >> a;
 				buildID = (BuildType) a;
 			}
@@ -277,7 +277,7 @@
 			QString sink;
 			stream >> numWads;
 
-			for (uint8 i = 0; i < numWads; ++i)
+			for (quint8 i = 0; i < numWads; ++i)
 			{
 				QString wad = readString (stream);
 				wads << wad;