mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 03:23:15 +01:00
Code Issues Releases Wiki Activity

use Console::WriteLine instead of log_info

Browse Source
This commit is contained in:
Ted John
2016-05-25 20:26:12 +01:00
committed by Michał Janiszewski
parent 5bc99d2006
commit d62c94f14a
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/Console.cpp
View File

@@ -55,9 +55,14 @@ namespace Console
puts("");
}
void WriteLine(const utf8 * str)
void WriteLine(const utf8 * format, ...)
{
puts(str);
va_list args;
va_start(args, format);
vfprintf(stdout, format, args);
puts("");
va_end(args);
}
namespace Error

2
src/core/Console.hpp
View File

@@ -28,7 +28,7 @@ namespace Console
void WriteSpace(size_t count);
void WriteFormat(const utf8 * format, ...);
void WriteLine();
void WriteLine(const utf8 * str);
void WriteLine(const utf8 * format, ...);
namespace Error
{

13
src/network/network.cpp
View File

@@ -32,8 +32,11 @@ extern "C" {
#include <algorithm>
#include <set>
#include <string>
#include "../core/Util.hpp"
#include "../core/Console.hpp"
#include "../core/Json.hpp"
#include "../core/Util.hpp"
extern "C" {
#include "../config.h"
#include "../game.h"
@@ -714,10 +717,10 @@ bool Network::BeginClient(const char* host, unsigned short port)
safe_strcat(keyPath, gConfigNetwork.player_name, MAX_PATH);
safe_strcat(keyPath, ".privkey", MAX_PATH);
if (!platform_file_exists(keyPath)) {
log_info("Generating key... This may take a while");
log_info("Need to collect enough entropy from the system");
Console::WriteLine("Generating key... This may take a while");
Console::WriteLine("Need to collect enough entropy from the system");
key.Generate();
log_info("Key generated, saving private bits as %s", keyPath);
Console::WriteLine("Key generated, saving private bits as %s", keyPath);
SDL_RWops *privkey = SDL_RWFromFile(keyPath, "wb+");
key.SavePrivate(privkey);
SDL_RWclose(privkey);
@@ -728,7 +731,7 @@ bool Network::BeginClient(const char* host, unsigned short port)
safe_strcat(keyPath, "-", MAX_PATH);
safe_strcat(keyPath, key.PublicKeyHash().c_str(), MAX_PATH);
safe_strcat(keyPath, ".pubkey", MAX_PATH);
log_info("Key generated, saving public bits as %s", keyPath);
Console::WriteLine("Key generated, saving public bits as %s", keyPath);
SDL_RWops *pubkey = SDL_RWFromFile(keyPath, "wb+");
key.SavePublic(pubkey);
SDL_RWclose(pubkey);