~bluebit/anakha/trunk

Committer: Jonas Erlandsson
Date: 2011-07-17 17:19:07 UTC
mfrom: (8.1.12 anakha)
Revision ID: more.room@gmail.com-20110717171907-fc83dx009xwce5ye

Post merge: Added support for John Torjo's Straightforward Settings Library ... Some restructuring to bring old files in to the new folder structure ...

files added:
include/ActionDispatcher.h

include/State.h

include/Unit.h

src/ActionDispatcher.cpp

src/State.cpp

src/Unit.cpp

files modified:
include/Action/Action.h

include/LUAManager.h

include/Network/Network.h

lua/raknetTest.lua

src/Action/Action.cpp

src/AudioManager/audioManager.cpp

src/AudioManager/oggFile.cpp

src/AudioManager/oggFileManager.cpp

src/LUAManager.cpp

src/Logger/Logger.cpp

src/Network/Network.cpp

Show diffs side-by-side

added added

removed removed

include/LUAManager.h

// Lua

extern "C" {

/* Remove this later

#include "../lua-5.1.4-2/src/lua.h"

#include "../lua-5.1.4-2/src/lualib.h"

#include "../lua-5.1.4-2/src/lauxlib.h"

#include "lauxlib.h"

}

//#include "../luabind-0.9.1/luabind/luabind.hpp"

#include <luabind/luabind.hpp>

//#include "../luabind-0.9.1/luabind/luabind.hpp"

#include "luabind.hpp"

class LUAManager {

public:

static LUAManager* getInstance();

virtual ~LUAManager();

void load(const std::string fileName);

void call_function(std::string);

// lua_CFunction = int (*lua_CFunction) (lua_State *L)

void exportFunction(lua_CFunction fun, std::string fun_name);

protected:

private:

LUAManager(); // Private constructor

LUAManager(const LUAManager&); // Prevent copy-construction

LUAManager& operator=(const LUAManager&); // Prevent assignment

void init(); // Run from getInstance()

bool load(std::string fname);

bool init();

static LUAManager* instance;

lua_State *scriptEnv;

Older »