Update self removal plan

diff --git a/qcsrc/lib/self.qh b/qcsrc/lib/self.qh
index d028bc28fd370c653ee672d919385aec925dc45f..7822eefe3a64f779a0c2dee52fc310faa30576f6 100644 (file)
--- a/qcsrc/lib/self.qh
+++ b/qcsrc/lib/self.qh
@@ -30,10 +30,20 @@
 
 // Step 5: this should work
 #if 0
+    #undef self
     #define self (0, this)
 #endif
 
-// Step 6: Remove SELFPARAM in favor of a parameter
+// Step 6: remove SELFPARAM, add parameters
+#if 0
+    #undef SELFPARAM
+#endif
+
+// Step 7: remove WITHSELF, no replacement
+#if 0
+    #undef WITHSELF
+    #define WITHSELF(value, block) block
+#endif
 
 .void(entity this) selftouch;
 void touch_self() { SELFPARAM(); this.selftouch(this); }