From 2ff07e7696e6c0ab9e506c465a8af15d87a39fa0 Mon Sep 17 00:00:00 2001
From: n0body <>
Date: Sun, 12 Oct 2003 15:18:13 +0000
Subject: [PATCH] Fix explode-when-killed not properly saved
---
src/stratagus/missile.cpp | 4 ++++
src/unit/unittype.cpp | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/stratagus/missile.cpp b/src/stratagus/missile.cpp
index f191c74ef..c41195218 100644
--- a/src/stratagus/missile.cpp
+++ b/src/stratagus/missile.cpp
@@ -285,6 +285,8 @@ local Missile* NewLocalMissile(void)
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 @@ global Missile* MakeMissile(MissileType* mtype,int sx,int sy,int dx,int dy)
{
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 @@ global Missile* MakeLocalMissile(MissileType* mtype, int sx, int sy, int dx, int
{
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);
diff --git a/src/unit/unittype.cpp b/src/unit/unittype.cpp
index 666b4a5bd..5c2cda0b0 100644
--- a/src/unit/unittype.cpp
+++ b/src/unit/unittype.cpp
@@ -809,7 +809,7 @@ local void SaveUnitType(CLFile* file, const UnitType* type, int all)
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, " ");