Skip to content

remove annoying warning on MSVC 19.37.32822 #234

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
majcosta merged 1 commit into from
Oct 7, 2023
+13 −13
Merged

remove annoying warning on MSVC 19.37.32822 #234

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Tactical/BinaryHeap.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ class CBinaryHeap
return (returnHeap);
}

int moveUp(register int index, KEY newKey)
int moveUp(int index, KEY newKey)
{
while (index > 1) {
int current2 = index>>1;//divided by 2
Expand All @@ -120,7 +120,7 @@ class CBinaryHeap

int moveDown(int index, KEY currentKey)
{
register int current2 = index+index;
int current2 = index+index;
while (current2 < heapCount) {
if (current2+1 < heapCount) {
//choose child to possibly move
Expand Down Expand Up @@ -314,7 +314,7 @@ class CBinaryHeap

int findData(const T data) const
{
register int current;
int current;
for (current = heapCount-1; current > 0; --current) {
if (BinaryHeap[current].data == data) {
break;
Expand Down
16 changes: 8 additions & 8 deletions Tactical/DisplayCover.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,7 @@ BOOLEAN HasAdjTile( const INT32& ubX, const INT32& ubY, const INT32& ubZ )

void AddCoverObjectsToViewArea()
{
register INT32 ubX, ubY, ubZ;
INT32 ubX, ubY, ubZ;
BOOLEAN fChanged = FALSE;

BOOLEAN fNightTime = NightTime( );
Expand Down Expand Up @@ -406,7 +406,7 @@ void RemoveCoverObjectsFromViewArea()
return;

// Go through the whole gCoverViewArea when removing cover objects. Otherwise we don't clean up tiles that are not in the viewport which results in an annoying visual bug.
register INT32 ubX, ubY, ubZ;
INT32 ubX, ubY, ubZ;
BOOLEAN fChanged = FALSE;

for ( ubX = 0; ubX < COVER_X_CELLS; ++ubX )
Expand Down Expand Up @@ -669,8 +669,8 @@ static void CalculateCoverFromEnemies()

void CalculateCover()
{
register INT32 ubX, ubY;
register INT8 ubZ;
INT32 ubX, ubY;
INT8 ubZ;
SOLDIERTYPE* pSoldier;

if (gusSelectedSoldier == NOBODY)
Expand Down Expand Up @@ -1144,7 +1144,7 @@ void AddMinesObjectsToViewArea()
if ( gsMaxCellY < 0 )
return;

register INT32 ubX, ubY, ubZ;
INT32 ubX, ubY, ubZ;
BOOLEAN fChanged = FALSE;

BOOLEAN fNightTime = NightTime( );
Expand Down Expand Up @@ -1503,7 +1503,7 @@ void AddTraitObjectsToViewArea()
if ( gsMaxCellY < 0 )
return;

register INT32 ubX, ubY, ubZ;
INT32 ubX, ubY, ubZ;
BOOLEAN fChanged = FALSE;

BOOLEAN fNightTime = NightTime( );
Expand Down Expand Up @@ -1657,7 +1657,7 @@ void AddTrackerObjectsToViewArea( )
if ( gsMaxCellY < 0 )
return;

register INT32 ubX, ubY, ubZ;
INT32 ubX, ubY, ubZ;
BOOLEAN fChanged = FALSE;

BOOLEAN fNightTime = NightTime();
Expand Down Expand Up @@ -1731,7 +1731,7 @@ void CalculateFortify( )
if ( gsMaxCellY < 0 )
return;

register INT32 ubX, ubY, ubZ;
INT32 ubX, ubY, ubZ;
BOOLEAN fChanged = FALSE;

BOOLEAN fNightTime = NightTime( );
Expand Down
4 changes: 2 additions & 2 deletions Tactical/Items.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15271,7 +15271,7 @@ BOOLEAN HasItemFlag( UINT16 usItem, UINT64 aFlag )
// Flugente: get first item number that has this flag. Use with caution, as we search in all items
BOOLEAN GetFirstItemWithFlag( UINT16* pusItem, UINT64 aFlag )
{
register UINT16 i;
UINT16 i;
for ( i = 1; i < gMAXITEMS_READ; ++i )
{
if ( HasItemFlag(i, aFlag) )
Expand Down Expand Up @@ -15537,7 +15537,7 @@ BOOLEAN GetFirstClothesItemWithSpecificData( UINT16* pusItem, PaletteRepID aPalV
UINT32 bestclothestype = 999999;
UINT16 bestitem = 0;

register UINT16 i;
UINT16 i;
for ( i = 1; i < gMAXITEMS_READ; ++i )
{
if ( Item[i].clothestype > 0 )
Expand Down