zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SVN r34 (trunk)

This commit is contained in:
Christoph Oelckers 2006-04-12 21:49:03 +00:00
parent 78a367a2d7
commit 4982558bbf
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/rh-log.txt
View File

@ -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 April 11, 2006
- Fixed: GCC misoptimized the SWAP macros in farchive.cpp. - Fixed: GCC misoptimized the SWAP macros in farchive.cpp.
- Fixed: Compiling with mingw once again works. - Fixed: Compiling with mingw once again works.

2
src/g_doom/a_doomkeys.cpp
View File

@ -69,7 +69,6 @@ class ARedCard : public ADoomKey
DECLARE_ACTOR (ARedCard, ADoomKey) DECLARE_ACTOR (ARedCard, ADoomKey)
public: public:
const char *PickupMessage (); const char *PickupMessage ();
const char *NeedKeyMessage (bool remote, int keynum);
}; };
FState ARedCard::States[] = FState ARedCard::States[] =
@ -95,7 +94,6 @@ class ABlueSkull : public ADoomKey
DECLARE_ACTOR (ABlueSkull, ADoomKey) DECLARE_ACTOR (ABlueSkull, ADoomKey)
public: public:
const char *PickupMessage (); const char *PickupMessage ();
const char *NeedKeyMessage (bool remote, int keynum);
}; };
FState ABlueSkull::States[] = FState ABlueSkull::States[] =

1
src/g_heretic/a_heretickeys.cpp
View File

@ -18,7 +18,6 @@ class AKeyGreen : public AHereticKey
DECLARE_ACTOR (AKeyGreen, AHereticKey) DECLARE_ACTOR (AKeyGreen, AHereticKey)
public: public:
const char *PickupMessage (); const char *PickupMessage ();
const char *NeedKeyMessage (bool remote, int keynum);
}; };
FState AKeyGreen::States[] = FState AKeyGreen::States[] =

6
src/g_shared/a_decals.cpp
View File

@ -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; FTexture *tex;
vertex_t *v1; vertex_t *v1;
@ -514,7 +514,7 @@ void DBaseDecal::Spread (const FDecalTemplate *tpl, side_t *wall)
DecalRight = DecalWidth - DecalLeft; DecalRight = DecalWidth - DecalLeft;
SpreadSource = this; SpreadSource = this;
SpreadTemplate = tpl; SpreadTemplate = tpl;
SpreadZ = z; SpreadZ = spread_z;
// Try spreading left first // 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 // 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; return decal;
} }

2
src/g_shared/a_sharedglobal.h
View File

@ -65,7 +65,7 @@ public:
fixed_t GetRealZ (const side_s *wall) const; fixed_t GetRealZ (const side_s *wall) const;
void SetShade (DWORD rgb); void SetShade (DWORD rgb);
void SetShade (int r, int g, int b); 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 SerializeChain (FArchive &arc, DBaseDecal **firstptr);
static void MoveChain (DBaseDecal *first, fixed_t x, fixed_t y); static void MoveChain (DBaseDecal *first, fixed_t x, fixed_t y);

2
src/version.h
View File

@ -43,7 +43,7 @@ enum { GAMEVERSION = 205 };
// SAVEVER is the version of the information stored in level snapshots. // SAVEVER is the version of the information stored in level snapshots.
// Note that SAVEVER is not directly comparable to VERSION. // Note that SAVEVER is not directly comparable to VERSION.
// SAVESIG should match SAVEVER. // SAVESIG should match SAVEVER.
#define SAVEVER 231 #define SAVEVER 232
#define SAVESIG "ZDOOMSAVE232" #define SAVESIG "ZDOOMSAVE232"
// This is so that derivates can use the same savegame versions without worrying about engine compatibility // This is so that derivates can use the same savegame versions without worrying about engine compatibility
#define GAMESIG "ZDOOM" #define GAMESIG "ZDOOM"