Allow user to load difficulty #518

ifeldshteyn · 2025-04-04T03:09:08Z

Allow FS to load the current difficulty

jerethk · 2025-04-04T08:26:51Z

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

+		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
+		return data->type == IELEV_ROTATE_WALL ? floor16(angleToFloat(data->speed)) : floor16(data->speed);
+	}
+


Thanks for adding this Karjala.
I have realised a (reasonably minor) flaw in my Elevator speed setter. Namely, in INF, it is possible to set an elevator to a floating point speed (like 6.5) whereas I have forced it to be integer (s32).

@luciusDXL and @ifeldshteyn Do you think we should correct this, and allow getting/setting of speed as a float via scripting? If so, would you be able to please make that amendment with this PR?

This function should return a float - both angles and speed are fixed point.

@ifeldshteyn @luciusDXL
Ok I'm pretty much responsible for creating this issue (used int instead of float when I made the setter), so here is the fix

2320077

Karjala, please go ahead and cherry pick it.

Looking at this now, I think there is still a problem.
In the infUpdate_rotateWall() function, you can see the speed is a fixed-point angle that gets rounded in the function. This code still truncates it before returning, losing the fractional part of the angle delta, which will break if used in cases like the tram in Harkov.

So you should treat it as a fixed-point value, convert to float and then convert to degrees.

I'm a bit confused, I think you will need to explain in more detail please.

Let's say we want to set a speed of 20.5 degrees / sec
the formula currently there is intToFixed16(floatToAngle(20.5))

floatToAngle(20.5) = 20.5 * 45.51 = 932
intToFixed(932) = 932 << 16 = 61079552

That seems correct, doesn't it? It looks the same as what is done when INF is parsed.

Then back the other way, formula is
angleToFloat(61079552 >> FRAC_BITS_16)

61079552 >> FRAC_BITS_16 = 932
angleToFloat(932) = 932 / 45.51 = 20.479

A small amount of precision has been lost but that's acceptable, isn't it?

jerethk · 2025-04-04T08:27:56Z

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

 		ScriptPropertyGetFunc("bool get_master()", getElevMaster);
-
+
+		ScriptPropertyGetFunc("int get_speed()", getElevSpeed);


If you decide to make the change, then this would become
float get_speed()
and
void set_speed(float)

Yeah, non-integer speeds are used in mods and even vanilla levels. So it would make sense to make it float instead of int.

That was me with my brain not being fully engaged when I made the original addition :-)
If you can be bothered Karjala, you can make the amendment, otherwise I'll raise a change (for both the get and set) after this is merged.

jerethk · 2025-04-04T08:30:04Z

TheForceEngine/TheForceEngine.vcxproj

    <ConfigurationType>Application</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v143</PlatformToolset>


Oooh, I wonder if Lucius will approve this. I have it as v143 too, it would save me the hassle of continually stashing and unstashing this file whenever I merge/rebase etc.
I assumed he must have some reason to want to keep it at v141....

CRUD - accidental commit =)

jerethk · 2025-04-04T08:30:59Z

TheForceEngine/crashdump.dmp

I don't think this is meant to be here? Mistake?

jerethk · 2025-04-04T08:31:25Z

TheForceEngine/x64/Debug/TheForceEngine.exe.recipe

+  <ContentFiles />
+  <SatelliteDlls />
+  <NonRecipeFileRefs />
+</Project>


I don't think these recipe files are supposed to be committed?

This recipe file is still here

luciusDXL · 2025-04-08T22:14:32Z

Currently VS2017 is used to preserve support for Win7 and 8 (theoretically at least).

Gerwin2k · 2025-04-08T23:44:27Z

Currently VS2017 is used to preserve support for Win7 and 8 (theoretically at least).

The ForceEngine Github builds work in Windows 7 x64 so far, practically that is.

luciusDXL · 2025-04-19T18:36:53Z

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp


 		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
-		data->speed = data->type == IELEV_ROTATE_WALL ? FIXED(floatToAngle(value)) : FIXED(value);
+		data->speed = data->type == IELEV_ROTATE_WALL ? intToFixed16(floatToAngle(value)) : floatToFixed16(value);


Same issue here, you are losing the fractional part of the angular speed. angle degrees to DF angles -> float to fixed I think is the order here.

Ok, I think see what you are saying. But line 2157 of infSystem.cpp uses intToFixed and therefore loses the precision as well. That is from vanilla, isn't it? Isn't it reasonable to just copy what vanilla does when it parses INF?

jerethk

Just looked at this again. A couple issues, I think

jerethk · 2025-06-14T20:50:04Z

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

+		if (!ScriptElev::isScriptElevValid(elev)) { return 0; }
+
+		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
+		return data->type == IELEV_ROTATE_WALL ? degreesToFixedAngle(data->speed) : fixed16ToFloat(data->speed);


Just looking at this again -- I think you've got these round the wrong way.
This is the getter, so it should call fixedAngleToDegrees

@Karjala22 I've built this and tested it and yes, you need to swap these functions around

Here it should be fixedAngleToDegrees
And in the setter below it should be degreesToFixedAngle

jerethk · 2025-06-14T20:50:30Z

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp


 		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
-		data->speed = data->type == IELEV_ROTATE_WALL ? FIXED(floatToAngle(value)) : FIXED(value);
+		data->speed = data->type == IELEV_ROTATE_WALL ? fixedAngleToDegrees(value) : floatToFixed16(value);


This is the setter, so I think it should call degreesToFixedAngle

jerethk · 2025-06-14T20:50:48Z

TheForceEngine/x64/Debug/TheForceEngine.exe.recipe

+  <ContentFiles />
+  <SatelliteDlls />
+  <NonRecipeFileRefs />
+</Project>


This recipe file is still here

jerethk · 2025-06-21T10:44:31Z

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

+		if (!ScriptElev::isScriptElevValid(elev)) { return 0; }
+
+		InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
+		return data->type == IELEV_ROTATE_WALL ? degreesToFixedAngle(data->speed) : fixed16ToFloat(data->speed);


@Karjala22 I've built this and tested it and yes, you need to swap these functions around

Here it should be fixedAngleToDegrees
And in the setter below it should be degreesToFixedAngle

Removing spurious file.

jerethk

This looks all good to me now. Thanks Karjala

Karjala22 added 5 commits April 3, 2025 23:05

Allow user to load difficulty

358c181

Add getSpeed call

c735050

Test push

2149e82

test commit

4c3be46

test commit

a6e7b70

jerethk reviewed Apr 4, 2025

View reviewed changes

Karjala22 added 2 commits April 5, 2025 14:27

Add dumps to ignore and back to v141

025d9f1

remove spurior recipes

e5bef98

Karjala22 added 6 commits April 9, 2025 00:28

Fix for remaster darkpilo.cfg which is not located in the game folder.

6683eb5

Add for linux compatibility

85b2194

Update Linux pathing.

d3ed1cb

fix for nix paths

8241d5f

change the path path based on testing on proton.

1babf91

patching jereth's float changes

1a9981b

luciusDXL reviewed Apr 19, 2025

View reviewed changes

ifeldshteyn and others added 3 commits April 21, 2025 14:19

Merge branch 'luciusDXL:master' into master

f7a999c

Update angle values

a108dbf

updating angle code

b133953

jerethk suggested changes Jun 14, 2025

View reviewed changes

jerethk suggested changes Jun 21, 2025

View reviewed changes

ifeldshteyn and others added 2 commits June 22, 2025 10:10

Delete TheForceEngine/x64/Debug/TheForceEngine.exe.recipe

b209eec

Removing spurious file.

Fix for angles

d33dd53

jerethk approved these changes Jun 25, 2025

View reviewed changes

ifeldshteyn and others added 2 commits September 8, 2025 13:18

Merge branch 'luciusDXL:master' into master

923de14

Merging in changes

b6ac018

luciusDXL approved these changes Sep 9, 2025

View reviewed changes

luciusDXL merged commit 62891e7 into luciusDXL:master Sep 9, 2025
2 checks passed

		ScriptPropertyGetFunc("bool get_master()", getElevMaster);


		ScriptPropertyGetFunc("int get_speed()", getElevSpeed);

Allow user to load difficulty #518

Allow user to load difficulty #518

Uh oh!

Conversation

ifeldshteyn commented Apr 4, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jerethk Apr 18, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luciusDXL Apr 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jerethk Apr 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jerethk Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

luciusDXL commented Apr 8, 2025

Uh oh!

Gerwin2k commented Apr 8, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jerethk left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jerethk left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

jerethk Apr 18, 2025 •

edited

Loading

luciusDXL Apr 19, 2025 •

edited

Loading

jerethk Apr 20, 2025 •

edited

Loading

jerethk Apr 15, 2025 •

edited

Loading