SOURCES: armagetron-types.patch - up to 0.2.6.1 (only one patch is...

[blekot]

Author: blekot                       Date: Thu Jul 28 21:35:05 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up to 0.2.6.1 (only one patch is needed, rest are included in sources)

---- Files affected:
SOURCES:
   armagetron-types.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/armagetron-types.patch
diff -u SOURCES/armagetron-types.patch:1.2 SOURCES/armagetron-types.patch:1.3
--- SOURCES/armagetron-types.patch:1.2	Mon Dec  1 11:12:37 2003
+++ SOURCES/armagetron-types.patch	Thu Jul 28 23:35:00 2005
@@ -1,69 +1,14 @@
---- armagetron-0.2.6.0/src/engine/eWall.cpp.orig	2003-10-13 20:43:15.000000000 +0000
-+++ armagetron-0.2.6.0/src/engine/eWall.cpp	2003-12-01 09:11:27.000000000 +0000
-@@ -280,6 +280,6 @@
- #else
-   static eWall* pwall = NULL;
-   static eWall& wall = *pwall; 
--  return reinterpret_cast<eWall *> (reinterpret_cast<int>(&this[-viewer]) - reinterpret_cast<int>(&wall.view[0]) + reinterpret_cast<int>(&wall));
-+  return reinterpret_cast<eWall *> (reinterpret_cast<size_t>(&this[-viewer]) - reinterpret_cast<size_t>(&wall.view[0]) + reinterpret_cast<size_t>(&wall));
- #endif
- }
---- armagetron-0.2.6.0/src/network/net_udp.cpp.orig	2003-10-13 20:43:15.000000000 +0000
-+++ armagetron-0.2.6.0/src/network/net_udp.cpp	2003-12-01 09:16:56.000000000 +0000
-@@ -104,8 +104,12 @@
- #ifdef MACOSX
+--- armagetron-0.2.6.0/src/network/net_udp.cpp.old 2005-07-28 23:11:29.000000000 +0200
++++ armagetron-0.2.6.0/src/network/net_udp.cpp     2005-07-28 23:12:06.000000000 +0200
+@@ -104,7 +104,11 @@
  typedef int NET_SIZE;
  #else
+ #ifdef MACOSX
 +#ifdef __linux__
 +typedef socklen_t NET_SIZE;
 +#else
- typedef size_t NET_SIZE;
- #endif
+ typedef int NET_SIZE;
 +#endif
- #include <unistd.h>
+ #else
+ typedef socklen_t NET_SIZE;
  #endif
- 
---- armagetron-0.2.6.0/src/network/nNetwork.cpp.orig	2003-10-14 07:38:56.000000000 +0000
-+++ armagetron-0.2.6.0/src/network/nNetwork.cpp	2003-12-01 09:14:07.000000000 +0000
-@@ -1618,7 +1618,7 @@
- 
- 				//	 if (peer!=id)
- 				//  con << "Changed incoming address.\n";
--				int lenleft = reinterpret_cast<int>(bend) - reinterpret_cast<int>(b);
-+				int lenleft = reinterpret_cast<size_t>(bend) - reinterpret_cast<size_t>(b);
- 
- #ifndef NOEXCEPT
- 				try
-@@ -1629,7 +1629,7 @@
- 					pmess = tNEW( nMessage )(b,id,lenleft);
- 					nMessage& mess = *pmess;
- 
--					lenleft = reinterpret_cast<int>(bend) - reinterpret_cast<int>(b);
-+					lenleft = reinterpret_cast<size_t>(bend) - reinterpret_cast<size_t>(b);
- 
- 					bool mess_is_new=true;
- 					// see if we have got this packet before
---- armagetron-0.2.6.0/src/network/nServerInfo.cpp.orig	2003-10-13 20:43:15.000000000 +0000
-+++ armagetron-0.2.6.0/src/network/nServerInfo.cpp	2003-12-01 09:12:48.000000000 +0000
-@@ -403,8 +403,8 @@
- 	static nServerInfo& info = *this; // will not cause recursion since it is called only once.
- 	// uaaa. Pointer magic...
- 	return reinterpret_cast<nServerInfo *>
--		( reinterpret_cast<int> (anchor) -
--		  reinterpret_cast<int> (&info.next) + reinterpret_cast<int>( &info )
-+		( reinterpret_cast<size_t> (anchor) -
-+		  reinterpret_cast<size_t> (&info.next) + reinterpret_cast<size_t>( &info )
- 		  );
- }
- 
---- armagetron-0.2.6.0/src/tron/gAIBase.cpp.orig	2003-07-20 10:13:10.000000000 +0000
-+++ armagetron-0.2.6.0/src/tron/gAIBase.cpp	2003-12-01 10:08:34.000000000 +0000
-@@ -113,7 +113,7 @@
- 		gAIPlayer  *ai  = dynamic_cast<gAIPlayer*>(p);
- 		if (ai && ai->Character() )
- 		{
--			int index = ((int)ai->Character() - (int)&gAICharacter::s_Characters(0))/sizeof(gAICharacter);
-+			int index = ((size_t)ai->Character() - (size_t)&gAICharacter::s_Characters(0))/sizeof(gAICharacter);
- 			inGame(index) = true;
- 		}
- 	}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/armagetron-types.patch?r1=1.2&r2=1.3&f=u