projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More de-FORTRANizing of the output code.
[super-star-trek.git]
/
battle.c
diff --git
a/battle.c
b/battle.c
index d47671174b0b67fa631c1fbf091d34005c4327d0..7abe93a4d1662836efedec438ac1bf0d14e7f913 100644
(file)
--- a/
battle.c
+++ b/
battle.c
@@
-191,10
+191,7
@@
void torpedo(double course, double r, int inx, int iny, double *hit) {
iy = y + 0.5;
\r
if (iy < 1 || iy > 10) break;
\r
if (l==4 || l==9) skip(1);
\r
iy = y + 0.5;
\r
if (iy < 1 || iy > 10) break;
\r
if (l==4 || l==9) skip(1);
\r
- cramf(x, 0, 1);
\r
- proutn(" - ");
\r
- cramf(y, 0, 1);
\r
- proutn(" ");
\r
+ proutn("%d - %d ", (int)x, (int)y);
\r
iquad=game.quad[ix][iy];
\r
if (iquad==IHDOT) continue;
\r
/* hit something */
\r
iquad=game.quad[ix][iy];
\r
if (iquad==IHDOT) continue;
\r
/* hit something */
\r
@@
-385,9
+382,7
@@
void torpedo(double course, double r, int inx, int iny, double *hit) {
if (shoved) {
\r
game.quad[jx][jy]=iquad;
\r
game.quad[ix][iy]=IHDOT;
\r
if (shoved) {
\r
game.quad[jx][jy]=iquad;
\r
game.quad[ix][iy]=IHDOT;
\r
- proutn(" displaced by blast to");
\r
- cramlc(2, jx, jy);
\r
- skip(1);
\r
+ prout(" displaced by blast to %s ", cramlc(sector, jx, jy));
\r
for (ll=1; ll<=nenhere; ll++)
\r
game.kdist[ll] = game.kavgd[ll] = sqrt(square(sectx-game.kx[ll])+square(secty-game.ky[ll]));
\r
sortkl();
\r
for (ll=1; ll<=nenhere; ll++)
\r
game.kdist[ll] = game.kavgd[ll] = sqrt(square(sectx-game.kx[ll])+square(secty-game.ky[ll]));
\r
sortkl();
\r
@@
-515,8
+510,7
@@
void attack(int k) {
shields were down for some strange reason. This
\r
doesn't make any sense, so I've fixed it */
\r
ihurt = 1;
\r
shields were down for some strange reason. This
\r
doesn't make any sense, so I've fixed it */
\r
ihurt = 1;
\r
- cramf(hit, 0, 2);
\r
- proutn(" unit hit");
\r
+ proutn("%d unit hit", (int)hit);
\r
if ((game.damage[DSRSENS] > 0 && itflag) || skill <= 2) {
\r
proutn(" on the ");
\r
crmshp();
\r
if ((game.damage[DSRSENS] > 0 && itflag) || skill <= 2) {
\r
proutn(" on the ");
\r
crmshp();
\r
@@
-959,9
+953,7
@@
void phasers(void) {
key = scan();
\r
}
\r
if (key != IHREAL && nenhere != 0) {
\r
key = scan();
\r
}
\r
if (key != IHREAL && nenhere != 0) {
\r
- proutn("Phasers locked on target. Energy available =");
\r
- cramf(ifast?energy-200.0:energy,1,2);
\r
- skip(1);
\r
+ prout("Phasers locked on target. Energy available = %3.2f", ifast?energy-200.0:energy);
\r
}
\r
do {
\r
while (key != IHREAL) {
\r
}
\r
do {
\r
while (key != IHREAL) {
\r
@@
-971,8
+963,8
@@
void phasers(void) {
}
\r
rpow = aaitem;
\r
if (rpow >= (ifast?energy-200:energy)) {
\r
}
\r
rpow = aaitem;
\r
if (rpow >= (ifast?energy-200:energy)) {
\r
- proutn("Energy available= ");
\r
-
cramf(ifast?energy-200:energy, 1,2
);
\r
+ proutn("Energy available= %3.2f",
\r
+
ifast?energy-200:energy
);
\r
skip(1);
\r
key = IHEOL;
\r
}
\r
skip(1);
\r
key = IHEOL;
\r
}
\r
@@
-1017,8
+1009,7
@@
void phasers(void) {
prout("phaser energy.");
\r
}
\r
else {
\r
prout("phaser energy.");
\r
}
\r
else {
\r
- cramf(extra, 0, 2);
\r
- prout(" expended on empty space.");
\r
+ prout("%d expended on empty space.", (int)extra);
\r
}
\r
}
\r
break;
\r
}
\r
}
\r
break;
\r
@@
-1043,8
+1034,8
@@
void phasers(void) {
int ii = game.kx[k], jj = game.ky[k];
\r
int ienm = game.quad[ii][jj];
\r
if (msgflag) {
\r
int ii = game.kx[k], jj = game.ky[k];
\r
int ienm = game.quad[ii][jj];
\r
if (msgflag) {
\r
- proutn("Energy available=
");
\r
-
cramf(energy-.006-(ifast?200:0), 0, 2
);
\r
+ proutn("Energy available=
%5.2f",
\r
+
energy-.006-(ifast?200:0)
);
\r
skip(1);
\r
msgflag = 0;
\r
rpow = 0.0;
\r
skip(1);
\r
msgflag = 0;
\r
rpow = 0.0;
\r
@@
-1165,8
+1156,7
@@
void hittem(double *hits) {
ii = game.kx[kk];
\r
jj = game.ky[kk];
\r
if (hit > 0.005) {
\r
ii = game.kx[kk];
\r
jj = game.ky[kk];
\r
if (hit > 0.005) {
\r
- cramf(hit, 0, 2);
\r
- proutn(" unit hit on ");
\r
+ proutn("%d unit hit on ", (int)hit);
\r
}
\r
else
\r
proutn("Very small hit on ");
\r
}
\r
else
\r
proutn("Very small hit on ");
\r
@@
-1182,9
+1172,8
@@
void hittem(double *hits) {
else /* decide whether or not to emasculate klingon */
\r
if (kpow > 0 && Rand() >= 0.9 &&
\r
kpow <= ((0.4 + 0.4*Rand())*kpini)) {
\r
else /* decide whether or not to emasculate klingon */
\r
if (kpow > 0 && Rand() >= 0.9 &&
\r
kpow <= ((0.4 + 0.4*Rand())*kpini)) {
\r
- proutn("***Mr. Spock- \"Captain, the vessel at");
\r
- cramlc(2,ii,jj);
\r
- skip(1);
\r
+ prout("***Mr. Spock- \"Captain, the vessel at ",
\r
+ cramlc(sector,ii,jj));
\r
prout(" has just lost its firepower.\"");
\r
game.kpower[kk] = -kpow;
\r
}
\r
prout(" has just lost its firepower.\"");
\r
game.kpower[kk] = -kpow;
\r
}
\r