1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- MP: Moved the FOV (friendly players share same field of view) to a define ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV (currently disabled)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6041 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-04-30 16:26:49 +00:00
parent 22a18ec262
commit 82dec9404c
5 changed files with 72 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Multiplayer/client.cpp
+11 -1
View File
@@ -1114,7 +1114,10 @@ void recieveHIRE(RPCParameters *rpcParameters)
pSoldier->bSide=0; //default coop only
gTacticalStatus.Team[MercCreateStruct.bTeam ].bSide=0;
#ifdef ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV
pSoldier->bVisible = 1;
#endif
if(MercCreateStruct.ubProfile==SLAY)//slay
{
@@ -1125,16 +1128,23 @@ void recieveHIRE(RPCParameters *rpcParameters)
if(cGameType==MP_TYPE_DEATHMATCH)//all vs all only
{
pSoldier->bSide=1;
#ifdef ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV
pSoldier->bVisible = 0;
#endif
gTacticalStatus.Team[MercCreateStruct.bTeam ].bSide=1;
}
if(cGameType==MP_TYPE_TEAMDEATMATCH) //allow teams
{
if(sHireMerc->team != TEAM)
{
pSoldier->bSide=1;
#ifdef ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV
pSoldier->bVisible = 0;
#endif
gTacticalStatus.Team[MercCreateStruct.bTeam ].bSide=1;
}
}
Multiplayer/connect.h
+7 -1
View File
@@ -148,10 +148,16 @@ extern char cServerName[30];
//OJW - 20081224
#define MAX_CONNECT_RETRIES 5
// WANNE: After some MP-Tests: It seems there are still problems with enemy interupt and if this define is enabled the ALT + E (give turn to client) does not work correctly. So I disabled this define for now ...
// WANNE: If this define is enabled, it hopefully fixes the "enemy AI got stuck on pure client interrupt". (this "fix" was added in revision 5623)
// After some MP-Tests: It seems there are still problems with enemy interupt and if this define is enabled the ALT + E (give turn to client) does not work correctly. So I disabled this define for now ...
//#define INTERRUPT_MP_DEADLOCK_FIX
// WANNE: This features seems to work, but there is a big problem: If the enemy is moving the game always wants to scroll to the enemy for the client who does not really see the enemy.
// This makes is impossible to play because it is always scrolling... Disabled for now!
// WANNE: If enabled, friendly players (in COOP and Team-Deathmatch) share the same field of view for the enemies.
// For example: If client #1 sees an enemy, also friendly client #2 sees the enemy on the minimap.
//#define ENABLE_MP_FRIENDLY_PLAYERS_SHARE_SAME_FOV
#define ENABLE_COLLISION (is_server && pBullet->pFirer->ubID<120) || (!is_server && is_client && pBullet->pFirer->ubID<20) || (!is_server && !is_client)
extern bool auto_retry;
extern int giNumTries;