mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Convert custom HeadSpin integer types to standard types from stdint.h
This commit is contained in:
@ -269,7 +269,7 @@ void pfGmBlueSpiral::HitCloth (int clothNum) {
|
||||
msg.messageBytes = sizeof(msg);
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
msg.clothNum = (byte)clothNum;
|
||||
msg.clothNum = (uint8_t)clothNum;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
}
|
||||
|
@ -279,8 +279,8 @@ void pfGmClimbingWall::Ready (unsigned readyType, unsigned teamNumber) {
|
||||
msg.messageBytes = sizeof(msg);
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
msg.readyType = (byte)readyType;
|
||||
msg.teamNumber = (byte)teamNumber;
|
||||
msg.readyType = (uint8_t)readyType;
|
||||
msg.teamNumber = (uint8_t)teamNumber;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
}
|
||||
@ -293,8 +293,8 @@ void pfGmClimbingWall::ChangeBlocker (unsigned teamNumber, unsigned blockerNumbe
|
||||
msg.messageBytes = sizeof(msg);
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
msg.teamNumber = (byte)teamNumber;
|
||||
msg.blockerNumber = (byte)blockerNumber;
|
||||
msg.teamNumber = (uint8_t)teamNumber;
|
||||
msg.blockerNumber = (uint8_t)blockerNumber;
|
||||
msg.added = added;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
@ -320,7 +320,7 @@ void pfGmClimbingWall::PlayerEntered (unsigned teamNumber) {
|
||||
msg.messageBytes = sizeof(msg);
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
msg.teamNumber = (byte)teamNumber;
|
||||
msg.teamNumber = (uint8_t)teamNumber;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
}
|
||||
|
@ -294,14 +294,14 @@ void pfGmHeek::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmHeek::PlayGame (unsigned position, dword points, const wchar name[]) {
|
||||
void pfGmHeek::PlayGame (unsigned position, uint32_t points, const wchar_t name[]) {
|
||||
Cli2Srv_Heek_PlayGame msg;
|
||||
msg.messageId = kCli2Srv_Heek_PlayGame;
|
||||
msg.messageBytes = sizeof(msg);
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
|
||||
msg.position = (byte)position;
|
||||
msg.position = (uint8_t)position;
|
||||
msg.points = points;
|
||||
StrCopy(msg.name, name, arrsize(msg.name));
|
||||
|
||||
@ -327,7 +327,7 @@ void pfGmHeek::Choose (EHeekChoice choice) {
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
|
||||
msg.choice = (byte)choice;
|
||||
msg.choice = (uint8_t)choice;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
}
|
||||
@ -340,7 +340,7 @@ void pfGmHeek::SequenceFinished (EHeekSeqFinished seq) {
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
|
||||
msg.seqFinished = (byte)seq;
|
||||
msg.seqFinished = (uint8_t)seq;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
}
|
@ -86,7 +86,7 @@ public:
|
||||
//========================================================================
|
||||
// Game methods
|
||||
//-------------
|
||||
void PlayGame (unsigned position, dword points, const wchar name[]);
|
||||
void PlayGame (unsigned position, uint32_t points, const wchar_t name[]);
|
||||
void LeaveGame ();
|
||||
void Choose (EHeekChoice choice);
|
||||
void SequenceFinished (EHeekSeqFinished seq);
|
||||
|
@ -66,7 +66,7 @@ typedef pfGameCli * (*FGameCliFactory)(
|
||||
struct GameTypeReg {
|
||||
FGameCliFactory create;
|
||||
Uuid typeId;
|
||||
const wchar * name;
|
||||
const wchar_t * name;
|
||||
};
|
||||
|
||||
void GameMgrRegisterGameType (const GameTypeReg & reg);
|
||||
|
@ -372,7 +372,7 @@ void pfGmMarker::ResetGame () {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmMarker::ChangeGameName (const wchar name[]) {
|
||||
void pfGmMarker::ChangeGameName (const wchar_t name[]) {
|
||||
|
||||
Cli2Srv_Marker_ChangeGameName msg;
|
||||
msg.messageId = kCli2Srv_Marker_ChangeGameName;
|
||||
@ -410,7 +410,7 @@ void pfGmMarker::DeleteGame () {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmMarker::AddMarker (double x, double y, double z, const wchar name[], const wchar age[]) {
|
||||
void pfGmMarker::AddMarker (double x, double y, double z, const wchar_t name[], const wchar_t age[]) {
|
||||
|
||||
Cli2Srv_Marker_AddMarker msg;
|
||||
msg.messageId = kCli2Srv_Marker_AddMarker;
|
||||
@ -440,7 +440,7 @@ void pfGmMarker::DeleteMarker (unsigned long markerID) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmMarker::ChangeMarkerName (unsigned long markerID, const wchar name[]) {
|
||||
void pfGmMarker::ChangeMarkerName (unsigned long markerID, const wchar_t name[]) {
|
||||
|
||||
Cli2Srv_Marker_ChangeMarkerName msg;
|
||||
msg.messageId = kCli2Srv_Marker_ChangeMarkerName;
|
||||
|
@ -89,12 +89,12 @@ public:
|
||||
void StartGame ();
|
||||
void PauseGame ();
|
||||
void ResetGame ();
|
||||
void ChangeGameName (const wchar name[]);
|
||||
void ChangeGameName (const wchar_t name[]);
|
||||
void ChangeTimeLimit (unsigned long timeLimit);
|
||||
void DeleteGame ();
|
||||
void AddMarker (double x, double y, double z, const wchar name[], const wchar age[]);
|
||||
void AddMarker (double x, double y, double z, const wchar_t name[], const wchar_t age[]);
|
||||
void DeleteMarker (unsigned long markerID);
|
||||
void ChangeMarkerName (unsigned long markerID, const wchar name[]);
|
||||
void ChangeMarkerName (unsigned long markerID, const wchar_t name[]);
|
||||
void CaptureMarker (unsigned long markerID);
|
||||
//========================================================================
|
||||
};
|
||||
|
@ -262,8 +262,8 @@ void pfGmTicTacToe::MakeMove (unsigned row, unsigned col) {
|
||||
msg.messageBytes = sizeof(msg);
|
||||
msg.recvGameId = GetGameId(); // send to GameSrv on server
|
||||
msg.transId = 0;
|
||||
msg.row = (byte)row;
|
||||
msg.col = (byte)col;
|
||||
msg.row = (uint8_t)row;
|
||||
msg.col = (uint8_t)col;
|
||||
|
||||
GameMgrSend(&msg);
|
||||
}
|
||||
|
@ -249,7 +249,7 @@ void pfGmVarSync::OnOwnerChange (const Srv2Cli_Game_OwnerChange & msg) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmVarSync::SetStringVar (unsigned long id, const wchar* val) {
|
||||
void pfGmVarSync::SetStringVar (unsigned long id, const wchar_t* val) {
|
||||
|
||||
Cli2Srv_VarSync_SetStringVar msg;
|
||||
msg.messageId = kCli2Srv_VarSync_SetStringVar;
|
||||
@ -289,7 +289,7 @@ void pfGmVarSync::RequestAllVars () {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmVarSync::CreateStringVar (const wchar* name, const wchar* val) {
|
||||
void pfGmVarSync::CreateStringVar (const wchar_t* name, const wchar_t* val) {
|
||||
|
||||
Cli2Srv_VarSync_CreateStringVar msg;
|
||||
msg.messageId = kCli2Srv_VarSync_CreateStringVar;
|
||||
@ -303,7 +303,7 @@ void pfGmVarSync::CreateStringVar (const wchar* name, const wchar* val) {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
void pfGmVarSync::CreateNumericVar (const wchar* name, double val) {
|
||||
void pfGmVarSync::CreateNumericVar (const wchar_t* name, double val) {
|
||||
|
||||
Cli2Srv_VarSync_CreateNumericVar msg;
|
||||
msg.messageId = kCli2Srv_VarSync_CreateNumericVar;
|
||||
|
@ -86,11 +86,11 @@ public:
|
||||
//========================================================================
|
||||
// Game methods
|
||||
//-------------
|
||||
void SetStringVar (unsigned long id, const wchar* val);
|
||||
void SetStringVar (unsigned long id, const wchar_t* val);
|
||||
void SetNumericVar (unsigned long id, double val);
|
||||
void RequestAllVars ();
|
||||
void CreateStringVar (const wchar* name, const wchar* val);
|
||||
void CreateNumericVar (const wchar* name, double val);
|
||||
void CreateStringVar (const wchar_t* name, const wchar_t* val);
|
||||
void CreateNumericVar (const wchar_t* name, double val);
|
||||
//========================================================================
|
||||
};
|
||||
|
||||
|
@ -351,7 +351,7 @@ pfGameCli * pfGameMgr::GetGameCli (unsigned gameId) const {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
const wchar * pfGameMgr::GetGameNameByTypeId (const Uuid & gameTypeId) const {
|
||||
const wchar_t * pfGameMgr::GetGameNameByTypeId (const Uuid & gameTypeId) const {
|
||||
|
||||
if (Factory * factory = s_factories.Find(gameTypeId))
|
||||
return factory->reg.name;
|
||||
@ -491,7 +491,7 @@ const Uuid & pfGameCli::GetGameTypeId () const {
|
||||
}
|
||||
|
||||
//============================================================================
|
||||
const wchar * pfGameCli::GetName () const {
|
||||
const wchar_t * pfGameCli::GetName () const {
|
||||
|
||||
return internal->factory->reg.name;
|
||||
}
|
||||
|
@ -156,7 +156,7 @@ public:
|
||||
// Return interface to the specified game
|
||||
pfGameCli * GetGameCli (unsigned gameId) const;
|
||||
// Get the name of a game by its typeid
|
||||
const wchar * GetGameNameByTypeId (const Uuid & gameTypeId) const;
|
||||
const wchar_t * GetGameNameByTypeId (const Uuid & gameTypeId) const;
|
||||
//========================================================================
|
||||
|
||||
//========================================================================
|
||||
@ -228,7 +228,7 @@ public:
|
||||
//-----------------------
|
||||
unsigned GetGameId () const;
|
||||
const Uuid & GetGameTypeId () const;
|
||||
const wchar * GetName () const;
|
||||
const wchar_t * GetName () const;
|
||||
plKey GetReceiver () const;
|
||||
unsigned GetPlayerCount () const;
|
||||
//========================================================================
|
||||
@ -250,7 +250,7 @@ public:
|
||||
// @@@: FUTURE WORK
|
||||
//-----------------
|
||||
// "Publish" this game, adding it to the age's the matchmaking service.
|
||||
// void PublishGame (const wchar desc[]);
|
||||
// void PublishGame (const wchar_t desc[]);
|
||||
// void UnpublishGame ();
|
||||
//========================================================================
|
||||
};
|
||||
|
Reference in New Issue
Block a user