mirror of
https://github.com/Shpoike/Quakespasm.git
synced 2024-11-10 07:21:58 +00:00
removed net_serial which was for dosquake only.
git-svn-id: svn://svn.code.sf.net/p/quakespasm/code/trunk/quakespasm@296 af15c1b1-3010-417e-b628-4374ebc0bcbd
This commit is contained in:
Ozkan Sezer
parent
a7103e2d39
commit
36d82d087d
4 changed files with 15 additions and 641 deletions
608
Quake/menu.c
608
Quake/menu.c
|
|
@ -39,8 +39,6 @@ void M_Menu_Main_f (void);
|
|||
void M_Menu_Setup_f (void);
|
||||
void M_Menu_Net_f (void);
|
||||
void M_Menu_LanConfig_f (void);
|
||||
void M_Menu_SerialConfig_f (void);
|
||||
void M_Menu_ModemConfig_f (void);
|
||||
void M_Menu_GameOptions_f (void);
|
||||
void M_Menu_Search_f (void);
|
||||
void M_Menu_ServerList_f (void);
|
||||
|
|
@ -57,8 +55,6 @@ void M_Main_Draw (void);
|
|||
void M_MultiPlayer_Draw (void);
|
||||
void M_Setup_Draw (void);
|
||||
void M_Net_Draw (void);
|
||||
void M_SerialConfig_Draw (void);
|
||||
void M_ModemConfig_Draw (void);
|
||||
void M_LanConfig_Draw (void);
|
||||
void M_GameOptions_Draw (void);
|
||||
void M_Search_Draw (void);
|
||||
|
|
@ -76,8 +72,6 @@ void M_Main_Key (int key);
|
|||
void M_MultiPlayer_Key (int key);
|
||||
void M_Setup_Key (int key);
|
||||
void M_Net_Key (int key);
|
||||
void M_SerialConfig_Key (int key);
|
||||
void M_ModemConfig_Key (int key);
|
||||
void M_LanConfig_Key (int key);
|
||||
void M_GameOptions_Key (int key);
|
||||
void M_Search_Key (int key);
|
||||
|
|
@ -98,10 +92,8 @@ char m_return_reason [32];
|
|||
|
||||
#define StartingGame (m_multiplayer_cursor == 1)
|
||||
#define JoiningGame (m_multiplayer_cursor == 0)
|
||||
#define SerialConfig (m_net_cursor == 0)
|
||||
#define DirectConfig (m_net_cursor == 1)
|
||||
#define IPXConfig (m_net_cursor == 2)
|
||||
#define TCPIPConfig (m_net_cursor == 3)
|
||||
#define IPXConfig (m_net_cursor == 0)
|
||||
#define TCPIPConfig (m_net_cursor == 1)
|
||||
|
||||
void M_ConfigureNetSubsystem(void);
|
||||
|
||||
|
|
@ -623,7 +615,7 @@ void M_MultiPlayer_Draw (void)
|
|||
|
||||
M_DrawTransPic (54, 32 + m_multiplayer_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
|
||||
|
||||
if (serialAvailable || ipxAvailable || tcpipAvailable)
|
||||
if (ipxAvailable || tcpipAvailable)
|
||||
return;
|
||||
M_PrintWhite ((320/2) - ((27*8)/2), 148, "No Communications Available");
|
||||
}
|
||||
|
|
@ -654,12 +646,12 @@ void M_MultiPlayer_Key (int key)
|
|||
switch (m_multiplayer_cursor)
|
||||
{
|
||||
case 0:
|
||||
if (serialAvailable || ipxAvailable || tcpipAvailable)
|
||||
if (ipxAvailable || tcpipAvailable)
|
||||
M_Menu_Net_f ();
|
||||
break;
|
||||
|
||||
case 1:
|
||||
if (serialAvailable || ipxAvailable || tcpipAvailable)
|
||||
if (ipxAvailable || tcpipAvailable)
|
||||
M_Menu_Net_f ();
|
||||
break;
|
||||
|
||||
|
|
@ -849,21 +841,10 @@ forward:
|
|||
|
||||
int m_net_cursor;
|
||||
int m_net_items;
|
||||
int m_net_saveHeight;
|
||||
|
||||
char *net_helpMessage [] =
|
||||
{
|
||||
/* .........1.........2.... */
|
||||
" ",
|
||||
" Two computers connected",
|
||||
" through two modems. ",
|
||||
" ",
|
||||
|
||||
" ",
|
||||
" Two computers connected",
|
||||
" by a null-modem cable. ",
|
||||
" ",
|
||||
|
||||
" Novell network LANs ",
|
||||
" or Windows 95 DOS-box. ",
|
||||
" ",
|
||||
|
|
@ -881,7 +862,7 @@ void M_Menu_Net_f (void)
|
|||
key_dest = key_menu;
|
||||
m_state = m_net;
|
||||
m_entersound = true;
|
||||
m_net_items = 4;
|
||||
m_net_items = 2;
|
||||
|
||||
if (m_net_cursor >= m_net_items)
|
||||
m_net_cursor = 0;
|
||||
|
|
@ -901,41 +882,6 @@ void M_Net_Draw (void)
|
|||
|
||||
f = 32;
|
||||
|
||||
if (serialAvailable)
|
||||
{
|
||||
p = Draw_CachePic ("gfx/netmen1.lmp");
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef _WIN32
|
||||
p = NULL;
|
||||
#else
|
||||
p = Draw_CachePic ("gfx/dim_modm.lmp");
|
||||
#endif
|
||||
}
|
||||
|
||||
if (p)
|
||||
M_DrawTransPic (72, f, p);
|
||||
|
||||
f += 19;
|
||||
|
||||
if (serialAvailable)
|
||||
{
|
||||
p = Draw_CachePic ("gfx/netmen2.lmp");
|
||||
}
|
||||
else
|
||||
{
|
||||
#ifdef _WIN32
|
||||
p = NULL;
|
||||
#else
|
||||
p = Draw_CachePic ("gfx/dim_drct.lmp");
|
||||
#endif
|
||||
}
|
||||
|
||||
if (p)
|
||||
M_DrawTransPic (72, f, p);
|
||||
|
||||
f += 19;
|
||||
if (ipxAvailable)
|
||||
p = Draw_CachePic ("gfx/netmen3.lmp");
|
||||
else
|
||||
|
|
@ -949,20 +895,13 @@ void M_Net_Draw (void)
|
|||
p = Draw_CachePic ("gfx/dim_tcp.lmp");
|
||||
M_DrawTransPic (72, f, p);
|
||||
|
||||
if (m_net_items == 5) // JDC, could just be removed
|
||||
{
|
||||
f += 19;
|
||||
p = Draw_CachePic ("gfx/netmen5.lmp");
|
||||
M_DrawTransPic (72, f, p);
|
||||
}
|
||||
|
||||
f = (320-26*8)/2;
|
||||
M_DrawTextBox (f, 134, 24, 4);
|
||||
M_DrawTextBox (f, 96, 24, 4);
|
||||
f += 8;
|
||||
M_Print (f, 142, net_helpMessage[m_net_cursor*4+0]);
|
||||
M_Print (f, 150, net_helpMessage[m_net_cursor*4+1]);
|
||||
M_Print (f, 158, net_helpMessage[m_net_cursor*4+2]);
|
||||
M_Print (f, 166, net_helpMessage[m_net_cursor*4+3]);
|
||||
M_Print (f, 104, net_helpMessage[m_net_cursor*4+0]);
|
||||
M_Print (f, 112, net_helpMessage[m_net_cursor*4+1]);
|
||||
M_Print (f, 120, net_helpMessage[m_net_cursor*4+2]);
|
||||
M_Print (f, 128, net_helpMessage[m_net_cursor*4+3]);
|
||||
|
||||
f = (int)(realtime * 10)%6; //johnfitz -- was host_time
|
||||
M_DrawTransPic (54, 32 + m_net_cursor * 20,Draw_CachePic( va("gfx/menudot%i.lmp", f+1 ) ) );
|
||||
|
|
@ -992,38 +931,13 @@ again:
|
|||
|
||||
case K_ENTER:
|
||||
m_entersound = true;
|
||||
|
||||
switch (m_net_cursor)
|
||||
{
|
||||
case 0:
|
||||
M_Menu_SerialConfig_f ();
|
||||
break;
|
||||
|
||||
case 1:
|
||||
M_Menu_SerialConfig_f ();
|
||||
break;
|
||||
|
||||
case 2:
|
||||
M_Menu_LanConfig_f ();
|
||||
break;
|
||||
|
||||
case 3:
|
||||
M_Menu_LanConfig_f ();
|
||||
break;
|
||||
|
||||
case 4:
|
||||
// multiprotocol
|
||||
break;
|
||||
}
|
||||
M_Menu_LanConfig_f ();
|
||||
break;
|
||||
}
|
||||
|
||||
if (m_net_cursor == 0 && !serialAvailable)
|
||||
if (m_net_cursor == 0 && !ipxAvailable)
|
||||
goto again;
|
||||
if (m_net_cursor == 1 && !serialAvailable)
|
||||
goto again;
|
||||
if (m_net_cursor == 2 && !ipxAvailable)
|
||||
goto again;
|
||||
if (m_net_cursor == 3 && !tcpipAvailable)
|
||||
if (m_net_cursor == 1 && !tcpipAvailable)
|
||||
goto again;
|
||||
}
|
||||
|
||||
|
|
@ -1682,478 +1596,6 @@ void M_Quit_Draw (void) //johnfitz -- modified for new quit message
|
|||
M_PrintWhite (160-4*(sizeof(msg3)-1), 104, msg3);
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
|
||||
/* SERIAL CONFIG MENU */
|
||||
|
||||
int serialConfig_cursor;
|
||||
int serialConfig_cursor_table[] = {48, 64, 80, 96, 112, 132};
|
||||
#define NUM_SERIALCONFIG_CMDS 6
|
||||
|
||||
static int ISA_uarts[] = {0x3f8,0x2f8,0x3e8,0x2e8};
|
||||
static int ISA_IRQs[] = {4,3,4,3};
|
||||
int serialConfig_baudrate[] = {9600,14400,19200,28800,38400,57600};
|
||||
|
||||
int serialConfig_comport;
|
||||
int serialConfig_irq ;
|
||||
int serialConfig_baud;
|
||||
char serialConfig_phone[16];
|
||||
|
||||
void M_Menu_SerialConfig_f (void)
|
||||
{
|
||||
int n;
|
||||
int port;
|
||||
int baudrate;
|
||||
qboolean useModem;
|
||||
|
||||
IN_Deactivate(vid.type == MODE_WINDOWED);
|
||||
key_dest = key_menu;
|
||||
m_state = m_serialconfig;
|
||||
m_entersound = true;
|
||||
if (JoiningGame && SerialConfig)
|
||||
serialConfig_cursor = 4;
|
||||
else
|
||||
serialConfig_cursor = 5;
|
||||
|
||||
(*GetComPortConfig) (0, &port, &serialConfig_irq, &baudrate, &useModem);
|
||||
|
||||
// map uart's port to COMx
|
||||
for (n = 0; n < 4; n++)
|
||||
{
|
||||
if (ISA_uarts[n] == port)
|
||||
break;
|
||||
}
|
||||
if (n == 4)
|
||||
{
|
||||
n = 0;
|
||||
serialConfig_irq = 4;
|
||||
}
|
||||
serialConfig_comport = n + 1;
|
||||
|
||||
// map baudrate to index
|
||||
for (n = 0; n < 6; n++)
|
||||
{
|
||||
if (serialConfig_baudrate[n] == baudrate)
|
||||
break;
|
||||
}
|
||||
if (n == 6)
|
||||
n = 5;
|
||||
serialConfig_baud = n;
|
||||
|
||||
m_return_onerror = false;
|
||||
m_return_reason[0] = 0;
|
||||
}
|
||||
|
||||
|
||||
void M_SerialConfig_Draw (void)
|
||||
{
|
||||
qpic_t *p;
|
||||
int basex;
|
||||
char *startJoin;
|
||||
char *directModem;
|
||||
|
||||
M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
|
||||
p = Draw_CachePic ("gfx/p_multi.lmp");
|
||||
basex = (320-p->width)/2;
|
||||
M_DrawPic (basex, 4, p);
|
||||
|
||||
if (StartingGame)
|
||||
startJoin = "New Game";
|
||||
else
|
||||
startJoin = "Join Game";
|
||||
if (SerialConfig)
|
||||
directModem = "Modem";
|
||||
else
|
||||
directModem = "Direct Connect";
|
||||
M_Print (basex, 32, va ("%s - %s", startJoin, directModem));
|
||||
basex += 8;
|
||||
|
||||
M_Print (basex, serialConfig_cursor_table[0], "Port");
|
||||
M_DrawTextBox (160, 40, 4, 1);
|
||||
M_Print (168, serialConfig_cursor_table[0], va("COM%u", serialConfig_comport));
|
||||
|
||||
M_Print (basex, serialConfig_cursor_table[1], "IRQ");
|
||||
M_DrawTextBox (160, serialConfig_cursor_table[1]-8, 1, 1);
|
||||
M_Print (168, serialConfig_cursor_table[1], va("%u", serialConfig_irq));
|
||||
|
||||
M_Print (basex, serialConfig_cursor_table[2], "Baud");
|
||||
M_DrawTextBox (160, serialConfig_cursor_table[2]-8, 5, 1);
|
||||
M_Print (168, serialConfig_cursor_table[2], va("%u", serialConfig_baudrate[serialConfig_baud]));
|
||||
|
||||
if (SerialConfig)
|
||||
{
|
||||
M_Print (basex, serialConfig_cursor_table[3], "Modem Setup...");
|
||||
if (JoiningGame)
|
||||
{
|
||||
M_Print (basex, serialConfig_cursor_table[4], "Phone number");
|
||||
M_DrawTextBox (160, serialConfig_cursor_table[4]-8, 16, 1);
|
||||
M_Print (168, serialConfig_cursor_table[4], serialConfig_phone);
|
||||
}
|
||||
}
|
||||
|
||||
if (JoiningGame)
|
||||
{
|
||||
M_DrawTextBox (basex, serialConfig_cursor_table[5]-8, 7, 1);
|
||||
M_Print (basex+8, serialConfig_cursor_table[5], "Connect");
|
||||
}
|
||||
else
|
||||
{
|
||||
M_DrawTextBox (basex, serialConfig_cursor_table[5]-8, 2, 1);
|
||||
M_Print (basex+8, serialConfig_cursor_table[5], "OK");
|
||||
}
|
||||
|
||||
M_DrawCharacter (basex-8, serialConfig_cursor_table [serialConfig_cursor], 12+((int)(realtime*4)&1));
|
||||
|
||||
if (serialConfig_cursor == 4)
|
||||
M_DrawCharacter (168 + 8*strlen(serialConfig_phone), serialConfig_cursor_table [serialConfig_cursor], 10+((int)(realtime*4)&1));
|
||||
|
||||
if (*m_return_reason)
|
||||
M_PrintWhite (basex, 148, m_return_reason);
|
||||
}
|
||||
|
||||
|
||||
void M_SerialConfig_Key (int key)
|
||||
{
|
||||
int l;
|
||||
|
||||
switch (key)
|
||||
{
|
||||
case K_ESCAPE:
|
||||
M_Menu_Net_f ();
|
||||
break;
|
||||
|
||||
case K_UPARROW:
|
||||
S_LocalSound ("misc/menu1.wav");
|
||||
serialConfig_cursor--;
|
||||
if (serialConfig_cursor < 0)
|
||||
serialConfig_cursor = NUM_SERIALCONFIG_CMDS-1;
|
||||
break;
|
||||
|
||||
case K_DOWNARROW:
|
||||
S_LocalSound ("misc/menu1.wav");
|
||||
serialConfig_cursor++;
|
||||
if (serialConfig_cursor >= NUM_SERIALCONFIG_CMDS)
|
||||
serialConfig_cursor = 0;
|
||||
break;
|
||||
|
||||
case K_LEFTARROW:
|
||||
if (serialConfig_cursor > 2)
|
||||
break;
|
||||
S_LocalSound ("misc/menu3.wav");
|
||||
|
||||
if (serialConfig_cursor == 0)
|
||||
{
|
||||
serialConfig_comport--;
|
||||
if (serialConfig_comport == 0)
|
||||
serialConfig_comport = 4;
|
||||
serialConfig_irq = ISA_IRQs[serialConfig_comport-1];
|
||||
}
|
||||
|
||||
if (serialConfig_cursor == 1)
|
||||
{
|
||||
serialConfig_irq--;
|
||||
if (serialConfig_irq == 6)
|
||||
serialConfig_irq = 5;
|
||||
if (serialConfig_irq == 1)
|
||||
serialConfig_irq = 7;
|
||||
}
|
||||
|
||||
if (serialConfig_cursor == 2)
|
||||
{
|
||||
serialConfig_baud--;
|
||||
if (serialConfig_baud < 0)
|
||||
serialConfig_baud = 5;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case K_RIGHTARROW:
|
||||
if (serialConfig_cursor > 2)
|
||||
break;
|
||||
forward:
|
||||
S_LocalSound ("misc/menu3.wav");
|
||||
|
||||
if (serialConfig_cursor == 0)
|
||||
{
|
||||
serialConfig_comport++;
|
||||
if (serialConfig_comport > 4)
|
||||
serialConfig_comport = 1;
|
||||
serialConfig_irq = ISA_IRQs[serialConfig_comport-1];
|
||||
}
|
||||
|
||||
if (serialConfig_cursor == 1)
|
||||
{
|
||||
serialConfig_irq++;
|
||||
if (serialConfig_irq == 6)
|
||||
serialConfig_irq = 7;
|
||||
if (serialConfig_irq == 8)
|
||||
serialConfig_irq = 2;
|
||||
}
|
||||
|
||||
if (serialConfig_cursor == 2)
|
||||
{
|
||||
serialConfig_baud++;
|
||||
if (serialConfig_baud > 5)
|
||||
serialConfig_baud = 0;
|
||||
}
|
||||
|
||||
break;
|
||||
|
||||
case K_ENTER:
|
||||
if (serialConfig_cursor < 3)
|
||||
goto forward;
|
||||
|
||||
m_entersound = true;
|
||||
|
||||
if (serialConfig_cursor == 3)
|
||||
{
|
||||
(*SetComPortConfig) (0, ISA_uarts[serialConfig_comport-1], serialConfig_irq, serialConfig_baudrate[serialConfig_baud], SerialConfig);
|
||||
|
||||
M_Menu_ModemConfig_f ();
|
||||
break;
|
||||
}
|
||||
|
||||
if (serialConfig_cursor == 4)
|
||||
{
|
||||
serialConfig_cursor = 5;
|
||||
break;
|
||||
}
|
||||
|
||||
// serialConfig_cursor == 5 (OK/CONNECT)
|
||||
(*SetComPortConfig) (0, ISA_uarts[serialConfig_comport-1], serialConfig_irq, serialConfig_baudrate[serialConfig_baud], SerialConfig);
|
||||
|
||||
M_ConfigureNetSubsystem ();
|
||||
|
||||
if (StartingGame)
|
||||
{
|
||||
M_Menu_GameOptions_f ();
|
||||
break;
|
||||
}
|
||||
|
||||
m_return_state = m_state;
|
||||
m_return_onerror = true;
|
||||
IN_Activate();
|
||||
key_dest = key_game;
|
||||
m_state = m_none;
|
||||
|
||||
if (SerialConfig)
|
||||
Cbuf_AddText (va ("connect \"%s\"\n", serialConfig_phone));
|
||||
else
|
||||
Cbuf_AddText ("connect\n");
|
||||
break;
|
||||
|
||||
case K_BACKSPACE:
|
||||
if (serialConfig_cursor == 4)
|
||||
{
|
||||
if (strlen(serialConfig_phone))
|
||||
serialConfig_phone[strlen(serialConfig_phone)-1] = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if (key < 32 || key > 127)
|
||||
break;
|
||||
if (serialConfig_cursor == 4)
|
||||
{
|
||||
l = strlen(serialConfig_phone);
|
||||
if (l < 15)
|
||||
{
|
||||
serialConfig_phone[l+1] = 0;
|
||||
serialConfig_phone[l] = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (DirectConfig && (serialConfig_cursor == 3 || serialConfig_cursor == 4))
|
||||
{
|
||||
if (key == K_UPARROW)
|
||||
serialConfig_cursor = 2;
|
||||
else
|
||||
serialConfig_cursor = 5;
|
||||
}
|
||||
|
||||
if (SerialConfig && StartingGame && serialConfig_cursor == 4)
|
||||
{
|
||||
if (key == K_UPARROW)
|
||||
serialConfig_cursor = 3;
|
||||
else
|
||||
serialConfig_cursor = 5;
|
||||
}
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
/* MODEM CONFIG MENU */
|
||||
|
||||
int modemConfig_cursor;
|
||||
int modemConfig_cursor_table [] = {40, 56, 88, 120, 156};
|
||||
#define NUM_MODEMCONFIG_CMDS 5
|
||||
|
||||
char modemConfig_dialing;
|
||||
char modemConfig_clear [16];
|
||||
char modemConfig_init [32];
|
||||
char modemConfig_hangup [16];
|
||||
|
||||
void M_Menu_ModemConfig_f (void)
|
||||
{
|
||||
IN_Deactivate(vid.type == MODE_WINDOWED);
|
||||
key_dest = key_menu;
|
||||
m_state = m_modemconfig;
|
||||
m_entersound = true;
|
||||
(*GetModemConfig) (0, &modemConfig_dialing, modemConfig_clear, modemConfig_init, modemConfig_hangup);
|
||||
}
|
||||
|
||||
|
||||
void M_ModemConfig_Draw (void)
|
||||
{
|
||||
qpic_t *p;
|
||||
int basex;
|
||||
|
||||
M_DrawTransPic (16, 4, Draw_CachePic ("gfx/qplaque.lmp") );
|
||||
p = Draw_CachePic ("gfx/p_multi.lmp");
|
||||
basex = (320-p->width)/2;
|
||||
M_DrawPic (basex, 4, p);
|
||||
basex += 8;
|
||||
|
||||
if (modemConfig_dialing == 'P')
|
||||
M_Print (basex, modemConfig_cursor_table[0], "Pulse Dialing");
|
||||
else
|
||||
M_Print (basex, modemConfig_cursor_table[0], "Touch Tone Dialing");
|
||||
|
||||
M_Print (basex, modemConfig_cursor_table[1], "Clear");
|
||||
M_DrawTextBox (basex, modemConfig_cursor_table[1]+4, 16, 1);
|
||||
M_Print (basex+8, modemConfig_cursor_table[1]+12, modemConfig_clear);
|
||||
if (modemConfig_cursor == 1)
|
||||
M_DrawCharacter (basex+8 + 8*strlen(modemConfig_clear), modemConfig_cursor_table[1]+12, 10+((int)(realtime*4)&1));
|
||||
|
||||
M_Print (basex, modemConfig_cursor_table[2], "Init");
|
||||
M_DrawTextBox (basex, modemConfig_cursor_table[2]+4, 30, 1);
|
||||
M_Print (basex+8, modemConfig_cursor_table[2]+12, modemConfig_init);
|
||||
if (modemConfig_cursor == 2)
|
||||
M_DrawCharacter (basex+8 + 8*strlen(modemConfig_init), modemConfig_cursor_table[2]+12, 10+((int)(realtime*4)&1));
|
||||
|
||||
M_Print (basex, modemConfig_cursor_table[3], "Hangup");
|
||||
M_DrawTextBox (basex, modemConfig_cursor_table[3]+4, 16, 1);
|
||||
M_Print (basex+8, modemConfig_cursor_table[3]+12, modemConfig_hangup);
|
||||
if (modemConfig_cursor == 3)
|
||||
M_DrawCharacter (basex+8 + 8*strlen(modemConfig_hangup), modemConfig_cursor_table[3]+12, 10+((int)(realtime*4)&1));
|
||||
|
||||
M_DrawTextBox (basex, modemConfig_cursor_table[4]-8, 2, 1);
|
||||
M_Print (basex+8, modemConfig_cursor_table[4], "OK");
|
||||
|
||||
M_DrawCharacter (basex-8, modemConfig_cursor_table [modemConfig_cursor], 12+((int)(realtime*4)&1));
|
||||
}
|
||||
|
||||
|
||||
void M_ModemConfig_Key (int key)
|
||||
{
|
||||
int l;
|
||||
|
||||
switch (key)
|
||||
{
|
||||
case K_ESCAPE:
|
||||
M_Menu_SerialConfig_f ();
|
||||
break;
|
||||
|
||||
case K_UPARROW:
|
||||
S_LocalSound ("misc/menu1.wav");
|
||||
modemConfig_cursor--;
|
||||
if (modemConfig_cursor < 0)
|
||||
modemConfig_cursor = NUM_MODEMCONFIG_CMDS-1;
|
||||
break;
|
||||
|
||||
case K_DOWNARROW:
|
||||
S_LocalSound ("misc/menu1.wav");
|
||||
modemConfig_cursor++;
|
||||
if (modemConfig_cursor >= NUM_MODEMCONFIG_CMDS)
|
||||
modemConfig_cursor = 0;
|
||||
break;
|
||||
|
||||
case K_LEFTARROW:
|
||||
case K_RIGHTARROW:
|
||||
if (modemConfig_cursor == 0)
|
||||
{
|
||||
if (modemConfig_dialing == 'P')
|
||||
modemConfig_dialing = 'T';
|
||||
else
|
||||
modemConfig_dialing = 'P';
|
||||
S_LocalSound ("misc/menu1.wav");
|
||||
}
|
||||
break;
|
||||
|
||||
case K_ENTER:
|
||||
if (modemConfig_cursor == 0)
|
||||
{
|
||||
if (modemConfig_dialing == 'P')
|
||||
modemConfig_dialing = 'T';
|
||||
else
|
||||
modemConfig_dialing = 'P';
|
||||
m_entersound = true;
|
||||
}
|
||||
|
||||
if (modemConfig_cursor == 4)
|
||||
{
|
||||
(*SetModemConfig) (0, va ("%c", modemConfig_dialing), modemConfig_clear, modemConfig_init, modemConfig_hangup);
|
||||
m_entersound = true;
|
||||
M_Menu_SerialConfig_f ();
|
||||
}
|
||||
break;
|
||||
|
||||
case K_BACKSPACE:
|
||||
if (modemConfig_cursor == 1)
|
||||
{
|
||||
if (strlen(modemConfig_clear))
|
||||
modemConfig_clear[strlen(modemConfig_clear)-1] = 0;
|
||||
}
|
||||
|
||||
if (modemConfig_cursor == 2)
|
||||
{
|
||||
if (strlen(modemConfig_init))
|
||||
modemConfig_init[strlen(modemConfig_init)-1] = 0;
|
||||
}
|
||||
|
||||
if (modemConfig_cursor == 3)
|
||||
{
|
||||
if (strlen(modemConfig_hangup))
|
||||
modemConfig_hangup[strlen(modemConfig_hangup)-1] = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
default:
|
||||
if (key < 32 || key > 127)
|
||||
break;
|
||||
|
||||
if (modemConfig_cursor == 1)
|
||||
{
|
||||
l = strlen(modemConfig_clear);
|
||||
if (l < 15)
|
||||
{
|
||||
modemConfig_clear[l+1] = 0;
|
||||
modemConfig_clear[l] = key;
|
||||
}
|
||||
}
|
||||
|
||||
if (modemConfig_cursor == 2)
|
||||
{
|
||||
l = strlen(modemConfig_init);
|
||||
if (l < 29)
|
||||
{
|
||||
modemConfig_init[l+1] = 0;
|
||||
modemConfig_init[l] = key;
|
||||
}
|
||||
}
|
||||
|
||||
if (modemConfig_cursor == 3)
|
||||
{
|
||||
l = strlen(modemConfig_hangup);
|
||||
if (l < 15)
|
||||
{
|
||||
modemConfig_hangup[l+1] = 0;
|
||||
modemConfig_hangup[l] = key;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//=============================================================================
|
||||
/* LAN CONFIG MENU */
|
||||
|
||||
|
|
@ -3091,14 +2533,6 @@ void M_Draw (void)
|
|||
M_Quit_Draw ();
|
||||
break;
|
||||
|
||||
case m_serialconfig:
|
||||
M_SerialConfig_Draw ();
|
||||
break;
|
||||
|
||||
case m_modemconfig:
|
||||
M_ModemConfig_Draw ();
|
||||
break;
|
||||
|
||||
case m_lanconfig:
|
||||
M_LanConfig_Draw ();
|
||||
break;
|
||||
|
|
@ -3181,14 +2615,6 @@ void M_Keydown (int key)
|
|||
M_Quit_Key (key);
|
||||
return;
|
||||
|
||||
case m_serialconfig:
|
||||
M_SerialConfig_Key (key);
|
||||
return;
|
||||
|
||||
case m_modemconfig:
|
||||
M_ModemConfig_Key (key);
|
||||
return;
|
||||
|
||||
case m_lanconfig:
|
||||
M_LanConfig_Key (key);
|
||||
return;
|
||||
|
|
@ -3212,10 +2638,6 @@ void M_ConfigureNetSubsystem(void)
|
|||
{
|
||||
// enable/disable net systems to match desired config
|
||||
Cbuf_AddText ("stopdemo\n");
|
||||
if (SerialConfig || DirectConfig)
|
||||
{
|
||||
Cbuf_AddText ("com1 enable\n");
|
||||
}
|
||||
|
||||
if (IPXConfig || TCPIPConfig)
|
||||
net_hostport = lanConfig_port;
|
||||
|
|
|
|||
|
|
@ -45,8 +45,6 @@ enum m_state_e {
|
|||
m_keys,
|
||||
m_help,
|
||||
m_quit,
|
||||
m_serialconfig,
|
||||
m_modemconfig,
|
||||
m_lanconfig,
|
||||
m_gameoptions,
|
||||
m_search,
|
||||
|
|
|
|||
|
|
@ -97,16 +97,10 @@ void NET_Slist_f (void);
|
|||
|
||||
/* FIXME: driver related, but public:
|
||||
*/
|
||||
extern qboolean serialAvailable;
|
||||
extern qboolean ipxAvailable;
|
||||
extern qboolean tcpipAvailable;
|
||||
extern char my_ipx_address[NET_NAMELEN];
|
||||
extern char my_tcpip_address[NET_NAMELEN];
|
||||
|
||||
extern void (*GetComPortConfig) (int portNumber, int *port, int *irq, int *baud, qboolean *useModem);
|
||||
extern void (*SetComPortConfig) (int portNumber, int port, int irq, int baud, qboolean useModem);
|
||||
extern void (*GetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
|
||||
extern void (*SetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
|
||||
|
||||
#endif /* _QUAKE_NET_H */
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ qsocket_t *net_activeSockets = NULL;
|
|||
qsocket_t *net_freeSockets = NULL;
|
||||
int net_numsockets = 0;
|
||||
|
||||
qboolean serialAvailable = false;
|
||||
qboolean ipxAvailable = false;
|
||||
qboolean tcpipAvailable = false;
|
||||
|
||||
|
|
@ -65,22 +64,6 @@ int unreliableMessagesReceived = 0;
|
|||
static cvar_t net_messagetimeout = {"net_messagetimeout","300"};
|
||||
cvar_t hostname = {"hostname", "UNNAMED"};
|
||||
|
||||
static qboolean configRestored = false;
|
||||
|
||||
void (*GetComPortConfig) (int portNumber, int *port, int *irq, int *baud, qboolean *useModem);
|
||||
void (*SetComPortConfig) (int portNumber, int port, int irq, int baud, qboolean useModem);
|
||||
void (*GetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
|
||||
void (*SetModemConfig) (int portNumber, char *dialType, char *clear, char *init, char *hangup);
|
||||
|
||||
cvar_t config_com_port = {"_config_com_port", "0x3f8", true};
|
||||
cvar_t config_com_irq = {"_config_com_irq", "4", true};
|
||||
cvar_t config_com_baud = {"_config_com_baud", "57600", true};
|
||||
cvar_t config_com_modem = {"_config_com_modem", "1", true};
|
||||
cvar_t config_modem_dialtype = {"_config_modem_dialtype", "T", true};
|
||||
cvar_t config_modem_clear = {"_config_modem_clear", "ATZ", true};
|
||||
cvar_t config_modem_init = {"_config_modem_init", "", true};
|
||||
cvar_t config_modem_hangup = {"_config_modem_hangup", "AT H", true};
|
||||
|
||||
// these two macros are to make the code more readable
|
||||
#define sfunc net_drivers[sock->driver]
|
||||
#define dfunc net_drivers[net_driverlevel]
|
||||
|
|
@ -762,14 +745,6 @@ void NET_Init (void)
|
|||
|
||||
Cvar_RegisterVariable (&net_messagetimeout, NULL);
|
||||
Cvar_RegisterVariable (&hostname, NULL);
|
||||
Cvar_RegisterVariable (&config_com_port, NULL);
|
||||
Cvar_RegisterVariable (&config_com_irq, NULL);
|
||||
Cvar_RegisterVariable (&config_com_baud, NULL);
|
||||
Cvar_RegisterVariable (&config_com_modem, NULL);
|
||||
Cvar_RegisterVariable (&config_modem_dialtype, NULL);
|
||||
Cvar_RegisterVariable (&config_modem_clear, NULL);
|
||||
Cvar_RegisterVariable (&config_modem_init, NULL);
|
||||
Cvar_RegisterVariable (&config_modem_hangup, NULL);
|
||||
|
||||
Cmd_AddCommand ("slist", NET_Slist_f);
|
||||
Cmd_AddCommand ("listen", NET_Listen_f);
|
||||
|
|
@ -831,21 +806,6 @@ void NET_Poll(void)
|
|||
{
|
||||
PollProcedure *pp;
|
||||
|
||||
if (!configRestored)
|
||||
{
|
||||
if (serialAvailable)
|
||||
{
|
||||
qboolean useModem;
|
||||
if (config_com_modem.value == 1.0)
|
||||
useModem = true;
|
||||
else
|
||||
useModem = false;
|
||||
SetComPortConfig (0, (int)config_com_port.value, (int)config_com_irq.value, (int)config_com_baud.value, useModem);
|
||||
SetModemConfig (0, config_modem_dialtype.string, config_modem_clear.string, config_modem_init.string, config_modem_hangup.string);
|
||||
}
|
||||
configRestored = true;
|
||||
}
|
||||
|
||||
SetNetTime();
|
||||
|
||||
for (pp = pollProcedureList; pp; pp = pp->next)
|
||||
|
|
|
|||
Loading…
Reference in a new issue