projects / packages / armagetron.git / blame
| Commit | Line | Data |
|---|---|---|
| 6ab82964 JB |
1 | --- armagetron-0.2.6.0/src/engine/eWall.cpp.orig 2003-10-13 20:43:15.000000000 +0000 |
| 2 | +++ armagetron-0.2.6.0/src/engine/eWall.cpp 2003-12-01 09:11:27.000000000 +0000 | |
| 3 | @@ -280,6 +280,6 @@ | |
| 4 | #else | |
| 5 | static eWall* pwall = NULL; | |
| 6 | static eWall& wall = *pwall; | |
| 7 | - return reinterpret_cast<eWall *> (reinterpret_cast<int>(&this[-viewer]) - reinterpret_cast<int>(&wall.view[0]) + reinterpret_cast<int>(&wall)); | |
| 8 | + return reinterpret_cast<eWall *> (reinterpret_cast<size_t>(&this[-viewer]) - reinterpret_cast<size_t>(&wall.view[0]) + reinterpret_cast<size_t>(&wall)); | |
| 9 | #endif | |
| 10 | } | |
| 11 | --- armagetron-0.2.6.0/src/network/net_udp.cpp.orig 2003-10-13 20:43:15.000000000 +0000 | |
| 12 | +++ armagetron-0.2.6.0/src/network/net_udp.cpp 2003-12-01 09:16:56.000000000 +0000 | |
| 13 | @@ -104,8 +104,12 @@ | |
| 14 | #ifdef MACOSX | |
| 15 | typedef int NET_SIZE; | |
| 16 | #else | |
| 17 | +#ifdef __linux__ | |
| 18 | +typedef socklen_t NET_SIZE; | |
| 19 | +#else | |
| 20 | typedef size_t NET_SIZE; | |
| 21 | #endif | |
| 22 | +#endif | |
| 23 | #include <unistd.h> | |
| 24 | #endif | |
| 25 | ||
| 26 | --- armagetron-0.2.6.0/src/network/nNetwork.cpp.orig 2003-10-14 07:38:56.000000000 +0000 | |
| 27 | +++ armagetron-0.2.6.0/src/network/nNetwork.cpp 2003-12-01 09:14:07.000000000 +0000 | |
| 28 | @@ -1618,7 +1618,7 @@ | |
| 29 | ||
| 30 | // if (peer!=id) | |
| 31 | // con << "Changed incoming address.\n"; | |
| 32 | - int lenleft = reinterpret_cast<int>(bend) - reinterpret_cast<int>(b); | |
| 33 | + int lenleft = reinterpret_cast<size_t>(bend) - reinterpret_cast<size_t>(b); | |
| 34 | ||
| 35 | #ifndef NOEXCEPT | |
| 36 | try | |
| 37 | @@ -1629,7 +1629,7 @@ | |
| 38 | pmess = tNEW( nMessage )(b,id,lenleft); | |
| 39 | nMessage& mess = *pmess; | |
| 40 | ||
| 41 | - lenleft = reinterpret_cast<int>(bend) - reinterpret_cast<int>(b); | |
| 42 | + lenleft = reinterpret_cast<size_t>(bend) - reinterpret_cast<size_t>(b); | |
| 43 | ||
| 44 | bool mess_is_new=true; | |
| 45 | // see if we have got this packet before | |
| 46 | --- armagetron-0.2.6.0/src/network/nServerInfo.cpp.orig 2003-10-13 20:43:15.000000000 +0000 | |
| 47 | +++ armagetron-0.2.6.0/src/network/nServerInfo.cpp 2003-12-01 09:12:48.000000000 +0000 | |
| 48 | @@ -403,8 +403,8 @@ | |
| 49 | static nServerInfo& info = *this; // will not cause recursion since it is called only once. | |
| 50 | // uaaa. Pointer magic... | |
| 51 | return reinterpret_cast<nServerInfo *> | |
| 52 | - ( reinterpret_cast<int> (anchor) - | |
| 53 | - reinterpret_cast<int> (&info.next) + reinterpret_cast<int>( &info ) | |
| 54 | + ( reinterpret_cast<size_t> (anchor) - | |
| 55 | + reinterpret_cast<size_t> (&info.next) + reinterpret_cast<size_t>( &info ) | |
| 56 | ); | |
| 57 | } | |
| 58 | ||
| 70f366cc JB |
59 | --- armagetron-0.2.6.0/src/tron/gAIBase.cpp.orig 2003-07-20 10:13:10.000000000 +0000 |
| 60 | +++ armagetron-0.2.6.0/src/tron/gAIBase.cpp 2003-12-01 10:08:34.000000000 +0000 | |
| 61 | @@ -113,7 +113,7 @@ | |
| 62 | gAIPlayer *ai = dynamic_cast<gAIPlayer*>(p); | |
| 63 | if (ai && ai->Character() ) | |
| 64 | { | |
| 65 | - int index = ((int)ai->Character() - (int)&gAICharacter::s_Characters(0))/sizeof(gAICharacter); | |
| 66 | + int index = ((size_t)ai->Character() - (size_t)&gAICharacter::s_Characters(0))/sizeof(gAICharacter); | |
| 67 | inGame(index) = true; | |
| 68 | } | |
| 69 | } |