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:
@ -112,12 +112,12 @@ enum {
|
||||
// empty
|
||||
};
|
||||
struct Cli2Srv_BlueSpiral_HitCloth : GameMsgHeader {
|
||||
byte clothNum; // the cloth we hit, 0..6
|
||||
uint8_t clothNum; // the cloth we hit, 0..6
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
struct Srv2Cli_BlueSpiral_ClothOrder : GameMsgHeader {
|
||||
byte order[7]; // each value is the cloth to hit, 0..6, the order is the order in the array
|
||||
uint8_t order[7]; // each value is the cloth to hit, 0..6, the order is the order in the array
|
||||
};
|
||||
struct Srv2Cli_BlueSpiral_SuccessfulHit : GameMsgHeader {
|
||||
// empty
|
||||
|
@ -125,19 +125,19 @@ enum {
|
||||
int amountToAdjust; // + or - value to adjust the number of blockers by
|
||||
};
|
||||
struct Cli2Srv_ClimbingWall_Ready : GameMsgHeader {
|
||||
byte readyType; // the type of ready this message represents (EClimbingWallReadyType)
|
||||
byte teamNumber; // the team that you are saying is ready (1 or 2)
|
||||
uint8_t readyType; // the type of ready this message represents (EClimbingWallReadyType)
|
||||
uint8_t teamNumber; // the team that you are saying is ready (1 or 2)
|
||||
};
|
||||
struct Cli2Srv_ClimbingWall_BlockerChanged : GameMsgHeader {
|
||||
byte teamNumber; // the team that is adjusting their blockers
|
||||
byte blockerNumber; // the number of the blocker that was added/removed
|
||||
uint8_t teamNumber; // the team that is adjusting their blockers
|
||||
uint8_t blockerNumber; // the number of the blocker that was added/removed
|
||||
bool added; // was the blocker added, or removed?
|
||||
};
|
||||
struct Cli2Srv_ClimbingWall_Reset : GameMsgHeader {
|
||||
// <no data>
|
||||
};
|
||||
struct Cli2Srv_ClimbingWall_PlayerEntered : GameMsgHeader {
|
||||
byte teamNumber; // the team this player is playing for
|
||||
uint8_t teamNumber; // the team this player is playing for
|
||||
};
|
||||
struct Cli2Srv_ClimbingWall_FinishedGame : GameMsgHeader {
|
||||
// <no data>
|
||||
@ -148,17 +148,17 @@ enum {
|
||||
|
||||
// Srv2Cli
|
||||
struct Srv2Cli_ClimbingWall_NumBlockersChanged : GameMsgHeader {
|
||||
byte newBlockerCount; // the new number of blocker we are playing with
|
||||
uint8_t newBlockerCount; // the new number of blocker we are playing with
|
||||
bool localOnly; // only adjust your local display, don't net prop
|
||||
};
|
||||
struct Srv2Cli_ClimbingWall_Ready : GameMsgHeader {
|
||||
byte readyType; // the type of ready this message represents (EClimbingWallReadyType)
|
||||
uint8_t readyType; // the type of ready this message represents (EClimbingWallReadyType)
|
||||
bool team1Ready;
|
||||
bool team2Ready;
|
||||
bool localOnly; // only adjust your local display, don't net prop
|
||||
};
|
||||
struct Srv2Cli_ClimbingWall_BlockersChanged : GameMsgHeader {
|
||||
byte teamNumber; // the team this set of blockers is for
|
||||
uint8_t teamNumber; // the team this set of blockers is for
|
||||
int blockersSet[kClimbingWallMaxBlockers]; // which blockers are set
|
||||
bool localOnly; // only adjust your local display, don't net prop
|
||||
};
|
||||
@ -171,7 +171,7 @@ enum {
|
||||
bool localOnly; // only adjust your local display, don't net prop
|
||||
};
|
||||
struct Srv2Cli_ClimbingWall_GameOver : GameMsgHeader {
|
||||
byte teamWon; // which team won the game
|
||||
uint8_t teamWon; // which team won the game
|
||||
int team1Blockers[kClimbingWallMaxBlockers];
|
||||
int team2Blockers[kClimbingWallMaxBlockers];
|
||||
bool localOnly; // only adjust your local display, don't net prop
|
||||
|
@ -138,18 +138,18 @@ enum {
|
||||
|
||||
// Cli2Srv
|
||||
struct Cli2Srv_Heek_PlayGame : GameMsgHeader {
|
||||
byte position; // 0...4
|
||||
dword points;
|
||||
wchar name[256];
|
||||
uint8_t position; // 0...4
|
||||
uint32_t points;
|
||||
wchar_t name[256];
|
||||
};
|
||||
struct Cli2Srv_Heek_LeaveGame : GameMsgHeader {
|
||||
// no extra data
|
||||
};
|
||||
struct Cli2Srv_Heek_Choose : GameMsgHeader {
|
||||
byte choice; // kHeekRock...kHeekScissors
|
||||
uint8_t choice; // kHeekRock...kHeekScissors
|
||||
};
|
||||
struct Cli2Srv_Heek_SeqFinished : GameMsgHeader {
|
||||
byte seqFinished; // kHeekCountdownSeq...kHeekGameWinSeq
|
||||
uint8_t seqFinished; // kHeekCountdownSeq...kHeekGameWinSeq
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
@ -162,39 +162,39 @@ enum {
|
||||
// no extra data
|
||||
};
|
||||
struct Srv2Cli_Heek_Welcome : GameMsgHeader {
|
||||
dword points;
|
||||
dword rank;
|
||||
wchar name[256];
|
||||
uint32_t points;
|
||||
uint32_t rank;
|
||||
wchar_t name[256];
|
||||
};
|
||||
struct Srv2Cli_Heek_Drop : GameMsgHeader {
|
||||
byte position; // 0...4
|
||||
uint8_t position; // 0...4
|
||||
};
|
||||
struct Srv2Cli_Heek_Setup : GameMsgHeader {
|
||||
byte position; // 0...4
|
||||
uint8_t position; // 0...4
|
||||
bool buttonState;
|
||||
bool lightOn[6];
|
||||
};
|
||||
struct Srv2Cli_Heek_LightState : GameMsgHeader {
|
||||
byte lightNum;
|
||||
byte state; // kHeekLightOn...kHeekLightFlash
|
||||
uint8_t lightNum;
|
||||
uint8_t state; // kHeekLightOn...kHeekLightFlash
|
||||
};
|
||||
struct Srv2Cli_Heek_InterfaceState : GameMsgHeader {
|
||||
bool buttonsEnabled;
|
||||
};
|
||||
struct Srv2Cli_Heek_CountdownState : GameMsgHeader {
|
||||
byte state; // kHeekCountdownStart...kHeekCountdownIdle
|
||||
uint8_t state; // kHeekCountdownStart...kHeekCountdownIdle
|
||||
};
|
||||
struct Srv2Cli_Heek_WinLose : GameMsgHeader {
|
||||
bool win;
|
||||
byte choice; // kHeekRock...kHeekScissors
|
||||
uint8_t choice; // kHeekRock...kHeekScissors
|
||||
};
|
||||
struct Srv2Cli_Heek_GameWin : GameMsgHeader {
|
||||
byte choice; // kHeekRock...kHeekScissors
|
||||
uint8_t choice; // kHeekRock...kHeekScissors
|
||||
};
|
||||
struct Srv2Cli_Heek_PointUpdate : GameMsgHeader {
|
||||
bool displayUpdate;
|
||||
dword points;
|
||||
dword rank;
|
||||
uint32_t points;
|
||||
uint32_t rank;
|
||||
};
|
||||
|
||||
//============================================================================
|
||||
|
@ -124,10 +124,10 @@ enum {
|
||||
// Message parameters
|
||||
//========================================================================
|
||||
struct Marker_CreateParam {
|
||||
byte gameType; // member of EMarkerGameType
|
||||
wchar gameName[256];
|
||||
dword timeLimit;
|
||||
wchar templateID[80]; // empty if creating a new game, guid if a quest game and we need to grab the data from the state server
|
||||
uint8_t gameType; // member of EMarkerGameType
|
||||
wchar_t gameName[256];
|
||||
uint32_t timeLimit;
|
||||
wchar_t templateID[80]; // empty if creating a new game, guid if a quest game and we need to grab the data from the state server
|
||||
};
|
||||
|
||||
//========================================================================
|
||||
@ -145,10 +145,10 @@ enum {
|
||||
// nothing
|
||||
};
|
||||
struct Cli2Srv_Marker_ChangeGameName : GameMsgHeader {
|
||||
wchar gameName[256];
|
||||
wchar_t gameName[256];
|
||||
};
|
||||
struct Cli2Srv_Marker_ChangeTimeLimit : GameMsgHeader {
|
||||
dword timeLimit;
|
||||
uint32_t timeLimit;
|
||||
};
|
||||
struct Cli2Srv_Marker_DeleteGame : GameMsgHeader {
|
||||
// nothing
|
||||
@ -157,35 +157,35 @@ enum {
|
||||
double x;
|
||||
double y;
|
||||
double z;
|
||||
wchar name[256];
|
||||
wchar age[80];
|
||||
wchar_t name[256];
|
||||
wchar_t age[80];
|
||||
};
|
||||
struct Cli2Srv_Marker_DeleteMarker : GameMsgHeader {
|
||||
dword markerID;
|
||||
uint32_t markerID;
|
||||
};
|
||||
struct Cli2Srv_Marker_ChangeMarkerName : GameMsgHeader {
|
||||
dword markerID;
|
||||
wchar markerName[256];
|
||||
uint32_t markerID;
|
||||
wchar_t markerName[256];
|
||||
};
|
||||
struct Cli2Srv_Marker_CaptureMarker : GameMsgHeader {
|
||||
dword markerID;
|
||||
uint32_t markerID;
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
struct Srv2Cli_Marker_TemplateCreated : GameMsgHeader {
|
||||
wchar templateID[80];
|
||||
wchar_t templateID[80];
|
||||
};
|
||||
struct Srv2Cli_Marker_TeamAssigned : GameMsgHeader {
|
||||
byte teamNumber; // 1 or 2
|
||||
uint8_t teamNumber; // 1 or 2
|
||||
};
|
||||
struct Srv2Cli_Marker_GameType : GameMsgHeader {
|
||||
byte gameType; // member of EMarkerGameType
|
||||
uint8_t gameType; // member of EMarkerGameType
|
||||
};
|
||||
struct Srv2Cli_Marker_GameStarted : GameMsgHeader {
|
||||
// nothing
|
||||
};
|
||||
struct Srv2Cli_Marker_GamePaused : GameMsgHeader {
|
||||
dword timeLeft; // 0 if quest game, since they don't have a timer
|
||||
uint32_t timeLeft; // 0 if quest game, since they don't have a timer
|
||||
};
|
||||
struct Srv2Cli_Marker_GameReset : GameMsgHeader {
|
||||
// nothing
|
||||
@ -194,10 +194,10 @@ enum {
|
||||
// nothing
|
||||
};
|
||||
struct Srv2Cli_Marker_GameNameChanged : GameMsgHeader {
|
||||
wchar newName[256];
|
||||
wchar_t newName[256];
|
||||
};
|
||||
struct Srv2Cli_Marker_TimeLimitChanged : GameMsgHeader {
|
||||
dword newTimeLimit;
|
||||
uint32_t newTimeLimit;
|
||||
};
|
||||
struct Srv2Cli_Marker_GameDeleted : GameMsgHeader {
|
||||
bool failed; // did the delete fail?
|
||||
@ -206,20 +206,20 @@ enum {
|
||||
double x;
|
||||
double y;
|
||||
double z;
|
||||
dword markerID;
|
||||
wchar name[256];
|
||||
wchar age[80];
|
||||
uint32_t markerID;
|
||||
wchar_t name[256];
|
||||
wchar_t age[80];
|
||||
};
|
||||
struct Srv2Cli_Marker_MarkerDeleted : GameMsgHeader {
|
||||
dword markerID;
|
||||
uint32_t markerID;
|
||||
};
|
||||
struct Srv2Cli_Marker_MarkerNameChanged : GameMsgHeader {
|
||||
dword markerID;
|
||||
wchar newName[256];
|
||||
uint32_t markerID;
|
||||
wchar_t newName[256];
|
||||
};
|
||||
struct Srv2Cli_Marker_MarkerCaptured : GameMsgHeader {
|
||||
dword markerID;
|
||||
byte team; // 0 for no team, or for quest games
|
||||
uint32_t markerID;
|
||||
uint8_t team; // 0 for no team, or for quest games
|
||||
};
|
||||
|
||||
|
||||
|
@ -103,7 +103,7 @@ enum {
|
||||
// Message parameters
|
||||
//========================================================================
|
||||
struct TTT_CreateParam {
|
||||
byte playerCount; // 1 or 2
|
||||
uint8_t playerCount; // 1 or 2
|
||||
};
|
||||
|
||||
//========================================================================
|
||||
@ -112,8 +112,8 @@ enum {
|
||||
|
||||
// Cli2Srv
|
||||
struct Cli2Srv_TTT_MakeMove : GameMsgHeader {
|
||||
byte row; // 1..3
|
||||
byte col; // 1..3
|
||||
uint8_t row; // 1..3
|
||||
uint8_t col; // 1..3
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
@ -122,12 +122,12 @@ enum {
|
||||
};
|
||||
struct Srv2Cli_TTT_GameOver : GameMsgHeader {
|
||||
ETTTGameResult result;
|
||||
dword winnerId;
|
||||
uint32_t winnerId;
|
||||
};
|
||||
struct Srv2Cli_TTT_MoveMade : GameMsgHeader {
|
||||
dword playerId;
|
||||
byte row; // 1..3
|
||||
byte col; // 1..3
|
||||
uint32_t playerId;
|
||||
uint8_t row; // 1..3
|
||||
uint8_t col; // 1..3
|
||||
};
|
||||
|
||||
//============================================================================
|
||||
|
@ -112,7 +112,7 @@ enum {
|
||||
// Cli2Srv
|
||||
struct Cli2Srv_VarSync_SetStringVar : GameMsgHeader {
|
||||
unsigned long varID;
|
||||
wchar varValue[256];
|
||||
wchar_t varValue[256];
|
||||
};
|
||||
struct Cli2Srv_VarSync_SetNumericVar : GameMsgHeader {
|
||||
unsigned long varID;
|
||||
@ -121,18 +121,18 @@ enum {
|
||||
struct Cli2Srv_VarSync_RequestAllVars : GameMsgHeader {
|
||||
};
|
||||
struct Cli2Srv_VarSync_CreateStringVar : GameMsgHeader {
|
||||
wchar varName[256];
|
||||
wchar varValue[256];
|
||||
wchar_t varName[256];
|
||||
wchar_t varValue[256];
|
||||
};
|
||||
struct Cli2Srv_VarSync_CreateNumericVar : GameMsgHeader {
|
||||
wchar varName[256];
|
||||
wchar_t varName[256];
|
||||
double varValue;
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
struct Srv2Cli_VarSync_StringVarChanged : GameMsgHeader {
|
||||
unsigned long varID;
|
||||
wchar varValue[256];
|
||||
wchar_t varValue[256];
|
||||
};
|
||||
struct Srv2Cli_VarSync_NumericVarChanged : GameMsgHeader {
|
||||
unsigned long varID;
|
||||
@ -141,12 +141,12 @@ enum {
|
||||
struct Srv2Cli_VarSync_AllVarsSent : GameMsgHeader {
|
||||
};
|
||||
struct Srv2Cli_VarSync_StringVarCreated : GameMsgHeader {
|
||||
wchar varName[256];
|
||||
wchar_t varName[256];
|
||||
unsigned long varID;
|
||||
wchar varValue[256];
|
||||
wchar_t varValue[256];
|
||||
};
|
||||
struct Srv2Cli_VarSync_NumericVarCreated : GameMsgHeader {
|
||||
wchar varName[256];
|
||||
wchar_t varName[256];
|
||||
unsigned long varID;
|
||||
double varValue;
|
||||
};
|
||||
|
@ -169,10 +169,10 @@ enum {
|
||||
//============================================================================
|
||||
|
||||
struct GameMsgHeader {
|
||||
dword messageId;
|
||||
dword transId;
|
||||
dword recvGameId; // 0 --> GameMgr, non-zero --> GameSrv
|
||||
dword messageBytes;
|
||||
uint32_t messageId;
|
||||
uint32_t transId;
|
||||
uint32_t recvGameId; // 0 --> GameMgr, non-zero --> GameSrv
|
||||
uint32_t messageBytes;
|
||||
};
|
||||
|
||||
//========================================================================
|
||||
@ -182,35 +182,35 @@ enum {
|
||||
// Cli2Srv
|
||||
struct Cli2Srv_GameMgr_CreateGame : GameMsgHeader {
|
||||
Uuid gameTypeId;
|
||||
dword createOptions;
|
||||
dword createDataBytes;
|
||||
byte createData[1]; // [createDataBytes]
|
||||
uint32_t createOptions;
|
||||
uint32_t createDataBytes;
|
||||
uint8_t createData[1]; // [createDataBytes]
|
||||
};
|
||||
struct Cli2Srv_GameMgr_JoinGame : GameMsgHeader {
|
||||
// Field ordering here is vitally important, see pfGameMgr::JoinGame for explanation
|
||||
dword newGameId;
|
||||
dword createOptions;
|
||||
uint32_t newGameId;
|
||||
uint32_t createOptions;
|
||||
Uuid gameTypeId;
|
||||
dword createDataBytes;
|
||||
byte createData[1]; // [createDataBytes]
|
||||
uint32_t createDataBytes;
|
||||
uint8_t createData[1]; // [createDataBytes]
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
struct Srv2Cli_GameMgr_GameInstance : GameMsgHeader {
|
||||
EGameJoinError result;
|
||||
dword ownerId;
|
||||
uint32_t ownerId;
|
||||
Uuid gameTypeId;
|
||||
dword newGameId;
|
||||
uint32_t newGameId;
|
||||
};
|
||||
struct Srv2Cli_GameMgr_InviteReceived : GameMsgHeader {
|
||||
dword inviterId;
|
||||
uint32_t inviterId;
|
||||
Uuid gameTypeId;
|
||||
dword newGameId;
|
||||
uint32_t newGameId;
|
||||
};
|
||||
struct Srv2Cli_GameMgr_InviteRevoked : GameMsgHeader {
|
||||
dword inviterId;
|
||||
uint32_t inviterId;
|
||||
Uuid gameTypeId;
|
||||
dword newGameId;
|
||||
uint32_t newGameId;
|
||||
};
|
||||
|
||||
|
||||
@ -222,26 +222,26 @@ enum {
|
||||
struct Cli2Srv_Game_LeaveGame : GameMsgHeader {
|
||||
};
|
||||
struct Cli2Srv_Game_Invite : GameMsgHeader {
|
||||
dword playerId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
struct Cli2Srv_Game_Uninvite : GameMsgHeader {
|
||||
dword playerId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
|
||||
// Srv2Cli
|
||||
struct Srv2Cli_Game_PlayerJoined : GameMsgHeader {
|
||||
dword playerId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
struct Srv2Cli_Game_PlayerLeft : GameMsgHeader {
|
||||
dword playerId;
|
||||
uint32_t playerId;
|
||||
};
|
||||
struct Srv2Cli_Game_InviteFailed : GameMsgHeader {
|
||||
dword inviteeId;
|
||||
dword operationId;
|
||||
uint32_t inviteeId;
|
||||
uint32_t operationId;
|
||||
EGameInviteError error;
|
||||
};
|
||||
struct Srv2Cli_Game_OwnerChange : GameMsgHeader {
|
||||
dword ownerId;
|
||||
uint32_t ownerId;
|
||||
};
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user