Skip to content

Fix compiling with a K&R C compiler. #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdebath wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix compiling with a K&R C compiler. #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion demons.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,12 @@ void fightd_()

/* DECLARATIONS */

integer blow_(integer h, integer v, integer rmk, integer hflg, integer out)
integer blow_(h, v, rmk, hflg, out)
integer h;
integer v;
integer rmk;
integer hflg;
integer out;
{
/* Initialized data */

Expand Down
5 changes: 2 additions & 3 deletions dinit.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,11 +127,12 @@ logical init_()
more_output("");
more_output("As he grabs you by the neck all grows dim about you.");
exit_();

L10000:
#endif

/* NOW START INITIALIZATION PROPER */

L10000:
ret_val = FALSE_;
/* !ASSUME INIT FAILS. */
mmax = 1050;
Expand Down Expand Up @@ -442,9 +443,7 @@ logical init_()
#ifdef DEBUG
more_output(NULL);
printf("I can't open %s.\n", TEXTFILE);
#endif
L1975:
#ifdef DEBUG
more_output("Suddenly a sinister, wraithlike figure appears before you,");
more_output("seeming to float in the air. In a low, sorrowful voice he says,");
more_output("\"Alas, the very nature of the world has changed, and the dungeon");
Expand Down
4 changes: 3 additions & 1 deletion dso1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,9 @@ integer adv;

/* DECLARATIONS */

void princo_(integer obj, integer desc)
void princo_(obj, desc)
integer obj;
integer desc;
{
/* Local variables */
integer i;
Expand Down
13 changes: 9 additions & 4 deletions dso2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
#include "funcs.h"
#include "vars.h"

logical moveto_(integer nr, integer who)
logical
moveto_(nr, who)
integer nr;
integer who;
{
/* System generated locals */
logical ret_val;
Expand Down Expand Up @@ -72,7 +75,7 @@ logical moveto_(integer nr, integer who)
}
/* !IN BUCKET? */
nlv = (rooms_1.rflag[nr - 1] & bits) == 0;
// Don't change this goto without looking at compiled size very carefully
/* Don't change this goto without looking at compiled size very carefully */
if (! lnr && nlv || lnr && lhr && nlv && bits != RLAND) {
goto L800;
}
Expand All @@ -87,7 +90,8 @@ logical moveto_(integer nr, integer who)

/* DECLARATIONS */

void score_(logical flg)
void score_(flg)
logical flg;
{
/* Initialized data */

Expand Down Expand Up @@ -141,7 +145,8 @@ void score_(logical flg)

/* DECLARATIONS */

void scrupd_(integer n)
void scrupd_(n)
integer n;
{
if (findex_1.endgmf) {
state_1.egscor += n;
Expand Down
18 changes: 14 additions & 4 deletions dso3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include "funcs.h"
#include "vars.h"

logical findxt_(integer dir, integer rm)
logical findxt_(dir, rm)
integer dir;
integer rm;
{
/* System generated locals */
logical ret_val;
Expand Down Expand Up @@ -62,8 +64,13 @@ logical findxt_(integer dir, integer rm)

/* DECLARATIONS */

integer fwim_(integer f1, integer f2, integer rm,
integer con, integer adv, logical nocare)
integer fwim_(f1, f2, rm, con, adv, nocare)
integer f1;
integer f2;
integer rm;
integer con;
integer adv;
logical nocare;
{
/* System generated locals */
integer ret_val;
Expand Down Expand Up @@ -129,7 +136,10 @@ integer fwim_(integer f1, integer f2, integer rm,

/* YES-IS-TRUE=YESNO(QUESTION,YES-STRING,NO-STRING) */

logical yesno_(integer q, integer y, integer n)
logical yesno_(q, y, n)
integer q;
integer y;
integer n;
{
/* Local variables */
char ans[100];
Expand Down
26 changes: 20 additions & 6 deletions dso4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,11 @@
#include "funcs.h"
#include "vars.h"

integer robadv_(integer adv, integer nr, integer nc, integer na)
integer robadv_(adv, nr, nc, na)
integer adv;
integer nr;
integer nc;
integer na;
{
/* System generated locals */
integer ret_val;
Expand All @@ -33,7 +37,12 @@ integer robadv_(integer adv, integer nr, integer nc, integer na)

/* DECLARATIONS */

integer robrm_(integer rm, integer pr, integer nr, integer nc, integer na)
integer robrm_(rm, pr, nr, nc, na)
integer rm;
integer pr;
integer nr;
integer nc;
integer na;
{
/* System generated locals */
integer ret_val;
Expand Down Expand Up @@ -69,7 +78,9 @@ integer robrm_(integer rm, integer pr, integer nr, integer nc, integer na)

/* DECLARATIONS */

logical winnin_(integer vl, integer hr)
logical winnin_(vl, hr)
integer vl;
integer hr;
{
/* System generated locals */
logical ret_val;
Expand Down Expand Up @@ -107,7 +118,9 @@ logical winnin_(integer vl, integer hr)

/* DECLARATIONS */

integer fights_(integer h, logical flg)
integer fights_(h, flg)
integer h;
logical flg;
{
/* Initialized data */

Expand All @@ -129,10 +142,11 @@ integer fights_(integer h, logical flg)

/* DECLARATIONS */

integer vilstr_(integer v)
integer vilstr_(v)
integer v;
{
/* System generated locals */
integer ret_val, i__1, i__2, i__3;
integer ret_val, i__2, i__3;

/* Local variables */
integer i;
Expand Down
18 changes: 13 additions & 5 deletions dso5.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@

/* GTTIME-- GET TOTAL TIME PLAYED */

void gttime_(integer *t)
void gttime_(t)
integer *t;
{
integer h, m, s;

Expand All @@ -23,7 +24,10 @@ void gttime_(integer *t)

/* DECLARATIONS */

logical opncls_(integer obj, integer so, integer sc)
logical opncls_(obj, so, sc)
integer obj;
integer so;
integer sc;
{
/* System generated locals */
logical ret_val;
Expand Down Expand Up @@ -70,7 +74,8 @@ logical opncls_(integer obj, integer so, integer sc)

/* DECLARATIONS */

logical lit_(integer rm)
logical lit_(rm)
integer rm;
{
/* System generated locals */
logical ret_val;
Expand Down Expand Up @@ -133,10 +138,13 @@ logical lit_(integer rm)

/* DECLARATIONS */

integer weight_(integer rm, integer cn, integer ad)
integer weight_(rm, cn, ad)
integer rm;
integer cn;
integer ad;
{
/* System generated locals */
integer ret_val, i__1;
integer ret_val;

/* Local variables */
integer i, j;
Expand Down
7 changes: 5 additions & 2 deletions dso6.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@
#include "funcs.h"
#include "vars.h"

logical ghere_(integer obj, integer rm)
logical ghere_(obj, rm)
integer obj;
integer rm;
{
/* System generated locals */
logical ret_val;
Expand Down Expand Up @@ -128,7 +130,8 @@ logical ghere_(integer obj, integer rm)

/* DECLARATIONS */

integer mrhere_(integer rm)
integer mrhere_(rm)
integer rm;
{
/* System generated locals */
integer ret_val;
Expand Down
10 changes: 7 additions & 3 deletions dso7.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
#include "funcs.h"
#include "vars.h"

void encryp_(const char *inw, char *outw)
void encryp_(inw, outw)
const char *inw;
char *outw;
{
/* Initialized data */

Expand Down Expand Up @@ -60,7 +62,8 @@ void encryp_(const char *inw, char *outw)

/* DECLARATIONS */

void cpgoto_(integer st)
void cpgoto_(st)
integer st;
{
/* System generated locals */
integer i__2;
Expand Down Expand Up @@ -88,7 +91,8 @@ void cpgoto_(integer st)

/* DECLARATIONS */

void cpinfo_(integer rmk, integer st)
void cpinfo_(rmk, st)
integer rmk; integer st;
{
/* Initialized data */

Expand Down
37 changes: 28 additions & 9 deletions dsub.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,11 @@ integer s2;

/* rspsb2nl_ Display a substitutable message with an optional newline */

static void rspsb2nl_(integer n, integer y, integer z, integer nl)
static void rspsb2nl_(n, y, z, nl)
integer n;
integer y;
integer z;
integer nl;
{
int res;
const char *zkey = "IanLanceTaylorJr";
Expand Down Expand Up @@ -157,7 +161,9 @@ logical objact_()

/* CALL BUG(NO,PAR) */

void bug_(integer a, integer b)
void bug_(a, b)
integer a;
integer b;
{
#ifdef DEBUG

Expand All @@ -180,7 +186,12 @@ void bug_(integer a, integer b)

/* CALL NEWSTA(OBJECT,STRING,NEWROOM,NEWCON,NEWADV) */

void newsta_(integer o, integer r, integer rm, integer cn, integer ad)
void newsta_(o, r, rm, cn, ad)
integer o;
integer r;
integer rm;
integer cn;
integer ad;
{
rspeak_(r);
objcts_1.oroom[o - 1] = rm;
Expand All @@ -192,7 +203,9 @@ void newsta_(integer o, integer r, integer rm, integer cn, integer ad)

/* DECLARATIONS */

logical qhere_(integer obj, integer rm)
logical qhere_(obj, rm)
integer obj;
integer rm;
{
/* Local variables */
integer i;
Expand All @@ -215,7 +228,8 @@ logical qhere_(integer obj, integer rm)

/* DECLARATIONS */

logical qempty_(integer obj)
logical qempty_(obj)
integer obj;
{
/* Local variables */
integer i;
Expand All @@ -234,7 +248,8 @@ logical qempty_(integer obj)

/* DECLARATIONS */

void jigsup_(integer desc)
void jigsup_(desc)
integer desc;
{
/* Initialized data */

Expand Down Expand Up @@ -390,7 +405,8 @@ void jigsup_(integer desc)

/* DECLARATIONS */

integer oactor_(integer obj)
integer oactor_(obj)
integer obj;
{
/* System generated locals */

Expand All @@ -417,7 +433,9 @@ integer oactor_(integer obj)

/* DECLARATIONS */

logical prob_(integer g, integer b)
logical prob_(g, b)
integer g;
integer b;
{
/* System generated locals */

Expand Down Expand Up @@ -551,7 +569,8 @@ integer full;

/* DECLARATIONS */

logical rappli_(integer ri)
logical rappli_(ri)
integer ri;
{
/* Initialized data */

Expand Down
Loading