Subversion Repository Public Repository

fonline_sdk

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 395 vs 396 for /Server/scripts/fonline.h

Diff revisions: vs.
  @@ -3,8 +3,8 @@
3 3
4 4 //
5 5 // FOnline engine structures, for native working
6 - // Last update 08.04.2013
7 - // Server version 508, MSVS 2010, GCC 4.7.2
6 + // Last update 16.04.2013
7 + // Server version 510, MSVS 2010, GCC 4.7.2
8 8 // Default calling convention - cdecl
9 9 //
10 10
  @@ -13,6 +13,8 @@
13 13 # define FO_WINDOWS
14 14 #elif defined ( __linux__ )
15 15 # define FO_LINUX
16 + #elif defined ( __APPLE__ )
17 + # define FO_MACOSX
16 18 #else
17 19 # error "Unknown operating system."
18 20 #endif
  @@ -31,6 +33,7 @@
31 33 # define FO_X86
32 34 #elif ( defined ( FO_MSVC ) && defined ( _M_X64 ) ) || ( defined ( FO_GCC ) && defined ( __LP64__ ) )
33 35 # define FO_X64
36 + # error "X64 CPU not supported for now."
34 37 #else
35 38 # error "Unknown CPU."
36 39 #endif
  @@ -627,7 +630,8 @@
627 630
628 631 struct Mutex
629 632 {
630 - const int Locker[ 6 ]; // CRITICAL_SECTION, include Windows.h
633 + const int Locker1[ 6 ]; // Windows - CRITICAL_SECTION (Locker1), Linux - pthread_mutex_t (Locker1)
634 + const int Locker2[ 5 ]; // MacOSX - pthread_mutex_t (Locker1 + Locker2)
631 635 };
632 636
633 637 struct Spinlock
  @@ -1941,7 +1945,7 @@
1941 1945 STATIC_ASSERT( sizeof( IntSet ) == 24 );
1942 1946 STATIC_ASSERT( sizeof( IntPair ) == 8 );
1943 1947 STATIC_ASSERT( sizeof( ProtoItem ) == 908 );
1944 - STATIC_ASSERT( sizeof( Mutex ) == 24 );
1948 + STATIC_ASSERT( sizeof( Mutex ) == 44 );
1945 1949 STATIC_ASSERT( sizeof( GameOptions ) == 1344 );
1946 1950 STATIC_ASSERT( sizeof( SpriteInfo ) == 36 );
1947 1951 STATIC_ASSERT( sizeof( Field ) == 76 );
  @@ -1962,7 +1966,7 @@
1962 1966 STATIC_ASSERT( offsetof( CritterCl, MoveSteps ) == 5708 );
1963 1967 STATIC_ASSERT( offsetof( MapEntire, Dir ) == 8 );
1964 1968 STATIC_ASSERT( offsetof( SceneryToClient, Reserved1 ) == 30 );
1965 - STATIC_ASSERT( offsetof( Map, RefCounter ) == 774 );
1969 + STATIC_ASSERT( offsetof( Map, RefCounter ) == 794 );
1966 1970 STATIC_ASSERT( offsetof( ProtoLocation, GeckVisible ) == 76 );
1967 1971 STATIC_ASSERT( offsetof( Location, RefCounter ) == 282 );
1968 1972