zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2025-02-07 09:01:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- removed a few leftover FRACUNITs.

Browse source
This commit is contained in:
Christoph Oelckers 2016-04-01 16:37:19 +02:00
parent bb13590e07
commit 046ee3e803
7 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_ceiling.cpp
View file

@ -205,7 +205,7 @@ void DCeiling::Tick ()
case ceilCrushAndRaise: case ceilCrushAndRaise:
case ceilLowerAndCrush: case ceilLowerAndCrush:
if (m_CrushMode == ECrushMode::crushSlowdown) if (m_CrushMode == ECrushMode::crushSlowdown)
m_Speed = FRACUNIT / 8; m_Speed = 1. / 8;
break; break;
default: default:

2
src/p_doors.cpp
View file

@ -254,7 +254,7 @@ void DDoor::DoorSound(bool raise, DSeqNode *curseq) const
if (m_Sector->Flags & SECF_SILENTMOVE) return; if (m_Sector->Flags & SECF_SILENTMOVE) return;
if (m_Speed >= FRACUNIT*8) if (m_Speed >= 8)
{ {
choice += 2; choice += 2;
} }

2
src/p_floor.cpp
View file

@ -615,7 +615,7 @@ bool EV_BuildStairs (int tag, DFloor::EStair type, line_t *line,
floor->m_PauseTime = 0; floor->m_PauseTime = 0;
floor->m_StepTime = floor->m_PerStepTime = persteptime; floor->m_StepTime = floor->m_PerStepTime = persteptime;
floor->m_Crush = (!(usespecials & DFloor::stairUseSpecials) && speed == 4*FRACUNIT) ? 10 : -1; //jff 2/27/98 fix uninitialized crush field floor->m_Crush = (!(usespecials & DFloor::stairUseSpecials) && speed == 4) ? 10 : -1; //jff 2/27/98 fix uninitialized crush field
floor->m_Hexencrush = false; floor->m_Hexencrush = false;
floor->m_Speed = speed; floor->m_Speed = speed;

1
src/p_local.h
View file

@ -51,7 +51,6 @@ struct FTranslatedLineTarget;
// mapblocks are used to check movement // mapblocks are used to check movement
// against lines and things // against lines and things
#define MAPBLOCKUNITS 128 #define MAPBLOCKUNITS 128
#define MAPBLOCKSIZE (MAPBLOCKUNITS*FRACUNIT)
// Inspired by Maes // Inspired by Maes
extern int bmapnegx; extern int bmapnegx;

4
src/p_spec.cpp
View file

@ -1131,7 +1131,7 @@ void P_InitSectorSpecial(sector_t *sector, int special, bool nothinkers)
break; break;
case dSector_DoorCloseIn30: case dSector_DoorCloseIn30:
new DDoor(sector, DDoor::doorWaitClose, FRACUNIT * 2, 0, 0, 30 * TICRATE); new DDoor(sector, DDoor::doorWaitClose, 2, 0, 0, 30 * TICRATE);
break; break;
case dDamage_End: case dDamage_End:
@ -1147,7 +1147,7 @@ void P_InitSectorSpecial(sector_t *sector, int special, bool nothinkers)
break; break;
case dSector_DoorRaiseIn5Mins: case dSector_DoorRaiseIn5Mins:
new DDoor (sector, DDoor::doorWaitRaise, 2*FRACUNIT, TICRATE*30/7, 0, 5*60*TICRATE); new DDoor (sector, DDoor::doorWaitRaise, 2, TICRATE*30/7, 0, 5*60*TICRATE);
break; break;
case dFriction_Low: case dFriction_Low:

2
src/posix/sdl/i_timer.cpp
View file

@ -184,7 +184,7 @@ double I_GetTimeFrac (uint32 *ms)
if (ms) *ms = TicStart + (1000 / TICRATE); if (ms) *ms = TicStart + (1000 / TICRATE);
if (TicStart == 0) if (TicStart == 0)
{ {
return FRACUNIT; return 1;
} }
else else
{ {

2
src/wi_stuff.cpp
View file

@ -722,7 +722,7 @@ static int WI_DrawCharPatch (FFont *font, int charcode, int x, int y, EColorRang
int width; int width;
screen->DrawTexture(font->GetChar(charcode, &width), x, y, screen->DrawTexture(font->GetChar(charcode, &width), x, y,
nomove ? DTA_CleanNoMove : DTA_Clean, true, nomove ? DTA_CleanNoMove : DTA_Clean, true,
DTA_ShadowAlpha, (gameinfo.gametype & GAME_DoomChex) ? 0 : FRACUNIT/2, DTA_ShadowAlpha, (gameinfo.gametype & GAME_DoomChex) ? 0 : OPAQUE/2,
DTA_Translation, font->GetColorTranslation(translation), DTA_Translation, font->GetColorTranslation(translation),
TAG_DONE); TAG_DONE);
return x - width; return x - width;