From ae94aa060d0e2b0773c797fe707806c88cff8971 Mon Sep 17 00:00:00 2001
From: nillerusr <nillerusr@gmail.com>
Date: Mon, 25 Jul 2022 16:47:41 +0300
Subject: [PATCH] game/client: fix C_BaseEntity prediction

---
 .gitignore                   |  7 ++--
 game/client/c_baseentity.cpp | 70 ++++++++++++++++++------------------
 ivp                          |  2 +-
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36b252a4..618c836d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,9 +3,12 @@
 *.vpc_crc
 *.project
 *obj_*
-build/
 .waf*
 .lock-waf*
 __pycache__
 *.pyc
-.DS_Store
\ No newline at end of file
+.DS_Store
+build*/
+android/
+.cache/
+.ccache/
diff --git a/game/client/c_baseentity.cpp b/game/client/c_baseentity.cpp
index ca8c8348..96017a82 100644
--- a/game/client/c_baseentity.cpp
+++ b/game/client/c_baseentity.cpp
@@ -5302,43 +5302,41 @@ int C_BaseEntity::GetIntermediateDataSize( void )
 
 static int g_FieldSizes[FIELD_TYPECOUNT] = 
 {
-	0,					// FIELD_VOID
-	sizeof(float),		// FIELD_FLOAT
-	sizeof(int),		// FIELD_STRING
-	sizeof(Vector),		// FIELD_VECTOR
-	sizeof(Quaternion),	// FIELD_QUATERNION
-	sizeof(int),		// FIELD_INTEGER
-	sizeof(char),		// FIELD_BOOLEAN
-	sizeof(short),		// FIELD_SHORT
-	sizeof(char),		// FIELD_CHARACTER
-	sizeof(color32),	// FIELD_COLOR32
-	sizeof(int),		// FIELD_EMBEDDED	(handled specially)
-	sizeof(int),		// FIELD_CUSTOM		(handled specially)
+	FIELD_SIZE( FIELD_VOID ),
+	FIELD_SIZE( FIELD_FLOAT ),
+	FIELD_SIZE( FIELD_STRING ),
+	FIELD_SIZE( FIELD_VECTOR ),
+	FIELD_SIZE( FIELD_QUATERNION ),
+	FIELD_SIZE( FIELD_INTEGER ),
+	FIELD_SIZE( FIELD_BOOLEAN ),
+	FIELD_SIZE( FIELD_SHORT ),
+	FIELD_SIZE( FIELD_CHARACTER ),
+	FIELD_SIZE( FIELD_COLOR32 ),
+	FIELD_SIZE( FIELD_EMBEDDED ),
+	FIELD_SIZE( FIELD_CUSTOM ),
 	
-	//---------------------------------
-
-	sizeof(int),		// FIELD_CLASSPTR
-	sizeof(EHANDLE),	// FIELD_EHANDLE
-	sizeof(int),		// FIELD_EDICT
-
-	sizeof(Vector),		// FIELD_POSITION_VECTOR
-	sizeof(float),		// FIELD_TIME
-	sizeof(int),		// FIELD_TICK
-	sizeof(int),		// FIELD_MODELNAME
-	sizeof(int),		// FIELD_SOUNDNAME
-
-	sizeof(int),		// FIELD_INPUT		(uses custom type)
-#ifdef GNUC
-	// pointer to members under gnuc are 8bytes if you have a virtual func
-	sizeof(uint64),		// FIELD_FUNCTION
-#else
-	sizeof(int *),		// FIELD_FUNCTION
-#endif
-	sizeof(VMatrix),	// FIELD_VMATRIX
-	sizeof(VMatrix),	// FIELD_VMATRIX_WORLDSPACE
-	sizeof(matrix3x4_t),// FIELD_MATRIX3X4_WORLDSPACE	// NOTE: Use array(FIELD_FLOAT, 12) for matrix3x4_t NOT in worldspace
-	sizeof(interval_t), // FIELD_INTERVAL
-	sizeof(int),		// FIELD_MODELINDEX
+	FIELD_SIZE( FIELD_CLASSPTR ),
+	FIELD_SIZE( FIELD_EHANDLE ),
+	FIELD_SIZE( FIELD_EDICT ),
+
+	FIELD_SIZE( FIELD_POSITION_VECTOR ),
+	FIELD_SIZE( FIELD_TIME ),
+	FIELD_SIZE( FIELD_TICK ),
+	FIELD_SIZE( FIELD_MODELNAME ),
+	FIELD_SIZE( FIELD_SOUNDNAME ),
+
+	FIELD_SIZE( FIELD_INPUT ),
+	FIELD_SIZE( FIELD_FUNCTION ),
+	FIELD_SIZE( FIELD_VMATRIX ),
+	FIELD_SIZE( FIELD_VMATRIX_WORLDSPACE ),
+	FIELD_SIZE( FIELD_MATRIX3X4_WORLDSPACE ),
+	FIELD_SIZE( FIELD_INTERVAL ),
+	FIELD_SIZE( FIELD_MODELINDEX ),
+	FIELD_SIZE( FIELD_MATERIALINDEX ),
+
+	FIELD_SIZE( FIELD_VECTOR2D ),
+	FIELD_SIZE( FIELD_INTEGER64 ),
+	FIELD_SIZE( FIELD_POINTER ),
 };
 
 //-----------------------------------------------------------------------------
diff --git a/ivp b/ivp
index 818b2cb7..878a5449 160000
--- a/ivp
+++ b/ivp
@@ -1 +1 @@
-Subproject commit 818b2cb7b060defb9739677449074798da3c8611
+Subproject commit 878a544907704eee58555736615e11f7e0ff4109