mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-14 02:27:40 -04:00
remove pointless "BUILD_TYPE" option... external vs. internal client should really be enough
(this also removes some hard-coded Cyan URLs which depended on that option)
This commit is contained in:
@ -767,8 +767,8 @@ static void IReadNetIni() {
|
||||
}
|
||||
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
// @@@: Internal dev build only: Drop a default version of the file if not found
|
||||
if (!ini && BuildType() == BUILD_TYPE_DEV) {
|
||||
// @@@: Internal build only: Drop a default version of the file if not found
|
||||
if (!ini) {
|
||||
EFileError fileError;
|
||||
qword fileSize;
|
||||
qword lastWrite;
|
||||
|
@ -1489,7 +1489,7 @@ static void Connect (
|
||||
connect.hdr.connType = kConnTypeCliToAuth;
|
||||
connect.hdr.hdrBytes = sizeof(connect.hdr);
|
||||
connect.hdr.buildId = BuildId();
|
||||
connect.hdr.buildType = BuildType();
|
||||
connect.hdr.buildType = BUILD_TYPE_LIVE;
|
||||
connect.hdr.branchId = BranchId();
|
||||
connect.hdr.productId = ProductId();
|
||||
connect.data.token = conn->token;
|
||||
|
@ -375,7 +375,7 @@ static void Connect (
|
||||
connect.hdr.connType = kConnTypeCliToCsr;
|
||||
connect.hdr.hdrBytes = sizeof(connect.hdr);
|
||||
connect.hdr.buildId = BuildId();
|
||||
connect.hdr.buildType = BuildType();
|
||||
connect.hdr.buildType = BUILD_TYPE_LIVE;
|
||||
connect.hdr.branchId = BranchId();
|
||||
connect.hdr.productId = ProductId();
|
||||
connect.data.dataBytes = sizeof(connect.data);
|
||||
|
@ -502,7 +502,7 @@ static void Connect (CliFileConn * conn) {
|
||||
connect.hdr.connType = kConnTypeCliToFile;
|
||||
connect.hdr.hdrBytes = sizeof(connect.hdr);
|
||||
connect.hdr.buildId = kFileSrvBuildId;
|
||||
connect.hdr.buildType = BuildType();
|
||||
connect.hdr.buildType = BUILD_TYPE_LIVE;
|
||||
connect.hdr.branchId = BranchId();
|
||||
connect.hdr.productId = ProductId();
|
||||
connect.data.buildId = conn->buildId;
|
||||
|
@ -352,7 +352,7 @@ static void Connect (
|
||||
connect.hdr.connType = kConnTypeCliToGame;
|
||||
connect.hdr.hdrBytes = sizeof(connect.hdr);
|
||||
connect.hdr.buildId = BuildId();
|
||||
connect.hdr.buildType = BuildType();
|
||||
connect.hdr.buildType = BUILD_TYPE_LIVE;
|
||||
connect.hdr.branchId = BranchId();
|
||||
connect.hdr.productId = ProductId();
|
||||
connect.data.dataBytes = sizeof(connect.data);
|
||||
|
@ -427,7 +427,7 @@ static void Connect (
|
||||
connect.hdr.connType = kConnTypeCliToGateKeeper;
|
||||
connect.hdr.hdrBytes = sizeof(connect.hdr);
|
||||
connect.hdr.buildId = BuildId();
|
||||
connect.hdr.buildType = BuildType();
|
||||
connect.hdr.buildType = BUILD_TYPE_LIVE;
|
||||
connect.hdr.branchId = BranchId();
|
||||
connect.hdr.productId = ProductId();
|
||||
connect.data.token = conn->token;
|
||||
|
@ -1161,7 +1161,7 @@ bool plSimpleStateVariable::ConvertTo(plSimpleVarDescriptor* toVar, bool force )
|
||||
int cnt = toVar->GetCount() ? toVar->GetCount() : fVar.GetCount();
|
||||
|
||||
if (cnt > fVar.GetCount()) {
|
||||
#if BUILD_TYPE == BUILD_TYPE_DEV
|
||||
#ifndef PLASMA_EXTERNAL_RELEASE
|
||||
FATAL("SDL Convert: array size increased, conversion loses data");
|
||||
#endif
|
||||
// Reallocate new memory (destroys existing variable state)
|
||||
|
Reference in New Issue
Block a user