mirror of
https://github.com/ZDoom/gzdoom.git
synced 2024-11-22 04:01:31 +00:00
SVN r34 (trunk)
This commit is contained in:
parent
78a367a2d7
commit
4982558bbf
6 changed files with 10 additions and 8 deletions
|
@ -1,3 +1,8 @@
|
|||
April 12, 2006 (Changes by Graf Zahl)
|
||||
- Fixed: SAVEVER was still 231 although MINSAVEVER was 232.
|
||||
- Fixed: Decal spreading used an incorrect z-coordinate. It has to use
|
||||
the one originally passed to DImpactDecal::StaticCreate.
|
||||
|
||||
April 11, 2006
|
||||
- Fixed: GCC misoptimized the SWAP macros in farchive.cpp.
|
||||
- Fixed: Compiling with mingw once again works.
|
||||
|
|
|
@ -69,7 +69,6 @@ class ARedCard : public ADoomKey
|
|||
DECLARE_ACTOR (ARedCard, ADoomKey)
|
||||
public:
|
||||
const char *PickupMessage ();
|
||||
const char *NeedKeyMessage (bool remote, int keynum);
|
||||
};
|
||||
|
||||
FState ARedCard::States[] =
|
||||
|
@ -95,7 +94,6 @@ class ABlueSkull : public ADoomKey
|
|||
DECLARE_ACTOR (ABlueSkull, ADoomKey)
|
||||
public:
|
||||
const char *PickupMessage ();
|
||||
const char *NeedKeyMessage (bool remote, int keynum);
|
||||
};
|
||||
|
||||
FState ABlueSkull::States[] =
|
||||
|
|
|
@ -18,7 +18,6 @@ class AKeyGreen : public AHereticKey
|
|||
DECLARE_ACTOR (AKeyGreen, AHereticKey)
|
||||
public:
|
||||
const char *PickupMessage ();
|
||||
const char *NeedKeyMessage (bool remote, int keynum);
|
||||
};
|
||||
|
||||
FState AKeyGreen::States[] =
|
||||
|
|
|
@ -493,7 +493,7 @@ void DBaseDecal::SpreadRight (fixed_t r, side_t *feelwall, fixed_t wallsize)
|
|||
}
|
||||
}
|
||||
|
||||
void DBaseDecal::Spread (const FDecalTemplate *tpl, side_t *wall)
|
||||
void DBaseDecal::Spread (const FDecalTemplate *tpl, side_t *wall, fixed_t spread_z)
|
||||
{
|
||||
FTexture *tex;
|
||||
vertex_t *v1;
|
||||
|
@ -514,7 +514,7 @@ void DBaseDecal::Spread (const FDecalTemplate *tpl, side_t *wall)
|
|||
DecalRight = DecalWidth - DecalLeft;
|
||||
SpreadSource = this;
|
||||
SpreadTemplate = tpl;
|
||||
SpreadZ = z;
|
||||
SpreadZ = spread_z;
|
||||
|
||||
|
||||
// Try spreading left first
|
||||
|
@ -662,7 +662,7 @@ DImpactDecal *DImpactDecal::StaticCreate (const FDecalTemplate *tpl, fixed_t x,
|
|||
}
|
||||
|
||||
// Spread decal to nearby walls if it does not all fit on this one
|
||||
decal->Spread (tpl, wall);
|
||||
decal->Spread (tpl, wall, z);
|
||||
}
|
||||
return decal;
|
||||
}
|
||||
|
|
|
@ -65,7 +65,7 @@ public:
|
|||
fixed_t GetRealZ (const side_s *wall) const;
|
||||
void SetShade (DWORD rgb);
|
||||
void SetShade (int r, int g, int b);
|
||||
void Spread (const FDecalTemplate *tpl, side_s *wall);
|
||||
void Spread (const FDecalTemplate *tpl, side_s *wall, fixed_t spread_z);
|
||||
|
||||
static void SerializeChain (FArchive &arc, DBaseDecal **firstptr);
|
||||
static void MoveChain (DBaseDecal *first, fixed_t x, fixed_t y);
|
||||
|
|
|
@ -43,7 +43,7 @@ enum { GAMEVERSION = 205 };
|
|||
// SAVEVER is the version of the information stored in level snapshots.
|
||||
// Note that SAVEVER is not directly comparable to VERSION.
|
||||
// SAVESIG should match SAVEVER.
|
||||
#define SAVEVER 231
|
||||
#define SAVEVER 232
|
||||
#define SAVESIG "ZDOOMSAVE232"
|
||||
// This is so that derivates can use the same savegame versions without worrying about engine compatibility
|
||||
#define GAMESIG "ZDOOM"
|
||||
|
|
Loading…
Reference in a new issue