zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 03:00:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

git-svn-id: https://svn.eduke32.com/eduke32@1146 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-11-22 06:46:27 +00:00
parent 632320e1fd
commit df2af2fc33
3 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
polymer/eduke32/source/duke3d.h
View file

@ -1051,9 +1051,9 @@ extern playerdata_t g_player[MAXPLAYERS];
typedef struct { typedef struct {
char *name; char *name;
int id; int id;
} keydef; } keydef_t;
extern keydef keynames[]; extern keydef_t keynames[];
extern char *mousenames[]; extern char *mousenames[];
extern char *duke3dgrp, *duke3dgrpstring; extern char *duke3dgrp, *duke3dgrpstring;

32
polymer/eduke32/source/game.c
View file

@ -109,7 +109,7 @@ static FILE *frecfilep = (FILE *)NULL;
int g_restorePalette,g_screenCapture; int g_restorePalette,g_screenCapture;
static int g_noLogoAnim = 0; static int g_noLogoAnim = 0;
static int g_noLogo = 0; static int g_noLogo = 0;
static int sendmessagecommand = -1; static int g_chatPlayer = -1;
char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp"; char defaultduke3dgrp[BMAX_PATH] = "duke3d.grp";
char *duke3dgrp = defaultduke3dgrp; char *duke3dgrp = defaultduke3dgrp;
@ -3078,14 +3078,14 @@ static void Net_EnterMessage(void)
if (g_player[myconnectindex].ps->gm&MODE_SENDTOWHOM) if (g_player[myconnectindex].ps->gm&MODE_SENDTOWHOM)
{ {
if (sendmessagecommand != -1 || ud.multimode < 3 || g_movesPerPacket == 4) if (g_chatPlayer != -1 || ud.multimode < 3 || g_movesPerPacket == 4)
{ {
tempbuf[0] = PACKET_TYPE_MESSAGE; tempbuf[0] = PACKET_TYPE_MESSAGE;
tempbuf[2] = 0; tempbuf[2] = 0;
recbuf[0] = 0; recbuf[0] = 0;
if (ud.multimode < 3) if (ud.multimode < 3)
sendmessagecommand = 2; g_chatPlayer = 2;
if (typebuf[0] == '/' && Btoupper(typebuf[1]) == 'M' && Btoupper(typebuf[2]) == 'E') if (typebuf[0] == '/' && Btoupper(typebuf[1]) == 'M' && Btoupper(typebuf[2]) == 'E')
{ {
@ -3112,7 +3112,7 @@ static void Net_EnterMessage(void)
recbuf[j] = 0; recbuf[j] = 0;
Bstrcat(tempbuf+2,recbuf); Bstrcat(tempbuf+2,recbuf);
if (sendmessagecommand >= ud.multimode || g_movesPerPacket == 4) if (g_chatPlayer >= ud.multimode || g_movesPerPacket == 4)
{ {
tempbuf[1] = 255; tempbuf[1] = 255;
TRAVERSE_CONNECT(ch) TRAVERSE_CONNECT(ch)
@ -3130,18 +3130,18 @@ static void Net_EnterMessage(void)
} }
quotebotgoal = quotebot; quotebotgoal = quotebot;
} }
else if (sendmessagecommand >= 0) else if (g_chatPlayer >= 0)
{ {
tempbuf[1] = (char)sendmessagecommand; tempbuf[1] = (char)g_chatPlayer;
if ((!g_networkBroadcastMode) && (myconnectindex != connecthead)) if ((!g_networkBroadcastMode) && (myconnectindex != connecthead))
sendmessagecommand = connecthead; g_chatPlayer = connecthead;
sendpacket(sendmessagecommand,tempbuf,j+2); sendpacket(g_chatPlayer,tempbuf,j+2);
} }
sendmessagecommand = -1; g_chatPlayer = -1;
g_player[myconnectindex].ps->gm &= ~(MODE_TYPE|MODE_SENDTOWHOM); g_player[myconnectindex].ps->gm &= ~(MODE_TYPE|MODE_SENDTOWHOM);
} }
else if (sendmessagecommand == -1) else if (g_chatPlayer == -1)
{ {
j = 50; j = 50;
gametext(320>>1,j,"SEND MESSAGE TO...",0,2+8+16); gametext(320>>1,j,"SEND MESSAGE TO...",0,2+8+16);
@ -3175,16 +3175,16 @@ static void Net_EnterMessage(void)
i = KB_GetCh(); i = KB_GetCh();
if (i == 'A' || i == 'a' || i == 13) if (i == 'A' || i == 'a' || i == 13)
sendmessagecommand = ud.multimode; g_chatPlayer = ud.multimode;
else if (i >= '1' || i <= (ud.multimode + '1')) else if (i >= '1' || i <= (ud.multimode + '1'))
sendmessagecommand = i - '1'; g_chatPlayer = i - '1';
else else
{ {
sendmessagecommand = ud.multimode; g_chatPlayer = ud.multimode;
if (i == 27) if (i == 27)
{ {
g_player[myconnectindex].ps->gm &= ~(MODE_TYPE|MODE_SENDTOWHOM); g_player[myconnectindex].ps->gm &= ~(MODE_TYPE|MODE_SENDTOWHOM);
sendmessagecommand = -1; g_chatPlayer = -1;
} }
else else
typebuf[0] = 0; typebuf[0] = 0;
@ -3222,8 +3222,8 @@ static void Net_EnterMessage(void)
} }
if (ud.automsg) if (ud.automsg)
{ {
if (SHIFTS_IS_PRESSED) sendmessagecommand = -1; if (SHIFTS_IS_PRESSED) g_chatPlayer = -1;
else sendmessagecommand = ud.multimode; else g_chatPlayer = ud.multimode;
} }
g_player[myconnectindex].ps->gm |= MODE_SENDTOWHOM; g_player[myconnectindex].ps->gm |= MODE_SENDTOWHOM;
} }

2
polymer/eduke32/source/osdcmds.c
View file

@ -1023,7 +1023,7 @@ static int osdcmd_button(const osdfuncparm_t *parm)
return OSDCMD_OK; return OSDCMD_OK;
} }
keydef keynames[]= keydef_t keynames[]=
{ {
{ "Escape", 0x1 }, { "Escape", 0x1 },
{ "1", 0x2 }, { "1", 0x2 },