[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src/missile missile.c
From: |
Mohydine |
Subject: |
[Stratagus-CVS] stratagus/src/missile missile.c |
Date: |
Mon, 20 Oct 2003 20:39:41 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Mohydine <address@hidden> 03/10/20 20:39:41
Modified files:
src/missile : missile.c
Log message:
more cleanup
Patches:
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.99
stratagus/src/missile/missile.c:1.100
--- stratagus/src/missile/missile.c:1.99 Mon Oct 20 20:27:45 2003
+++ stratagus/src/missile/missile.c Mon Oct 20 20:39:41 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.c,v 1.99 2003/10/21 00:27:45 mohydine Exp $
+// $Id: missile.c,v 1.100 2003/10/21 00:39:41 mohydine Exp $
//@{
@@ -801,7 +801,8 @@
dir = ((DirectionToHeading(dx, dy) + nextdir / 2) & 0xFF) / nextdir;
if (dir <= LookingS / nextdir) { // north->east->south
missile->SpriteFrame += dir;
- } else {
+ }
+ else {
missile->SpriteFrame += 256 / nextdir - dir;
missile->SpriteFrame = -missile->SpriteFrame;
}
@@ -895,6 +896,8 @@
int ZprojToX; // Projection of Z axis on axis X.
int ZprojToY; // Projection of Z axis on axis Y.
int Z; // should be missile->Z later.
+ int x;
+ int y;
DebugCheck(missile == NULL);
K = -1024; // Should be initialised by an other method (computed with
distance...)
@@ -920,9 +923,6 @@
missile->Y += Z * ZprojToY / 64;
MissileNewHeadingFromXY(missile, missile->X - orig_x, missile->Y - orig_y);
if (missile->Type->SmokeMissile && missile->CurrentStep) {
- int x;
- int y;
-
x = missile->X + missile->Type->Width / 2;
y = missile->Y + missile->Type->Height / 2;
MakeMissile(missile->Type->SmokeMissile, x, y, x, y);
@@ -949,7 +949,8 @@
if (goal->HP && goal->Orders[0].Action != UnitActionDie) {
if (missile->Damage) { // direct damage, spells mostly
HitUnit(missile->SourceUnit, goal, missile->Damage / splash);
- } else {
+ }
+ else {
DebugCheck(missile->SourceUnit == NULL);
HitUnit(missile->SourceUnit, goal,
CalculateDamage(missile->SourceUnit->Stats, goal,
@@ -976,15 +977,18 @@
if (HumanWallOnMap(x, y)) {
if (missile->Damage) { // direct damage, spells mostly
HitWall(x, y, missile->Damage / splash);
- } else {
+ }
+ else {
HitWall(x, y,
CalculateDamageStats(missile->SourceUnit->Stats,
UnitTypeHumanWall->Stats, 0, 0) / splash);
}
- } else {
+ }
+ else {
if (missile->Damage) { // direct damage, spells mostly
HitWall(x, y, missile->Damage / splash);
- } else {
+ }
+ else {
DebugCheck(missile->SourceUnit == NULL);
HitWall(x, y,
CalculateDamageStats(missile->SourceUnit->Stats,
@@ -1094,7 +1098,8 @@
x >= goal->X + goal->Type->TileWidth ||
y >= goal->Y + goal->Type->TileHeight) {
MissileHitsGoal(missile, goal, 2);
- } else {
+ }
+ else {
MissileHitsGoal(missile, goal, 1);
}
}
@@ -1110,7 +1115,8 @@
if (x + i >= 0 && x + i < TheMap.Width && y + n >= 0 && y + n <
TheMap.Height) {
if (i == 0 && n == 0) {
MissileHitsWall(missile, x + i, y + n, 1);
- } else {
+ }
+ else {
MissileHitsWall(missile, x + i, y + n, 2);
}
}
@@ -1167,7 +1173,8 @@
missile->SpriteFrame -= VideoGraphicFrames(missile->Type->Sprite);
AnimationIsFinished = 1;
}
- } else {
+ }
+ else {
if (missile->SpriteFrame < 0) {
missile->SpriteFrame += VideoGraphicFrames(missile->Type->Sprite);
AnimationIsFinished = 1;
@@ -1209,7 +1216,8 @@
if (dx * f / i < totalx) {
if ((i - 1) * 2 < f) {
j = i - 1;
- } else {
+ }
+ else {
j = f - i;
}
missile->SpriteFrame = missile->SpriteFrame %
missile->Type->NumDirections +
@@ -1340,7 +1348,7 @@
DebugCheck(file == NULL);
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.99 2003/10/21
00:27:45 mohydine Exp $\n\n");
+ CLprintf(file, ";;; MODULE: missile-types $Id: missile.c,v 1.100
2003/10/21 00:39:41 mohydine Exp $\n\n");
//
// Original number to internal missile-type name.
@@ -1392,7 +1400,7 @@
if (mtype->ImpactMissile) {
CLprintf(file, "\n 'impact-missile '%s",
mtype->ImpactMissile->Ident);
}
- if (mtype->SmokeMissile) {
+ if (mtype->SmokeMissile) {
CLprintf(file, "\n 'smoke-missile '%s",
mtype->SmokeMissile->Ident);
}
CLprintf(file, "\n ");
@@ -1446,7 +1454,7 @@
DebugCheck(file == NULL);
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.99 2003/10/21
00:27:45 mohydine Exp $\n\n");
+ CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.100 2003/10/21
00:39:41 mohydine Exp $\n\n");
for (missiles = GlobalMissiles; *missiles; ++missiles) {
SaveMissile(*missiles, file);
@@ -1585,7 +1593,8 @@
if (PointToPointMissile(missile)) {
MissileHit(missile);
missile->TTL = 0;
- } else {
+ }
+ else {
NextMissileFrame(missile, 1, 0);
}
}
@@ -1620,7 +1629,8 @@
if (PointToPointMissile(missile)) {
MissileHit(missile);
missile->TTL = 0;
- } else {
+ }
+ else {
NextMissileFrameCycle(missile);
}
}
@@ -1661,10 +1671,12 @@
MissileHit(missile);
// FIXME: hits to left and right
// FIXME: reduce damage effects on later impacts
- } else {
+ }
+ else {
missile->TTL = 0;
}
- } else {
+ }
+ else {
NextMissileFrame(missile, 1, 0);
}
}
@@ -1725,7 +1737,8 @@
if (!fire) {
missile->TTL = 0;
unit->Burning = 0;
- } else {
+ }
+ else {
if (missile->Type != fire) {
missile->X += missile->Type->Width / 2;
missile->Y += missile->Type->Height / 2;
@@ -1763,7 +1776,8 @@
if (ParabolicMissile(missile)) {
MissileHit(missile);
missile->TTL = 0;
- } else {
+ }
+ else {
NextMissileFrameCycle(missile);
}
}
- [Stratagus-CVS] stratagus/src/missile missile.c, Russell Smith, 2003/10/07
- [Stratagus-CVS] stratagus/src/missile missile.c, Crestez Leonard, 2003/10/09
- [Stratagus-CVS] stratagus/src/missile missile.c, Jimmy Salmon, 2003/10/17
- [Stratagus-CVS] stratagus/src/missile missile.c, Mohydine, 2003/10/17
- [Stratagus-CVS] stratagus/src/missile missile.c, Mohydine, 2003/10/17
- [Stratagus-CVS] stratagus/src/missile missile.c, Jimmy Salmon, 2003/10/18
- [Stratagus-CVS] stratagus/src/missile missile.c, Mohydine, 2003/10/20
- [Stratagus-CVS] stratagus/src/missile missile.c,
Mohydine <=
- [Stratagus-CVS] stratagus/src/missile missile.c, Mohydine, 2003/10/20
- [Stratagus-CVS] stratagus/src/missile missile.c, Crestez Leonard, 2003/10/29
- [Stratagus-CVS] stratagus/src/missile missile.c, ludovic p, 2003/10/30