mirror of
https://github.com/1dot13/source.git
synced 2026-08-05 14:00:23 +02:00
*disable tank spawning, and fix bug causing lack of AI to spawn in maps with snipers or tanks.
*small change associated with hidden interrupts now occuring and not necessarily only being between AI to hopefully stop crashes. (thanks for the call stack!) *added no gear option 4 MERC *disable explosions git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -115,7 +115,7 @@ unsigned char packetIdentifier;
|
||||
#include "test_space.h"
|
||||
#include "interface panels.h"
|
||||
|
||||
|
||||
#include "game init.h"
|
||||
|
||||
extern INT8 SquadMovementGroups[ ];
|
||||
RakPeerInterface *client;
|
||||
@@ -1783,7 +1783,7 @@ void requestSETTINGS(void)
|
||||
|
||||
cl_name.cl_edge=atoi(SECT_EDGE);
|
||||
|
||||
|
||||
|
||||
client->RPC("requestSETTINGS",(const char*)&cl_name, (int)sizeof(client_info)*8, HIGH_PRIORITY, RELIABLE, 0, UNASSIGNED_SYSTEM_ADDRESS, true, 0, UNASSIGNED_NETWORK_ID,0);
|
||||
|
||||
}
|
||||
@@ -2408,6 +2408,7 @@ void UpdateSoldierFromNetwork (RPCParameters *rpcParameters)
|
||||
{
|
||||
gTacticalStatus.usTactialTurnLimitCounter = SUpdateNetworkSoldier->usTactialTurnLimitCounter;
|
||||
gTacticalStatus.usTactialTurnLimitMax = SUpdateNetworkSoldier->usTactialTurnLimitMax;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2760,6 +2761,7 @@ void connect_client ( void )
|
||||
if( !is_connected && !is_connecting)
|
||||
{
|
||||
|
||||
|
||||
recieved_settings=0;
|
||||
goahead = 0;
|
||||
numready = 0;
|
||||
@@ -2805,7 +2807,7 @@ void connect_client ( void )
|
||||
GetPrivateProfileString( "Ja2_mp Settings","CLIENT_NAME", "", clname, MAX_PATH, "..\\Ja2_mp.ini" );
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
char op1[30];
|
||||
@@ -2846,7 +2848,7 @@ void connect_client ( void )
|
||||
/*netbTeam = (CLIENT_NUM)+5;
|
||||
ubID_prefix = gTacticalStatus.Team[ netbTeam ].bFirstID;*/
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//**********************
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
|
||||
extern int readyteamreg[10];
|
||||
|
||||
extern bool NOGEAR;
|
||||
|
||||
typedef struct
|
||||
{
|
||||
UINT16 soldier_id;
|
||||
@@ -49,6 +51,7 @@ void unlock (void);
|
||||
void UpdateSoldierToNetwork ( SOLDIERTYPE *pSoldier );
|
||||
|
||||
extern BOOLEAN gfUIInterfaceSetBusy;
|
||||
void TrashAllSoldiers( );
|
||||
|
||||
void kick_player (void);
|
||||
void overide_turn (void);
|
||||
|
||||
+2
-25
@@ -23,7 +23,7 @@ INT32 gsMAX_MERCS;
|
||||
bool gsMORALE;
|
||||
int gsREPORT_NAME;
|
||||
|
||||
|
||||
#include "game init.h"
|
||||
|
||||
#include "text.h"
|
||||
#include "connect.h"
|
||||
@@ -391,30 +391,6 @@ void requestSETTINGS(RPCParameters *rpcParameters )
|
||||
|
||||
}
|
||||
|
||||
//void rOVH (RPCParameters *rpcParameters)
|
||||
//{
|
||||
// ovh_struct* rovhs = (ovh_struct*)rpcParameters->input;
|
||||
//
|
||||
//
|
||||
//
|
||||
// ++mercs_ready[rovhs->ubid];
|
||||
// //ncr++;
|
||||
// nc = server->NumberOfConnections();
|
||||
//
|
||||
// if(mercs_ready[rovhs->ubid] >= nc)
|
||||
// {
|
||||
// mercs_ready[rovhs->ubid]=0;
|
||||
// ScreenMsg( FONT_LTBLUE, MSG_CHAT, L"advance %d",rovhs->ubid );
|
||||
//
|
||||
// adv aoh;
|
||||
// aoh.ubid=rovhs->ubid;
|
||||
//
|
||||
// server->RPC("advance_ovh_frame",(const char*)&aoh, (int)sizeof(adv)*8, HIGH_PRIORITY, RELIABLE, 0, UNASSIGNED_SYSTEM_ADDRESS, true, 0, UNASSIGNED_NETWORK_ID,0);
|
||||
//
|
||||
// }
|
||||
//
|
||||
//}
|
||||
|
||||
|
||||
void start_server (void)
|
||||
{
|
||||
@@ -593,6 +569,7 @@ if(gsPLAYER_BSIDE==2)//only enable ai during coop
|
||||
ScreenMsg( FONT_LTBLUE, MSG_CHAT, MPServerMessage[1]);
|
||||
ScreenMsg( FONT_LTBLUE, MSG_CHAT, MPServerMessage[2]);
|
||||
is_server = true;
|
||||
|
||||
connect_client();//connect client to server
|
||||
}
|
||||
else
|
||||
|
||||
@@ -104,7 +104,7 @@ bool ovh_ready;
|
||||
#include "opplist.h"
|
||||
#include "fresh_header.h"
|
||||
//int cnt = 40;
|
||||
|
||||
#include "game init.h"
|
||||
|
||||
void test_func2 (void)//now bound to "0"
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user