some fixes

d3xp/Actor.h

@@ -33,7 +33,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "IK.h"
 #include "PlayerView.h"
 
-#include "trigger.h"
+#include "Trigger.h"
 
 
 

d3xp/Game_local.cpp

@@ -53,10 +53,10 @@ If you have questions concerning this license or the applicable additional terms
 #include "bc_ventpeek.h"
 #include "sw_skycontroller.h"
 
-#include "securitycamera.h"
+#include "SecurityCamera.h"
 #include "BrittleFracture.h"
 
-#include "misc.h"
+#include "Misc.h"
 
 #include "bc_infostation.h"
 #include "bc_trigger_deodorant.h"
@@ -6827,7 +6827,7 @@ idEntity* idGameLocal::DoParticleAng(const char* particleName, idVec3 position,
 			idleSmoke->PostEventMS(&EV_Remove, 5000);
 		}
 
-		idleSmoke->PostEventMS(&EV_Activate, 0, NULL);
+		idleSmoke->PostEventMS(&EV_Activate, 0, (idEntity *)NULL);
 		return idleSmoke;
 	}
 
@@ -6862,7 +6862,7 @@ idEntity * idGameLocal::DoParticle(const char *particleName, idVec3 position, id
 			idleSmoke->PostEventMS(&EV_Remove, 5000);
 		}
 
-		idleSmoke->PostEventMS(&EV_Activate, 0, NULL);
+		idleSmoke->PostEventMS(&EV_Activate, 0, (idEntity *)NULL);
 		return idleSmoke;
 	}
 
@@ -7797,8 +7797,8 @@ bool idGameLocal::DoOriginContainmentCheck(idEntity *ent)
 	{
 #ifdef _DEBUG
 		gameRenderWorld->DebugArrow(colorRed, ent->GetPhysics()->GetOrigin(), ent->GetPhysics()->GetAbsBounds().GetCenter(), 4, 60000);
-		gameRenderWorld->DrawTextA(va("%s", ent->GetName()), ent->GetPhysics()->GetAbsBounds().GetCenter() + idVec3(0, 0, 6), .12f, colorRed, mat3_default, 1, 60000);
-		gameRenderWorld->DrawTextA("origin is outside of brush.", ent->GetPhysics()->GetAbsBounds().GetCenter() + idVec3(0, 0, 2), .12f, colorRed, mat3_default, 1, 60000);
+		gameRenderWorld->DrawText(va("%s", ent->GetName()), ent->GetPhysics()->GetAbsBounds().GetCenter() + idVec3(0, 0, 6), .12f, colorRed, mat3_default, 1, 60000);
+		gameRenderWorld->DrawText("origin is outside of brush.", ent->GetPhysics()->GetAbsBounds().GetCenter() + idVec3(0, 0, 2), .12f, colorRed, mat3_default, 1, 60000);
 #endif
 		return false;
 	}

d3xp/Game_local.h

@@ -380,6 +380,9 @@ class idEntityPtr {
 
 	idEntityPtr<type> &		operator=( type *ent );
 	bool					operator==(idEntityPtr<type>& other) const;
+#if !defined(_MSC_VER)
+	bool					operator==(const idEntityPtr<type>& other) const;
+#endif
 
 	// synchronize entity pointers over the network
 	int						GetSpawnId( void ) const { return spawnId; }
@@ -1061,6 +1064,13 @@ ID_INLINE bool idEntityPtr<type>::operator==(idEntityPtr<type>& other) const {
 	return spawnId == other.spawnId;
 }
 
+#if !defined(_MSC_VER)
+template< class type >
+ID_INLINE bool idEntityPtr<type>::operator==(const idEntityPtr<type>& other) const {
+	return spawnId == other.spawnId;
+}
+#endif
+
 template< class type >
 ID_INLINE bool idEntityPtr<type>::SetSpawnId( int id ) {
 	// the reason for this first check is unclear:

d3xp/Item.cpp

@@ -40,7 +40,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "Misc.h"
 #include "framework/DeclEntityDef.h"
 
-#include "worldspawn.h"
+#include "WorldSpawn.h"
 
 #include "idlib/LangDict.h"
 #include "bc_catcage.h"
@@ -2124,7 +2124,13 @@ void idMoveableItem::Restore( idRestoreGame *savefile ) {
 	savefile->ReadInt( collideFrobTimer ); //  int collideFrobTimer
 
 
+#if !defined(_WIN32) //karin: write int, but read long here. long is 4 bytes in win64 only, others 64-bits is 8bytes
+	int i_spawnTime;
+	savefile->ReadInt( i_spawnTime ); //  int spawnTime
+	spawnTime = i_spawnTime;
+#else
 	savefile->ReadLong( spawnTime ); //  int spawnTime
+#endif
 	savefile->ReadBool( showItemLine ); //  bool showItemLine
 	savefile->ReadInt( itemLineHandle ); //  int itemLineHandle
 	savefile->ReadVec3( itemLineColor ); //  idVec3 itemLineColor

d3xp/Misc.cpp

@@ -43,7 +43,7 @@ Various utility objects and functions.
 #include "Moveable.h"
 #include "SmokeParticles.h"
 
-#include "fx.h"
+#include "Fx.h"
 #include "Misc.h"
 
 /*
@@ -412,7 +412,7 @@ void idPathCorner::Spawn( void )
 		if (value <= 0)
 		{
 			common->Warning("pathcorner '%s' is not within an AAS-reachable area (%s).", this->GetName(), aas->GetSettings()->fileExtension.c_str());
-			gameRenderWorld->DrawTextA(idStr::Format("'%s' not within AAS reachable area (%s).", this->GetName(), aas->GetSettings()->fileExtension.c_str()), this->GetPhysics()->GetOrigin() + idVec3(0, 0, 70), 1.5f, idVec4(1, 0, 0, 1), mat3_identity, 1, 90000);
+			gameRenderWorld->DrawText(idStr::Format("'%s' not within AAS reachable area (%s).", this->GetName(), aas->GetSettings()->fileExtension.c_str()), this->GetPhysics()->GetOrigin() + idVec3(0, 0, 70), 1.5f, idVec4(1, 0, 0, 1), mat3_identity, 1, 90000);
 			gameRenderWorld->DebugArrow(colorRed, this->GetPhysics()->GetOrigin() + idVec3(0, 0, 64), this->GetPhysics()->GetOrigin(), 4, 90000);
 		}
 	}
@@ -2428,7 +2428,7 @@ void idVacuumSeparatorEntity::Spawn() {
 	if ( !portal )
 	{
 		gameLocal.Warning("VacuumSeparator '%s' doesn't contact a portal at %.1f %.1f %.1f", this->GetName(), this->GetPhysics()->GetOrigin().x, this->GetPhysics()->GetOrigin().y, this->GetPhysics()->GetOrigin().z); //BC
-		gameRenderWorld->DrawTextA(va("'%s' doesn't contact a portal", this->GetName()), this->GetPhysics()->GetOrigin() + idVec3(0, 0, 70), 0.5f, idVec4(1, 0, 0, 1), mat3_identity, 1, 90000);
+		gameRenderWorld->DrawText(va("'%s' doesn't contact a portal", this->GetName()), this->GetPhysics()->GetOrigin() + idVec3(0, 0, 70), 0.5f, idVec4(1, 0, 0, 1), mat3_identity, 1, 90000);
 		gameRenderWorld->DebugArrow(colorRed, this->GetPhysics()->GetOrigin() + idVec3(0, 0, 64), this->GetPhysics()->GetOrigin(), 4, 90000);
 		return;
 	}

d3xp/Player.cpp

@@ -229,7 +229,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "bc_cryointerior.h"
 #include "bc_cryospawn.h"
 #include "bc_trashchute.h"
-#include "securitycamera.h"
+#include "SecurityCamera.h"
 #include "bc_electricalbox.h"
 #include "bc_skullsaver.h"
 #include "bc_interestpoint.h"
@@ -35164,7 +35164,7 @@ bool idPlayer::isInZoomMode()
 
 bool idPlayer::isInLabelInspectMode()
 {
-	return (zoominspect_LabelmodeActive == TRUE);
+	return (zoominspect_LabelmodeActive/* == TRUE*/);
 }
 
 void idPlayer::SetDrawIngressPoints(bool value)

d3xp/Projectile.cpp

@@ -39,7 +39,7 @@ If you have questions concerning this license or the applicable additional terms
 #include "BrittleFracture.h"
 
 #include "bc_lever.h"
-#include "fx.h"
+#include "Fx.h"
 
 #include "bc_gunner.h"
 #include "bc_frobcube.h"

d3xp/ai/AI_events.cpp

@@ -3250,8 +3250,8 @@ void idAI::Event_GetCoverNode(void)
 
 		if (developer.GetInteger() >= 2)
 		{
-			gameRenderWorld->DrawTextA(va("%.1f", candidateScore), ent->GetPhysics()->GetOrigin() + idVec3(0, 0, 16), .3f, colorWhite, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 0, 4000);
-			//gameRenderWorld->DrawTextA(va("%.2f  ", facingDot), ent->GetPhysics()->GetOrigin() + idVec3(0, 0, 8), .2f, colorOrange, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 0, 4000);
+			gameRenderWorld->DrawText(va("%.1f", candidateScore), ent->GetPhysics()->GetOrigin() + idVec3(0, 0, 16), .3f, colorWhite, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 0, 4000);
+			//gameRenderWorld->DrawText(va("%.2f  ", facingDot), ent->GetPhysics()->GetOrigin() + idVec3(0, 0, 8), .2f, colorOrange, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 0, 4000);
 		}
 
 		if (candidateScore > bestScore)
@@ -3827,7 +3827,7 @@ bool idAI::CanHitFromAnim(const char *animname, idVec3 targetPos)
 	if (ai_debugPerception.GetInteger() > 0)
 	{
 		gameRenderWorld->DebugArrow(tr.fraction >= .98f ? colorGreen : colorRed, fromPos, tr.endpos, 4, 1000);
-		gameRenderWorld->DrawTextA(animname, fromPos, 0.07f, tr.fraction >= .98f ? colorGreen : colorRed, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 1000);
+		gameRenderWorld->DrawText(animname, fromPos, 0.07f, tr.fraction >= .98f ? colorGreen : colorRed, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 1000);
 	}
 
 	//gameRenderWorld->DebugArrow(colorRed, fromPos, targetPos + idVec3(0,0,-4), 1, 1000);

d3xp/anim/Anim_Blend.cpp

@@ -1187,7 +1187,7 @@ void idAnim::CallFrameCommands( idEntity *ent, int from, int to, int animChannel
 							idleSmoke->SetAxis(axis);
 							idleSmoke->BindToJoint(ent, jointNum, true);
 							idleSmoke->PostEventMS(&EV_Remove, 8000); //Delete particle effect after XX seconds.
-							idleSmoke->PostEventMS(&EV_Activate, 0, NULL);
+							idleSmoke->PostEventMS(&EV_Activate, 0, (idEntity *)NULL);
 
 							//gameRenderWorld->DebugArrowSimple(offset);
 						}

d3xp/bc_asteroid.cpp

@@ -1,7 +1,7 @@
 #include "framework/DeclEntityDef.h"
 
 #include "SmokeParticles.h"
-#include "fx.h"
+#include "Fx.h"
 #include "bc_asteroid.h"
 
 

d3xp/bc_baffler.cpp

@@ -9,7 +9,7 @@
 #include "WorldSpawn.h"
 #include "SmokeParticles.h"
 #include "framework/DeclEntityDef.h"
-#include "trigger.h"
+#include "Trigger.h"
 
 #include "bc_baffler.h"
 

d3xp/bc_beaconlogic.cpp

@@ -1,7 +1,7 @@
 #include "script/Script_Thread.h"
 #include "framework/DeclEntityDef.h"
 
-#include "player.h"
+#include "Player.h"
 #include "bc_meta.h"
 #include "bc_lifeboat.h"
 #include "bc_beaconlogic.h"

d3xp/bc_beaconlogic.h

@@ -1,5 +1,5 @@
 #include "Misc.h"
-#include "target.h"
+#include "Target.h"
 
 class idBeaconLogic : public idEntity
 {

d3xp/bc_camerasplice.cpp

@@ -11,7 +11,7 @@
 #include "bc_meta.h"
 #include "bc_notewall.h"
 #include "bc_frobcube.h"
-#include "securitycamera.h"
+#include "SecurityCamera.h"
 #include "bc_camerasplice.h"
 
 const int ANIM_OPENTIME = 500; //Delay before camera switches allegience

d3xp/bc_carepackage.cpp

@@ -2,7 +2,7 @@
 #include "Entity.h"
 #include "Player.h"
 
-#include "fx.h"
+#include "Fx.h"
 #include "bc_carepackage.h"
 
 const int LANDING_DISTANCE_FROM_POD = 384;

d3xp/bc_cassetteplayer.cpp

@@ -115,7 +115,7 @@ void idCassettePlayer::Save(idSaveGame *savefile) const
 void idCassettePlayer::Restore(idRestoreGame *savefile)
 {
 	tracklist->Restore( savefile ); //  idListGUI* tracklist
-	SaveFileReadArray( soundshaderList, ReadString ); //  idList<idStr> soundshaderList
+	SaveFileReadList( soundshaderList, ReadString ); //  idList<idStr> soundshaderList
 }
 
 void idCassettePlayer::Think(void)

d3xp/bc_cat.cpp

@@ -6,7 +6,7 @@
 #include "Player.h"
 #include "Fx.h"
 #include "Moveable.h"
-#include "trigger.h"
+#include "Trigger.h"
 
 #include "bc_cat.h"
 

d3xp/bc_chembomb.cpp

@@ -9,7 +9,7 @@
 #include "WorldSpawn.h"
 #include "SmokeParticles.h"
 #include "framework/DeclEntityDef.h"
-#include "trigger.h"
+#include "Trigger.h"
 #include "bc_glasspiece.h"
 
 #include "bc_chembomb.h"

d3xp/bc_cryointerior.cpp

@@ -8,7 +8,7 @@
 
 #include "WorldSpawn.h"
 
-#include "target.h"
+#include "Target.h"
 #include "bc_frobcube.h"
 #include "bc_ventpeek.h"
 #include "bc_meta.h"

d3xp/bc_diagnosticbox.cpp

@@ -8,11 +8,11 @@
 //#include "Moveable.h"
 //#include "trigger.h"
 \
-#include "ai\AI.h"
+#include "ai/AI.h"
 #include "WorldSpawn.h"
 #include "framework/DeclEntityDef.h"
 
-#include "securitycamera.h"
+#include "SecurityCamera.h"
 #include "bc_sabotagepoint.h"
 #include "bc_meta.h"
 #include "bc_diagnosticbox.h"

d3xp/bc_engineer.cpp

@@ -1,7 +1,7 @@
 #include "Fx.h"
 #include "WorldSpawn.h"
 #include "gamesys/SysCvar.h"
-#include "player.h"
+#include "Player.h"
 #include "framework/DeclEntityDef.h"
 
 #include "bc_vomanager.h"

d3xp/bc_exteriorstrut.cpp

@@ -6,7 +6,7 @@
 #include "Player.h"
 #include "Fx.h"
 #include "Moveable.h"
-#include "trigger.h"
+#include "Trigger.h"
 
 #include "bc_exteriorstrut.h"
 

d3xp/bc_fireball.cpp

@@ -6,7 +6,7 @@
 #include "Player.h"
 #include "Fx.h"
 #include "Moveable.h"
-#include "trigger.h"
+#include "Trigger.h"
 
 #include "bc_fireball.h"
 

d3xp/bc_flyingbarrel.cpp

@@ -1,7 +1,7 @@
 #include "framework/DeclEntityDef.h"
 
-#include "trigger.h"
-#include "fx.h"
+#include "Trigger.h"
+#include "Fx.h"
 #include "Light.h"
 
 #include "bc_flyingbarrel.h"

d3xp/bc_food.cpp

@@ -6,7 +6,7 @@
 #include "Player.h"
 #include "Fx.h"
 #include "Moveable.h"
-#include "trigger.h"
+#include "Trigger.h"
 #include "idlib/LangDict.h"
 
 //#include "item.h"

d3xp/bc_ftl.cpp

@@ -9,7 +9,7 @@
 //#include "trigger.h"
 #include "WorldSpawn.h"
 
-#include "misc.h"
+#include "Misc.h"
 #include "bc_skullsaver.h"
 #include "bc_bossmonster.h"
 #include "bc_sabotagelever.h"

d3xp/bc_ftl_charger.cpp

@@ -5,7 +5,7 @@
 #include "Fx.h"
 
 #include "Item.h"
-#include "player.h"
+#include "Player.h"
 #include "bc_frobcube.h"
 #include "bc_ftl_charger.h"
 

d3xp/bc_gunner.cpp

@@ -11,7 +11,7 @@
 #include "WorldSpawn.h"
 
 #include "gamesys/SysCvar.h"
-#include "player.h"
+#include "Player.h"
 #include "framework/DeclEntityDef.h"
 #include "idlib/LangDict.h"
 
@@ -834,11 +834,11 @@ void idGunnerMonster::Think(void)
 	{
 		if (this->lastInterest.IsValid())
 		{
-			gameRenderWorld->DrawTextA(idStr::Format("%s -- %i", this->lastInterest.GetEntity()->name.c_str(), this->lastInterestPriority), this->GetEyePosition() + idVec3(0, 0, 8), .1f, colorGreen, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 100);
+			gameRenderWorld->DrawText(idStr::Format("%s -- %i", this->lastInterest.GetEntity()->name.c_str(), this->lastInterestPriority), this->GetEyePosition() + idVec3(0, 0, 8), .1f, colorGreen, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 100);
 		}
 		else
 		{
-			gameRenderWorld->DrawTextA("No interest", this->GetEyePosition() + idVec3(0, 0, 8), .1f, colorRed, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 10);
+			gameRenderWorld->DrawText("No interest", this->GetEyePosition() + idVec3(0, 0, 8), .1f, colorRed, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 10);
 		}	
 	}
 
@@ -3919,8 +3919,8 @@ void idGunnerMonster::InterestPointReact(idEntity *interestpoint, int roletype)
 		}
 
 		gameRenderWorld->DebugArrow(colorWhite, interestpoint->GetPhysics()->GetOrigin() + idVec3(0, 0, arrowLength), interestpoint->GetPhysics()->GetOrigin(), 4, 30000);
-		gameRenderWorld->DrawTextA(idStr::Format("%s", intName.c_str()), interestpoint->GetPhysics()->GetOrigin() + idVec3(0, 0, arrowLength + 8), .1f, colorWhite, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 30000);
-		gameRenderWorld->DrawTextA(idStr::Format("priority: %d", static_cast<idInterestPoint *>(interestpoint)->priority), interestpoint->GetPhysics()->GetOrigin() + idVec3(0, 0, arrowLength + 4), .1f, colorWhite, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 30000);
+		gameRenderWorld->DrawText(idStr::Format("%s", intName.c_str()), interestpoint->GetPhysics()->GetOrigin() + idVec3(0, 0, arrowLength + 8), .1f, colorWhite, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 30000);
+		gameRenderWorld->DrawText(idStr::Format("priority: %d", static_cast<idInterestPoint *>(interestpoint)->priority), interestpoint->GetPhysics()->GetOrigin() + idVec3(0, 0, arrowLength + 4), .1f, colorWhite, gameLocal.GetLocalPlayer()->viewAngles.ToMat3(), 1, 30000);
 	}
 
 	interestWalkableDestination = FindValidPosition(interestpoint->GetPhysics()->GetOrigin());

d3xp/bc_highlighter.cpp

@@ -3,9 +3,9 @@
 #include "gamesys/SysCvar.h"
 #include "idlib/LangDict.h"
 
-#include "worldspawn.h"
-#include "player.h"
-#include "actor.h"
+#include "WorldSpawn.h"
+#include "Player.h"
+#include "Actor.h"
 #include "bc_meta.h"
 #include "bc_highlighter.h"