Tribes2/T2-CPP
1
0
Fork 0
mirror of https://github.com/Ragora/T2-CPP.git synced 2026-01-20 02:24:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated to Visual C++ 2015 but kept old vcxproj files

Browse source
This commit is contained in:
Calvin Balke 2016-07-06 18:38:32 -07:00
parent 524dd4b205
commit 015a9f4dc8
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CommonAPI/Common/source/DXAPI/Move.cpp
View file

@ -1,3 +1,4 @@
#include <algorithm>
#include <DXAPI/Move.h> #include <DXAPI/Move.h>
#define M_PI 3.14159265358979323846 #define M_PI 3.14159265358979323846
#define M_2PI 6.28318530717958647692528676655900576 #define M_2PI 6.28318530717958647692528676655900576

7
Mod Sources/TSExtension/TSExtension/source/DXConCmds.cpp
View file

@ -399,9 +399,9 @@ bool reMatch(Linker::SimObject* obj, S32 argc, const char* argv[])
try try
{ {
std::smatch match; std::smatch match;
std::string tmps = std::string(argv[2]);
std::regex sequence(argv[1], std::regex::extended); std::regex sequence(argv[1], std::regex::extended);
std::regex_match(std::string(argv[2]), match, sequence); std::regex_match(tmps, match, sequence);
return !match.empty() && match.size() != 0; return !match.empty() && match.size() != 0;
} }
@ -421,7 +421,8 @@ bool reSearch(Linker::SimObject* obj, S32 argc, const char* argv[])
std::smatch match; std::smatch match;
std::regex sequence(argv[1], std::regex::extended); std::regex sequence(argv[1], std::regex::extended);
std::regex_search(std::string(argv[2]), match, sequence); std::string tmps = std::string(argv[2]);
std::regex_search(tmps, match, sequence);
return !match.empty() && match.size() != 0; return !match.empty() && match.size() != 0;
} }

6
Mod Sources/TSExtension/TSExtension/source/DXTCPObjects.cpp
View file

@ -250,7 +250,7 @@ bool conTSExtensionUpdate(Linker::SimObject *obj, S32 argc, const char *argv[])
} }
connectionInfo->is_connected = false; connectionInfo->is_connected = false;
disconnections.insert(disconnections.end(), currentConnection.get()); disconnections.insert(disconnections.end(), std::unique_ptr<DX::TCPObject>(currentConnection.get()));
Con::errorf(0,"Got a send error! SimID: %u - Error %u", currentConnection->identifier, wsa_error); Con::errorf(0,"Got a send error! SimID: %u - Error %u", currentConnection->identifier, wsa_error);
break; break;
@ -276,14 +276,14 @@ bool conTSExtensionUpdate(Linker::SimObject *obj, S32 argc, const char *argv[])
{ {
Con::errorf(0, "Got an error! %u - SimID %u", currentError, currentConnection.get()->identifier); Con::errorf(0, "Got an error! %u - SimID %u", currentError, currentConnection.get()->identifier);
disconnections.insert(disconnections.end(), currentConnection.get()); disconnections.insert(disconnections.end(), std::unique_ptr<DX::TCPObject>(currentConnection.get()));
} }
else if (data_length == 0) else if (data_length == 0)
{ {
Con::errorf(0, "Finished receiving?"); Con::errorf(0, "Finished receiving?");
// Put us on the D/C list // Put us on the D/C list
disconnections.insert(disconnections.end(), currentConnection.get()); disconnections.insert(disconnections.end(), std::unique_ptr<DX::TCPObject>(currentConnection.get()));
// Stream the data into ::onLine // Stream the data into ::onLine
unsigned int current_start = 0; unsigned int current_start = 0;