diff options
| author | Max Horn | 2009-02-15 22:01:09 +0000 |
|---|---|---|
| committer | Max Horn | 2009-02-15 22:01:09 +0000 |
| commit | 4eff1002f99c15c213144c2aef1bf49c1bbb65e6 (patch) | |
| tree | adbd8d3dd57f02f95e4cdd1a3716cf99a0b2d761 /engines/sci/include | |
| parent | 7a72318a12bec184885beeef9b58b5f968c7b3bc (diff) | |
| download | scummvm-rg350-4eff1002f99c15c213144c2aef1bf49c1bbb65e6.tar.gz scummvm-rg350-4eff1002f99c15c213144c2aef1bf49c1bbb65e6.tar.bz2 scummvm-rg350-4eff1002f99c15c213144c2aef1bf49c1bbb65e6.zip | |
SCI: Got rid of a nasty hack where class, delete, new were re#defined because FreeSCI used these C++ keywords for variable names
svn-id: r38312
Diffstat (limited to 'engines/sci/include')
| -rw-r--r-- | engines/sci/include/kernel.h | 2 | ||||
| -rw-r--r-- | engines/sci/include/old_objects.h | 8 | ||||
| -rw-r--r-- | engines/sci/include/resource.h | 5 | ||||
| -rw-r--r-- | engines/sci/include/vm.h | 8 |
4 files changed, 3 insertions, 20 deletions
diff --git a/engines/sci/include/kernel.h b/engines/sci/include/kernel.h index 6c4b15926c..7737973a78 100644 --- a/engines/sci/include/kernel.h +++ b/engines/sci/include/kernel.h @@ -392,7 +392,7 @@ typedef struct { typedef struct { int type; /* KF_* */ const char *name; - kfunct_sig_pair_t new; + kfunct_sig_pair_t sig_pair; } sci_kernel_function_t; extern sci_kernel_function_t kfunct_mappers[]; diff --git a/engines/sci/include/old_objects.h b/engines/sci/include/old_objects.h index 850e489a83..e735a4dbc9 100644 --- a/engines/sci/include/old_objects.h +++ b/engines/sci/include/old_objects.h @@ -4,12 +4,6 @@ #include <sciresource.h> #include <util.h> -#ifdef __cplusplus -# define new new_ -# define delete delete_ -# define class class_ -#endif /* __cplusplus */ - typedef FLEXARRAY(script_opcode,int number;) script_method; typedef struct object_ @@ -33,7 +27,7 @@ typedef struct object_ typedef struct { int id; - object* class; + object* classID; byte* heap; int offset; } instance; diff --git a/engines/sci/include/resource.h b/engines/sci/include/resource.h index 88df611e59..24b7c716c7 100644 --- a/engines/sci/include/resource.h +++ b/engines/sci/include/resource.h @@ -212,11 +212,6 @@ putInt16(byte* dest, int src) ** (int) src: value to write */ -#ifdef _cplusplus -# define delete _freesci_cplusplus_workaround_delete -# define new _freesci_cplusplus_workaround_new -#endif - #define SCI_MEMTEST memtest(__FILE__, __LINE__) /*-- queues --*/ diff --git a/engines/sci/include/vm.h b/engines/sci/include/vm.h index 31141126ff..863d9c2186 100644 --- a/engines/sci/include/vm.h +++ b/engines/sci/include/vm.h @@ -39,12 +39,6 @@ #ifndef _SCI_VM_H #define _SCI_VM_H -#ifdef __cplusplus -# define new new_ -# define delete delete_ -# define class class_ -#endif /* __cplusplus */ - #define VM_STACK_SIZE 0x1000 /* Number of bytes to be allocated for the stack */ @@ -338,7 +332,7 @@ typedef struct { selector_t caller, moveDone, moveSpeed; /* Used for DoBresen */ - selector_t delete; /* Called by Animate() to dispose a view object */ + selector_t delete_; /* Called by Animate() to dispose a view object */ selector_t vol; selector_t pri; |