From 350aac765d3e94494f9b3db3a16f3b09d454bd5b Mon Sep 17 00:00:00 2001
From: dholland <dholland@NetBSD.org>
Date: Sun, 3 Feb 2008 21:24:58 +0000
Subject: Once upon a time, larn 12.0 had functions named getchar() and
 putchar() that conflicted with libc. We changed them to lgetchar() and
 xputchar() respectively; larn 12.2 changed them to ttgetch() and ttputch().
 After reflecting on this for a while I've decided to adopt the larn 12.2
 names; not so much for compatibility but for consistency going forward. So,
 massrename them. Also make ttputch() static.

---
 larn/moreobj.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'larn/moreobj.c')

diff --git a/larn/moreobj.c b/larn/moreobj.c
index 70853acb..7854cf7d 100644
--- a/larn/moreobj.c
+++ b/larn/moreobj.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: moreobj.c,v 1.8 2008/01/28 05:38:54 dholland Exp $	*/
+/*	$NetBSD: moreobj.c,v 1.9 2008/02/03 21:24:58 dholland Exp $	*/
 
 /*
  * moreobj.c 		Larn is copyrighted 1986 by Noah Morgan.
@@ -9,7 +9,7 @@
  */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: moreobj.c,v 1.8 2008/01/28 05:38:54 dholland Exp $");
+__RCSID("$NetBSD: moreobj.c,v 1.9 2008/02/03 21:24:58 dholland Exp $");
 #endif				/* not lint */
 #include <stdlib.h>
 #include <unistd.h>
@@ -35,11 +35,11 @@ oaltar()
 	iopts();
 	while (1) {
 		while (1)
-			switch (lgetchar()) {
+			switch (ttgetch()) {
 			case 'p':
 				lprcat(" pray\nDo you (m) give money or (j) just pray? ");
 				while (1)
-					switch (lgetchar()) {
+					switch (ttgetch()) {
 					case 'j':
 						if (rnd(100) < 75)
 							lprcat("\nnothing happens");
@@ -153,7 +153,7 @@ othrone(arg)
 	iopts();
 	while (1) {
 		while (1)
-			switch (lgetchar()) {
+			switch (ttgetch()) {
 			case 'p':
 				lprcat(" pry off");
 				k = rnd(101);
@@ -203,7 +203,7 @@ odeadthrone()
 	iopts();
 	while (1) {
 		while (1)
-			switch (lgetchar()) {
+			switch (ttgetch()) {
 			case 's':
 				lprcat(" sit down");
 				k = rnd(101);
@@ -238,7 +238,7 @@ ochest()
 	iopts();
 	while (1) {
 		while (1)
-			switch (lgetchar()) {
+			switch (ttgetch()) {
 			case 'o':
 				lprcat(" open it");
 				k = rnd(101);
@@ -307,7 +307,7 @@ ofountain()
 	lprcat("\nDo you (d) drink, (w) wash yourself");
 	iopts();
 	while (1)
-		switch (lgetchar()) {
+		switch (ttgetch()) {
 		case 'd':
 			lprcat("drink");
 			if (rnd(1501) < 2) {
-- 
cgit v1.2.3