@@ -73,13 +73,13 @@ void DetectLevelFormat(IVirtualStream* pFile)
7373 break ;
7474 case LUMP_JUNCTIONS2:
7575 {
76- MsgInfo (" Assuming it's a 'Driver 2 DEMO' 1.6 alpha LEV file\n " );
76+ MsgInfo (" Detected 'Driver 2 DEMO' 1.6 alpha LEV file\n " );
7777 g_format = LEV_FORMAT_DRIVER2_ALPHA16; // as it is an old junction format - it's clearly a alpha 1.6 level
7878 break ;
7979 }
8080 case LUMP_JUNCTIONS2_NEW:
8181 {
82- MsgInfo (" Assuming it's a 'Driver 2' final LEV file\n " );
82+ MsgInfo (" Detected 'Driver 2' final LEV file\n " );
8383 g_format = LEV_FORMAT_DRIVER2_RETAIL; // most recent LEV file
8484 break ;
8585 }
@@ -92,7 +92,7 @@ void DetectLevelFormat(IVirtualStream* pFile)
9292 case LUMP_SUBDIVISION:
9393 default : // maybe Lump 11?
9494 {
95- MsgInfo (" Assuming it's a 'Driver 1' LEV file\n " );
95+ MsgInfo (" Detected 'Driver 1' LEV file\n " );
9696 g_format = LEV_FORMAT_DRIVER1;
9797 break ;
9898 }
@@ -150,67 +150,67 @@ void ProcessLumps(IVirtualStream* pFile)
150150 switch (lump.type )
151151 {
152152 case LUMP_MODELS:
153- MsgWarning ( " LUMP_MODELS ofs=%d size=%d\n " , pFile->Tell (), lump.size );
153+ DevMsg (SPEW_WARNING, " LUMP_MODELS ofs=%d size=%d\n " , pFile->Tell (), lump.size );
154154 g_levModels.LoadLevelModelsLump (pFile);
155155 break ;
156156 case LUMP_MAP:
157- MsgWarning ( " LUMP_MAP ofs=%d size=%d\n " , pFile->Tell (), lump.size );
157+ DevMsg (SPEW_WARNING, " LUMP_MAP ofs=%d size=%d\n " , pFile->Tell (), lump.size );
158158 g_levMap->LoadMapLump (pFile);
159159 break ;
160160 case LUMP_TEXTURENAMES:
161- MsgWarning ( " LUMP_TEXTURENAMES ofs=%d size=%d\n " , pFile->Tell (), lump.size );
161+ DevMsg (SPEW_WARNING, " LUMP_TEXTURENAMES ofs=%d size=%d\n " , pFile->Tell (), lump.size );
162162 g_levTextures.LoadTextureNamesLump (pFile, lump.size );
163163 break ;
164164 case LUMP_MODELNAMES:
165- MsgWarning ( " LUMP_MODELNAMES ofs=%d size=%d\n " , pFile->Tell (), lump.size );
165+ DevMsg (SPEW_WARNING, " LUMP_MODELNAMES ofs=%d size=%d\n " , pFile->Tell (), lump.size );
166166 g_levModels.LoadModelNamesLump (pFile, lump.size );
167167 break ;
168168 case LUMP_SUBDIVISION:
169- MsgWarning ( " LUMP_SUBDIVISION ofs=%d size=%d\n " , pFile->Tell (), lump.size );
169+ DevMsg (SPEW_WARNING, " LUMP_SUBDIVISION ofs=%d size=%d\n " , pFile->Tell (), lump.size );
170170 break ;
171171 case LUMP_LOWDETAILTABLE:
172- MsgWarning ( " LUMP_LOWDETAILTABLE ofs=%d size=%d\n " , pFile->Tell (), lump.size );
172+ DevMsg (SPEW_WARNING, " LUMP_LOWDETAILTABLE ofs=%d size=%d\n " , pFile->Tell (), lump.size );
173173 break ;
174174 case LUMP_MOTIONCAPTURE:
175- MsgWarning ( " LUMP_MOTIONCAPTURE ofs=%d size=%d\n " , pFile->Tell (), lump.size );
175+ DevMsg (SPEW_WARNING, " LUMP_MOTIONCAPTURE ofs=%d size=%d\n " , pFile->Tell (), lump.size );
176176 break ;
177177 case LUMP_OVERLAYMAP:
178- MsgWarning ( " LUMP_OVERLAYMAP ofs=%d size=%d\n " , pFile->Tell (), lump.size );
178+ DevMsg (SPEW_WARNING, " LUMP_OVERLAYMAP ofs=%d size=%d\n " , pFile->Tell (), lump.size );
179179 LoadOverlayMapLump (pFile, lump.size );
180180 break ;
181181 case LUMP_PALLET:
182- MsgWarning ( " LUMP_PALLET ofs=%d size=%d\n " , pFile->Tell (), lump.size );
182+ DevMsg (SPEW_WARNING, " LUMP_PALLET ofs=%d size=%d\n " , pFile->Tell (), lump.size );
183183 g_levTextures.ProcessPalletLump (pFile);
184184 break ;
185185 case LUMP_SPOOLINFO:
186- MsgWarning ( " LUMP_SPOOLINFO ofs=%d size=%d\n " , pFile->Tell (), lump.size );
186+ DevMsg (SPEW_WARNING, " LUMP_SPOOLINFO ofs=%d size=%d\n " , pFile->Tell (), lump.size );
187187 g_levMap->LoadSpoolInfoLump (pFile);
188188 break ;
189189 case LUMP_STRAIGHTS2:
190- MsgWarning ( " LUMP_STRAIGHTS2 ofs=%d size=%d\n " , pFile->Tell (), lump.size );
190+ DevMsg (SPEW_WARNING, " LUMP_STRAIGHTS2 ofs=%d size=%d\n " , pFile->Tell (), lump.size );
191191 break ;
192192 case LUMP_CURVES2:
193- MsgWarning ( " LUMP_CURVES2 ofs=%d size=%d\n " , pFile->Tell (), lump.size );
193+ DevMsg (SPEW_WARNING, " LUMP_CURVES2 ofs=%d size=%d\n " , pFile->Tell (), lump.size );
194194 break ;
195195 case LUMP_JUNCTIONS2:
196- MsgWarning ( " LUMP_JUNCTIONS2 ofs=%d size=%d\n " , pFile->Tell (), lump.size );
196+ DevMsg (SPEW_WARNING, " LUMP_JUNCTIONS2 ofs=%d size=%d\n " , pFile->Tell (), lump.size );
197197 break ;
198198 case LUMP_JUNCTIONS2_NEW:
199- MsgWarning ( " LUMP_JUNCTIONS2_NEW ofs=%d size=%d\n " , pFile->Tell (), lump.size );
199+ DevMsg (SPEW_WARNING, " LUMP_JUNCTIONS2_NEW ofs=%d size=%d\n " , pFile->Tell (), lump.size );
200200 break ;
201201 case LUMP_CHAIR:
202- MsgWarning ( " LUMP_CHAIR ofs=%d size=%d\n " , pFile->Tell (), lump.size );
202+ DevMsg (SPEW_WARNING, " LUMP_CHAIR ofs=%d size=%d\n " , pFile->Tell (), lump.size );
203203 break ;
204204 case LUMP_CAR_MODELS:
205- MsgWarning ( " LUMP_CAR_MODELS ofs=%d size=%d\n " , pFile->Tell (), lump.size );
205+ DevMsg (SPEW_WARNING, " LUMP_CAR_MODELS ofs=%d size=%d\n " , pFile->Tell (), lump.size );
206206 g_levModels.LoadCarModelsLump (pFile, lump.size );
207207 break ;
208208 case LUMP_TEXTUREINFO:
209- MsgWarning ( " LUMP_TEXTUREINFO ofs=%d size=%d\n " , pFile->Tell (), lump.size );
209+ DevMsg (SPEW_WARNING, " LUMP_TEXTUREINFO ofs=%d size=%d\n " , pFile->Tell (), lump.size );
210210 g_levTextures.LoadTextureInfoLump (pFile);
211211 break ;
212212 default :
213- MsgInfo ( " LUMP type: %d (0x%X) ofs=%d size=%d\n " , lump.type , lump.type , pFile->Tell (), lump.size );
213+ DevMsg (SPEW_WARNING, " LUMP type: %d (0x%X) ofs=%d size=%d\n " , lump.type , lump.type , pFile->Tell (), lump.size );
214214 }
215215
216216 // skip lump
@@ -251,7 +251,7 @@ void LoadLevelFile(const char* filename)
251251 // seek to begin
252252 g_levStream->Seek (0 , VS_SEEK_SET);
253253
254- MsgWarning (" -----------\n loading lev file '%s'\n " , filename);
254+ MsgWarning (" -----------\n Loading LEV file '%s'\n " , filename);
255255
256256 std::string fileName = filename;
257257
@@ -273,17 +273,17 @@ void LoadLevelFile(const char* filename)
273273 // read chunk offsets
274274 g_levStream->Read (&g_levInfo, sizeof (dlevinfo_t ), 1 );
275275
276- Msg ( " levdesc_offset = %d\n " , g_levInfo.levdesc_offset );
277- Msg ( " levdesc_size = %d\n " , g_levInfo.levdesc_size );
276+ DevMsg (SPEW_NORM, " levdesc_offset = %d\n " , g_levInfo.levdesc_offset );
277+ DevMsg (SPEW_NORM, " levdesc_size = %d\n " , g_levInfo.levdesc_size );
278278
279- Msg ( " texdata_offset = %d\n " , g_levInfo.texdata_offset );
280- Msg ( " texdata_size = %d\n " , g_levInfo.texdata_size );
279+ DevMsg (SPEW_NORM, " texdata_offset = %d\n " , g_levInfo.texdata_offset );
280+ DevMsg (SPEW_NORM, " texdata_size = %d\n " , g_levInfo.texdata_size );
281281
282- Msg ( " levdata_offset = %d\n " , g_levInfo.levdata_offset );
283- Msg ( " levdata_size = %d\n " , g_levInfo.levdata_size );
282+ DevMsg (SPEW_NORM, " levdata_offset = %d\n " , g_levInfo.levdata_offset );
283+ DevMsg (SPEW_NORM, " levdata_size = %d\n " , g_levInfo.levdata_size );
284284
285- Msg ( " spooldata_offset = %d\n " , g_levInfo.spooldata_offset );
286- Msg ( " spooldata_size = %d\n " , g_levInfo.spooldata_size );
285+ DevMsg (SPEW_NORM, " spooldata_offset = %d\n " , g_levInfo.spooldata_offset );
286+ DevMsg (SPEW_NORM, " spooldata_size = %d\n " , g_levInfo.spooldata_size );
287287
288288 // read cells
289289
@@ -299,7 +299,7 @@ void LoadLevelFile(const char* filename)
299299 MsgError (" Not a LUMP_LEVELDESC!\n " );
300300 }
301301
302- MsgInfo ( " entering LUMP_LEVELDESC size = %d\n --------------\n " , curLump.size );
302+ DevMsg (SPEW_INFO, " entering LUMP_LEVELDESC size = %d\n --------------\n " , curLump.size );
303303
304304 // read sublumps
305305 ProcessLumps (g_levStream);
@@ -321,7 +321,7 @@ void LoadLevelFile(const char* filename)
321321 MsgError (" Not a lump 0x24!\n " );
322322 }
323323
324- MsgInfo ( " entering LUMP_LEVELDATA size = %d\n --------------\n " , curLump.size );
324+ DevMsg (SPEW_INFO, " entering LUMP_LEVELDATA size = %d\n --------------\n " , curLump.size );
325325
326326 // read sublumps
327327 ProcessLumps (g_levStream);
0 commit comments