From a82ee857e50d24abdaadd3ecfb0ca7bdda415eb2 Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Mon, 16 Sep 2019 17:30:39 +0200
Subject: [PATCH] - fixed a few warnings.
# Conflicts:
# src/scripting/vmthunks.cpp
---
src/resourcefiles/resourcefile.cpp | 4 ++--
src/scripting/vmthunks.cpp | 8 ++++----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/resourcefiles/resourcefile.cpp b/src/resourcefiles/resourcefile.cpp
index 79da7d7b0..d3949f5ed 100644
--- a/src/resourcefiles/resourcefile.cpp
+++ b/src/resourcefiles/resourcefile.cpp
@@ -370,8 +370,8 @@ void FResourceFile::GenerateHash()
for(uint32_t i = 0; i < NumLumps; i++)
{
auto lump = GetLump(i);
- md5.Update((const uint8_t*)lump->Name, strlen(lump->Name) + 1); // +1 to hash the terminating 0 as well.
- md5.Update((const uint8_t*)lump->FullName.GetChars(), lump->FullName.Len() + 1);
+ md5.Update((const uint8_t*)lump->Name, (unsigned)strlen(lump->Name) + 1); // +1 to hash the terminating 0 as well.
+ md5.Update((const uint8_t*)lump->FullName.GetChars(), (unsigned)lump->FullName.Len() + 1);
md5.Update((const uint8_t*)&lump->LumpSize, 4);
}
md5.Final(digest);
diff --git a/src/scripting/vmthunks.cpp b/src/scripting/vmthunks.cpp
index 1b37a05ad..3e26ad5de 100644
--- a/src/scripting/vmthunks.cpp
+++ b/src/scripting/vmthunks.cpp
@@ -1334,9 +1334,9 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, RemoveForceField, RemoveForceField)
return 0;
}
- static F3DFloor* Get3DFloor(sector_t *self, int index)
+ static F3DFloor* Get3DFloor(sector_t *self, unsigned int index)
{
- if ((index < 0) || ((unsigned int)index >= self->e->XFloor.ffloors.Size()))
+ if (index >= self->e->XFloor.ffloors.Size())
return nullptr;
return self->e->XFloor.ffloors[index];
}
@@ -1359,9 +1359,9 @@ DEFINE_ACTION_FUNCTION_NATIVE(_Sector, RemoveForceField, RemoveForceField)
ACTION_RETURN_INT(self->e->XFloor.ffloors.Size());
}
- static sector_t* GetAttached(sector_t *self, int index)
+ static sector_t* GetAttached(sector_t *self, unsigned int index)
{
- if ((index < 0) || ((unsigned int)index >= self->e->XFloor.attached.Size()))
+ if (index >= self->e->XFloor.attached.Size())
return nullptr;
return self->e->XFloor.attached[index];
}