diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 16:21:58 +0300 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2019-06-30 16:21:58 +0300 |
| commit | 7c6b291860fd415f79067fc7058f11ffa58fdf10 (patch) | |
| tree | 15ccabed4c8c5d7c5c2f7a636035876cbd183e4d /src/FileLoader.cpp | |
| parent | 90bcb888e8cd3f6580984c0248e474650c350007 (diff) | |
| parent | 9b5a7cd4bb6d106e10e4502f123814f4ece44a2f (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/FileLoader.cpp')
| -rw-r--r-- | src/FileLoader.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/FileLoader.cpp b/src/FileLoader.cpp index 8213a5c7..8bc6ad11 100644 --- a/src/FileLoader.cpp +++ b/src/FileLoader.cpp @@ -38,7 +38,7 @@ void LoadingScreenLoadingFile(const char *filename) { sprintf(gString, "Loading %s", GetFilename(filename)); - LoadingScreen("Loading the Game", gString, 0); + LoadingScreen("Loading the Game", gString, nil); } void @@ -144,7 +144,7 @@ CFileLoader::LoadLine(int fd) int i; char *line; - if(CFileMgr::ReadLine(fd, ms_line, 256) == nil) + if(CFileMgr::ReadLine(fd, ms_line, 256) == false) return nil; for(i = 0; ms_line[i] != '\0'; i++) if(ms_line[i] < ' ' || ms_line[i] == ',') @@ -311,7 +311,7 @@ CFileLoader::FindRelatedModelInfoCB(RpAtomic *atomic, void *data) nodename = GetFrameNodeName(RpClumpGetFrame(atomic)); GetNameAndLOD(nodename, name, &n); - mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(name, 0); + mi = (CSimpleModelInfo*)CModelInfo::GetModelInfo(name, nil); if(mi){ assert(mi->IsSimple()); mi->SetAtomic(n, atomic); @@ -360,7 +360,7 @@ CFileLoader::LoadClumpFile(const char *filename) if(clump){ nodename = GetFrameNodeName(RpClumpGetFrame(clump)); GetNameAndLOD(nodename, name, &n); - mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(name, 0); + mi = (CClumpModelInfo*)CModelInfo::GetModelInfo(name, nil); assert(mi->IsClump()); if(mi) mi->SetClump(clump); @@ -457,7 +457,7 @@ CFileLoader::SetRelatedModelInfoCB(RpAtomic *atomic, void *data) RpClumpRemoveAtomic(clump, atomic); RpAtomicSetFrame(atomic, RwFrameCreate()); CVisibilityPlugins::SetAtomicModelInfo(atomic, gpRelatedModelInfo); - CVisibilityPlugins::SetAtomicRenderCallback(atomic, 0); + CVisibilityPlugins::SetAtomicRenderCallback(atomic, nil); return atomic; } |