[luadefs-server] Use LUA_DECLARE in headers

multitheftauto · Sep 9, 2015 · 19bf09b · 19bf09b
1 parent 7cd5a1d
commit 19bf09b
Show file tree

Hide file tree

Showing 12 changed files with 255 additions and 255 deletions.
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaBitDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaBitDefs.h
@@ -21,21 +21,21 @@ class CLuaBitDefs: public CLuaDefs
     static void     LoadFunctions                       ( void );
 
     // bitwise operators
-    static int      bitAnd                              ( lua_State* luaVM );
-    static int      bitNot                              ( lua_State* luaVM );
-    static int      bitOr                               ( lua_State* luaVM );
-    static int      bitTest                             ( lua_State* luaVM );
-    static int      bitXor                              ( lua_State* luaVM );
-
-    static int      bitLRotate                          ( lua_State* luaVM );
-    static int      bitRRotate                          ( lua_State* luaVM );
-    static int      bitLShift                           ( lua_State* luaVM );
-    static int      bitRShift                           ( lua_State* luaVM );
-    static int      bitArShift                          ( lua_State* luaVM );
+    LUA_DECLARE ( bitAnd );
+    LUA_DECLARE ( bitNot );
+    LUA_DECLARE ( bitOr );
+    LUA_DECLARE ( bitTest );
+    LUA_DECLARE ( bitXor );
+
+    LUA_DECLARE ( bitLRotate );
+    LUA_DECLARE ( bitRRotate );
+    LUA_DECLARE ( bitLShift );
+    LUA_DECLARE ( bitRShift );
+    LUA_DECLARE ( bitArShift );
 
     // utilities
-    static int      bitExtract                          ( lua_State* luaVM );
-    static int      bitReplace                          ( lua_State* luaVM );
+    LUA_DECLARE ( bitExtract );
+    LUA_DECLARE ( bitReplace );
 
 };
 

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaClassDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaClassDefs.h
@@ -23,15 +23,15 @@ extern "C"
 class CLuaClassDefs: public CLuaDefs
 {
 public:
-    static int			Index               ( lua_State* luaVM );
-    static int			NewIndex            ( lua_State* luaVM );
-    static int			StaticNewIndex      ( lua_State* luaVM );
-    static int			Call                ( lua_State* luaVM );
+    LUA_DECLARE ( Index );
+    LUA_DECLARE ( NewIndex );
+    LUA_DECLARE ( StaticNewIndex );
+    LUA_DECLARE ( Call );
 
-    static int			ReadOnly            ( lua_State* luaVM );
-    static int			WriteOnly           ( lua_State* luaVM );
+    LUA_DECLARE ( ReadOnly );
+    LUA_DECLARE ( WriteOnly );
 
-    static int			ToString            ( lua_State* luaVM );
+    LUA_DECLARE ( ToString );
 
     static const char*	GetObjectClass	    ( void* pObject );
     static const char*	GetResourceClass	( CResource* pResource );

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaHTTPDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaHTTPDefs.h
@@ -22,12 +22,12 @@ class CLuaHTTPDefs: public CLuaDefs
 public:
     static void     LoadFunctions                       ( lua_State* luaVM );
 
-    static int      httpWrite                           ( lua_State* luaVM );
-    static int      httpSetResponseHeader               ( lua_State* luaVM );
-    static int      httpSetResponseCookie               ( lua_State* luaVM );
-    static int      httpSetResponseCode                 ( lua_State* luaVM );
-    static int      httpClear                           ( lua_State* luaVM );
-    static int      httpRequestLogin                    ( lua_State* luaVM );
+    LUA_DECLARE ( httpWrite );
+    LUA_DECLARE ( httpSetResponseHeader );
+    LUA_DECLARE ( httpSetResponseCookie );
+    LUA_DECLARE ( httpSetResponseCode );
+    LUA_DECLARE ( httpClear );
+    LUA_DECLARE ( httpRequestLogin );
 };
 
 #endif
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaMatrixDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaMatrixDefs.h
@@ -24,31 +24,31 @@ class CLuaMatrixDefs: public CLuaDefs
 {
 public:
     static void     AddClass                        ( lua_State* luaVM );
-    static int      Create                          ( lua_State* luaVM );
-    static int      Destroy                         ( lua_State* luaVM );
-
-    static int      ToString                        ( lua_State* luaVM );
-
-    static int      TransformDirection              ( lua_State* luaVM );
-    static int      TransformPosition               ( lua_State* luaVM );
-    static int      Inverse                         ( lua_State* luaVM );
-
-    static int      GetPosition                     ( lua_State* luaVM );
-    static int      GetRotation                     ( lua_State* luaVM );
-    static int      GetForward                      ( lua_State* luaVM );
-    static int      GetRight                        ( lua_State* luaVM );
-    static int      GetUp                           ( lua_State* luaVM );
-
-    static int      SetPosition                     ( lua_State* luaVM );
-    static int      SetRotation                     ( lua_State* luaVM );
-    static int      SetForward                      ( lua_State* luaVM );
-    static int      SetRight                        ( lua_State* luaVM );
-    static int      SetUp                           ( lua_State* luaVM );
-
-    static int      Add                             ( lua_State* luaVM );
-    static int      Sub                             ( lua_State* luaVM );
-    static int      Mul                             ( lua_State* luaVM );
-    static int      Div                             ( lua_State* luaVM );
+    LUA_DECLARE ( Create );
+    LUA_DECLARE ( Destroy );
+
+    LUA_DECLARE ( ToString );
+
+    LUA_DECLARE ( TransformDirection );
+    LUA_DECLARE ( TransformPosition );
+    LUA_DECLARE ( Inverse );
+
+    LUA_DECLARE ( GetPosition );
+    LUA_DECLARE ( GetRotation );
+    LUA_DECLARE ( GetForward );
+    LUA_DECLARE ( GetRight );
+    LUA_DECLARE ( GetUp );
+
+    LUA_DECLARE ( SetPosition );
+    LUA_DECLARE ( SetRotation );
+    LUA_DECLARE ( SetForward );
+    LUA_DECLARE ( SetRight );
+    LUA_DECLARE ( SetUp );
+
+    LUA_DECLARE ( Add );
+    LUA_DECLARE ( Sub );
+    LUA_DECLARE ( Mul );
+    LUA_DECLARE ( Div );
 };
 
 #endif
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaPickupDefs.h
@@ -21,18 +21,18 @@ class CLuaPickupDefs: public CLuaDefs
     static void     AddClass ( lua_State* luaVM );
 
     // Create/destroy
-    static int      createPickup                        ( lua_State* luaVM );
+    LUA_DECLARE ( createPickup );
 
     // Get
-    static int      getPickupType                       ( lua_State* luaVM );
-    static int      getPickupWeapon                     ( lua_State* luaVM );
-    static int      getPickupAmount                     ( lua_State* luaVM );
-    static int      getPickupAmmo                       ( lua_State* luaVM );
-    static int      getPickupRespawnInterval            ( lua_State* luaVM );
-    static int      isPickupSpawned                     ( lua_State* luaVM );
+    LUA_DECLARE ( getPickupType );
+    LUA_DECLARE ( getPickupWeapon );
+    LUA_DECLARE ( getPickupAmount );
+    LUA_DECLARE ( getPickupAmmo );
+    LUA_DECLARE ( getPickupRespawnInterval );
+    LUA_DECLARE ( isPickupSpawned );
 
     // Set
-    static int      setPickupType                       ( lua_State* luaVM );
-    static int      setPickupRespawnInterval            ( lua_State* luaVM );
-    static int      usePickup                           ( lua_State* luaVM );
+    LUA_DECLARE ( setPickupType );
+    LUA_DECLARE ( setPickupRespawnInterval );
+    LUA_DECLARE ( usePickup );
 };
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.h
@@ -22,28 +22,28 @@ class CLuaTextDefs: public CLuaDefs
     static void     LoadFunctions                       ( void );
     static void     AddClasses                          ( lua_State* luaVM );
 
-    static int      textCreateDisplay                   ( lua_State* luaVM );
-    static int      textDestroyDisplay                  ( lua_State* luaVM );
-    static int      textCreateTextItem                  ( lua_State* luaVM );
-    static int      textDestroyTextItem                 ( lua_State* luaVM );
+    LUA_DECLARE ( textCreateDisplay );
+    LUA_DECLARE ( textDestroyDisplay );
+    LUA_DECLARE ( textCreateTextItem );
+    LUA_DECLARE ( textDestroyTextItem );
 
-    static int      textDisplayAddText                  ( lua_State* luaVM );
-    static int      textDisplayRemoveText               ( lua_State* luaVM );
-    static int      textDisplayAddObserver              ( lua_State* luaVM );
-    static int      textDisplayRemoveObserver           ( lua_State* luaVM );
-    static int      textDisplayIsObserver               ( lua_State* luaVM );
-    static int      textDisplayGetObservers             ( lua_State* luaVM );
+    LUA_DECLARE ( textDisplayAddText );
+    LUA_DECLARE ( textDisplayRemoveText );
+    LUA_DECLARE ( textDisplayAddObserver );
+    LUA_DECLARE ( textDisplayRemoveObserver );
+    LUA_DECLARE ( textDisplayIsObserver );
+    LUA_DECLARE ( textDisplayGetObservers );
 
-    static int      textItemSetText                     ( lua_State* luaVM );
-    static int      textItemGetText                     ( lua_State* luaVM );
-    static int      textItemSetScale                    ( lua_State* luaVM );
-    static int      textItemGetScale                    ( lua_State* luaVM );
-    static int      textItemSetPosition                 ( lua_State* luaVM );
-    static int      textItemGetPosition                 ( lua_State* luaVM );
-    static int      textItemSetColor                    ( lua_State* luaVM );
-    static int      textItemGetColor                    ( lua_State* luaVM );
-    static int      textItemSetPriority                 ( lua_State* luaVM );
-    static int      textItemGetPriority                 ( lua_State* luaVM );
+    LUA_DECLARE ( textItemSetText );
+    LUA_DECLARE ( textItemGetText );
+    LUA_DECLARE ( textItemSetScale );
+    LUA_DECLARE ( textItemGetScale );
+    LUA_DECLARE ( textItemSetPosition );
+    LUA_DECLARE ( textItemGetPosition );
+    LUA_DECLARE ( textItemSetColor );
+    LUA_DECLARE ( textItemGetColor );
+    LUA_DECLARE ( textItemSetPriority );
+    LUA_DECLARE ( textItemGetPriority );
 };
 
 #endif
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVector2Defs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVector2Defs.h
@@ -24,32 +24,32 @@ class CLuaVector2Defs : public CLuaDefs
 {
 public:
     static void    AddClass                             ( lua_State * luaVM );
-    static int     Create                               ( lua_State * luaVM );
-    static int     Destroy                              ( lua_State * luaVM );
-
-    static int     GetLength                            ( lua_State * luaVM );
-    static int     GetLengthSquared                     ( lua_State * luaVM );
-    static int     GetNormalized                        ( lua_State * luaVM );
-    static int     Normalize                            ( lua_State * luaVM );
-    static int     Dot                                  ( lua_State * luaVM );
-
-    static int     ToString                             ( lua_State * luaVM );
-
-    static int     SetX                                 ( lua_State * luaVM );
-    static int     SetY                                 ( lua_State * luaVM );
-    static int     SetZ                                 ( lua_State * luaVM );
-
-    static int     GetX                                 ( lua_State * luaVM );
-    static int     GetY                                 ( lua_State * luaVM );
-    static int     GetZ                                 ( lua_State * luaVM );
-
-    static int     Add                                  ( lua_State * luaVM );
-    static int     Sub                                  ( lua_State * luaVM );
-    static int     Mul                                  ( lua_State * luaVM );
-    static int     Div                                  ( lua_State * luaVM );
-    static int     Pow                                  ( lua_State * luaVM );
-    static int     Unm                                  ( lua_State * luaVM );
-    static int     Eq                                   ( lua_State * luaVM );
+    LUA_DECLARE ( Create );
+    LUA_DECLARE ( Destroy );
+
+    LUA_DECLARE ( GetLength );
+    LUA_DECLARE ( GetLengthSquared );
+    LUA_DECLARE ( GetNormalized );
+    LUA_DECLARE ( Normalize );
+    LUA_DECLARE ( Dot );
+
+    LUA_DECLARE ( ToString );
+
+    LUA_DECLARE ( SetX );
+    LUA_DECLARE ( SetY );
+    LUA_DECLARE ( SetZ );
+
+    LUA_DECLARE ( GetX );
+    LUA_DECLARE ( GetY );
+    LUA_DECLARE ( GetZ );
+
+    LUA_DECLARE ( Add );
+    LUA_DECLARE ( Sub );
+    LUA_DECLARE ( Mul );
+    LUA_DECLARE ( Div );
+    LUA_DECLARE ( Pow );
+    LUA_DECLARE ( Unm );
+    LUA_DECLARE ( Eq );
 };
 
 #endif
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVector3Defs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVector3Defs.h
@@ -24,33 +24,33 @@ class CLuaVector3Defs: public CLuaDefs
 {
 public:
     static void    AddClass                             ( lua_State* luaVM );
-    static int     Create                               ( lua_State* luaVM );
-    static int     Destroy                              ( lua_State* luaVM );
-
-    static int     GetLength                            ( lua_State* luaVM );
-    static int     GetLengthSquared                     ( lua_State* luaVM );
-    static int     GetNormalized                        ( lua_State* luaVM );
-    static int     Normalize                            ( lua_State* luaVM );
-    static int     Cross                                ( lua_State* luaVM );
-    static int     Dot                                  ( lua_State* luaVM );
-
-    static int     ToString                             ( lua_State* luaVM );
-
-    static int     SetX                                 ( lua_State* luaVM );
-    static int     SetY                                 ( lua_State* luaVM );
-    static int     SetZ                                 ( lua_State* luaVM );
-
-    static int     GetX                                 ( lua_State* luaVM );
-    static int     GetY                                 ( lua_State* luaVM );
-    static int     GetZ                                 ( lua_State* luaVM );
-
-    static int     Add                                  ( lua_State* luaVM );
-    static int     Sub                                  ( lua_State* luaVM );
-    static int     Mul                                  ( lua_State* luaVM );
-    static int     Div                                  ( lua_State* luaVM );
-    static int     Pow                                  ( lua_State* luaVM );
-    static int     Unm                                  ( lua_State* luaVM );
-    static int     Eq                                   ( lua_State* luaVM );
+    LUA_DECLARE ( Create );
+    LUA_DECLARE ( Destroy );
+
+    LUA_DECLARE ( GetLength );
+    LUA_DECLARE ( GetLengthSquared );
+    LUA_DECLARE ( GetNormalized );
+    LUA_DECLARE ( Normalize );
+    LUA_DECLARE ( Cross );
+    LUA_DECLARE ( Dot );
+
+    LUA_DECLARE ( ToString );
+
+    LUA_DECLARE ( SetX );
+    LUA_DECLARE ( SetY );
+    LUA_DECLARE ( SetZ );
+
+    LUA_DECLARE ( GetX );
+    LUA_DECLARE ( GetY );
+    LUA_DECLARE ( GetZ );
+
+    LUA_DECLARE ( Add );
+    LUA_DECLARE ( Sub );
+    LUA_DECLARE ( Mul );
+    LUA_DECLARE ( Div );
+    LUA_DECLARE ( Pow );
+    LUA_DECLARE ( Unm );
+    LUA_DECLARE ( Eq );
 };
 
 #endif
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVector4Defs.h b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaVector4Defs.h
@@ -24,34 +24,34 @@ class CLuaVector4Defs: public CLuaDefs
 {
 public:
     static void    AddClass                             ( lua_State* luaVM );
-    static int     Create                               ( lua_State* luaVM );
-    static int     Destroy                              ( lua_State* luaVM );
-
-    static int     GetLength                            ( lua_State* luaVM );
-    static int     GetLengthSquared                     ( lua_State* luaVM );
-    static int     GetNormalized                        ( lua_State* luaVM );
-    static int     Normalize                            ( lua_State* luaVM );
-    static int     Dot                                  ( lua_State* luaVM );
-
-    static int     ToString                             ( lua_State* luaVM );
-
-    static int     SetX                                 ( lua_State* luaVM );
-    static int     SetY                                 ( lua_State* luaVM );
-    static int     SetZ                                 ( lua_State* luaVM );
-    static int     SetW                                 ( lua_State* luaVM );
-
-    static int     GetX                                 ( lua_State* luaVM );
-    static int     GetY                                 ( lua_State* luaVM );
-    static int     GetZ                                 ( lua_State* luaVM );
-    static int     GetW                                 ( lua_State* luaVM );
-
-    static int     Add                                  ( lua_State* luaVM );
-    static int     Sub                                  ( lua_State* luaVM );
-    static int     Mul                                  ( lua_State* luaVM );
-    static int     Div                                  ( lua_State* luaVM );
-    static int     Pow                                  ( lua_State* luaVM );
-    static int     Unm                                  ( lua_State* luaVM );
-    static int     Eq                                   ( lua_State* luaVM );
+    LUA_DECLARE ( Create );
+    LUA_DECLARE ( Destroy );
+
+    LUA_DECLARE ( GetLength );
+    LUA_DECLARE ( GetLengthSquared );
+    LUA_DECLARE ( GetNormalized );
+    LUA_DECLARE ( Normalize );
+    LUA_DECLARE ( Dot );
+
+    LUA_DECLARE ( ToString );
+
+    LUA_DECLARE ( SetX );
+    LUA_DECLARE ( SetY );
+    LUA_DECLARE ( SetZ );
+    LUA_DECLARE ( SetW );
+
+    LUA_DECLARE ( GetX );
+    LUA_DECLARE ( GetY );
+    LUA_DECLARE ( GetZ );
+    LUA_DECLARE ( GetW );
+
+    LUA_DECLARE ( Add );
+    LUA_DECLARE ( Sub );
+    LUA_DECLARE ( Mul );
+    LUA_DECLARE ( Div );
+    LUA_DECLARE ( Pow );
+    LUA_DECLARE ( Unm );
+    LUA_DECLARE ( Eq );
 };
 
 #endif