summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2021-01-17 14:03:37 +0100
committerNikolay Korolev <nickvnuk@gmail.com>2021-01-17 14:03:37 +0100
commit4703ec5164acd169f4ce315a0f035bc6ab554f0b (patch)
treedfe39174e824f5dd4055b86ea3df845f434e134d /src/core
parentMerge remote-tracking branch 'upstream/lcs' into lcs (diff)
downloadre3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.tar
re3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.tar.gz
re3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.tar.bz2
re3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.tar.lz
re3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.tar.xz
re3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.tar.zst
re3-4703ec5164acd169f4ce315a0f035bc6ab554f0b.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pad.h10
-rw-r--r--src/core/Radar.cpp2
-rw-r--r--src/core/main.cpp2
3 files changed, 13 insertions, 1 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 3a4f54b3..a3634134 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -277,6 +277,16 @@ public:
uint32 InputHowLongAgo(void);
void SetDrunkInputDelay(int32 delay) { DrunkDrivingBufferUsed = delay; }
+ // TODO(LCS): properly, this is just to get some estimation for script
+ int16 GetOddJobTrigger() { return GetRightShockJustDown(); }
+ int16 GuiLeft() { return GetAnaloguePadLeft() || GetDPadLeftJustDown(); }
+ int16 GuiRight() { return GetAnaloguePadRight() || GetDPadRightJustDown(); }
+ int16 GuiUp() { return GetAnaloguePadUp() || GetDPadUpJustDown(); }
+ int16 GuiDown() { return GetAnaloguePadDown() || GetDPadDownJustDown(); }
+ int16 GuiSelect() { return GetSelect(); }
+ int16 GuiBack() { return GetStart(); }
+ int16 GetSkipCutscene() { return GetCrossJustDown(); }
+
#ifdef XINPUT
void AffectFromXinput(uint32 pad);
#endif
diff --git a/src/core/Radar.cpp b/src/core/Radar.cpp
index d9802acc..b7787627 100644
--- a/src/core/Radar.cpp
+++ b/src/core/Radar.cpp
@@ -1129,6 +1129,7 @@ void CRadar::SetRadarMarkerState(int32 counter, bool flag)
}
void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
+ /*
float f1 = radius * 1.4f;
float f2 = radius * 0.5f;
CVector p1, p2;
@@ -1148,6 +1149,7 @@ void CRadar::ShowRadarMarker(CVector pos, uint32 color, float radius) {
p1 = pos - TheCamera.GetRight()*f1;
p2 = pos - TheCamera.GetRight()*f2;
CTheScripts::ScriptDebugLine3D(p1.x, p1.y, p1.z, p2.x, p2.y, p2.z, color, color);
+ */
}
void CRadar::ShowRadarTrace(float x, float y, uint32 size, uint8 red, uint8 green, uint8 blue, uint8 alpha)
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 7f73c311..3632807c 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1275,7 +1275,7 @@ RenderScene(void)
void
RenderDebugShit(void)
{
- CTheScripts::RenderTheScriptDebugLines();
+ //CTheScripts::RenderTheScriptDebugLines();
#ifndef FINAL
if(gbShowCollisionLines)
CRenderer::RenderCollisionLines();