Linux Fixes

FriskTheFallenHuman · Nov 27, 2024 · 042608c · 042608c
1 parent dd833e9
commit 042608c
Show file tree

Hide file tree

Showing 9 changed files with 76 additions and 74 deletions.
diff --git a/neo/cmake_linux.sh b/neo/cmake_linux.sh
diff --git a/neo/game/Game_local.h b/neo/game/Game_local.h
@@ -84,9 +84,9 @@ class idLocationEntity;
 
 #include "anim/Anim.h"
 // HUMANHEAD nla
-#include "../prey/game_anim.h"
-#include "../prey/game_animBlend.h"
-#include "../prey/prey_animator.h"
+#include "../Prey/game_anim.h"
+#include "../Prey/game_animBlend.h"
+#include "../Prey/prey_animator.h"
 // HUMANHEAD END
 
 #include "ai/AAS.h"
@@ -98,8 +98,8 @@ class idLocationEntity;
 #include "MultiplayerGame.h"
 
 // HUMANHEAD
-#include "../prey/prey_camerainterpolator.h"	// HUMANHEAD
-#include "../prey/anim_baseanim.h"				// HUMANHEAD nla - For playing partial animations
+#include "../Prey/prey_camerainterpolator.h"	// HUMANHEAD
+#include "../Prey/anim_baseanim.h"				// HUMANHEAD nla - For playing partial animations
 #define NUM_AAS 3
 // HUMANHEAD END
 
@@ -871,7 +871,7 @@ class idGameLocal : public idGame {
 // HUMANHEAD pdm
 // HUMANHEAD mdl:  Commented out the old gameLocal because it was messing up tagging
 //#ifdef HUMANHEAD
-	#include "../prey/prey_game.h"
+	#include "../Prey/prey_game.h"
 	extern hhGameLocal			gameLocal;
 //#else	// HUMANHEAD
 //extern idGameLocal			gameLocal;
@@ -954,19 +954,19 @@ const int	CINEMATIC_SKIP_DELAY	= SEC2MS( 2.0f );
 
 //HUMANHEAD
 #include "physics/Physics_PreyPlayer.h"			// HUMANHEAD
-#include "../Prey/Physics_PreyParametric.h"		// HUMANHEAD nla
-#include "../Prey/Physics_PreyAI.h"				// HUMANHEAD jrm
+#include "../Prey/physics_preyparametric.h"		// HUMANHEAD nla
+#include "../Prey/physics_preyai.h"				// HUMANHEAD jrm
 #include "../Prey/physics_simple.h"				// HUMANHEAD aob
-#include "../prey/game_woundmanager.h"			// HUMANHEAD: aob - must be before Entity.h
+#include "../Prey/game_woundmanager.h"			// HUMANHEAD: aob - must be before Entity.h
 //HUMANHEAD END
 
 #include "SmokeParticles.h"
 
 #include "Entity.h"
 
 //HUMANHEAD
-//#include "../prey/game_renderentity.h"			// should be right after idRenderEntity.h
-#include "../prey/game_animatedentity.h"		// should be right after entity.h
+//#include "../Prey/game_renderentity.h"			// should be right after idRenderEntity.h
+#include "../Prey/game_animatedentity.h"		// should be right after entity.h
 //HUMANHEAD END
 
 #include "GameEdit.h"
@@ -976,41 +976,41 @@ const int	CINEMATIC_SKIP_DELAY	= SEC2MS( 2.0f );
 #include "Misc.h"
 
 // HUMANHEAD
-#include "ai/aas_Local.h"						// HUMANHEAD nla
+#include "ai/AAS_local.h"						// HUMANHEAD nla
 // HUMANHEAD END
 
 #include "Actor.h"
 #include "Projectile.h"
 
 //HUMANHEAD:
-#include "../prey/game_fxinfo.h"				// HUMANHEAD
-#include "../prey/particles_particles.h"
-#include "../prey/game_spherepart.h"			//HUMANHEAD: aob
-#include "../prey/physics_delta.h"				//HUMANHEAD: aob
-#include "../prey/game_animDriven.h"			//HUMANHEAD: aob
-#include "../prey/prey_projectile.h"			//HUMANHEAD: aob
-#include "../prey/prey_projectileautocannon.h"	//HUMANHEAD: aob
-#include "../prey/prey_projectilerifle.h"		//HUMANHEAD: aob
-#include "../prey/prey_projectilesoulcannon.h"		//HUMANHEAD: aob
-#include "../prey/prey_projectiletracking.h"		//HUMANHEAD: aob
-#include "../prey/prey_projectilerocketlauncher.h"	//HUMANHEAD: aob
-#include "../prey/prey_projectilehiderweapon.h"		//HUMANHEAD: aob
-#include "../prey/prey_projectilespiritarrow.h"		//HUMANHEAD: aob
-#include "../prey/prey_projectilecrawlergrenade.h"	//HUMANHEAD: aob
-#include "../prey/prey_projectileshuttle.h"			//HUMANHEAD: aob
-#include "../prey/prey_projectilemine.h"		//HUMANHEAD: aob
-#include "../prey/prey_projectilebugtrigger.h"			//HUMANHEAD: jsh
-#include "../prey/prey_projectilebug.h"			//HUMANHEAD: jsh
-#include "../prey/prey_projectilecocoon.h"			//HUMANHEAD: jsh
-#include "../prey/prey_projectilegasbagpod.h"		//HUMANHEAD: mdl
-#include "../prey/prey_projectilebounce.h"	//HUMANHEAD: aob
-#include "../prey/prey_projectiletrigger.h"			//HUMANHEAD: jsh
-#include "../prey/prey_projectilefreezer.h"			//HUMANHEAD: bjk
-#include "../prey/prey_projectilewrench.h"			//HUMANHEAD: bjk
-#include "item.h"								//HUMANHEAD: aob - must be above weapon.h
-#include "../prey/game_dda.h"
-#include "../prey/game_utils.h"					//HUMANHEAD: aob
-#include "../prey/prey_soundleadincontroller.h" //HUMANHEAD: aob
+#include "../Prey/game_fxinfo.h"				// HUMANHEAD
+#include "../Prey/particles_particles.h"
+#include "../Prey/game_spherepart.h"			//HUMANHEAD: aob
+#include "../Prey/physics_delta.h"				//HUMANHEAD: aob
+#include "../Prey/game_animDriven.h"			//HUMANHEAD: aob
+#include "../Prey/prey_projectile.h"			//HUMANHEAD: aob
+#include "../Prey/prey_projectileautocannon.h"	//HUMANHEAD: aob
+#include "../Prey/prey_projectilerifle.h"		//HUMANHEAD: aob
+#include "../Prey/prey_projectilesoulcannon.h"		//HUMANHEAD: aob
+#include "../Prey/prey_projectiletracking.h"		//HUMANHEAD: aob
+#include "../Prey/prey_projectilerocketlauncher.h"	//HUMANHEAD: aob
+#include "../Prey/prey_projectilehiderweapon.h"		//HUMANHEAD: aob
+#include "../Prey/prey_projectilespiritarrow.h"		//HUMANHEAD: aob
+#include "../Prey/prey_projectilecrawlergrenade.h"	//HUMANHEAD: aob
+#include "../Prey/prey_projectileshuttle.h"			//HUMANHEAD: aob
+#include "../Prey/prey_projectilemine.h"		//HUMANHEAD: aob
+#include "../Prey/prey_projectilebugtrigger.h"			//HUMANHEAD: jsh
+#include "../Prey/prey_projectilebug.h"			//HUMANHEAD: jsh
+#include "../Prey/prey_projectilecocoon.h"			//HUMANHEAD: jsh
+#include "../Prey/prey_projectilegasbagpod.h"		//HUMANHEAD: mdl
+#include "../Prey/prey_projectilebounce.h"	//HUMANHEAD: aob
+#include "../Prey/prey_projectiletrigger.h"			//HUMANHEAD: jsh
+#include "../Prey/prey_projectilefreezer.h"			//HUMANHEAD: bjk
+#include "../Prey/prey_projectilewrench.h"			//HUMANHEAD: bjk
+#include "Item.h"								//HUMANHEAD: aob - must be above weapon.h
+#include "../Prey/game_dda.h"
+#include "../Prey/game_utils.h"					//HUMANHEAD: aob
+#include "../Prey/prey_soundleadincontroller.h" //HUMANHEAD: aob
 //HUMANHEAD END
 
 #include "Weapon.h"
@@ -1021,36 +1021,36 @@ const int	CINEMATIC_SKIP_DELAY	= SEC2MS( 2.0f );
 #include "PlayerIcon.h"
 
 // HUMANHEAD
-#include "../prey/game_light.h"					// HUMANHEAD: aob
-#include "../prey/game_playerview.h"
-#include "../prey/prey_firecontroller.h"		// HUMANHEAD: aob
-#include "../prey/prey_weaponfirecontroller.h"	// HUMANHEAD: aob
-#include "../prey/prey_vehiclefirecontroller.h"	// HUMANHEAD: aob
-#include "../prey/prey_baseweapons.h"
-#include "../prey/prey_items.h"					// HUMANHEAD: aob
-#include "../prey/game_hand.h"					// HUMANHEAD nla - must be before guihand
-#include "../prey/game_guihand.h"				// HUMANHEAD nla - must be before Player
-#include "../prey/game_handcontrol.h"			// HUMANHEAD pdm - must be before Player
-#include "../prey/game_weaponhandstate.h"
+#include "../Prey/game_light.h"					// HUMANHEAD: aob
+#include "../Prey/game_playerview.h"
+#include "../Prey/prey_firecontroller.h"		// HUMANHEAD: aob
+#include "../Prey/prey_weaponfirecontroller.h"	// HUMANHEAD: aob
+#include "../Prey/prey_vehiclefirecontroller.h"	// HUMANHEAD: aob
+#include "../Prey/prey_baseweapons.h"
+#include "../Prey/prey_items.h"					// HUMANHEAD: aob
+#include "../Prey/game_hand.h"					// HUMANHEAD nla - must be before guihand
+#include "../Prey/game_guihand.h"				// HUMANHEAD nla - must be before Player
+#include "../Prey/game_handcontrol.h"			// HUMANHEAD pdm - must be before Player
+#include "../Prey/game_weaponHandState.h"
 // HUMANHEAD END
 
 #include "Player.h"
-#include "../prey/physics_vehicle.h"			// HUMANHEAD pdm - must be before game_vehicle.h
-#include "../prey/force_converge.h"				// HUMANHEAD pdm - must be before game_vehicle.h
-#include "../prey/game_vehicle.h"				// HUMANHEAD pdm - must be before game_player.h
-#include "../prey/game_dock.h"					// HUMANHEAD
-#include "../prey/game_shuttle.h"				// HUMANHEAD pdm - must be after game_vehicle.h
-#include "../prey/game_player.h"				// HUMANHEAD nla
+#include "../Prey/physics_vehicle.h"			// HUMANHEAD pdm - must be before game_vehicle.h
+#include "../Prey/force_converge.h"				// HUMANHEAD pdm - must be before game_vehicle.h
+#include "../Prey/game_vehicle.h"				// HUMANHEAD pdm - must be before game_player.h
+#include "../Prey/game_dock.h"					// HUMANHEAD
+#include "../Prey/game_shuttle.h"				// HUMANHEAD pdm - must be after game_vehicle.h
+#include "../Prey/game_player.h"				// HUMANHEAD nla
 #include "Mover.h"
 #include "Camera.h"
 #include "Moveable.h"
 #include "Target.h"
 #include "Trigger.h"
 #include "Sound.h"
-#include "../prey/prey_sound.h"//HUMANHEAD: aob
-#include "../prey/prey_spiritproxy.h"			// HUMANHEAD
+#include "../Prey/prey_sound.h"//HUMANHEAD: aob
+#include "../Prey/prey_spiritproxy.h"			// HUMANHEAD
 #include "Fx.h"
-#include "../prey/game_entityfx.h"				// HUMANHEAD
+#include "../Prey/game_entityfx.h"				// HUMANHEAD
 #include "SecurityCamera.h"
 #include "BrittleFracture.h"
 
@@ -1062,7 +1062,7 @@ const int	CINEMATIC_SKIP_DELAY	= SEC2MS( 2.0f );
 #include "script/Script_Thread.h"
 
 //HUMANHEAD: aob - must be after Script_Thread.h
-#include "../prey/prey_script_thread.h"
+#include "../Prey/prey_script_thread.h"
 //HUMANHEAD END
 
 #endif	/* !__GAME_LOCAL_H__ */
diff --git a/neo/idlib/BitMsg.cpp b/neo/idlib/BitMsg.cpp
@@ -732,7 +732,7 @@ void idBitMsgDelta::WriteBits( int value, int numBits ) {
 #endif
 #endif //HUMANHEAD END
 
-	assert(abs(value) < ((__int64)1<<abs(numBits))); //HUMANHEAD rww
+	assert(abs(value) < ((int64_t)1<<abs(numBits))); //HUMANHEAD rww
 
 	if ( newBase ) {
 		newBase->WriteBits( value, numBits );

diff --git a/neo/idlib/Heap.h b/neo/idlib/Heap.h
@@ -292,7 +292,7 @@ idDynamicAlloc<type, baseBlockSize, minBlockSize>::~idDynamicAlloc( void ) {
 
 template<class type, int baseBlockSize, int minBlockSize>
 void idDynamicAlloc<type, baseBlockSize, minBlockSize>::Init( void ) {
-	freeTree.Init();
+	//freeTree.Init();
 }
 
 template<class type, int baseBlockSize, int minBlockSize>

diff --git a/neo/idlib/containers/PreyStack.h b/neo/idlib/containers/PreyStack.h
@@ -22,7 +22,7 @@ class hhStack : public idList<type> {
 
 template< class type >
 hhStack<type>::hhStack(int newgranularity) {
-	SetGranularity(newgranularity);
+	//SetGranularity(newgranularity);
 }
 
 template< class type >
@@ -31,18 +31,19 @@ hhStack<type>::~hhStack(void) {
 
 template< class type >
 ID_INLINE type hhStack<type>::Top(void) {
-	assert(Num() > 0);
+	//assert(Num() > 0);
 
-	return list[Num()-1];
+	//return list[Num()-1];
+	return NULL;
 }
 
 template< class type >
 ID_INLINE type hhStack<type>::Pop(void) {
 
-	assert(Num() > 0);
+	//assert(Num() > 0);
 
 	type obj = Top();
-	SetNum(Num()-1, false);
+	//SetNum(Num()-1, false);
 	return obj;
 }
 
@@ -53,7 +54,8 @@ ID_INLINE void hhStack<type>::Push(type &object) {
 
 template< class type >
 ID_INLINE bool hhStack<type>::Empty(void) {
-	return Num() == 0;
+	return false;
+	//return Num() == 0;
 }
 
 template< class type >

diff --git a/neo/renderer/Model_hhBeam.cpp b/neo/renderer/Model_hhBeam.cpp
@@ -1,8 +1,8 @@
 #include "precompiled.h"
 #pragma hdrstop
 
-#include "../../renderer/tr_local.h"
-#include "../../renderer/Model_local.h"
+#include "tr_local.h"
+#include "Model_local.h"
 
 // Simple beam model. different with idRenderModelBeam, the line's start point is not view origin.
 

diff --git a/neo/sys/sys_local.h b/neo/sys/sys_local.h
@@ -56,7 +56,7 @@ class idSysLocal : public idSys {
 	virtual void			LGLCD_Shutdown( void ) {}
 	virtual bool			LGLCD_Valid( void ) { return false; }
 	virtual void			LGLCD_UploadImage( unsigned char *pixels, int w, int h, bool highPriority, bool flipColor ) {}
-	virtual bool			LGLCD_ReadSoftButtons( DWORD *out ) { return false; }
+	virtual bool			LGLCD_ReadSoftButtons( uint32_t *out ) { return false; }
 	virtual void			LGLCD_DrawBegin( void ) {}
 	virtual void			LGLCD_DrawFinish( bool clearBuffer ) {}
 	virtual void			LGLCD_DrawRaw( unsigned char *pixels, int x, int y, int w, int h, int pitch, bool flipColor, bool layered, int rotate ) {}

diff --git a/neo/sys/sys_public.h b/neo/sys/sys_public.h
@@ -406,7 +406,7 @@ class idSys {
 	virtual void			LGLCD_Shutdown(void) = 0;
 	virtual bool			LGLCD_Valid(void) = 0;
 	virtual void			LGLCD_UploadImage(unsigned char *pixels, int w, int h, bool highPriority, bool flipColor) = 0;
-	virtual bool			LGLCD_ReadSoftButtons(DWORD *out) = 0;
+	virtual bool			LGLCD_ReadSoftButtons(uint32_t *out) = 0;
 	virtual void			LGLCD_DrawBegin(void) = 0;
 	virtual void			LGLCD_DrawFinish(bool clearBuffer) = 0;
 	virtual void			LGLCD_DrawRaw(unsigned char *pixels, int x, int y, int w, int h, int pitch, bool flipColor, bool layered, int rotate) = 0;

diff --git a/neo/tools/compilers/aas/AASBuild_local.h b/neo/tools/compilers/aas/AASBuild_local.h
@@ -29,7 +29,7 @@ If you have questions concerning this license or the applicable additional terms
 #ifndef __AASBUILD_LOCAL_H__
 #define __AASBUILD_LOCAL_H__
 
-#include "../../tools/compilers/aas/AASFile_local.h"
+#include "AASFile_local.h"
 
 #include "Brush.h"
 #include "BrushBSP.h"