Changeset 9006 in orxonox.OLD for trunk/src/defs

Timestamp:

Jul 2, 2006, 2:11:59 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the mountain_lake branche back to the trunk
merged with command:
svn merge -r8799:HEAD ​https://svn.orxonox.net/orxonox/branches/mountain_lake .

conflicts in script taken from the branche, since they are indentation-problems.

also fixed the delete-bug for the lightning-effect

File:

• trunk/src/defs/class_id.h (modified) (1 diff)

trunk/src/defs/class_id.h

@@ -336 +336 @@
   CL_SNOW_EFFECT                =    0x00000a14,
   CL_CLOUD_EFFECT               =    0x00000a15,
-  CL_LIGHTENING_EFFECT          =    0x00000a16,
+  CL_LIGHTNING_EFFECT          =    0x00000a16,
   CL_EXPLOSION                  =    0x00000a20,
   CL_LIGHTNING_BOLT             =    0x00000a21,