mirror of
https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git
synced 2025-07-18 11:19:10 +00:00
Replace Uuid with plUUID EVERYWHERE.
This commit is contained in:
@ -68,7 +68,7 @@ enum EBlueSpiralInitResult {
|
||||
// Game type id
|
||||
//============================================================================
|
||||
|
||||
const Uuid kGameTypeId_BlueSpiral = Uuid(L"5ff98165-913e-4fd1-a2c2-9c7f31be2cc8");
|
||||
const plUUID kGameTypeId_BlueSpiral("5ff98165-913e-4fd1-a2c2-9c7f31be2cc8");
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
@ -75,7 +75,7 @@ const int kClimbingWallNoBlocker = -1; // the value of a slot in the blocker arr
|
||||
// Game type id
|
||||
//============================================================================
|
||||
|
||||
const Uuid kGameTypeId_ClimbingWall = Uuid(L"6224cdf4-3556-4740-b7cd-d637562d07be");
|
||||
const plUUID kGameTypeId_ClimbingWall("6224cdf4-3556-4740-b7cd-d637562d07be");
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
@ -91,7 +91,7 @@ enum EHeekCountdownState {
|
||||
// Game type id
|
||||
//============================================================================
|
||||
|
||||
const Uuid kGameTypeId_Heek = Uuid(L"9d83c2e2-7835-4477-9aaa-22254c59a753");
|
||||
const plUUID kGameTypeId_Heek("9d83c2e2-7835-4477-9aaa-22254c59a753");
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
@ -75,7 +75,7 @@ enum EMarkerGameType {
|
||||
// Game type id
|
||||
//============================================================================
|
||||
|
||||
const Uuid kGameTypeId_Marker = Uuid(L"000b2c39-0319-4be1-b06c-7a105b160fcf");
|
||||
const plUUID kGameTypeId_Marker("000b2c39-0319-4be1-b06c-7a105b160fcf");
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
@ -54,6 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
|
||||
#include "pnUtils/pnUtils.h"
|
||||
#include "pnNetBase/pnNetBase.h"
|
||||
#include "pnProduct/pnProduct.h"
|
||||
#include "pnUUID/pnUUID.h"
|
||||
|
||||
#include "pnGameMgr.h"
|
||||
#include "Intern.h"
|
||||
|
@ -74,7 +74,7 @@ enum ETTTGameResult {
|
||||
// Game type id
|
||||
//============================================================================
|
||||
|
||||
const Uuid kGameTypeId_TicTacToe = Uuid(L"a7236529-11d8-4758-9368-59cb43445a83");
|
||||
const plUUID kGameTypeId_TicTacToe("a7236529-11d8-4758-9368-59cb43445a83");
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
@ -68,7 +68,7 @@ enum EVarSyncInitResult {
|
||||
// Game type id
|
||||
//============================================================================
|
||||
|
||||
const Uuid kGameTypeId_VarSync = Uuid(L"475c2e9b-a245-4106-a047-9b25d41ff333");
|
||||
const plUUID kGameTypeId_VarSync("475c2e9b-a245-4106-a047-9b25d41ff333");
|
||||
|
||||
|
||||
//============================================================================
|
||||
|
@ -181,7 +181,7 @@ enum {
|
||||
|
||||
// Cli2Srv
|
||||
struct Cli2Srv_GameMgr_CreateGame : GameMsgHeader {
|
||||
Uuid gameTypeId;
|
||||
plUUID gameTypeId;
|
||||
uint32_t createOptions;
|
||||
uint32_t createDataBytes;
|
||||
uint8_t createData[1]; // [createDataBytes]
|
||||
@ -190,7 +190,7 @@ enum {
|
||||
// Field ordering here is vitally important, see pfGameMgr::JoinGame for explanation
|
||||
uint32_t newGameId;
|
||||
uint32_t createOptions;
|
||||
Uuid gameTypeId;
|
||||
plUUID gameTypeId;
|
||||
uint32_t createDataBytes;
|
||||
uint8_t createData[1]; // [createDataBytes]
|
||||
};
|
||||
@ -199,17 +199,17 @@ enum {
|
||||
struct Srv2Cli_GameMgr_GameInstance : GameMsgHeader {
|
||||
EGameJoinError result;
|
||||
uint32_t ownerId;
|
||||
Uuid gameTypeId;
|
||||
plUUID gameTypeId;
|
||||
uint32_t newGameId;
|
||||
};
|
||||
struct Srv2Cli_GameMgr_InviteReceived : GameMsgHeader {
|
||||
uint32_t inviterId;
|
||||
Uuid gameTypeId;
|
||||
plUUID gameTypeId;
|
||||
uint32_t newGameId;
|
||||
};
|
||||
struct Srv2Cli_GameMgr_InviteRevoked : GameMsgHeader {
|
||||
uint32_t inviterId;
|
||||
Uuid gameTypeId;
|
||||
plUUID gameTypeId;
|
||||
uint32_t newGameId;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user