- Reverted the 'None' name change from r569.

SVN r585 (trunk)

docs/rh-log.txt

@@ -1,3 +1,6 @@
+December 8, 2007
+- Reverted the 'None' name change from r569.
+
 December 6, 2007
 - Fixed the PowerTimeFreezer, too. It got easier once I realized that I only
   need to be concerned about changing the flag on odd tics, since A_Tracer()

src/name.cpp

@@ -71,10 +71,8 @@ FName::NameManager FName::NameData;
 static const char *PredefinedNames[] =
 {
 #define xx(n) #n,
-#define yy(n,s) s,
 #include "namedef.h"
 #undef xx
-#undef yy
 };
 
 // CODE --------------------------------------------------------------------

src/name.h

@@ -37,10 +37,8 @@
 enum ENamedName
 {
 #define xx(n) NAME_##n,
-#define yy(n,s) NAME_##n,
 #include "namedef.h"
 #undef xx
-#undef yy
 };
 
 class FString;

src/namedef.h

@@ -1,5 +1,5 @@
 // 'None' must always be the first name.
-yy(None, "")
+xx(None)
 
 xx(Super)
 xx(Object)