[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Stratagus-CVS] stratagus/src missile/missile.c unit/unittype.c
From: |
Crestez Leonard |
Subject: |
[Stratagus-CVS] stratagus/src missile/missile.c unit/unittype.c |
Date: |
Sun, 12 Oct 2003 12:18:13 -0400 |
CVSROOT: /cvsroot/stratagus
Module name: stratagus
Branch:
Changes by: Crestez Leonard <address@hidden> 03/10/12 12:18:13
Modified files:
src/missile : missile.c
src/unit : unittype.c
Log message:
Fix explode-when-killed not properly saved
Patches:
Index: stratagus/src/missile/missile.c
diff -u stratagus/src/missile/missile.c:1.89
stratagus/src/missile/missile.c:1.90
--- stratagus/src/missile/missile.c:1.89 Sat Oct 11 15:07:22 2003
+++ stratagus/src/missile/missile.c Sun Oct 12 12:18:12 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: missile.c,v 1.89 2003/10/11 19:07:22 n0body Exp $
+// $Id: missile.c,v 1.90 2003/10/12 16:18:12 n0body Exp $
//@{
@@ -285,6 +285,8 @@
local Missile* InitMissile(Missile* missile, MissileType* mtype, int sx,
int sy, int dx, int dy)
{
+ DebugCheck(!mtype);
+ DebugCheck(!missile);
missile->X = sx - mtype->Width / 2;
missile->Y = sy - mtype->Height / 2;
missile->DX = dx - mtype->Width / 2;
@@ -322,6 +324,7 @@
{
Missile* missile;
+ DebugCheck(!mtype);
DebugLevel3Fn("type %d(%s) at %d,%d to %d,%d\n" _C_
mtype - MissileTypes _C_ mtype->Ident _C_ sx _C_ sy _C_ dx _C_ dy);
@@ -348,6 +351,7 @@
{
Missile* missile;
+ DebugCheck(!mtype);
DebugLevel3Fn("type %d(%s) at %d,%d to %d,%d\n" _C_
mtype - MissileTypes _C_ mtype->Ident _C_ sx _C_ sy _C_ dx _C_ dy);
@@ -1708,7 +1712,7 @@
int i;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.89 2003/10/11
19:07:22 n0body Exp $\n\n");
+ CLprintf(file,";;; MODULE: missile-types $Id: missile.c,v 1.90 2003/10/12
16:18:12 n0body Exp $\n\n");
//
// Original number to internal missile-type name.
@@ -1803,7 +1807,7 @@
Missile* const* missiles;
CLprintf(file,"\n;;; -----------------------------------------\n");
- CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.89 2003/10/11
19:07:22 n0body Exp $\n\n");
+ CLprintf(file,";;; MODULE: missiles $Id: missile.c,v 1.90 2003/10/12
16:18:12 n0body Exp $\n\n");
for (missiles = GlobalMissiles; *missiles; ++missiles) {
SaveMissile(*missiles, file);
Index: stratagus/src/unit/unittype.c
diff -u stratagus/src/unit/unittype.c:1.111 stratagus/src/unit/unittype.c:1.112
--- stratagus/src/unit/unittype.c:1.111 Thu Oct 9 19:04:03 2003
+++ stratagus/src/unit/unittype.c Sun Oct 12 12:18:13 2003
@@ -26,7 +26,7 @@
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
// 02111-1307, USA.
//
-// $Id: unittype.c,v 1.111 2003/10/09 23:04:03 jsalmon3 Exp $
+// $Id: unittype.c,v 1.112 2003/10/12 16:18:13 n0body Exp $
//@{
@@ -809,7 +809,7 @@
type->CorpseName, type->CorpseScript);
}
if (type->ExplodeWhenKilled) {
- CLprintf(file, " 'explode-when-killed '%s\n", type->Missile.Name);
+ CLprintf(file, " 'explode-when-killed '%s\n", type->Explosion.Name);
}
CLprintf(file, " ");
@@ -1146,7 +1146,7 @@
char** sp;
CLprintf(file, "\n;;; -----------------------------------------\n");
- CLprintf(file, ";;; MODULE: unittypes $Id: unittype.c,v 1.111 2003/10/09
23:04:03 jsalmon3 Exp $\n\n");
+ CLprintf(file, ";;; MODULE: unittypes $Id: unittype.c,v 1.112 2003/10/12
16:18:13 n0body Exp $\n\n");
// Original number to internal unit-type name.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Stratagus-CVS] stratagus/src missile/missile.c unit/unittype.c,
Crestez Leonard <=