Skip to content

Commit 4b22c54

Browse files
committed
- fix LEV file autodetection
1 parent 0ff9112 commit 4b22c54

2 files changed

Lines changed: 11 additions & 8 deletions

File tree

DriverLevelTool/driver_routines/level.cpp

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -312,13 +312,16 @@ void DetectLevelFormat(IVirtualStream* pFile)
312312
case LUMP_MAP:
313313
case LUMP_TEXTURENAMES:
314314
case LUMP_MODELNAMES:
315-
case LUMP_SUBDIVISION:
316315
case LUMP_LOWDETAILTABLE:
317316
case LUMP_MOTIONCAPTURE:
318317
case LUMP_OVERLAYMAP:
319318
case LUMP_PALLET:
320319
case LUMP_SPOOLINFO:
321320
case LUMP_CURVES2:
321+
case LUMP_CHAIR:
322+
case LUMP_CAR_MODELS:
323+
case LUMP_TEXTUREINFO:
324+
break;
322325
case LUMP_JUNCTIONS2:
323326
{
324327
MsgInfo("Assuming it's a 'Driver 2 DEMO' 1.6 alpha LEV file\n");
@@ -331,10 +334,13 @@ void DetectLevelFormat(IVirtualStream* pFile)
331334
g_format = LEV_FORMAT_DRIVER2_RETAIL; // most recent LEV file
332335
break;
333336
}
334-
case LUMP_CHAIR:
335-
case LUMP_CAR_MODELS:
336-
case LUMP_TEXTUREINFO:
337-
default:
337+
case LUMP_ROADMAP:
338+
case LUMP_ROADS:
339+
case LUMP_JUNCTIONS:
340+
case LUMP_ROADSURF:
341+
case LUMP_ROADBOUNDS:
342+
case LUMP_JUNCBOUNDS:
343+
case LUMP_SUBDIVISION:
338344
{
339345
MsgInfo("Assuming it's a 'Driver 1' LEV file\n");
340346
g_format = LEV_FORMAT_DRIVER1;

DriverLevelTool/driver_routines/models.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,9 +197,6 @@ int decode_poly(const char* polyList, dpoly_t* out)
197197
*(ushort*)out->uv[2] = *(uint*)&pgt4->uv2;
198198
*(ushort*)out->uv[3] = *(uint*)&pgt4->uv3;
199199

200-
//SwapValues(out->vindices[2], out->vindices[3]);
201-
//SwapValues(out->nindices[2], out->nindices[3]);
202-
203200
*(uint*)out->color = *(uint*)&pgt4->color;
204201
out->page = pgt4->texture_set;
205202
out->detail = pgt4->texture_id;

0 commit comments

Comments
 (0)