From e2ee647731e5056b7cad76b35fb7d70c2528cafc Mon Sep 17 00:00:00 2001
From: Rob Pearce <rob@nethack.net>
Date: Wed, 19 Nov 2008 01:42:40 +0000
Subject: [PATCH] More replacements

---
 defs.h   |  2 +-
 rc.c     |  2 +-
 shared.c | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/defs.h b/defs.h
index 4512ba0..4dcfdf8 100644
--- a/defs.h
+++ b/defs.h
@@ -487,7 +487,7 @@
 #define P_CANDLE	139
 #define P_PIZZA		140
 #define P_SUNDAE	141
-#define P_CANDY		142
+#define P_CAKE		142
 #define P_CHOCOLATE	143
 
 
diff --git a/rc.c b/rc.c
index 9cb9eaa..874b8bb 100644
--- a/rc.c
+++ b/rc.c
@@ -103,7 +103,7 @@ int fruittypes[] = {
 	P_BURGER,
 	P_PIZZA,
 	P_SUNDAE,
-	P_CANDY,
+	P_CAKE,
 	P_CHOCOLATE,
 	-1
 };
diff --git a/shared.c b/shared.c
index 2326f12..842db59 100644
--- a/shared.c
+++ b/shared.c
@@ -1356,8 +1356,8 @@ int loadimagesets(void) {
 	loadspriteimage(P_SUNDAE,F_WALK1, "sprites/sundae.png");
 	imageset[P_SUNDAE].numimages = 1;
 
-	loadspriteimage(P_CANDY,F_WALK1, "sprites/candy.png");
-	imageset[P_CANDY].numimages = 1;
+	loadspriteimage(P_CAKE,F_WALK1, "sprites/cake.png");
+	imageset[P_CAKE].numimages = 1;
 
 	loadspriteimage(P_CHOCOLATE,F_WALK1, "sprites/chocolate.png");
 	imageset[P_CHOCOLATE].numimages = 1;
@@ -2351,7 +2351,7 @@ int isfruit(int id) {
 		case P_BURGER:
 		case P_PIZZA:
 		case P_SUNDAE:
-		case P_CANDY:
+		case P_CAKE:
 		case P_CHOCOLATE:
 		case P_DIAMOND:
 			return FT_FRUIT;
@@ -2926,7 +2926,7 @@ int getpoints(int id) {
 		case P_SUNDAE:
 			points = 3000;
 			break;
-		case P_CANDY:
+		case P_CAKE:
 			points = 3500;
 			break;
 		case P_CHOCOLATE:
@@ -3224,7 +3224,7 @@ void setfruitinfo(void) {
 	setinfo(P_DIAMOND, "Diamond", "", "diamond.png");
 	setinfo(P_PIZZA, "Pizza", "", "pizza.png");
 	setinfo(P_SUNDAE, "Sundae", "", "sundae.png");
-	setinfo(P_CANDY, "Candy", "", "candy.png");
+	setinfo(P_CAKE, "Cake", "", "cake.png");
 	setinfo(P_CHOCOLATE, "Chocolate", "", "chocolate.png");
 	setinfo(P_FLOWERYELLOW, "Sunflower", "", "flower-yellow.png");
 	setinfo(P_FLOWERRED, "Tulip", "", "flower-red.png");