Second round of merging Sergeev changes.

[super-star-trek.git] / battle.c

diff --git a/battle.c b/battle.c
index 845aa832937bcd98f2fd2c2052ce6aacceba8fed..455801b9e2b43bc4b6366fcb4aa9fdbeec9f68c3 100644 (file)
--- a/battle.c
+++ b/battle.c
@@ -1235,7 +1235,7 @@ void phasers(void) {
 void hittem(double *hits) {
        double kp, kpow, wham, hit, dustfac, kpini;
 #ifdef SERGEEV
-       int cx, cy;
+       int crx, cry;
 #endif /* SERGEEV */
        int nenhr2=nenhere, k=1, kk=1, ii, jj, ienm;