libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-21 19:51:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

LASTEXPRESS: Move Entity function declaration macros to entity.h

Browse Source
This commit is contained in:
Julien 2012-07-23 01:25:03 -04:00
parent 82ad017a8e
commit e985f7374f
2 changed files with 30 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
engines/lastexpress/entities/entity.h
View File

@ -41,9 +41,38 @@ class Sequence;
class SequenceFrame;
struct SavePoint;
//////////////////////////////////////////////////////////////////////////
// Declaration
//////////////////////////////////////////////////////////////////////////
#define DECLARE_FUNCTION(name) \
void setup_##name(); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_1(name, param1) \
void setup_##name(param1); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_2(name, param1, param2) \
void setup_##name(param1, param2); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_3(name, param1, param2, param3) \
void setup_##name(param1, param2, param3); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_4(name, param1, param2, param3, param4) \
void setup_##name(param1, param2, param3, param4); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_NOSETUP(name) \
void name(const SavePoint &savepoint);
#define DECLARE_NULL_FUNCTION() \
void setup_nullfunction();
//////////////////////////////////////////////////////////////////////////
// Callbacks
//////////////////////////////////////////////////////////////////////////
#define ENTITY_CALLBACK(class, name, pointer) \
Common::Functor1Mem<const SavePoint&, void, class>(pointer, &class::name)
@ -63,7 +92,7 @@ struct SavePoint;
((EntityData::EntityParametersIIII*)_data->getParameters(8, index))->param##id
//////////////////////////////////////////////////////////////////////////
class EntityData : Common::Serializable {
public:

30
engines/lastexpress/entities/entity_intern.h
View File

@ -25,36 +25,6 @@
namespace LastExpress {
//////////////////////////////////////////////////////////////////////////
// Declaration
//////////////////////////////////////////////////////////////////////////
#define DECLARE_FUNCTION(name) \
void setup_##name(); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_1(name, param1) \
void setup_##name(param1); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_2(name, param1, param2) \
void setup_##name(param1, param2); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_3(name, param1, param2, param3) \
void setup_##name(param1, param2, param3); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_4(name, param1, param2, param3, param4) \
void setup_##name(param1, param2, param3, param4); \
void name(const SavePoint &savepoint);
#define DECLARE_FUNCTION_NOSETUP(name) \
void name(const SavePoint &savepoint);
#define DECLARE_NULL_FUNCTION() \
void setup_nullfunction();
//////////////////////////////////////////////////////////////////////////
// Setup
//////////////////////////////////////////////////////////////////////////