diff --git a/src/p_ceiling.cpp b/src/p_ceiling.cpp index 096333bbb..00af933ef 100644 --- a/src/p_ceiling.cpp +++ b/src/p_ceiling.cpp @@ -205,7 +205,7 @@ void DCeiling::Tick () case ceilCrushAndRaise: case ceilLowerAndCrush: if (m_CrushMode == ECrushMode::crushSlowdown) - m_Speed = FRACUNIT / 8; + m_Speed = 1. / 8; break; default: diff --git a/src/p_doors.cpp b/src/p_doors.cpp index 24af77194..ba2fba399 100644 --- a/src/p_doors.cpp +++ b/src/p_doors.cpp @@ -254,7 +254,7 @@ void DDoor::DoorSound(bool raise, DSeqNode *curseq) const if (m_Sector->Flags & SECF_SILENTMOVE) return; - if (m_Speed >= FRACUNIT*8) + if (m_Speed >= 8) { choice += 2; } diff --git a/src/p_floor.cpp b/src/p_floor.cpp index 9588e8e1c..9ad68c3b1 100644 --- a/src/p_floor.cpp +++ b/src/p_floor.cpp @@ -615,7 +615,7 @@ bool EV_BuildStairs (int tag, DFloor::EStair type, line_t *line, floor->m_PauseTime = 0; 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_Speed = speed; diff --git a/src/p_local.h b/src/p_local.h index 4a68c236c..0dd0dca68 100644 --- a/src/p_local.h +++ b/src/p_local.h @@ -51,7 +51,6 @@ struct FTranslatedLineTarget; // mapblocks are used to check movement // against lines and things #define MAPBLOCKUNITS 128 -#define MAPBLOCKSIZE (MAPBLOCKUNITS*FRACUNIT) // Inspired by Maes extern int bmapnegx; diff --git a/src/p_spec.cpp b/src/p_spec.cpp index 7eaab5dde..037a12940 100644 --- a/src/p_spec.cpp +++ b/src/p_spec.cpp @@ -1131,7 +1131,7 @@ void P_InitSectorSpecial(sector_t *sector, int special, bool nothinkers) break; 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; case dDamage_End: @@ -1147,7 +1147,7 @@ void P_InitSectorSpecial(sector_t *sector, int special, bool nothinkers) break; 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; case dFriction_Low: diff --git a/src/posix/sdl/i_timer.cpp b/src/posix/sdl/i_timer.cpp index fa08659a1..cad3000ba 100644 --- a/src/posix/sdl/i_timer.cpp +++ b/src/posix/sdl/i_timer.cpp @@ -184,7 +184,7 @@ double I_GetTimeFrac (uint32 *ms) if (ms) *ms = TicStart + (1000 / TICRATE); if (TicStart == 0) { - return FRACUNIT; + return 1; } else { diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp index d568051ae..108edff3b 100644 --- a/src/wi_stuff.cpp +++ b/src/wi_stuff.cpp @@ -722,7 +722,7 @@ static int WI_DrawCharPatch (FFont *font, int charcode, int x, int y, EColorRang int width; screen->DrawTexture(font->GetChar(charcode, &width), x, y, 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), TAG_DONE); return x - width;