a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 03:10:07 +00:00
Code Issues Projects Releases Wiki Activity

Fix some UBs

Browse source
This commit is contained in:
erorcun 2021-01-29 01:44:33 +03:00
parent 7056f9954f
commit 810bad9fd8
8 changed files with 36 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/audio/MusicManager.cpp
View file

@ -1223,8 +1223,11 @@ cMusicManager::DisplayRadioStationName()
gNumRetunePresses++; gNumRetunePresses++;
} }
else else
#ifdef FIX_BUGS
track = m_nFrontendTrack == NO_TRACK ? POLICE_RADIO : m_nFrontendTrack;
#else
track = m_nFrontendTrack; track = m_nFrontendTrack;
#endif
wchar* string = nil; wchar* string = nil;
switch (track) { switch (track) {

2
src/audio/MusicManager.h
View file

@ -29,7 +29,7 @@ public:
uint32 m_nResetTime; uint32 m_nResetTime;
bool m_bRadioSetByScript; bool m_bRadioSetByScript;
uint8 m_nRadioStation; uint8 m_nRadioStation;
uint32 m_nRadioPosition; int32 m_nRadioPosition;
uint32 m_nRadioInCar; uint32 m_nRadioInCar;
uint32 m_nFrontendTrack; uint32 m_nFrontendTrack;
uint32 m_nPlayingTrack; uint32 m_nPlayingTrack;

2
src/control/PathFind.cpp
View file

@ -859,7 +859,7 @@ CPathFind::PreparePathDataForType(uint8 type, CTempNode *tempnodes, CPathInfoFor
mag = Sqrt(dx*dx + dy*dy); mag = Sqrt(dx*dx + dy*dy);
dx /= mag; dx /= mag;
dy /= mag; dy /= mag;
int width = Max(m_pathNodes[i].width, m_pathNodes[j].width); uint8 width = Max(m_pathNodes[i].width, m_pathNodes[j].width);
if(i < j){ if(i < j){
dx = -dx; dx = -dx;
dy = -dy; dy = -dy;

8
src/control/PathFind.h
View file

@ -120,7 +120,7 @@ struct CCarPathLink
uint8 trafficLightDirection : 1; uint8 trafficLightDirection : 1;
uint8 trafficLightType : 2; uint8 trafficLightType : 2;
uint8 bBridgeLights : 1; // at least in LCS... uint8 bBridgeLights : 1; // at least in LCS...
int8 width; uint8 width;
CVector2D GetPosition(void) { return CVector2D(x/8.0f, y/8.0f); } CVector2D GetPosition(void) { return CVector2D(x/8.0f, y/8.0f); }
CVector2D GetDirection(void) { return CVector2D(dirX/100.0f, dirY/100.0f); } CVector2D GetDirection(void) { return CVector2D(dirX/100.0f, dirY/100.0f); }
@ -151,7 +151,7 @@ struct CPathInfoForObject
int8 numLeftLanes; int8 numLeftLanes;
int8 numRightLanes; int8 numRightLanes;
int8 speedLimit; int8 speedLimit;
int8 width; uint8 width;
uint8 crossing : 1; uint8 crossing : 1;
uint8 onlySmallBoats : 1; uint8 onlySmallBoats : 1;
@ -177,7 +177,7 @@ struct CTempNode
int16 link2; int16 link2;
int8 numLeftLanes; int8 numLeftLanes;
int8 numRightLanes; int8 numRightLanes;
int8 width; uint8 width;
bool isCross; bool isCross;
int8 linkState; int8 linkState;
}; };
@ -188,7 +188,7 @@ struct CTempNodeExternal // made up name
int16 next; int16 next;
int8 numLeftLanes; int8 numLeftLanes;
int8 numRightLanes; int8 numRightLanes;
int8 width; uint8 width;
bool isCross; bool isCross;
}; };

25
src/core/Frontend.cpp
View file

@ -5567,33 +5567,40 @@ void
CMenuManager::DrawQuitGameScreen(void) CMenuManager::DrawQuitGameScreen(void)
{ {
static int32 exitSignalTimer = 0; static int32 exitSignalTimer = 0;
#ifdef FIX_BUGS
int alpha = clamp(m_nMenuFadeAlpha, 0, 255);
#else
int alpha = m_nMenuFadeAlpha;
#endif
#ifndef MUCH_SHORTER_OUTRO_SCREEN #ifndef MUCH_SHORTER_OUTRO_SCREEN
static PauseModeTime lastTickIncrease = 0; static PauseModeTime lastTickIncrease = 0;
if (m_nMenuFadeAlpha == 255 && CTimer::GetTimeInMillisecondsPauseMode() - lastTickIncrease > 10) { if (alpha == 255 && CTimer::GetTimeInMillisecondsPauseMode() - lastTickIncrease > 10) {
exitSignalTimer++; exitSignalTimer++;
lastTickIncrease = CTimer::GetTimeInMillisecondsPauseMode(); lastTickIncrease = CTimer::GetTimeInMillisecondsPauseMode();
} }
#else #else
static PauseModeTime sincePress = 0; static PauseModeTime firstTick = CTimer::GetTimeInMillisecondsPauseMode();
sincePress += frameTime; if (alpha == 255 && CTimer::GetTimeInMillisecondsPauseMode() - firstTick > 1000) {
if (sincePress > 500)
exitSignalTimer = 150; exitSignalTimer = 150;
}
#endif #endif
static CSprite2d *splash = nil; static CSprite2d *splash = nil;
if (splash == nil) if (splash == nil)
splash = LoadSplash("OUTRO"); splash = LoadSplash("OUTRO");
m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(28.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, -(m_nMenuFadeAlpha + 1))); m_aFrontEndSprites[MENUSPRITE_VCLOGO].Draw(CRect(MENU_X(28.0f), MENU_Y(8.0f), MENU_X(157.0f), MENU_Y(138.0f)), CRGBA(255, 255, 255, 255 - alpha));
// Or we can see menu background from sides // Or we can see menu background from sides
#ifdef ASPECT_RATIO_SCALE #ifdef ASPECT_RATIO_SCALE
CSprite2d::DrawRect(CRect(0, 0, MENU_X_LEFT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(0, 0, 0, m_nMenuFadeAlpha)); CSprite2d::DrawRect(CRect(0, 0, MENU_X_LEFT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(0, 0, 0, alpha));
CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(0.f), 0, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, m_nMenuFadeAlpha)); CSprite2d::DrawRect(CRect(MENU_X_RIGHT_ALIGNED(0.f), 0, SCREEN_WIDTH, SCREEN_HEIGHT), CRGBA(0, 0, 0, alpha));
#endif #endif
splash->Draw(CRect(MENU_X_LEFT_ALIGNED(0.f), 0, MENU_X_RIGHT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(255, 255, 255, m_nMenuFadeAlpha)); splash->Draw(CRect(MENU_X_LEFT_ALIGNED(0.f), 0, MENU_X_RIGHT_ALIGNED(0.f), SCREEN_HEIGHT), CRGBA(255, 255, 255, alpha));
if (m_nMenuFadeAlpha == 255 && exitSignalTimer == 150) if (alpha == 255 && exitSignalTimer == 150)
RsEventHandler(rsQUITAPP, nil); RsEventHandler(rsQUITAPP, nil);
m_bShowMouse = false; m_bShowMouse = false;

5
src/core/main.cpp
View file

@ -1065,8 +1065,13 @@ DisplayGameDebugText()
#endif #endif
FrameSamples++; FrameSamples++;
#ifdef FIX_HIGH_FPS_BUGS_ON_FRONTEND
FramesPerSecondCounter += frameTime / 1000.f; // convert to seconds
FramesPerSecond = FrameSamples / FramesPerSecondCounter;
#else
FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f); FramesPerSecondCounter += 1000.0f / (CTimer::GetTimeStepNonClippedInSeconds() * 1000.0f);
FramesPerSecond = FramesPerSecondCounter / FrameSamples; FramesPerSecond = FramesPerSecondCounter / FrameSamples;
#endif
if ( FrameSamples > 30 ) if ( FrameSamples > 30 )
{ {

2
src/peds/Ped.h
View file

@ -639,7 +639,7 @@ public:
uint32 m_threatFlags; uint32 m_threatFlags;
uint32 m_threatCheckTimer; uint32 m_threatCheckTimer;
uint32 m_threatCheckInterval; uint32 m_threatCheckInterval;
uint32 m_delayedSoundID; int32 m_delayedSoundID;
uint32 m_delayedSoundTimer; uint32 m_delayedSoundTimer;
uint32 m_lastSoundStart; uint32 m_lastSoundStart;
uint32 m_soundStart; uint32 m_soundStart;

8
src/skel/crossplatform.cpp
View file

@ -32,8 +32,8 @@ HANDLE FindFirstFile(const char* pathname, WIN32_FIND_DATA* firstfile) {
char *folder = strtok(pathCopy, "*"); char *folder = strtok(pathCopy, "*");
char *extension = strtok(NULL, "*"); char *extension = strtok(NULL, "*");
// because strtok doesn't return NULL for last delimiter // because I remember like strtok might not return NULL for last delimiter
if (extension - folder == strlen(pathname)) if (extension && extension - folder == strlen(pathname))
extension = nil; extension = nil;
// Case-sensitivity and backslashes... // Case-sensitivity and backslashes...
@ -187,7 +187,7 @@ char* casepath(char const* path, bool checkPathFirst)
rl = 1; rl = 1;
} }
bool cantProceed = false; // just convert slashes in what's left in string, not case sensitivity bool cantProceed = false; // just convert slashes in what's left in string, don't correct case of letters(because we can't)
bool mayBeTrailingSlash = false; bool mayBeTrailingSlash = false;
char* c; char* c;
while (c = strsep(&p, "/\\")) while (c = strsep(&p, "/\\"))
@ -251,7 +251,7 @@ char* casepath(char const* path, bool checkPathFirst)
} }
if (rl > l + 2) { if (rl > l + 2) {
printf("\n\ncasepath: Corrected path length is longer then original+2:\n\tOriginal: %s (%d chars)\n\tCorrected: %s (%d chars)\n\n", path, l, out, rl); printf("\n\ncasepath: Corrected path length is longer then original+2:\n\tOriginal: %s (%zu chars)\n\tCorrected: %s (%zu chars)\n\n", path, l, out, rl);
} }
return out; return out;
} }