Only in KoboDeluxe-0.5.1: KoboDeluxe-0.5.1
diff -ur KoboDeluxe-0.5.1/enemies.h KoboDeluxe-0.5.1./enemies.h
--- KoboDeluxe-0.5.1/enemies.h	2008-11-03 17:52:18 +0000
+++ KoboDeluxe-0.5.1./enemies.h	2008-11-03 17:56:55 +0000
@@ -72,7 +72,7 @@
 extern const enemy_kind cannon;
 extern const enemy_kind pipe1;
 extern const enemy_kind core;
-extern const enemy_kind pipe2;
+extern const enemy_kind pipe_2;
 extern const enemy_kind rock;
 extern const enemy_kind ring;
 extern const enemy_kind enemy_m1;
@@ -430,7 +430,7 @@
 
 inline int _enemy::is_pipe()
 {
-	return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe2)));
+	return ((_state != notuse) && ((ek == &pipe1) || (ek == &pipe_2)));
 }
 
 
diff -ur KoboDeluxe-0.5.1/enemy.cpp KoboDeluxe-0.5.1./enemy.cpp
--- KoboDeluxe-0.5.1/enemy.cpp	2008-11-03 17:52:18 +0000
+++ KoboDeluxe-0.5.1./enemy.cpp	2008-11-03 17:57:04 +0000
@@ -755,10 +755,10 @@
 
 void _enemy::kill_core()
 {
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
-	enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+	enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
 	enemies.make(&explosion4, CS2PIXEL(x), CS2PIXEL(y));
 	sound.g_base_core_explo(x, y);
 	release();
@@ -863,7 +863,7 @@
 
 /*
  * ===========================================================================
- *                                pipe2
+ *                                pipe_2
  * ===========================================================================
  */
 void _enemy::make_pipe2()
@@ -978,19 +978,19 @@
 	}
 	p ^= a;
 	if(p & U_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 1);
 	if(p & R_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 3);
 	if(p & D_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 5);
 	if(p & L_MASK)
-		enemies.make(&pipe2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
+		enemies.make(&pipe_2, CS2PIXEL(x), CS2PIXEL(y), 0, 0, 7);
 	manage.add_score(10);
 	release();
 }
 
 
-const enemy_kind pipe2 = {
+const enemy_kind pipe_2 = {
 	0,
 	&_enemy::make_pipe2,
 	&_enemy::move_pipe2,
diff -ur KoboDeluxe-0.5.1/graphics/window.cpp KoboDeluxe-0.5.1.new/graphics/window.cpp
--- KoboDeluxe-0.5.1/graphics/window.cpp	2009-05-26 19:24:52 +0000
+++ KoboDeluxe-0.5.1.new/graphics/window.cpp	2009-05-26 19:33:34 +0000
@@ -398,7 +398,7 @@
 		 */
 		if(token)
 		{
-			char *tok = strchr(txt, token);
+			const char *tok = strchr(txt, token);
 			if(tok)
 				tokpos = tok-txt;
 			else