projects
/
super-star-trek.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5fd1629
)
REmove half the conditionals.
author
Eric S. Raymond
<esr@thyrsus.com>
Thu, 3 Feb 2005 20:08:04 +0000
(20:08 +0000)
committer
Eric S. Raymond
<esr@thyrsus.com>
Thu, 3 Feb 2005 20:08:04 +0000
(20:08 +0000)
setup.c
patch
|
blob
|
history
diff --git
a/setup.c
b/setup.c
index ca00504d5f424c772a7b2e91159b0a05a1622b89..58f45f175b8d12593d592c00f8f0a3ead10edf4a 100644
(file)
--- a/
setup.c
+++ b/
setup.c
@@
-1,8
+1,6
@@
#include <time.h>
#include <sys/stat.h>
#include <time.h>
#include <sys/stat.h>
-#ifdef SERGEEV
-#include <conio.h>
-#endif /* SERGEEV */
+#include "conio.h"
#include "sst.h"
#ifdef __linux__
#include "sst.h"
#ifdef __linux__
@@
-17,10
+15,10
@@
void prelim(void) {
skip(2);
prout("-SUPER- STAR TREK");
skip(1);
skip(2);
prout("-SUPER- STAR TREK");
skip(1);
-#ifndef
SERGEEV
+#ifndef
__HISTORICAL__
prout("Latest update-21 Sept 78");
skip(1);
prout("Latest update-21 Sept 78");
skip(1);
-#endif /*
SERGEEV
*/
+#endif /*
__HISTORICAL__
*/
}
void freeze(int boss) {
}
void freeze(int boss) {
@@
-400,9
+398,6
@@
void randomize(void) {
}
int choose(int needprompt) {
}
int choose(int needprompt) {
-#ifdef SERGEEV
- int i;
-#endif /* SERGEEV */
while (TRUE) {
tourn = 0;
thawed = 0;
while (TRUE) {
tourn = 0;
thawed = 0;
@@
-425,13
+420,8
@@
int choose(int needprompt) {
srand((unsigned int)(int)aaitem);
break;
}
srand((unsigned int)(int)aaitem);
break;
}
-#ifdef SERGEEV
- if (isit("saved")) {
+ if (isit("frozen") || isit("frozen")) {
if (thaw()) continue;
if (thaw()) continue;
-#else
- if (isit("frozen")) {
- thaw();
-#endif /* SERGEEV */
chew();
#ifndef SERGEEV
if (*game.passwd==0) continue;
chew();
#ifndef SERGEEV
if (*game.passwd==0) continue;