From b2b4176745c6329b0677c566bcde6755c7cf8ee9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Brammer?= Date: Wed, 30 Mar 2011 21:17:57 +0200 Subject: [PATCH] Undeprecate the Melee rule The Melee rule is the interface to distinguish Melee- and Cooperative scenarios for various purposes. Using a separate flag might be cleaner, but would violate the do-not-repeat-yourself-rule. --- src/game/object/C4Id.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/object/C4Id.h b/src/game/object/C4Id.h index 9bdd267fa..a739d2866 100644 --- a/src/game/object/C4Id.h +++ b/src/game/object/C4Id.h @@ -56,7 +56,7 @@ public: DEPRECATED static const C4ID Conkit; // Construction kit static const C4ID Clonk; DEPRECATED static const C4ID Flame; - DEPRECATED static const C4ID Melee; + static const C4ID Melee; DEPRECATED static const C4ID Bubble; C4ID(): v(None.v) {}