[openjk] 58/130: JO: Undefine _G2_GORE

[Simon McVittie]

This is an automated email from the git hooks/post-receive script.

smcv pushed a commit to branch debian/master
in repository openjk.

commit a2a364d79b49575b6a9d4a056061a703508ae7ec
Author: bibendovsky <bibendovsky at hotmail.com>
Date:   Sat Jul 30 15:52:30 2016 +0300

    JO: Undefine _G2_GORE
---
 code/game/ghoul2_shared.h         | 8 --------
 code/qcommon/q_shared.h           | 4 +++-
 shared/qcommon/ojk_saved_game.cpp | 4 ++--
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/code/game/ghoul2_shared.h b/code/game/ghoul2_shared.h
index c2a3254..29e9536 100644
--- a/code/game/ghoul2_shared.h
+++ b/code/game/ghoul2_shared.h
@@ -451,11 +451,9 @@ public:
 	int				mLodBias;
 	int				mNewOrigin;	// this contains the bolt index of the new origin for this model
 
-#ifndef JK2_MODE
 #ifdef _G2_GORE
 	int				mGoreSetTag;
 #endif
-#endif // !JK2_MODE
 
 	qhandle_t		mModel;		// this and the next entries do NOT go across the network. They are for gameside access ONLY
 	char			mFileName[MAX_QPATH];
@@ -487,11 +485,9 @@ public:
 	mSurfaceRoot(0),
 	mLodBias(0),
 	mNewOrigin(-1),
-#ifndef JK2_MODE
 #ifdef _G2_GORE
 	mGoreSetTag(0),
 #endif
-#endif // !JK2_MODE
 	mModel(0),
 	mAnimFrameDefault(0),
 	mSkelFrameNum(-1),
@@ -523,11 +519,9 @@ public:
         saved_game->write<int32_t>(mLodBias);
         saved_game->write<int32_t>(mNewOrigin);
 
-#ifndef JK2_MODE
 #ifdef _G2_GORE
         saved_game->write<int32_t>(mGoreSetTag);
 #endif // _G2_GORE
-#endif // !JK2_MODE
 
         saved_game->write<int32_t>(mModel);
         saved_game->write<int8_t>(mFileName);
@@ -549,11 +543,9 @@ public:
         saved_game->read<int32_t>(mLodBias);
         saved_game->read<int32_t>(mNewOrigin);
 
-#ifndef JK2_MODE
 #ifdef _G2_GORE
         saved_game->read<int32_t>(mGoreSetTag);
 #endif // _G2_GORE
-#endif // !JK2_MODE
 
         saved_game->read<int32_t>(mModel);
         saved_game->read<int8_t>(mFileName);
diff --git a/code/qcommon/q_shared.h b/code/qcommon/q_shared.h
index 9b63a8c..e20d577 100644
--- a/code/qcommon/q_shared.h
+++ b/code/qcommon/q_shared.h
@@ -56,7 +56,9 @@ along with this program; if not, see <http://www.gnu.org/licenses/>.
 #endif
 
 //rww - conveniently toggle "gore" code, for model decals and stuff.
+#ifndef JK2_MODE
 #define _G2_GORE
+#endif // !JK2_MODE
 
 #if JK2_MODE
 #define PRODUCT_NAME			"openjo_sp"
@@ -2519,7 +2521,7 @@ public:
 
 #ifndef JK2_MODE
 	short		saberMoveNext;
-#endif // JK2_MODE
+#endif // !JK2_MODE
 
 	short		saberBounceMove;
 	short		saberBlocking;
diff --git a/shared/qcommon/ojk_saved_game.cpp b/shared/qcommon/ojk_saved_game.cpp
index a021fe3..8c63d9c 100644
--- a/shared/qcommon/ojk_saved_game.cpp
+++ b/shared/qcommon/ojk_saved_game.cpp
@@ -280,7 +280,7 @@ void SavedGame::read_chunk(
         &uiLoadedCksum,
         static_cast<int>(sizeof(uiLoadedCksum)),
         file_handle_);
-#endif // JK2_MODE
+#endif // !JK2_MODE
 
     // Make sure the checksums match...
     //
@@ -413,7 +413,7 @@ void SavedGame::write_chunk(
             &uiCksum,
             static_cast<int>(sizeof(uiCksum)),
             file_handle_);
-#endif // JK2_MODE
+#endif // !JK2_MODE
 
         if (uiSaved !=
             sizeof(chunk_id) +

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/openjk.git