Merge branch 'master' into net-screen
This commit is contained in:
commit
8132dd6be5
|
@ -465,6 +465,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||
{
|
||||
// what we're gonna do now is check if the node exists
|
||||
// with that logic, characters 4 and 5 are our numbers:
|
||||
const char *newmsg;
|
||||
int spc = 1; // used if nodenum[1] is a space.
|
||||
char *nodenum = (char*) malloc(3);
|
||||
strncpy(nodenum, msg+3, 5);
|
||||
|
@ -503,7 +504,7 @@ static void DoSayCommand(SINT8 target, size_t usedargs, UINT8 flags)
|
|||
return;
|
||||
}
|
||||
buf[0] = target;
|
||||
const char *newmsg = msg+5+spc;
|
||||
newmsg = msg+5+spc;
|
||||
memcpy(msg, newmsg, 252);
|
||||
}
|
||||
|
||||
|
@ -607,6 +608,7 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
|
|||
char *msg;
|
||||
boolean action = false;
|
||||
char *ptr;
|
||||
int spam_eatmsg = 0;
|
||||
|
||||
CONS_Debug(DBG_NETPLAY,"Received SAY cmd from Player %d (%s)\n", playernum+1, player_names[playernum]);
|
||||
|
||||
|
@ -653,8 +655,6 @@ static void Got_Saycmd(UINT8 **p, INT32 playernum)
|
|||
}
|
||||
}
|
||||
|
||||
int spam_eatmsg = 0;
|
||||
|
||||
// before we do anything, let's verify the guy isn't spamming, get this easier on us.
|
||||
|
||||
//if (stop_spamming_you_cunt[playernum] != 0 && cv_chatspamprotection.value && !(flags & HU_CSAY))
|
||||
|
@ -896,9 +896,10 @@ static inline boolean HU_keyInChatString(char *s, char ch)
|
|||
}
|
||||
else if (ch == KEY_BACKSPACE)
|
||||
{
|
||||
size_t i;
|
||||
if (c_input <= 0)
|
||||
return false;
|
||||
size_t i = c_input;
|
||||
i = c_input;
|
||||
if (!s[i-1])
|
||||
return false;
|
||||
|
||||
|
@ -951,12 +952,14 @@ static void HU_queueChatChar(INT32 c)
|
|||
char buf[2+256];
|
||||
size_t ci = 2;
|
||||
char *msg = &buf[2];
|
||||
size_t i;
|
||||
INT32 target = 0;
|
||||
do {
|
||||
c = w_chat[-2+ci++];
|
||||
if (!c || (c >= ' ' && !(c & 0x80))) // copy printable characters and terminating '\0' only.
|
||||
buf[ci-1]=c;
|
||||
} while (c);
|
||||
size_t i = 0;
|
||||
i = 0;
|
||||
for (;(i<HU_MAXMSGLEN);i++)
|
||||
w_chat[i] = 0; // reset this.
|
||||
|
||||
|
@ -969,10 +972,11 @@ static void HU_queueChatChar(INT32 c)
|
|||
return;
|
||||
}
|
||||
|
||||
INT32 target = 0;
|
||||
|
||||
if (strlen(msg) > 4 && strnicmp(msg, "/pm", 3) == 0) // used /pm
|
||||
{
|
||||
int spc;
|
||||
char *nodenum;
|
||||
const char *newmsg;
|
||||
// what we're gonna do now is check if the node exists
|
||||
// with that logic, characters 4 and 5 are our numbers:
|
||||
|
||||
|
@ -983,8 +987,8 @@ static void HU_queueChatChar(INT32 c)
|
|||
return;
|
||||
}
|
||||
|
||||
int spc = 1; // used if nodenum[1] is a space.
|
||||
char *nodenum = (char*) malloc(3);
|
||||
spc = 1; // used if nodenum[1] is a space.
|
||||
nodenum = (char*) malloc(3);
|
||||
strncpy(nodenum, msg+3, 5);
|
||||
// check for undesirable characters in our "number"
|
||||
if (((nodenum[0] < '0') || (nodenum[0] > '9')) || ((nodenum[1] < '0') || (nodenum[1] > '9')))
|
||||
|
@ -1021,7 +1025,7 @@ static void HU_queueChatChar(INT32 c)
|
|||
return;
|
||||
}
|
||||
// we need to get rid of the /pm<node>
|
||||
const char *newmsg = msg+5+spc;
|
||||
newmsg = msg+5+spc;
|
||||
memcpy(msg, newmsg, 255);
|
||||
}
|
||||
if (ci > 3) // don't send target+flags+empty message.
|
||||
|
@ -1142,14 +1146,16 @@ boolean HU_Responder(event_t *ev)
|
|||
if (((c == 'v' || c == 'V') && ctrldown) && !CHAT_MUTE)
|
||||
{
|
||||
const char *paste = I_ClipboardPaste();
|
||||
size_t chatlen;
|
||||
size_t pastelen;
|
||||
|
||||
// create a dummy string real quickly
|
||||
|
||||
if (paste == NULL)
|
||||
return true;
|
||||
|
||||
size_t chatlen = strlen(w_chat);
|
||||
size_t pastelen = strlen(paste);
|
||||
chatlen = strlen(w_chat);
|
||||
pastelen = strlen(paste);
|
||||
if (chatlen+pastelen > HU_MAXMSGLEN)
|
||||
return true; // we can't paste this!!
|
||||
|
||||
|
@ -1283,9 +1289,6 @@ INT16 chatx = 13, chaty = 169; // let's use this as our coordinates, shh
|
|||
|
||||
static void HU_drawMiniChat(void)
|
||||
{
|
||||
if (!chat_nummsg_min)
|
||||
return; // needless to say it's useless to do anything if we don't have anything to draw.
|
||||
|
||||
INT32 x = chatx+2;
|
||||
INT32 charwidth = 4, charheight = 6;
|
||||
INT32 boxw = cv_chatwidth.value;
|
||||
|
@ -1295,6 +1298,10 @@ static void HU_drawMiniChat(void)
|
|||
|
||||
INT32 msglines = 0;
|
||||
// process all messages once without rendering anything or doing anything fancy so that we know how many lines each message has...
|
||||
INT32 y;
|
||||
|
||||
if (!chat_nummsg_min)
|
||||
return; // needless to say it's useless to do anything if we don't have anything to draw.
|
||||
|
||||
if (splitscreen > 1)
|
||||
boxw = max(64, boxw/2);
|
||||
|
@ -1345,7 +1352,7 @@ static void HU_drawMiniChat(void)
|
|||
msglines += linescount+1;
|
||||
}
|
||||
|
||||
INT32 y = chaty - charheight*(msglines+1);
|
||||
y = chaty - charheight*(msglines+1);
|
||||
|
||||
if (splitscreen)
|
||||
{
|
||||
|
@ -1651,7 +1658,6 @@ static void HU_DrawChat(void)
|
|||
// handle /pm list.
|
||||
if (strnicmp(w_chat, "/pm", 3) == 0 && vid.width >= 400 && !teamtalk) // 320x200 unsupported kthxbai
|
||||
{
|
||||
i = 0;
|
||||
INT32 count = 0;
|
||||
INT32 p_dispy = chaty - charheight -1;
|
||||
if (splitscreen)
|
||||
|
@ -1662,21 +1668,23 @@ static void HU_DrawChat(void)
|
|||
}
|
||||
else
|
||||
p_dispy -= (cv_kartspeedometer.value ? 16 : 0);
|
||||
i = 0;
|
||||
for(i=0; (i<MAXPLAYERS); i++)
|
||||
{
|
||||
|
||||
// filter: (code needs optimization pls help I'm bad with C)
|
||||
if (w_chat[3])
|
||||
{
|
||||
|
||||
char *nodenum;
|
||||
UINT32 n;
|
||||
// right, that's half important: (w_chat[4] may be a space since /pm0 msg is perfectly acceptable!)
|
||||
if ( ( ((w_chat[3] != 0) && ((w_chat[3] < '0') || (w_chat[3] > '9'))) || ((w_chat[4] != 0) && (((w_chat[4] < '0') || (w_chat[4] > '9'))))) && (w_chat[4] != ' '))
|
||||
break;
|
||||
|
||||
|
||||
char *nodenum = (char*) malloc(3);
|
||||
nodenum = (char*) malloc(3);
|
||||
strncpy(nodenum, w_chat+3, 4);
|
||||
UINT32 n = atoi((const char*) nodenum); // turn that into a number
|
||||
n = atoi((const char*) nodenum); // turn that into a number
|
||||
// special cases:
|
||||
|
||||
if ((n == 0) && !(w_chat[4] == '0'))
|
||||
|
@ -2242,6 +2250,7 @@ void HU_drawPing(INT32 x, INT32 y, INT32 ping, boolean notext)
|
|||
UINT8 barcolor = 128; // color we use for the bars (green, yellow or red)
|
||||
SINT8 i = 0;
|
||||
SINT8 yoffset = 6;
|
||||
INT32 dx;
|
||||
if (ping < 128)
|
||||
{
|
||||
numbars = 3;
|
||||
|
@ -2253,7 +2262,7 @@ void HU_drawPing(INT32 x, INT32 y, INT32 ping, boolean notext)
|
|||
barcolor = 103;
|
||||
}
|
||||
|
||||
INT32 dx = x+1 - (V_SmallStringWidth(va("%dms", ping), V_ALLOWLOWERCASE)/2);
|
||||
dx = x+1 - (V_SmallStringWidth(va("%dms", ping), V_ALLOWLOWERCASE)/2);
|
||||
if (!notext || vid.width >= 640) // how sad, we're using a shit resolution.
|
||||
V_DrawSmallString(dx, y+4, V_ALLOWLOWERCASE, va("%dms", ping));
|
||||
|
||||
|
|
|
@ -2879,6 +2879,7 @@ static void K_DoThunderShield(player_t *player)
|
|||
int i = 0;
|
||||
fixed_t sx;
|
||||
fixed_t sy;
|
||||
angle_t an;
|
||||
|
||||
S_StartSound(player->mo, sfx_zio3);
|
||||
//player->kartstuff[k_thunderanim] = 35;
|
||||
|
@ -2908,7 +2909,7 @@ static void K_DoThunderShield(player_t *player)
|
|||
}
|
||||
|
||||
// spawn the radius thing:
|
||||
angle_t an = ANGLE_22h;
|
||||
an = ANGLE_22h;
|
||||
for (i=0; i<15; i++)
|
||||
{
|
||||
sx = player->mo->x + FixedMul((player->mo->scale*THUNDERRADIUS), FINECOSINE((an*i)>>ANGLETOFINESHIFT));
|
||||
|
|
|
@ -92,9 +92,10 @@ static int lib_print(lua_State *L)
|
|||
static int lib_chatprint(lua_State *L)
|
||||
{
|
||||
const char *str = luaL_checkstring(L, 1); // retrieve string
|
||||
int len;
|
||||
if (str == NULL) // error if we don't have a string!
|
||||
return luaL_error(L, LUA_QL("tostring") " must return a string to " LUA_QL("chatprint"));
|
||||
int len = strlen(str);
|
||||
len = strlen(str);
|
||||
if (len > 255) // string is too long!!!
|
||||
return luaL_error(L, "String exceeds the 255 characters limit of the chat buffer.");
|
||||
|
||||
|
@ -113,6 +114,8 @@ static int lib_chatprintf(lua_State *L)
|
|||
{
|
||||
int n = lua_gettop(L); /* number of arguments */
|
||||
player_t *plr;
|
||||
const char *str;
|
||||
int len;
|
||||
if (n < 2)
|
||||
return luaL_error(L, "chatprintf requires at least two arguments: player and text.");
|
||||
|
||||
|
@ -122,10 +125,10 @@ static int lib_chatprintf(lua_State *L)
|
|||
if (plr != &players[consoleplayer])
|
||||
return 0;
|
||||
|
||||
const char *str = luaL_checkstring(L, 2); // retrieve string
|
||||
str = luaL_checkstring(L, 2); // retrieve string
|
||||
if (str == NULL) // error if we don't have a string!
|
||||
return luaL_error(L, LUA_QL("tostring") " must return a string to " LUA_QL("chatprintf"));
|
||||
int len = strlen(str);
|
||||
len = strlen(str);
|
||||
if (len > 255) // string is too long!!!
|
||||
return luaL_error(L, "String exceeds the 255 characters limit of the chat buffer.");
|
||||
|
||||
|
|
|
@ -8398,11 +8398,11 @@ void A_BallhogExplode(mobj_t *actor)
|
|||
// Dumb simple function that gives a mobj its target's momentums without updating its angle.
|
||||
void A_LightningFollowPlayer(mobj_t *actor)
|
||||
{
|
||||
fixed_t sx, sy;
|
||||
#ifdef HAVE_BLUA
|
||||
if (LUA_CallAction("A_LightningFollowPlayer", actor))
|
||||
return;
|
||||
#endif
|
||||
fixed_t sx, sy;
|
||||
if (actor->target)
|
||||
{
|
||||
if (actor->extravalue1) // Make the radius also follow the player somewhat accuratly
|
||||
|
|
Loading…
Reference in New Issue