archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-12-22 11:32:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/miami' into lcs

Browse Source 
# Conflicts:
#	src/modelinfo/BaseModelInfo.cpp
This commit is contained in:
Sergeanur
2021-01-23 15:14:15 +02:00
parent cfac29b0ef b5c4866964
commit 904090cbb6
46 changed files with 155 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/control/Script.h
View File

@@ -1,6 +1,5 @@
#pragma once
#include "common.h"
#include "Font.h"
#include "Font.h"
#include "Ped.h"
#include "PedType.h"
#include "Text.h"
@@ -39,9 +38,11 @@ void FlushLog();
#define SPHERE_MARKER_PULSE_FRACTION 0.1f
#ifdef USE_PRECISE_MEASUREMENT_CONVERTION
#define MILES_IN_METER (0.000621371192f)
#define METERS_IN_FOOT (0.3048f)
#define FEET_IN_METER (3.28084f)
#else
#define MILES_IN_METER (1 / 1670.f)
#define METERS_IN_FOOT (0.3f)
#define FEET_IN_METER (3.33f)
#endif