diff options
| author | Petr Mrázek | 2011-07-22 01:56:16 +0000 |
|---|---|---|
| committer | Petr Mrázek | 2011-07-22 01:56:16 +0000 |
| commit | 9b364f1cd23dc74b96809f77e45ba3397a646e7a (patch) | |
| tree | 914e8d1f7ece1606d75e1e35bf443689b05b0ffb /ContentLoader.cpp | |
| parent | bf89e3ad6b98442dca909e327b80c5e292db6092 (diff) | |
| download | stonesense-9b364f1cd23dc74b96809f77e45ba3397a646e7a.tar.gz stonesense-9b364f1cd23dc74b96809f77e45ba3397a646e7a.tar.bz2 stonesense-9b364f1cd23dc74b96809f77e45ba3397a646e7a.tar.xz | |
Const correctness of string constant handling, some other warnings fixed.
Diffstat (limited to 'ContentLoader.cpp')
| -rw-r--r-- | ContentLoader.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/ContentLoader.cpp b/ContentLoader.cpp index ab490e3..1fb269e 100644 --- a/ContentLoader.cpp +++ b/ContentLoader.cpp @@ -642,7 +642,7 @@ const char * lookupFormName(int formType) uint8_t lookupMaterialFore(int matType,int matIndex)
{
if (matIndex < 0)
- return NULL;
+ return 0;
vector<t_matgloss>* typeVector;
//// for appropriate elements, look up subtype
//if (matType == Mat_Wood)
@@ -660,17 +660,17 @@ uint8_t lookupMaterialFore(int matType,int matIndex) //else
//{
//maybe allow some more in later
- return NULL;
+ return 0;
//}
if (matIndex >= typeVector->size())
- return NULL;
+ return 0;
return (*typeVector)[matIndex].fore;
}
uint8_t lookupMaterialBack(int matType,int matIndex)
{
if (matIndex < 0)
- return NULL;
+ return 0;
vector<t_matgloss>* typeVector;
//// for appropriate elements, look up subtype
//if (matType == Mat_Wood)
@@ -688,17 +688,17 @@ uint8_t lookupMaterialBack(int matType,int matIndex) //else
//{
//maybe allow some more in later
- return NULL;
+ return 0;
//}
if (matIndex >= typeVector->size())
- return NULL;
+ return 0;
return (*typeVector)[matIndex].back;
}
uint8_t lookupMaterialBright(int matType,int matIndex)
{
if (matIndex < 0)
- return NULL;
+ return 0;
vector<t_matgloss>* typeVector;
//// for appropriate elements, look up subtype
//if (matType == Mat_Wood)
@@ -716,10 +716,10 @@ uint8_t lookupMaterialBright(int matType,int matIndex) //else
//{
//maybe allow some more in later
- return NULL;
+ return 0;
//}
if (matIndex >= typeVector->size())
- return NULL;
+ return 0;
return (*typeVector)[matIndex].bright;
}
|
