diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp index 62de66e1..7bb6b174 100644 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp @@ -1554,7 +1554,7 @@ SessionApiClient* ConnectionServer::getSessionApiClient() // ---------------------------------------------------------------------- -void ConnectionServer::setDone(char const reasonfmt, ...) +void ConnectionServer::setDone(char const *reasonfmt, ...) { if (!done) { diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h index d6d07a73..36abc449 100644 --- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h +++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.h @@ -36,7 +36,7 @@ class ConnectionServer : public MessageDispatch::Receiver public: static void install(); static void remove(); - void setDone(char const reasonfmt, ...); + void setDone(char const *reasonfmt, ...); ~ConnectionServer (); diff --git a/engine/server/application/LogServer/src/shared/LogServer.cpp b/engine/server/application/LogServer/src/shared/LogServer.cpp index 3b978e44..e608ab89 100644 --- a/engine/server/application/LogServer/src/shared/LogServer.cpp +++ b/engine/server/application/LogServer/src/shared/LogServer.cpp @@ -127,7 +127,7 @@ void LogServer::receiveMessage(MessageDispatch::Emitter const &source, MessageDi // ---------------------------------------------------------------------- -void LogServer::setDone(char const reasonfmt, ...) +void LogServer::setDone(char const *reasonfmt, ...) { if (!m_done) { diff --git a/engine/server/application/LogServer/src/shared/LogServer.h b/engine/server/application/LogServer/src/shared/LogServer.h index 03e1dce9..6edc6b19 100644 --- a/engine/server/application/LogServer/src/shared/LogServer.h +++ b/engine/server/application/LogServer/src/shared/LogServer.h @@ -30,7 +30,7 @@ public: static void remove(); static void run(); void mainLoop(); - void setDone(char const reason, ...); + void setDone(char const *reasonfmt, ...); virtual void receiveMessage(MessageDispatch::Emitter const &source, MessageDispatch::MessageBase const &message); diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp b/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp index fd973f07..c1dbd871 100644 --- a/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp +++ b/engine/server/application/PlanetServer/src/shared/PlanetServer.cpp @@ -1449,7 +1449,7 @@ void PlanetServer::sendQueuedMessagesForObject(const PlanetProxyObject &theObjec // ---------------------------------------------------------------------- -void PlanetServer::setDone(char const reasonfmt, ...) +void PlanetServer::setDone(char const *reasonfmt, ...) { if (!m_done) { diff --git a/engine/server/application/PlanetServer/src/shared/PlanetServer.h b/engine/server/application/PlanetServer/src/shared/PlanetServer.h index c013b932..cf457544 100644 --- a/engine/server/application/PlanetServer/src/shared/PlanetServer.h +++ b/engine/server/application/PlanetServer/src/shared/PlanetServer.h @@ -49,7 +49,7 @@ public: static void run(void); void mainLoop(void); - void setDone(char const reasonfmt, ...); + void setDone(char const *reasonfmt, ...); const unsigned short getGameServicePort() const; const Service * getGameService() const; diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp index 9e1f5886..f27df9a7 100644 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.cpp @@ -311,7 +311,7 @@ void DatabaseProcess::run(void) // ---------------------------------------------------------------------- -void DatabaseProcess::setDone(char const reasonfmt, ...) +void DatabaseProcess::setDone(char const *reasonfmt, ...) { if (!done) { diff --git a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h index 90bb2088..5cc5f2e7 100644 --- a/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h +++ b/engine/server/library/serverDatabase/src/shared/DatabaseProcess.h @@ -40,7 +40,7 @@ class DatabaseProcess : public MessageDispatch::Receiver // running: virtual void run (void) = 0; - void setDone(char const reasonfmt, ...); + void setDone(char const *reasonfmt, ...); virtual void frameTick(void) {} diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp index 15d35ef5..6350d91b 100644 --- a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp +++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.cpp @@ -535,7 +535,7 @@ uint32 PlayerShipController::getCurSyncStamp() const // ---------------------------------------------------------------------- -void PlayerShipController::logMoveFail(char const reasonFmt, ...) const +void PlayerShipController::logMoveFail(char const *reasonFmt, ...) const { ShipObject const * const ship = NON_NULL(getShipOwner()); Client const * const client = NON_NULL(ship->getClient()); diff --git a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h index e535da9f..fdf02467 100644 --- a/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h +++ b/engine/server/library/serverGame/src/shared/controller/PlayerShipController.h @@ -76,7 +76,7 @@ private: uint32 getCurSyncStamp() const; bool checkValidMove(Transform const &transform, Vector const &velocity, float speed, uint32 syncStamp); - void logMoveFail(char const reasonFmt, ...) const; + void logMoveFail(char const *reasonFmt, ...) const; private: diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.cpp b/engine/server/library/serverGame/src/shared/core/GameServer.cpp index 8026de12..563fa2b8 100644 --- a/engine/server/library/serverGame/src/shared/core/GameServer.cpp +++ b/engine/server/library/serverGame/src/shared/core/GameServer.cpp @@ -4864,7 +4864,7 @@ void GameServer::getObjectsWithClients(std::vector &objects) con // ---------------------------------------------------------------------- -void GameServer::setDone(char const reasonfmt, ...) +void GameServer::setDone(char const *reasonfmt, ...) { if (!m_done) { diff --git a/engine/server/library/serverGame/src/shared/core/GameServer.h b/engine/server/library/serverGame/src/shared/core/GameServer.h index f30e4b38..c3036761 100644 --- a/engine/server/library/serverGame/src/shared/core/GameServer.h +++ b/engine/server/library/serverGame/src/shared/core/GameServer.h @@ -106,7 +106,7 @@ public: void clearCustomerServiceServerConnection(); void setCentralServerConnection (CentralServerConnection *newCentralServerConnection); void setDatabaseProcessConnection (DatabaseProcessConnection *newDatabaseProcessConnection); - void setDone (char const reasonfmt, ...); + void setDone (char const *reasonfmt, ...); void setProcessId (uint32 newProcessId); void onDatabaseProcessConnectionEstablished(); void onPlanetServerConnectionEstablished (); diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp index 6306ae8a..35d9a1b4 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.cpp @@ -177,7 +177,7 @@ int File::readLine(char *buffer, int bufferSize) /** * fprintf functionality. */ -int File::print(const char format, ...) +int File::print(const char *format, ...) { NOT_NULL(m_fp); diff --git a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h index 50c531bf..b8f655e6 100644 --- a/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h +++ b/engine/shared/library/sharedTemplateDefinition/src/shared/core/File.h @@ -33,7 +33,7 @@ public: int readLine(char *buffer, int bufferSize); int puts(const char *string); - int print(const char format, ...); + int print(const char *format, ...); void printWarning(const char *buffer) const; void printError(const char *buffer) const;