mirror of
https://github.com/CraftyBoss/SuperMarioOdysseyOnline.git
synced 2024-12-04 17:07:29 +00:00
69d6a732c7
- change: general game mode management more abstract and less H&S oriented
- change: split 8bit updateType into 4bit game mode and 4bit update type.
- change: don't process packets from other game modes (legacy mode for backwards compatibility)
- change: cache game mode of other players in puppet, resend GameModeInf on detected game mode change
- change: send gamemode NONE when H&S is selected but not active
- change: improved distance calculations in squared distance space
- change: change from hider to seeker when dead even if there are no other players
- fix: add hours to the minutes for the H&S GameModeInf packet
- fix: set milliseconds and hours when receiving time from server
- fix: keep the new time from the server for longer than a single frame
- fix: reset H&S icon after receiving a new state from the server
- refac: move code to generate PlayerList into own abstract LayoutPlayerList class.
- refac: to_string() method for GameTime to simplify code in the Game Mode Icon class.
- refac: rename TagInf packet to GameModeInf packet
- refac: remove param from `SocketClient::tryGetPacket()` (unused)
- refac: move all H&S specific files into the same directory (out of layouts)
- refac: move GameModeTimer.cpp from source/server/hns/ to source/server/gamemode/
- refac: clean up some unused, duplicate or complicated imports
- [mod menu] change: use the game mode name in the options & menu title
- [mod menu] change: select the next game mode in the game mode select menu
- [mod menu] change: possibility to always change the gravity setting in the H&S config menu
- [mod menu] add: toggle options to control mario/cappy collision/bounciness
(cherry picked from commit a9b2c87aa0)
(cherry picked from commit 918f61fbfd619d781d88dc74878d392c48cfa480)
(cherry picked from commit 96aff7dd7167d8244acef7884fa3503d4c3f868a)
(cherry picked from commit 0fb6413ec91bbf679e9f8cea1aa512159101fa46)
(cherry picked from commit ab78a812fd18781655ccf38e803f619ea427d1ac)
Co-authored-by: Robin C. Ladiges <rcl.git@blackpinguin.de>
37 lines
1 KiB
C
37 lines
1 KiB
C
#pragma once
|
|
|
|
#include "Packet.h"
|
|
#include "algorithms/PlayerAnims.h"
|
|
#include "sead/math/seadVector.h"
|
|
#include "sead/math/seadQuat.h"
|
|
|
|
struct PACKED PlayerInf : Packet {
|
|
PlayerInf() : Packet() {
|
|
mType = PacketType::PLAYERINF;
|
|
mPacketSize = sizeof(PlayerInf) - sizeof(Packet);
|
|
};
|
|
sead::Vector3f playerPos;
|
|
sead::Quatf playerRot;
|
|
float animBlendWeights[6];
|
|
PlayerAnims::Type actName;
|
|
PlayerAnims::Type subActName;
|
|
|
|
bool operator==(const PlayerInf& rhs) const {
|
|
bool isWeightsEqual = true;
|
|
for (size_t i = 0; i < 6; i++) {
|
|
if (animBlendWeights[i] != rhs.animBlendWeights[i]) {
|
|
isWeightsEqual = false;
|
|
break;
|
|
}
|
|
}
|
|
return (
|
|
isWeightsEqual
|
|
&& playerPos == rhs.playerPos
|
|
&& playerRot == rhs.playerRot
|
|
&& actName == rhs.actName
|
|
&& subActName == rhs.subActName
|
|
);
|
|
}
|
|
|
|
bool operator!=(const PlayerInf& rhs) const { return !operator==(rhs); }
|
|
};
|