KNFify (with indent)

1 files changed, 185 insertions, 188 deletions

diff --git a/battlestar/com3.c b/battlestar/com3.c
index c17c2a34..77ab3db8 100644
--- a/battlestar/com3.c
+++ b/battlestar/com3.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: com3.c,v 1.5 1997/10/10 11:39:22 lukem Exp $	*/
+/*	$NetBSD: com3.c,v 1.6 1997/10/11 02:07:02 lukem Exp $	*/
 
 /*
  * Copyright (c) 1983, 1993
@@ -38,240 +38,236 @@
 #if 0
 static char sccsid[] = "@(#)com3.c	8.2 (Berkeley) 4/28/95";
 #else
-__RCSID("$NetBSD: com3.c,v 1.5 1997/10/10 11:39:22 lukem Exp $");
+__RCSID("$NetBSD: com3.c,v 1.6 1997/10/11 02:07:02 lukem Exp $");
 #endif
-#endif /* not lint */
+#endif				/* not lint */
 
 #include "extern.h"
 
 void
 dig()
 {
-	if (testbit(inven,SHOVEL)){
+	if (testbit(inven, SHOVEL)) {
 		puts("OK");
 		ourtime++;
-		switch(position){
-			case 144:		/* copse near beach */
-				if (!notes[DUG]){
-					setbit(location[position].objects,DEADWOOD);
-					setbit(location[position].objects,COMPASS);
-					setbit(location[position].objects,KNIFE);
-					setbit(location[position].objects,MACE);
-					notes[DUG] = 1;
-				}
-				break;
+		switch (position) {
+		case 144:	/* copse near beach */
+			if (!notes[DUG]) {
+				setbit(location[position].objects, DEADWOOD);
+				setbit(location[position].objects, COMPASS);
+				setbit(location[position].objects, KNIFE);
+				setbit(location[position].objects, MACE);
+				notes[DUG] = 1;
+			}
+			break;
 
-			default:
-				puts("Nothing happens.");
+		default:
+			puts("Nothing happens.");
 		}
-	}
-	else	
+	} else
 		puts("You don't have a shovel.");
 }
 
 int
 jump()
 {
-	int n;
+	int     n;
 
-	switch(position){
-		default:
-			puts("Nothing happens.");
-			return(-1);
+	switch (position) {
+	default:
+		puts("Nothing happens.");
+		return (-1);
 
-		case 242:
-			position = 133;
-			break;
-		case 214:
-		case 215:
-		case 162:
-		case 159:
-			position = 145;
-			break;
-		case 232:
-			position = 275;
-			break;
-		case 3:
-			position = 1;
-			break;
-		case 172:
-			position = 201;
+	case 242:
+		position = 133;
+		break;
+	case 214:
+	case 215:
+	case 162:
+	case 159:
+		position = 145;
+		break;
+	case 232:
+		position = 275;
+		break;
+	case 3:
+		position = 1;
+		break;
+	case 172:
+		position = 201;
 	}
 	puts("Ahhhhhhh...");
 	injuries[12] = injuries[8] = injuries[7] = injuries[6] = 1;
-	for (n=0; n < NUMOFOBJECTS; n++)
-		if (testbit(inven,n)){
-			clearbit(inven,n);
-			setbit(location[position].objects,n);
+	for (n = 0; n < NUMOFOBJECTS; n++)
+		if (testbit(inven, n)) {
+			clearbit(inven, n);
+			setbit(location[position].objects, n);
 		}
 	carrying = 0;
 	encumber = 0;
-	return(0);
+	return (0);
 }
 
 void
 bury()
 {
-	int value;
+	int     value;
 
-	if (testbit(inven,SHOVEL)){
-		while(wordtype[++wordnumber] != OBJECT && wordtype[wordnumber] != NOUNS && wordnumber < wordcount);
+	if (testbit(inven, SHOVEL)) {
+		while (wordtype[++wordnumber] != OBJECT && wordtype[wordnumber] != NOUNS && wordnumber < wordcount);
 		value = wordvalue[wordnumber];
-		if (wordtype[wordnumber] == NOUNS && (testbit(location[position].objects,value) || value == BODY))
-			switch(value){
-				case BODY:
-					wordtype[wordnumber] = OBJECT;
-					if (testbit(inven,MAID) || testbit(location[position].objects,MAID))
-						value = MAID;
-					if (testbit(inven,DEADWOOD) || testbit(location[position].objects,DEADWOOD))
-						value = DEADWOOD;
-					if (testbit(inven,DEADGOD) || testbit(location[position].objects,DEADGOD))
-						value = DEADGOD;
-					if (testbit(inven,DEADTIME) || testbit(location[position].objects,DEADTIME))
-						value = DEADTIME;
-					if (testbit(inven,DEADNATIVE) || testbit(location[position].objects,DEADNATIVE))
-						value = DEADNATIVE;
-					break;
+		if (wordtype[wordnumber] == NOUNS && (testbit(location[position].objects, value) || value == BODY))
+			switch (value) {
+			case BODY:
+				wordtype[wordnumber] = OBJECT;
+				if (testbit(inven, MAID) || testbit(location[position].objects, MAID))
+					value = MAID;
+				if (testbit(inven, DEADWOOD) || testbit(location[position].objects, DEADWOOD))
+					value = DEADWOOD;
+				if (testbit(inven, DEADGOD) || testbit(location[position].objects, DEADGOD))
+					value = DEADGOD;
+				if (testbit(inven, DEADTIME) || testbit(location[position].objects, DEADTIME))
+					value = DEADTIME;
+				if (testbit(inven, DEADNATIVE) || testbit(location[position].objects, DEADNATIVE))
+					value = DEADNATIVE;
+				break;
 
-				case NATIVE:
-				case NORMGOD:
-					puts("She screams as you wrestle her into the hole.");
-				case TIMER:
-					power += 7;
-					ego -= 10;
-				case AMULET:
-				case MEDALION:
-				case TALISMAN:
-					wordtype[wordnumber] = OBJECT;
-					break;
+			case NATIVE:
+			case NORMGOD:
+				puts("She screams as you wrestle her into the hole.");
+			case TIMER:
+				power += 7;
+				ego -= 10;
+			case AMULET:
+			case MEDALION:
+			case TALISMAN:
+				wordtype[wordnumber] = OBJECT;
+				break;
 
-				default:
-					puts("Wha..?");
+			default:
+				puts("Wha..?");
 			}
-		if (wordtype[wordnumber] == OBJECT && position > 88 && (testbit(inven,value) || testbit(location[position].objects,value))){
+		if (wordtype[wordnumber] == OBJECT && position > 88 && (testbit(inven, value) || testbit(location[position].objects, value))) {
 			puts("Buried.");
-			if (testbit(inven,value)){
-				clearbit(inven,value);
+			if (testbit(inven, value)) {
+				clearbit(inven, value);
 				carrying -= objwt[value];
 				encumber -= objcumber[value];
 			}
-			clearbit(location[position].objects,value);
-			switch(value){
-				case MAID:
-				case DEADWOOD:
-				case DEADNATIVE:
-				case DEADTIME:
-				case DEADGOD:
-					ego += 2;
-					printf("The %s should rest easier now.\n",objsht[value]);
+			clearbit(location[position].objects, value);
+			switch (value) {
+			case MAID:
+			case DEADWOOD:
+			case DEADNATIVE:
+			case DEADTIME:
+			case DEADGOD:
+				ego += 2;
+				printf("The %s should rest easier now.\n", objsht[value]);
 			}
-		}
-		else
+		} else
 			puts("It doesn't seem to work.");
-	}
-	else
+	} else
 		puts("You aren't holding a shovel.");
 }
 
 void
 drink()
 {
-	int n;
+	int     n;
 
-	if (testbit(inven,POTION)){
+	if (testbit(inven, POTION)) {
 		puts("The cool liquid runs down your throat but turns to fire and you choke.");
 		puts("The heat reaches your limbs and tingles your spirit.  You feel like falling");
 		puts("asleep.");
 		clearbit(inven, POTION);
 		WEIGHT = MAXWEIGHT;
 		CUMBER = MAXCUMBER;
-		for (n=0; n < NUMOFINJURIES; n++)
+		for (n = 0; n < NUMOFINJURIES; n++)
 			injuries[n] = 0;
 		ourtime++;
 		zzz();
-	}
-	else
+	} else
 		puts("I'm not thirsty.");
 }
 
 int
 shoot()
 {
-	int firstnumber, value;
-	int n;
+	int     firstnumber, value;
+	int     n;
 
 	firstnumber = 0;
-	if (!testbit(inven,LASER))
+	if (!testbit(inven, LASER))
 		puts("You aren't holding a blaster.");
 	else {
 		firstnumber = wordnumber;
-		while(wordtype[++wordnumber] == ADJS);
-		while(wordnumber<=wordcount && wordtype[wordnumber] == OBJECT){
+		while (wordtype[++wordnumber] == ADJS);
+		while (wordnumber <= wordcount && wordtype[wordnumber] == OBJECT) {
 			value = wordvalue[wordnumber];
 			printf("%s:\n", objsht[value]);
-			for (n=0; objsht[value][n]; n++);
-			if (testbit(location[position].objects,value)){
-				clearbit(location[position].objects,value);
+			for (n = 0; objsht[value][n]; n++);
+			if (testbit(location[position].objects, value)) {
+				clearbit(location[position].objects, value);
 				ourtime++;
-				printf("The %s explode%s\n",objsht[value],(objsht[value][n-1]=='s' ? (objsht[value][n-2]=='s' ? "s." : ".") : "s."));
+				printf("The %s explode%s\n", objsht[value], (objsht[value][n - 1] == 's' ? (objsht[value][n - 2] == 's' ? "s." : ".") : "s."));
 				if (value == BOMB)
 					die();
-			}
-			else
+			} else
 				printf("I dont see any %s around here.\n", objsht[value]);
 			if (wordnumber < wordcount - 1 && wordvalue[++wordnumber] == AND)
 				wordnumber++;
 			else
-				return(firstnumber);
+				return (firstnumber);
 		}
-			    /* special cases with their own return()'s */
+		/* special cases with their own return()'s */
 
-		if (wordnumber <= wordcount && wordtype[wordnumber] == NOUNS){
+		if (wordnumber <= wordcount && wordtype[wordnumber] == NOUNS) {
 			ourtime++;
-			switch(wordvalue[wordnumber]){
-			
-				case DOOR:
-					switch(position){
-						case 189:
-						case 231:
-							puts("The door is unhinged.");
-							location[189].north = 231;
-							location[231].south = 189;
-							whichway(location[position]);
-							break;
-						case 30:
-							puts("The wooden door splinters.");
-							location[30].west = 25;
-							whichway(location[position]);
-							break;
-						case 31:
-							puts("The laser blast has no effect on the door.");
-							break;
-						case 20:
-							puts("The blast hits the door and it explodes into flame.  The magnesium burns");
-							puts("so rapidly that we have no chance to escape.");
-							die();
-						default:
-							puts("Nothing happens.");
-					}
+			switch (wordvalue[wordnumber]) {
+
+			case DOOR:
+				switch (position) {
+				case 189:
+				case 231:
+					puts("The door is unhinged.");
+					location[189].north = 231;
+					location[231].south = 189;
+					whichway(location[position]);
 					break;
+				case 30:
+					puts("The wooden door splinters.");
+					location[30].west = 25;
+					whichway(location[position]);
+					break;
+				case 31:
+					puts("The laser blast has no effect on the door.");
+					break;
+				case 20:
+					puts("The blast hits the door and it explodes into flame.  The magnesium burns");
+					puts("so rapidly that we have no chance to escape.");
+					die();
+				default:
+					puts("Nothing happens.");
+				}
+				break;
 
-				case NORMGOD:
-					if (testbit(location[position].objects,BATHGOD)){
-						puts("The goddess is hit in the chest and splashes back against the rocks.");
-						puts("Dark blood oozes from the charred blast hole.  Her naked body floats in the");
-						puts("pools and then off downstream.");
-						clearbit(location[position].objects,BATHGOD);
-						setbit(location[180].objects,DEADGOD);
-						power += 5;
-						ego -= 10;
-						notes[JINXED]++;
-					} else if (testbit(location[position].objects,NORMGOD)){
+			case NORMGOD:
+				if (testbit(location[position].objects, BATHGOD)) {
+					puts("The goddess is hit in the chest and splashes back against the rocks.");
+					puts("Dark blood oozes from the charred blast hole.  Her naked body floats in the");
+					puts("pools and then off downstream.");
+					clearbit(location[position].objects, BATHGOD);
+					setbit(location[180].objects, DEADGOD);
+					power += 5;
+					ego -= 10;
+					notes[JINXED]++;
+				} else
+					if (testbit(location[position].objects, NORMGOD)) {
 						puts("The blast catches the goddess in the stomach, knocking her to the ground.");
 						puts("She writhes in the dirt as the agony of death taunts her.");
 						puts("She has stopped moving.");
-						clearbit(location[position].objects,NORMGOD);
-						setbit(location[position].objects,DEADGOD);
+						clearbit(location[position].objects, NORMGOD);
+						setbit(location[position].objects, DEADGOD);
 						power += 5;
 						ego -= 10;
 						notes[JINXED]++;
@@ -280,46 +276,47 @@ shoot()
 						break;
 					} else
 						puts("I don't see any goddess around here.");
-					break;
+				break;
 
-				case TIMER:
-					if (testbit(location[position].objects,TIMER)){
-						puts("The old man slumps over the bar.");
-						power++;
-						ego -= 2;
-						notes[JINXED]++;
-						clearbit(location[position].objects,TIMER);
-						setbit(location[position].objects,DEADTIME);
-					}
-					else puts("What old timer?");
-					break;
-				case MAN:
-					if (testbit(location[position].objects,MAN)){
-						puts("The man falls to the ground with blood pouring all over his white suit.");
-						puts("Your fantasy is over.");
-						die();
-					}
-					else puts("What man?");
-					break;
-				case NATIVE:
-					if (testbit(location[position].objects,NATIVE)){
-						puts("The girl is blown backwards several feet and lies in a pool of blood.");
-						clearbit(location[position].objects,NATIVE);
-						setbit(location[position].objects,DEADNATIVE);
-						power += 5;
-						ego -= 2;
-						notes[JINXED]++;
-					} else puts("There is no girl here.");
-					break;
-				case -1:
-					puts("Shoot what?");
-					break;
+			case TIMER:
+				if (testbit(location[position].objects, TIMER)) {
+					puts("The old man slumps over the bar.");
+					power++;
+					ego -= 2;
+					notes[JINXED]++;
+					clearbit(location[position].objects, TIMER);
+					setbit(location[position].objects, DEADTIME);
+				} else
+					puts("What old timer?");
+				break;
+			case MAN:
+				if (testbit(location[position].objects, MAN)) {
+					puts("The man falls to the ground with blood pouring all over his white suit.");
+					puts("Your fantasy is over.");
+					die();
+				} else
+					puts("What man?");
+				break;
+			case NATIVE:
+				if (testbit(location[position].objects, NATIVE)) {
+					puts("The girl is blown backwards several feet and lies in a pool of blood.");
+					clearbit(location[position].objects, NATIVE);
+					setbit(location[position].objects, DEADNATIVE);
+					power += 5;
+					ego -= 2;
+					notes[JINXED]++;
+				} else
+					puts("There is no girl here.");
+				break;
+			case -1:
+				puts("Shoot what?");
+				break;
 
-				default:
-					printf("You can't shoot the %s.\n",objsht[wordvalue[wordnumber]]);
+			default:
+				printf("You can't shoot the %s.\n", objsht[wordvalue[wordnumber]]);
 			}
-		}
-		else puts("You must be a looney.");
+		} else
+			puts("You must be a looney.");
 	}
-	return(firstnumber);
+	return (firstnumber);
 }