OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Fixed: cycle_t was still a DWORD and not a QWORD under GCC.

Browse source 
- The stat meters now return an FString instead of sprintfing into a fixed
  output buffer.
- NOASM is now automatically defined when compiling for a non-x86 target.
- Some changes have been made to the integral types in doomtype.h:
  - For consistancy with the other integral types, byte is no longer a
    synonym for BYTE.
  - Most uses of BOOL have been change to the standard C++ bool type. Those
    that weren't were changed to INTBOOL to indicate they may contain values
    other than 0 or 1 but are still used as a boolean.
  - Compiler-provided types with explicit bit sizes are now used. In
    particular, DWORD is no longer a long so it will work with both 64-bit
    Windows and Linux.
  - Since some files need to include Windows headers, uint32 is a synonym
    for the non-Windows version of DWORD.
- Removed d_textur.h. The pic_t struct it defined was used nowhere, and that
  was all it contained.


SVN r326 (trunk)
This commit is contained in:
Randy Heit 2006-09-14 00:02:31 +00:00
commit c412b42703
175 changed files with 1489 additions and 1341 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/p_mobj.cpp
View file

@ -427,12 +427,12 @@ AActor::AActor () throw()
AActor::AActor (const AActor &other) throw()
{
memcpy (&x, &other.x, (byte *)&this[1] - (byte *)&x);
memcpy (&x, &other.x, (BYTE *)&this[1] - (BYTE *)&x);
}
AActor &AActor::operator= (const AActor &other)
{
memcpy (&x, &other.x, (byte *)&this[1] - (byte *)&x);
memcpy (&x, &other.x, (BYTE *)&this[1] - (BYTE *)&x);
return *this;
}
@ -2459,9 +2459,9 @@ void AActor::SetShade (int r, int g, int b)
void AActor::Tick ()
{
// [RH] Data for Heretic/Hexen scrolling sectors
static const byte HexenScrollDirs[8] = { 64, 0, 192, 128, 96, 32, 224, 160 };
static const char HexenSpeedMuls[3] = { 5, 10, 25 };
static const char HexenScrollies[24][2] =
static const BYTE HexenScrollDirs[8] = { 64, 0, 192, 128, 96, 32, 224, 160 };
static const BYTE HexenSpeedMuls[3] = { 5, 10, 25 };
static const SBYTE HexenScrollies[24][2] =
{
{ 0, 1 }, { 0, 2 }, { 0, 4 },
{ -1, 0 }, { -2, 0 }, { -4, 0 },
@ -2473,8 +2473,8 @@ void AActor::Tick ()
{ 1, -1 }, { 2, -2 }, { 4, -4 }
};
static const byte HereticScrollDirs[4] = { 6, 9, 1, 4 };
static const char HereticSpeedMuls[5] = { 5, 10, 25, 30, 35 };
static const BYTE HereticScrollDirs[4] = { 6, 9, 1, 4 };
static const BYTE HereticSpeedMuls[5] = { 5, 10, 25, 30, 35 };
AActor *onmo;
int i;
@ -2670,7 +2670,7 @@ void AActor::Tick ()
scrolltype <= Carry_West35)
{ // Heretic scroll special
scrolltype -= Carry_East5;
byte dir = HereticScrollDirs[scrolltype / 5];
BYTE dir = HereticScrollDirs[scrolltype / 5];
fixed_t carryspeed = DivScale32 (HereticSpeedMuls[scrolltype % 5], 32*CARRYFACTOR);
if (scrolltype<=Carry_East35 && !(i_compatflags&COMPATF_RAVENSCROLL))
{
@ -2943,7 +2943,7 @@ void AActor::Tick ()
bool AActor::UpdateWaterLevel (fixed_t oldz)
{
byte lastwaterlevel = waterlevel;
BYTE lastwaterlevel = waterlevel;
waterlevel = 0;