js/Cube
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More string migration

Browse source 
FossilOrigin-Name: 245efe8045462b8ece957f5bed9f5543ec761f4506353d571186a7efb469b878
This commit is contained in:
Jonathan Schleifer 2025-03-08 00:58:32 +00:00
parent 745514762e
commit 7ab817d420
3 changed files with 26 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/client.mm
View file

@ -164,14 +164,12 @@ trydisconnect()
disconnect(0, !disconnecting);
}
string ctext;
static OFString *ctext;
void
toserver(OFString *text)
{
@autoreleasepool {
conoutf(@"%s:\f %@", player1->name, text);
strn0cpy(ctext, text.UTF8String, 80);
}
conoutf(@"%s:\f %@", player1->name, text);
ctext = text;
}
void
@ -238,13 +236,11 @@ OFString *toservermap;
bool senditemstoserver =
false; // after a map change, since server doesn't have map data
string clientpassword;
OFString *clientpassword;
void
password(OFString *p)
{
@autoreleasepool {
strcpy_s(clientpassword, p.UTF8String);
}
clientpassword = p;
}
COMMAND(password, ARG_1STR)
@ -253,14 +249,14 @@ netmapstart()
{
senditemstoserver = true;
return clienthost != NULL;
};
}
void
initclientnet()
{
ctext[0] = 0;
ctext = @"";
toservermap = @"";
clientpassword[0] = 0;
clientpassword = @"";
newname(@"unnamed");
newteam(@"red");
}
@ -329,13 +325,12 @@ c2sinfo(dynent *d) // send update to the server
senditemstoserver = false;
serveriteminitdone = true;
}
if (ctext[0]) // player chat, not flood protected for
// now
{
// player chat, not flood protected for now
if (ctext.length > 0) {
packet->flags = ENET_PACKET_FLAG_RELIABLE;
putint(p, SV_TEXT);
sendstring(@(ctext), p);
ctext[0] = 0;
sendstring(ctext, p);
ctext = @"";
}
if (!c2sinit) // tell other clients who I am
{