Merge branch 'fairy_tale_busters' into Version0.66

ZeqMacaw · Jan 22, 2020 · 5e4ee55 · 5e4ee55
2 parents 8c5c0f3 + 315a037
commit 5e4ee55
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/Crowbar/Core/GameModel/- Base/SourceModel.vb b/Crowbar/Core/GameModel/- Base/SourceModel.vb
@@ -78,6 +78,16 @@ Public MustInherit Class SourceModel
 			ElseIf version = 53 Then
 				'TODO: Finish.
 				model = New SourceModel53(mdlPathFileName, version)
+			ElseIf version = 54 Then
+				model = New SourceModel49(mdlPathFileName, version)
+			ElseIf version = 55 Then
+				model = New SourceModel49(mdlPathFileName, version)
+			ElseIf version = 56 Then
+				model = New SourceModel49(mdlPathFileName, version)
+			ElseIf version = 58 Then
+				model = New SourceModel49(mdlPathFileName, version)
+			ElseIf version = 59 Then
+				model = New SourceModel49(mdlPathFileName, version)
 			Else
 				' Version not implemented.
 				model = Nothing

diff --git a/Crowbar/Core/GameModel/CompiledFiles/VvdFile/VvdFile04/SourceVvdFile04.vb b/Crowbar/Core/GameModel/CompiledFiles/VvdFile/VvdFile04/SourceVvdFile04.vb
@@ -39,7 +39,7 @@ Public Class SourceVvdFile04
 		Me.theVvdFileData.theFileSeekLog.Add(fileOffsetStart, fileOffsetEnd, "VVD File Header")
 	End Sub
 
-	Public Sub ReadVertexes()
+	Public Sub ReadVertexes(Optional ByVal mdlVersion As Integer = 0)
 		If Me.theVvdFileData.lodCount <= 0 Then
 			Exit Sub
 		End If
@@ -94,6 +94,12 @@ Public Class SourceVvdFile04
 			aStudioVertex.normalZ = Me.theInputFileReader.ReadSingle()
 			aStudioVertex.texCoordX = Me.theInputFileReader.ReadSingle()
 			aStudioVertex.texCoordY = Me.theInputFileReader.ReadSingle()
+			If mdlVersion >= 54 OrElse mdlVersion <= 59 Then
+				Me.theInputFileReader.ReadSingle()
+				Me.theInputFileReader.ReadSingle()
+				Me.theInputFileReader.ReadSingle()
+				Me.theInputFileReader.ReadSingle()
+			End If
 			Me.theVvdFileData.theVertexes.Add(aStudioVertex)
 		Next
 

diff --git a/Crowbar/Core/GameModel/SourceModel49/SourceModel49.vb b/Crowbar/Core/GameModel/SourceModel49/SourceModel49.vb
@@ -591,7 +591,7 @@ Public Class SourceModel49
 		Dim vvdFile As New SourceVvdFile04(Me.theInputFileReader, Me.theVvdFileData49)
 
 		vvdFile.ReadSourceVvdHeader()
-		vvdFile.ReadVertexes()
+		vvdFile.ReadVertexes(Me.theMdlFileData.version)
 		vvdFile.ReadFixups()
 		vvdFile.ReadUnreadBytes()
 	End Sub