History

windows type mismatch warning fixes

Brad Hefta-Gaub committed 12 years ago

Commit 55babbf1 parent 08c9dfb24 files · +96 −95Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 24 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+3−3
@@ -205,7 +205,7 @@ void VoxelSystem::freeBufferIndex(glBufferIndex index) { · 204 unmodified lines
205 205
206 // make sure the index isn't already in the free list..., this is a debugging measure only done if you've enabled audits206 // make sure the index isn't already in the free list..., this is a debugging measure only done if you've enabled audits
207 if (Menu::getInstance()->isOptionChecked(MenuOption::AutomaticallyAuditTree)) {207 if (Menu::getInstance()->isOptionChecked(MenuOption::AutomaticallyAuditTree)) {
208 for (long i = 0; i < _freeIndexes.size(); i++) {208 for (unsigned long i = 0; i < _freeIndexes.size(); i++) {
209 if (_freeIndexes[i] == index) {209 if (_freeIndexes[i] == index) {
210 printf("freeBufferIndex(glBufferIndex index)... index=%ld already in free list!\n", index);210 printf("freeBufferIndex(glBufferIndex index)... index=%ld already in free list!\n", index);
211 inList = true;211 inList = true;
@@ -382,7 +382,7 @@ void VoxelSystem::setupFaceIndices(GLuint& faceVBOID, GLubyte faceIdentityIndice · 170 unmodified lines
382 382
383 // populate the indicesArray383 // populate the indicesArray
384 // this will not change given new voxels, so we can set it all up now384 // this will not change given new voxels, so we can set it all up now
385 for (int n = 0; n < _maxVoxels; n++) {385 for (unsigned long n = 0; n < _maxVoxels; n++) {
386 // fill the indices array386 // fill the indices array
387 int voxelIndexOffset = n * INDICES_PER_FACE;387 int voxelIndexOffset = n * INDICES_PER_FACE;
388 GLuint* currentIndicesPos = indicesArray + voxelIndexOffset;388 GLuint* currentIndicesPos = indicesArray + voxelIndexOffset;
@@ -421,7 +421,7 @@ void VoxelSystem::initVoxelMemory() { · 32 unmodified lines
421 421
422 // populate the indicesArray422 // populate the indicesArray
423 // this will not change given new voxels, so we can set it all up now423 // this will not change given new voxels, so we can set it all up now
424 for (int n = 0; n < _maxVoxels; n++) {424 for (unsigned long n = 0; n < _maxVoxels; n++) {
425 indicesArray[n] = n;425 indicesArray[n] = n;
426 }426 }
427 427