zdoom/gzdoom-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom-gles.git synced 2025-01-31 12:30:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed a few warnings.

Browse source 
# Conflicts:
#	src/scripting/vmthunks.cpp
This commit is contained in:
Christoph Oelckers 2019-09-16 17:30:39 +02:00 committed by drfrag
parent 9b84a97a1d
commit a82ee857e5
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/resourcefiles/resourcefile.cpp
View file

@ -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);

8
src/scripting/vmthunks.cpp
View file

@ -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];
}