Skip to content

Commit 87b3b8b

Browse files
committed
Second post-merge fixes
1 parent 9451e96 commit 87b3b8b

File tree

8 files changed

+11
-13
lines changed

8 files changed

+11
-13
lines changed

src/xrCore/_math.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,11 +211,7 @@ void initialize()
211211

212212
namespace CPU
213213
{
214-
XRCORE_API u64 qpc_freq = [] {
215-
u64 result;
216-
QueryPerformanceCounter((PLARGE_INTEGER)&result);
217-
return result;
218-
}();
214+
XRCORE_API u64 qpc_freq = SDL_GetPerformanceFrequency();
219215

220216
XRCORE_API u32 qpc_counter = 0;
221217

src/xrGame/WeaponAK74.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "stdafx.h"
1+
#include "StdAfx.h"
22
#include "WeaponAK74.h"
33

44
CWeaponAK74::CWeaponAK74(ESoundTypes eSoundType) : CWeaponMagazinedWGrenade(eSoundType) {}

src/xrGame/WeaponFN2000.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "stdafx.h"
1+
#include "StdAfx.h"
22
#include "WeaponFN2000.h"
33

44
CWeaponFN2000::CWeaponFN2000() : CWeaponMagazined(SOUND_TYPE_WEAPON_SNIPERRIFLE) {}

src/xrGame/WeaponHPSA.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "stdafx.h"
1+
#include "StdAfx.h"
22
#include "WeaponHPSA.h"
33

44
CWeaponHPSA::CWeaponHPSA() : CWeaponPistol() {}

src/xrGame/WeaponLR300.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "stdafx.h"
1+
#include "StdAfx.h"
22
#include "WeaponLR300.h"
33

44
CWeaponLR300::CWeaponLR300() : CWeaponMagazined(SOUND_TYPE_WEAPON_SUBMACHINEGUN) {}

src/xrGame/WeaponPM.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "stdafx.h"
1+
#include "StdAfx.h"
22
#include "WeaponPM.h"
33

44
CWeaponPM::CWeaponPM() : CWeaponPistol() {}

src/xrGame/WeaponScript.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
#include "WeaponMagazined.h"
44
#include "WeaponMagazinedWGrenade.h"
55
#include "WeaponBinoculars.h"
6-
#include "WeaponBM16.h"
6+
#include "weaponBM16.h"
77
#include "F1.h"
88
#include "WeaponFN2000.h"
99
#include "WeaponFORT.h"
@@ -25,8 +25,8 @@
2525
#include "WeaponVal.h"
2626
#include "WeaponVintorez.h"
2727
#include "WeaponWalther.h"
28-
#include "Medkit.h"
29-
#include "Antirad.h"
28+
#include "medkit.h"
29+
#include "antirad.h"
3030
#include "FoodItem.h"
3131
#include "BottleItem.h"
3232
#include "ExplosiveItem.h"

src/xrGame/ui/UIWindow_script.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,9 @@ SCRIPT_EXPORT(connect_error_cb, (), {
8787
class_<connect_error_cb>("connect_error_cb")
8888
.def(constructor<>())
8989
.def(constructor<connect_error_cb::lua_object_type, connect_error_cb::lua_function_type>())
90+
#ifndef LINUX // FIXME!!!
9091
.def("bind", &connect_error_cb::bind)
92+
#endif
9193
.def("clear", &connect_error_cb::clear)
9294
];
9395
});

0 commit comments

Comments
 (0)