[openjk] 49/130: Fix 'holes' inside saved game affected classes due alignment
Simon McVittie
smcv at debian.org
Fri Oct 28 11:09:17 UTC 2016
This is an automated email from the git hooks/post-receive script.
smcv pushed a commit to branch debian/master
in repository openjk.
commit bb3a1ca512c10da668cce1d97e8059784ebe9aa9
Author: bibendovsky <bibendovsky at hotmail.com>
Date: Sat Jul 23 17:42:47 2016 +0300
Fix 'holes' inside saved game affected classes due alignment
---
code/cgame/FxScheduler.h | 2 ++
code/game/b_public.h | 2 ++
code/game/g_local.h | 2 ++
code/game/g_shared.h | 6 ++++++
code/game/g_vehicles.h | 4 ++++
code/game/ghoul2_shared.h | 4 ++++
code/qcommon/q_shared.h | 2 ++
codeJK2/game/b_public.h | 2 ++
8 files changed, 24 insertions(+)
diff --git a/code/cgame/FxScheduler.h b/code/cgame/FxScheduler.h
index ef6e8a9..1025661 100644
--- a/code/cgame/FxScheduler.h
+++ b/code/cgame/FxScheduler.h
@@ -420,6 +420,7 @@ struct SLoopedEffect
saved_game->write<int32_t>(mLoopStopTime);
saved_game->write<int8_t>(mPortalEffect);
saved_game->write<int8_t>(mIsRelative);
+ saved_game->skip(2);
}
void sg_import(
@@ -431,6 +432,7 @@ struct SLoopedEffect
saved_game->read<int32_t>(mLoopStopTime);
saved_game->read<int8_t>(mPortalEffect);
saved_game->read<int8_t>(mIsRelative);
+ saved_game->skip(2);
}
};
diff --git a/code/game/b_public.h b/code/game/b_public.h
index f2054f0..5351e16 100644
--- a/code/game/b_public.h
+++ b/code/game/b_public.h
@@ -467,6 +467,7 @@ public:
saved_game->write<int32_t>(currentSpeed);
saved_game->write<int8_t>(last_forwardmove);
saved_game->write<int8_t>(last_rightmove);
+ saved_game->skip(2);
saved_game->write<float>(lastClearOrigin);
saved_game->write<int32_t>(shoveCount);
saved_game->write<int32_t>(blockedDebounceTime);
@@ -588,6 +589,7 @@ public:
saved_game->read<int32_t>(currentSpeed);
saved_game->read<int8_t>(last_forwardmove);
saved_game->read<int8_t>(last_rightmove);
+ saved_game->skip(2);
saved_game->read<float>(lastClearOrigin);
saved_game->read<int32_t>(shoveCount);
saved_game->read<int32_t>(blockedDebounceTime);
diff --git a/code/game/g_local.h b/code/game/g_local.h
index 3502333..c99532e 100644
--- a/code/game/g_local.h
+++ b/code/game/g_local.h
@@ -109,6 +109,7 @@ public:
saved_game->write<>(legsAnimEvents);
saved_game->write<uint8_t>(torsoAnimEventCount);
saved_game->write<uint8_t>(legsAnimEventCount);
+ saved_game->skip(2);
}
void sg_import(
@@ -120,6 +121,7 @@ public:
saved_game->read<>(legsAnimEvents);
saved_game->read<uint8_t>(torsoAnimEventCount);
saved_game->read<uint8_t>(legsAnimEventCount);
+ saved_game->skip(2);
}
}; // ja_animFileSet_t
diff --git a/code/game/g_shared.h b/code/game/g_shared.h
index 8fe7f2a..cd23705 100644
--- a/code/game/g_shared.h
+++ b/code/game/g_shared.h
@@ -634,9 +634,11 @@ public:
saved_game->write<int32_t>(connected);
saved_game->write<>(lastCommand);
saved_game->write<int8_t>(netname);
+ saved_game->skip(2);
saved_game->write<int32_t>(maxHealth);
saved_game->write<int32_t>(enterTime);
saved_game->write<int16_t>(cmd_angles);
+ saved_game->skip(2);
saved_game->write<>(teamState);
}
@@ -646,9 +648,11 @@ public:
saved_game->read<int32_t>(connected);
saved_game->read<>(lastCommand);
saved_game->read<int8_t>(netname);
+ saved_game->skip(2);
saved_game->read<int32_t>(maxHealth);
saved_game->read<int32_t>(enterTime);
saved_game->read<int16_t>(cmd_angles);
+ saved_game->skip(2);
saved_game->read<>(teamState);
}
}; // ja_clientPersistant_t
@@ -837,6 +841,7 @@ public:
saved_game->write<int8_t>(dismemberProbArms);
saved_game->write<int8_t>(dismemberProbHands);
saved_game->write<int8_t>(dismemberProbWaist);
+ saved_game->skip(2);
saved_game->write<int32_t>(standheight);
saved_game->write<int32_t>(crouchheight);
saved_game->write<int32_t>(poisonDamage);
@@ -902,6 +907,7 @@ public:
saved_game->read<int8_t>(dismemberProbArms);
saved_game->read<int8_t>(dismemberProbHands);
saved_game->read<int8_t>(dismemberProbWaist);
+ saved_game->skip(2);
saved_game->read<int32_t>(standheight);
saved_game->read<int32_t>(crouchheight);
saved_game->read<int32_t>(poisonDamage);
diff --git a/code/game/g_vehicles.h b/code/game/g_vehicles.h
index f54c770..e1ec086 100644
--- a/code/game/g_vehicles.h
+++ b/code/game/g_vehicles.h
@@ -474,6 +474,7 @@ struct Muzzle
saved_game->write<float>(m_vMuzzleDir);
saved_game->write<int32_t>(m_iMuzzleWait);
saved_game->write<int8_t>(m_bFired);
+ saved_game->skip(3);
}
void sg_import(
@@ -483,6 +484,7 @@ struct Muzzle
saved_game->read<float>(m_vMuzzleDir);
saved_game->read<int32_t>(m_iMuzzleWait);
saved_game->read<int8_t>(m_bFired);
+ saved_game->skip(3);
}
};
@@ -701,6 +703,7 @@ struct Vehicle_t
saved_game->write<int32_t>(m_pParentEntity);
saved_game->write<int32_t>(m_iBoarding);
saved_game->write<int8_t>(m_bWasBoarding);
+ saved_game->skip(3);
saved_game->write<float>(m_vBoardingVelocity);
saved_game->write<float>(m_fTimeModifier);
saved_game->write<int32_t>(m_iLeftWingBone);
@@ -747,6 +750,7 @@ struct Vehicle_t
saved_game->read<int32_t>(m_pParentEntity);
saved_game->read<int32_t>(m_iBoarding);
saved_game->read<int8_t>(m_bWasBoarding);
+ saved_game->skip(3);
saved_game->read<float>(m_vBoardingVelocity);
saved_game->read<float>(m_fTimeModifier);
saved_game->read<int32_t>(m_iLeftWingBone);
diff --git a/code/game/ghoul2_shared.h b/code/game/ghoul2_shared.h
index c9e30a2..f0a24e6 100644
--- a/code/game/ghoul2_shared.h
+++ b/code/game/ghoul2_shared.h
@@ -274,11 +274,13 @@ boneInfo_t():
saved_game->write<int32_t>(solidCount);
saved_game->write<int8_t>(physicsSettled);
saved_game->write<int8_t>(snapped);
+ saved_game->skip(2);
saved_game->write<int32_t>(parentBoneIndex);
saved_game->write<float>(offsetRotation);
saved_game->write<float>(overGradSpeed);
saved_game->write<float>(overGoalSpot);
saved_game->write<int8_t>(hasOverGoal);
+ saved_game->skip(3);
saved_game->write<>(animFrameMatrix);
saved_game->write<int32_t>(hasAnimFrameMatrix);
saved_game->write<int32_t>(airTime);
@@ -345,11 +347,13 @@ boneInfo_t():
saved_game->read<int32_t>(solidCount);
saved_game->read<int8_t>(physicsSettled);
saved_game->read<int8_t>(snapped);
+ saved_game->skip(2);
saved_game->read<int32_t>(parentBoneIndex);
saved_game->read<float>(offsetRotation);
saved_game->read<float>(overGradSpeed);
saved_game->read<float>(overGoalSpot);
saved_game->read<int8_t>(hasOverGoal);
+ saved_game->skip(3);
saved_game->read<>(animFrameMatrix);
saved_game->read<int32_t>(hasAnimFrameMatrix);
saved_game->read<int32_t>(airTime);
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 54ef294..da6153f 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -2929,6 +2929,7 @@ typedef struct usercmd_s {
saved_game->write<int32_t>(serverTime);
saved_game->write<int32_t>(buttons);
saved_game->write<uint8_t>(weapon);
+ saved_game->skip(3);
saved_game->write<int32_t>(angles);
saved_game->write<uint8_t>(generic_cmd);
saved_game->write<int8_t>(forwardmove);
@@ -2942,6 +2943,7 @@ typedef struct usercmd_s {
saved_game->read<int32_t>(serverTime);
saved_game->read<int32_t>(buttons);
saved_game->read<uint8_t>(weapon);
+ saved_game->skip(3);
saved_game->read<int32_t>(angles);
saved_game->read<uint8_t>(generic_cmd);
saved_game->read<int8_t>(forwardmove);
diff --git a/codeJK2/game/b_public.h b/codeJK2/game/b_public.h
index 66263b0..9f76dba 100644
--- a/codeJK2/game/b_public.h
+++ b/codeJK2/game/b_public.h
@@ -422,6 +422,7 @@ public:
saved_game->write<int32_t>(currentSpeed);
saved_game->write<int8_t>(last_forwardmove);
saved_game->write<int8_t>(last_rightmove);
+ saved_game->skip(2);
saved_game->write<float>(lastClearOrigin);
saved_game->write<int32_t>(consecutiveBlockedMoves);
saved_game->write<int32_t>(blockedDebounceTime);
@@ -526,6 +527,7 @@ public:
saved_game->read<int32_t>(currentSpeed);
saved_game->read<int8_t>(last_forwardmove);
saved_game->read<int8_t>(last_rightmove);
+ saved_game->skip(2);
saved_game->read<float>(lastClearOrigin);
saved_game->read<int32_t>(consecutiveBlockedMoves);
saved_game->read<int32_t>(blockedDebounceTime);
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git
More information about the Pkg-games-commits
mailing list