Skip to content

Commit

Permalink
Clean up client File luadefs
Browse files Browse the repository at this point in the history
  • Loading branch information
@qaisjp
qaisjp committed Jan 21, 2016
1 parent 56e6a53 commit c4f2ea4
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 71 deletions.
33 changes: 1 addition & 32 deletions MTA10/mods/shared_logic/lua/CLuaMain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1383,37 +1383,6 @@ void CLuaMain::AddTimerClass ( lua_State* luaVM )
}


void CLuaMain::AddFileClass ( lua_State* luaVM )
{
lua_newclass ( luaVM );

lua_classfunction ( luaVM, "create", "fileOpen" );
lua_classfunction ( luaVM, "destroy", "fileClose" );
lua_classfunction ( luaVM, "close", "fileClose" );
lua_classfunction ( luaVM, "new", "fileCreate" );

lua_classfunction ( luaVM, "delete", "fileDelete" );
lua_classfunction ( luaVM, "exists", "fileExists" );
lua_classfunction ( luaVM, "flush", "fileFlush" );
lua_classfunction ( luaVM, "getPos", "fileGetPos" );
lua_classfunction ( luaVM, "getSize", "fileGetSize" );
lua_classfunction ( luaVM, "isEOF", "fileIsEOF" );
lua_classfunction ( luaVM, "read", "fileRead" );
lua_classfunction ( luaVM, "rename", "fileRename" );
lua_classfunction ( luaVM, "setPos", "fileSetPos" );
lua_classfunction ( luaVM, "write", "fileWrite" );
lua_classfunction ( luaVM, "copy", "fileCopy" );
lua_classfunction ( luaVM, "getPath", "fileGetPath" );

lua_classvariable ( luaVM, "pos", "fileSetPos", "fileGetPos" );
lua_classvariable ( luaVM, "size", NULL, "fileGetSize" );
lua_classvariable ( luaVM, "isEOF", NULL, "fileIsEOF" );
lua_classvariable ( luaVM, "path", NULL, "fileGetPath" );

lua_registerclass ( luaVM, "File" );
}


void CLuaMain::AddXMLClass ( lua_State* luaVM )
{
lua_newclass ( luaVM );
Expand Down Expand Up @@ -1905,7 +1874,6 @@ void CLuaMain::InitClasses ( lua_State* luaVM )

AddResourceClass ( luaVM );
AddTimerClass ( luaVM );
AddFileClass ( luaVM );
AddXMLClass ( luaVM );

AddEngineClass ( luaVM );
Expand All @@ -1923,6 +1891,7 @@ void CLuaMain::InitClasses ( lua_State* luaVM )

AddCameraClass ( luaVM );

CLuaFileDefs::AddClass ( luaVM );
CLuaSearchLightDefs::AddClass ( luaVM );
}

Expand Down
1 change: 0 additions & 1 deletion MTA10/mods/shared_logic/lua/CLuaMain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ class CLuaMain //: public CClient

void AddResourceClass ( lua_State* luaVM );
void AddTimerClass ( lua_State* luaVM );
void AddFileClass ( lua_State* luaVM );
void AddXMLClass ( lua_State* luaVM );

void AddEngineClass ( lua_State* luaVM );
Expand Down
61 changes: 45 additions & 16 deletions MTA10/mods/shared_logic/luadefs/CLuaFileDefs.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,29 +14,58 @@
*****************************************************************************/

#include "StdInc.h"

#define DEFAULT_MAX_FILESIZE 52428800

void CLuaFileDefs::LoadFunctions ( void )
{
CLuaCFunctions::AddFunction ( "fileCreate", CLuaFileDefs::fileCreate );
CLuaCFunctions::AddFunction ( "fileExists", CLuaFileDefs::fileExists );
CLuaCFunctions::AddFunction ( "fileOpen", CLuaFileDefs::fileOpen );
CLuaCFunctions::AddFunction ( "fileIsEOF", CLuaFileDefs::fileIsEOF );
CLuaCFunctions::AddFunction ( "fileGetPos", CLuaFileDefs::fileGetPos );
CLuaCFunctions::AddFunction ( "fileSetPos", CLuaFileDefs::fileSetPos );
CLuaCFunctions::AddFunction ( "fileGetSize", CLuaFileDefs::fileGetSize );
CLuaCFunctions::AddFunction ( "fileRead", CLuaFileDefs::fileRead );
CLuaCFunctions::AddFunction ( "fileWrite", CLuaFileDefs::fileWrite );
CLuaCFunctions::AddFunction ( "fileFlush", CLuaFileDefs::fileFlush );
CLuaCFunctions::AddFunction ( "fileClose", CLuaFileDefs::fileClose );
CLuaCFunctions::AddFunction ( "fileDelete", CLuaFileDefs::fileDelete );
CLuaCFunctions::AddFunction ( "fileRename", CLuaFileDefs::fileRename );
CLuaCFunctions::AddFunction ( "fileCopy", CLuaFileDefs::fileCopy );
CLuaCFunctions::AddFunction ( "fileGetPath", CLuaFileDefs::fileGetPath );
CLuaCFunctions::AddFunction ( "fileCreate", fileCreate );
CLuaCFunctions::AddFunction ( "fileExists", fileExists );
CLuaCFunctions::AddFunction ( "fileOpen", fileOpen );
CLuaCFunctions::AddFunction ( "fileIsEOF", fileIsEOF );
CLuaCFunctions::AddFunction ( "fileGetPos", fileGetPos );
CLuaCFunctions::AddFunction ( "fileSetPos", fileSetPos );
CLuaCFunctions::AddFunction ( "fileGetSize", fileGetSize );
CLuaCFunctions::AddFunction ( "fileRead", fileRead );
CLuaCFunctions::AddFunction ( "fileWrite", fileWrite );
CLuaCFunctions::AddFunction ( "fileFlush", fileFlush );
CLuaCFunctions::AddFunction ( "fileClose", fileClose );
CLuaCFunctions::AddFunction ( "fileDelete", fileDelete );
CLuaCFunctions::AddFunction ( "fileRename", fileRename );
CLuaCFunctions::AddFunction ( "fileCopy", fileCopy );
CLuaCFunctions::AddFunction ( "fileGetPath", fileGetPath );
}


void CLuaFileDefs::AddClass ( lua_State* luaVM )
{
lua_newclass ( luaVM );

lua_classfunction ( luaVM, "create", "fileOpen" );
lua_classfunction ( luaVM, "destroy", "fileClose" );
lua_classfunction ( luaVM, "close", "fileClose" );
lua_classfunction ( luaVM, "new", "fileCreate" );

lua_classfunction ( luaVM, "delete", "fileDelete" );
lua_classfunction ( luaVM, "exists", "fileExists" );
lua_classfunction ( luaVM, "flush", "fileFlush" );
lua_classfunction ( luaVM, "getPos", "fileGetPos" );
lua_classfunction ( luaVM, "getSize", "fileGetSize" );
lua_classfunction ( luaVM, "isEOF", "fileIsEOF" );
lua_classfunction ( luaVM, "read", "fileRead" );
lua_classfunction ( luaVM, "rename", "fileRename" );
lua_classfunction ( luaVM, "setPos", "fileSetPos" );
lua_classfunction ( luaVM, "write", "fileWrite" );
lua_classfunction ( luaVM, "copy", "fileCopy" );
lua_classfunction ( luaVM, "getPath", "fileGetPath" );

lua_classvariable ( luaVM, "pos", "fileSetPos", "fileGetPos" );
lua_classvariable ( luaVM, "size", NULL, "fileGetSize" );
lua_classvariable ( luaVM, "isEOF", NULL, "fileIsEOF" );
lua_classvariable ( luaVM, "path", NULL, "fileGetPath" );

lua_registerclass ( luaVM, "File" );
}

int CLuaFileDefs::fileCreate ( lua_State* luaVM )
{
// file fileCreate ( string filePath )
Expand Down
41 changes: 19 additions & 22 deletions MTA10/mods/shared_logic/luadefs/CLuaFileDefs.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,31 +9,28 @@
*
*****************************************************************************/

#ifndef __CLUAFILEDEFS_H
#define __CLUAFILEDEFS_H

#pragma once
#include "CLuaDefs.h"

class CLuaFileDefs: public CLuaDefs
{
public:
static void LoadFunctions ( void );

static int fileCreate ( lua_State* luaVM );
static int fileExists ( lua_State* luaVM );
static int fileOpen ( lua_State* luaVM );
static int fileIsEOF ( lua_State* luaVM );
static int fileGetPos ( lua_State* luaVM );
static int fileSetPos ( lua_State* luaVM );
static int fileGetSize ( lua_State* luaVM );
static int fileRead ( lua_State* luaVM );
static int fileWrite ( lua_State* luaVM );
static int fileFlush ( lua_State* luaVM );
static int fileClose ( lua_State* luaVM );
static int fileDelete ( lua_State* luaVM );
static int fileRename ( lua_State* luaVM );
static int fileCopy ( lua_State* luaVM );
static int fileGetPath ( lua_State* luaVM );
};
static void LoadFunctions ( void );
static void AddClass ( lua_State* luaVM );

#endif
LUA_DECLARE(fileCreate)
LUA_DECLARE(fileExists)
LUA_DECLARE(fileOpen)
LUA_DECLARE(fileIsEOF)
LUA_DECLARE(fileGetPos)
LUA_DECLARE(fileSetPos)
LUA_DECLARE(fileGetSize)
LUA_DECLARE(fileRead)
LUA_DECLARE(fileWrite)
LUA_DECLARE(fileFlush)
LUA_DECLARE(fileClose)
LUA_DECLARE(fileDelete)
LUA_DECLARE(fileRename)
LUA_DECLARE(fileCopy)
LUA_DECLARE(fileGetPath)
};

1 comment on commit c4f2ea4

@qaisjp
Copy link
Contributor Author

@qaisjp qaisjp commented on c4f2ea4 Jan 21, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This includes significant changes added in 87697c4, so the backport needs to be done carefully.

Please sign in to comment.