Skip to content

Commit a81f414

Browse files
committed
* Updated Version
* Fixed some warnings.
1 parent c05e0e4 commit a81f414

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

TheForceEngine/TFE_DarkForces/Scripting/gs_player.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ namespace TFE_DarkForces
9595

9696
void setPlayerYaw(float value)
9797
{
98-
float yaw = floatToAngle(value);
98+
angle14_32 yaw = floatToAngle(value);
9999
s_playerObject->yaw = yaw;
100100
s_playerYaw = yaw;
101101
}

TheForceEngine/TFE_DarkForces/Scripting/scriptElev.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace TFE_DarkForces
2828
if (!ScriptElev::isScriptElevValid(elev)) { return; }
2929

3030
InfElevator* data = (InfElevator*)allocator_getByIndex(s_infSerState.infElevators, elev->m_id);
31-
data->speed = data->type == IELEV_ROTATE_WALL ? FIXED(floatToAngle(value)) : FIXED(value);
31+
data->speed = data->type == IELEV_ROTATE_WALL ? FIXED(floatToAngle((f32)value)) : FIXED(value);
3232
}
3333

3434
void ScriptElev::registerType()

TheForceEngine/TFE_Input/replay.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ namespace TFE_Input
275275
// Serializes the input events into the demo file from vectors to strings
276276
vector<s32> serializeInputs(Stream* stream, vector<s32> inputList, bool writeFlag)
277277
{
278-
int keySize = 0;
278+
s32 keySize = 0;
279279
string keyString;
280280

281281
// The Vector would consist of the key codes for the input events
@@ -284,7 +284,7 @@ namespace TFE_Input
284284
if (writeFlag)
285285
{
286286
keyString = convertToString(inputList);
287-
keySize = keyString.size();
287+
keySize = (s32)keyString.size();
288288
}
289289

290290
SERIALIZE(ReplayVersionInit, keySize, 0);
@@ -549,7 +549,7 @@ namespace TFE_Input
549549
SERIALIZE_BUF(SaveVersionInit, frameTicks, sizeof(fixed16_16) * TFE_ARRAYSIZE(frameTicks));
550550

551551
// Handle events list size
552-
int eventListsSize = inputMapping_getCounter();
552+
s32 eventListsSize = inputMapping_getCounter();
553553
SERIALIZE(ReplayVersionInit, eventListsSize, 0);
554554

555555
// Settings and Input Handling
@@ -636,7 +636,7 @@ namespace TFE_Input
636636
// Wipe the events and load them from the demo
637637
clearEvents();
638638

639-
for (int i = 0; i < eventListsSize + 1; i++)
639+
for (s32 i = 0; i < eventListsSize + 1; i++)
640640
{
641641
SERIALIZE(ReplayVersionInit, eventCounter, 0);
642642

@@ -668,7 +668,7 @@ namespace TFE_Input
668668

669669
// Wipe the event counter and set the max input counter
670670
inputMapping_resetCounter();
671-
inputMapping_setMaxCounter(inputEvents.size());
671+
inputMapping_setMaxCounter((s32)inputEvents.size());
672672

673673
// Set the new start time
674674
TFE_System::setStartTime(replayStartTime);
@@ -886,7 +886,7 @@ namespace TFE_Input
886886
keysPressed = convertToString(event.keysPressed);
887887
mouse = convertToString(event.mousePos);
888888
s32 xPos = s_eyePos.x;
889-
s32 yPos = s_playerEye->posWS.y * -1.0;
889+
s32 yPos = -s_playerEye->posWS.y;
890890
s32 zPos = s_eyePos.z;
891891
angle14_16 yaw = s_playerEye->yaw;
892892
angle14_16 pitch = s_playerEye->pitch;

TheForceEngine/gitVersion.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
const char c_gitVersion[] = R"(
2-
v1.22.200
2+
v1.22.300
33
)";

0 commit comments

Comments
 (0)