summaryrefslogtreecommitdiffstats
path: root/larn/display.c
diff options
context:
space:
mode:
Diffstat (limited to 'larn/display.c')
-rw-r--r--larn/display.c130
1 files changed, 64 insertions, 66 deletions
diff --git a/larn/display.c b/larn/display.c
index 54dd70cc..cb7ef552 100644
--- a/larn/display.c
+++ b/larn/display.c
@@ -1,16 +1,16 @@
-/* $NetBSD: display.c,v 1.6 2008/01/28 03:39:30 dholland Exp $ */
+/* $NetBSD: display.c,v 1.7 2008/01/28 05:38:53 dholland Exp $ */
/* display.c Larn is copyrighted 1986 by Noah Morgan. */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: display.c,v 1.6 2008/01/28 03:39:30 dholland Exp $");
+__RCSID("$NetBSD: display.c,v 1.7 2008/01/28 05:38:53 dholland Exp $");
#endif /* not lint */
#include "header.h"
#include "extern.h"
#define makecode(_a,_b,_c) (((_a)<<16) + ((_b)<<8) + (_c))
-static void botsub(int, char *);
+static void botsub(int, const char *);
static int minx, maxx, miny, maxy, k, m;
static char bot1f = 0, bot2f = 0, bot3f = 0;
@@ -92,31 +92,31 @@ bot_linex()
cbak[i] = c[i];
return;
}
- botsub(makecode(SPELLS, 8, 18), "%3d");
+ botsub(makecode(SPELLS, 8, 18), "%3ld");
if (c[SPELLMAX] > 99)
- botsub(makecode(SPELLMAX, 12, 18), "%3d)");
+ botsub(makecode(SPELLMAX, 12, 18), "%3ld)");
else
- botsub(makecode(SPELLMAX, 12, 18), "%2d) ");
- botsub(makecode(HP, 5, 19), "%3d");
- botsub(makecode(HPMAX, 9, 19), "%3d");
- botsub(makecode(AC, 21, 18), "%-3d");
- botsub(makecode(WCLASS, 30, 18), "%-3d");
- botsub(makecode(EXPERIENCE, 49, 18), "%-9d");
+ botsub(makecode(SPELLMAX, 12, 18), "%2ld) ");
+ botsub(makecode(HP, 5, 19), "%3ld");
+ botsub(makecode(HPMAX, 9, 19), "%3ld");
+ botsub(makecode(AC, 21, 18), "%-3ld");
+ botsub(makecode(WCLASS, 30, 18), "%-3ld");
+ botsub(makecode(EXPERIENCE, 49, 18), "%-9ld");
if (c[LEVEL] != cbak[LEVEL]) {
cursor(59, 18);
lprcat(class[c[LEVEL] - 1]);
}
if (c[LEVEL] > 99)
- botsub(makecode(LEVEL, 40, 18), "%3d");
+ botsub(makecode(LEVEL, 40, 18), "%3ld");
else
- botsub(makecode(LEVEL, 40, 18), " %-2d");
+ botsub(makecode(LEVEL, 40, 18), " %-2ld");
c[TMP] = c[STRENGTH] + c[STREXTRA];
- botsub(makecode(TMP, 18, 19), "%-2d");
- botsub(makecode(INTELLIGENCE, 25, 19), "%-2d");
- botsub(makecode(WISDOM, 32, 19), "%-2d");
- botsub(makecode(CONSTITUTION, 39, 19), "%-2d");
- botsub(makecode(DEXTERITY, 46, 19), "%-2d");
- botsub(makecode(CHARISMA, 53, 19), "%-2d");
+ botsub(makecode(TMP, 18, 19), "%-2ld");
+ botsub(makecode(INTELLIGENCE, 25, 19), "%-2ld");
+ botsub(makecode(WISDOM, 32, 19), "%-2ld");
+ botsub(makecode(CONSTITUTION, 39, 19), "%-2ld");
+ botsub(makecode(DEXTERITY, 46, 19), "%-2ld");
+ botsub(makecode(CHARISMA, 53, 19), "%-2ld");
if ((level != cbak[CAVELEVEL]) || (c[TELEFLAG] != cbak[TELEFLAG])) {
if ((level == 0) || (wizard))
c[TELEFLAG] = 0;
@@ -128,7 +128,7 @@ bot_linex()
else
lprcat(levelname[level]);
}
- botsub(makecode(GOLD, 69, 19), "%-6d");
+ botsub(makecode(GOLD, 69, 19), "%-6ld");
botside();
}
@@ -139,8 +139,8 @@ bot_linex()
void
bottomgold()
{
- botsub(makecode(GOLD, 69, 19), "%-6d");
- /* botsub(GOLD,"%-6d",69,19); */
+ botsub(makecode(GOLD, 69, 19), "%-6ld");
+ /* botsub(GOLD,"%-6ld",69,19); */
}
/*
@@ -154,7 +154,7 @@ bot_hpx()
recalc();
bot_linex();
} else
- botsub(makecode(HP, 5, 19), "%3d");
+ botsub(makecode(HP, 5, 19), "%3ld");
}
/*
@@ -163,7 +163,7 @@ bot_hpx()
void
bot_spellx()
{
- botsub(makecode(SPELLS, 9, 18), "%2d");
+ botsub(makecode(SPELLS, 9, 18), "%2ld");
}
/*
@@ -171,7 +171,7 @@ bot_spellx()
*/
static struct bot_side_def {
int typ;
- char *string;
+ const char *string;
}
bot_data[] =
{
@@ -217,9 +217,7 @@ botside()
}
static void
-botsub(idx, str)
- int idx;
- char *str;
+botsub(int idx, const char *str)
{
int x, y;
y = idx & 0xff;
@@ -281,7 +279,7 @@ u_char screen[MAXX][MAXY], d_flag; /* template for the screen */
void
drawscreen()
{
- int i, j, k;
+ int i, j, kk;
int lastx, lasty; /* variables used to optimize the
* object printing */
if (d_xmin == 0 && d_xmax == MAXX && d_ymin == 0 && d_ymax == MAXY) {
@@ -299,9 +297,9 @@ drawscreen()
for (j = d_xmin; j < d_xmax; j++)
if (know[j][i] == 0)
screen[j][i] = ' ';
- else if ((k = mitem[j][i]) != 0)
- screen[j][i] = monstnamelist[k];
- else if ((k = item[j][i]) == OWALL)
+ else if ((kk = mitem[j][i]) != 0)
+ screen[j][i] = monstnamelist[kk];
+ else if ((kk = item[j][i]) == OWALL)
screen[j][i] = '#';
else
screen[j][i] = ' ';
@@ -325,10 +323,10 @@ drawscreen()
}
while (j <= m) {
if (j <= m - 3) {
- for (k = j; k <= j + 3; k++)
- if (screen[k][i] != ' ')
- k = 1000;
- if (k < 1000) {
+ for (kk = j; kk <= j + 3; kk++)
+ if (screen[kk][i] != ' ')
+ kk = 1000;
+ if (kk < 1000) {
while (screen[j][i] == ' ' && j <= m)
j++;
cursor(j + 1, i + 1);
@@ -341,15 +339,15 @@ drawscreen()
for (lastx = lasty = 127, i = d_ymin; i < d_ymax; i++)
for (j = d_xmin; j < d_xmax; j++) {
- if ((k = item[j][i]) != 0)
- if (k != OWALL)
+ if ((kk = item[j][i]) != 0)
+ if (kk != OWALL)
if ((know[j][i]) && (mitem[j][i] == 0))
- if (objnamelist[k] != ' ') {
+ if (objnamelist[kk] != ' ') {
if (lasty != i + 1 || lastx != j)
cursor(lastx = j + 1, lasty = i + 1);
else
lastx++;
- lprc(objnamelist[k]);
+ lprc(objnamelist[kk]);
}
}
@@ -375,7 +373,7 @@ void
showcell(x, y)
int x, y;
{
- int i, j, k, m;
+ int i, j, kk, mm;
if (c[BLINDCOUNT])
return; /* see nothing if blind */
if (c[AWARENESS]) {
@@ -400,34 +398,34 @@ showcell(x, y)
maxy = MAXY - 1;
for (j = miny; j <= maxy; j++)
- for (m = minx; m <= maxx; m++)
- if (know[m][j] == 0) {
- cursor(m + 1, j + 1);
+ for (mm = minx; mm <= maxx; mm++)
+ if (know[mm][j] == 0) {
+ cursor(mm + 1, j + 1);
x = maxx;
while (know[x][j])
--x;
- for (i = m; i <= x; i++) {
- if ((k = mitem[i][j]) != 0)
- lprc(monstnamelist[k]);
+ for (i = mm; i <= x; i++) {
+ if ((kk = mitem[i][j]) != 0)
+ lprc(monstnamelist[kk]);
else
- switch (k = item[i][j]) {
+ switch (kk = item[i][j]) {
case OWALL:
case 0:
case OIVTELETRAP:
case OTRAPARROWIV:
case OIVDARTRAP:
case OIVTRAPDOOR:
- lprc(objnamelist[k]);
+ lprc(objnamelist[kk]);
break;
default:
setbold();
- lprc(objnamelist[k]);
+ lprc(objnamelist[kk]);
resetbold();
};
know[i][j] = 1;
}
- m = maxx;
+ mm = maxx;
}
}
@@ -497,42 +495,42 @@ moveplayer(dir)
* [8-southwest] if direction=0, don't
* move--just show where he is */
{
- int k, m, i, j;
+ int kk, mm, i, j;
if (c[CONFUSE])
if (c[LEVEL] < rnd(30))
dir = rund(9); /* if confused any dir */
- k = playerx + diroffx[dir];
- m = playery + diroffy[dir];
- if (k < 0 || k >= MAXX || m < 0 || m >= MAXY) {
+ kk = playerx + diroffx[dir];
+ mm = playery + diroffy[dir];
+ if (kk < 0 || kk >= MAXX || mm < 0 || mm >= MAXY) {
nomove = 1;
return (yrepcount = 0);
}
- i = item[k][m];
- j = mitem[k][m];
+ i = item[kk][mm];
+ j = mitem[kk][mm];
if (i == OWALL && c[WTW] == 0) {
nomove = 1;
return (yrepcount = 0);
} /* hit a wall */
- if (k == 33 && m == MAXY - 1 && level == 1) {
+ if (kk == 33 && mm == MAXY - 1 && level == 1) {
newcavelevel(0);
- for (k = 0; k < MAXX; k++)
- for (m = 0; m < MAXY; m++)
- if (item[k][m] == OENTRANCE) {
- playerx = k;
- playery = m;
+ for (kk = 0; kk < MAXX; kk++)
+ for (mm = 0; mm < MAXY; mm++)
+ if (item[kk][mm] == OENTRANCE) {
+ playerx = kk;
+ playery = mm;
positionplayer();
drawscreen();
return (0);
}
}
if (j > 0) {
- hitmonster(k, m);
+ hitmonster(kk, mm);
return (yrepcount = 0);
} /* hit a monster */
lastpx = playerx;
lastpy = playery;
- playerx = k;
- playery = m;
+ playerx = kk;
+ playery = mm;
if (i && i != OTRAPARROWIV && i != OIVTELETRAP && i != OIVDARTRAP && i != OIVTRAPDOOR)
return (yrepcount = 0);
else
generated by cgit v1.2.3-56-ge451 (git 2.39.0) at 2024-05-18 16:07:42 +0000