github.com/td512.re3
1
0
Fork 0
mirror of https://github.com/td512/re3.git synced 2026-03-10 03:50:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'miami' into lcs

Browse Source 
# Conflicts:
#	src/control/CarCtrl.cpp
#	src/control/Script4.cpp
#	src/core/Frontend.cpp
This commit is contained in:
Sergeanur
2021-06-30 21:26:36 +03:00
parent 1c5a864598 a73a2c9179
commit 138abb91f6
51 changed files with 293 additions and 313 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/FileLoader.cpp
View File

@@ -1147,7 +1147,7 @@ CFileLoader::Load2dEffect(const char *line)
&probability);
effect->attractor.type = flags;
#ifdef FIX_BUGS
effect->attractor.probability = clamp(probability, 0, 255);
effect->attractor.probability = Clamp(probability, 0, 255);
#else
effect->attractor.probability = probability;
#endif