blob: 81ff4bea50278875729d3950fb735dbd59fe2aa5 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
|
diff -ur -x '*.o' scorched-orig/src/common/SoundStore.h scorched/src/common/SoundStore.h
--- scorched-orig/src/common/SoundStore.h 2003-07-30 17:41:28.000000000 -0400
+++ scorched/src/common/SoundStore.h 2003-08-06 20:41:23.056115008 -0400
@@ -29,7 +29,7 @@
#include <string>
#define CACHE_SOUND(var, filename) \
- static SoundBuffer* ##var = SoundStore::instance()->fetchOrCreateBuffer(##filename);
+ static SoundBuffer* var = SoundStore::instance()->fetchOrCreateBuffer(filename);
class SoundStore
{
diff -ur -x '*.o' scorched-orig/src/engine/ActionMeta.h scorched/src/engine/ActionMeta.h
--- scorched-orig/src/engine/ActionMeta.h 2003-07-30 17:41:29.000000000 -0400
+++ scorched/src/engine/ActionMeta.h 2003-08-06 20:36:57.001561448 -0400
@@ -29,7 +29,7 @@
#define REGISTER_ACTION_HEADER(x) \
virtual const char *getActionName() { return #x ; } \
- ##x *getActionCopy() { return new x ; } \
+ x *getActionCopy() { return new x ; } \
virtual bool getReferenced() { return true; }
#define REGISTER_ACTION_SOURCE(x) \
struct META_##x { META_##x() { ActionMetaRegistration::addMap(#x , new x ); } }; \
|
GitWeb
