jprdonnelly/Descent3
1
0
Fork 0
mirror of https://github.com/kevinbentley/Descent3.git synced 2026-05-20 12:00:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix simple warnings

Browse Source 
Most of these warnings are due to the use of NULL instead of 0 or NULL instead of '\0'.
Some are macro redefinitions. None of them are pointer storage related. Those will be
in another PR.
This commit is contained in:
GravisZro
2024-04-18 15:13:35 -04:00
parent 4f5bd86c1c
commit b5632bbc3e
21 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bitmap/bitmain.cpp
View File

@@ -1207,7 +1207,7 @@ int bm_w(int handle, int miplevel) {
}
if (GameBitmaps[handle].flags & BF_NOT_RESIDENT)
if (!bm_MakeBitmapResident(handle))
return NULL;
return 0;
if (!(GameBitmaps[handle].flags & BF_MIPMAPPED))
miplevel = 0;
w = GameBitmaps[handle].width;
@@ -1224,7 +1224,7 @@ int bm_h(int handle, int miplevel) {
// If this bitmap is not page in, do so!
if (GameBitmaps[handle].flags & BF_NOT_RESIDENT)
if (!bm_MakeBitmapResident(handle))
return NULL;
return 0;
if (!(GameBitmaps[handle].flags & BF_MIPMAPPED))
miplevel = 0;
h = GameBitmaps[handle].height;
@@ -1245,7 +1245,7 @@ int bm_miplevels(int handle) {
// If this bitmap is not page in, do so!
if (GameBitmaps[handle].flags & BF_NOT_RESIDENT)
if (!bm_MakeBitmapResident(handle))
return NULL;
return 0;
if (GameBitmaps[handle].flags & BF_MIPMAPPED) {
for (int tmp = GameBitmaps[handle].width; tmp > 0; tmp = tmp >> 1) {
levels++;
@@ -1264,7 +1264,7 @@ int bm_mipped(int handle) {
// If this bitmap is not page in, do so!
if (GameBitmaps[handle].flags & BF_NOT_RESIDENT)
if (!bm_MakeBitmapResident(handle))
return NULL;
return 0;
if (GameBitmaps[handle].flags & BF_MIPMAPPED)
return 1;
return 0;
@@ -1752,6 +1752,6 @@ int bm_format(int handle) {
}
if (GameBitmaps[handle].flags & BF_NOT_RESIDENT)
if (!bm_MakeBitmapResident(handle))
return NULL;
return 0;
return (GameBitmaps[handle].format);
}