thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-03-26 04:51:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Correct compiler issues.

Browse source
This commit is contained in:
Sryder 2019-06-08 22:59:13 +01:00
parent 3a25bb38fe
commit b1fa5f6d34
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/k_bheap.c
View file

@ -519,7 +519,7 @@ boolean K_BHeapPop(bheap_t *const heap, bheapitem_t *const returnitemstorage)
{
CONS_Debug(DBG_GAMELOGIC, "Uninitialised heap in K_BHeapPop.\n");
}
else if (heap->count = 0U)
else if (heap->count == 0U)
{
CONS_Debug(DBG_GAMELOGIC, "Tried to Pop from empty heap in K_BHeapPop.\n");
}
@ -600,13 +600,13 @@ boolean K_UpdateBHeapItemValue(bheapitem_t *const item, const UINT32 newvalue)
}
/*--------------------------------------------------
UINT32 K_BHeapContains(bheap_t *const heap, void *const data, size_t index)
size_t K_BHeapContains(bheap_t *const heap, void *const data, size_t index)
See header file for description.
--------------------------------------------------*/
UINT32 K_BHeapContains(bheap_t *const heap, void *const data, size_t index)
size_t K_BHeapContains(bheap_t *const heap, void *const data, size_t index)
{
UINT32 heapindexwithdata = SIZE_MAX;
size_t heapindexwithdata = SIZE_MAX;
if (heap == NULL)
{

8
src/k_bheap.h
View file

@ -3,13 +3,13 @@
#include "doomdef.h"
typedef void(*updateindexfunc)(void *const, const UINT32);
typedef void(*updateindexfunc)(void *const, const size_t);
typedef struct bheapitem_s
{
size_t heapindex; // The index in the heap this item is
updateindexfunc indexchanged; // A callback function that is called when this item changes index to alert data
bheap_t *owner; // The heap that owns this item
struct bheap_s *owner; // The heap that owns this item
void *data; // data for this heap item
UINT32 value; // The value of this item, the lowest value item is first in the array
} bheapitem_t;
@ -106,7 +106,7 @@ boolean K_UpdateBHeapItemValue(bheapitem_t *const item, const UINT32 newvalue);
/*--------------------------------------------------
boolean K_BHeapContains(bheap_t *const heap, void *const data, size_t index)
size_t K_BHeapContains(bheap_t *const heap, void *const data, size_t index)
Checks to see if data is contained in the heap. If index is not SIZE_MAX, then only the index sent in is
checked. Otherwise every index is checked linearly.
@ -120,6 +120,6 @@ boolean K_UpdateBHeapItemValue(bheapitem_t *const item, const UINT32 newvalue);
The heap index that contains data, SIZE_MAX if it is not in the heap
--------------------------------------------------*/
UINT32 K_BHeapContains(bheap_t *const heap, void *const data, size_t index);
size_t K_BHeapContains(bheap_t *const heap, void *const data, size_t index);
#endif