Skip to content

Commit

Permalink
Fixed build
Browse files Browse the repository at this point in the history
  • Loading branch information
deathkiller committed Feb 18, 2025
1 parent 80eca6c commit 4be452d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
push:
branches:
- 'master'
pull_request:
pull_request_target:
types: [ opened, synchronize ]
workflow_dispatch:

Expand All @@ -14,6 +14,7 @@ concurrency:

jobs:
Build:
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
runs-on: 'ubuntu-latest'
#runs-on: 'ubuntu-22.04'

Expand All @@ -40,7 +41,7 @@ jobs:
- name: 'Build'
run: |
mkdir -p ./build/docs/
./m.css/documentation/doxygen.py Docs/conf.py
./m.css/documentation/doxygen.py ./Docs/conf.py
- name: 'Upload Package'
uses: actions/upload-artifact@v4
Expand Down
8 changes: 4 additions & 4 deletions Sources/Jazz2/Multiplayer/MultiLevelHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -718,7 +718,7 @@ namespace Jazz2::Multiplayer
return;
}

LOGD("[MP] Changing level to \"%s\" (0x%02x)", nextLevel.data(), exitType);
LOGD("[MP] Changing level to \"%s\" (0x%02x)", nextLevel.data(), (std::uint32_t)exitType);

LevelHandler::BeginLevelChange(initiator, exitType, nextLevel);
}
Expand Down Expand Up @@ -1477,7 +1477,7 @@ namespace Jazz2::Multiplayer
MemoryStream packet(data);
MultiplayerGameMode gameMode = (MultiplayerGameMode)packet.ReadValue<std::uint8_t>();

LOGD("[MP] ServerPacketType::ChangeGameMode - mode: %u", gameMode);
LOGD("[MP] ServerPacketType::ChangeGameMode - mode: %u", (std::uint32_t)gameMode);

_gameMode = gameMode;
break;
Expand Down Expand Up @@ -1558,7 +1558,7 @@ namespace Jazz2::Multiplayer
std::int32_t posY = packet.ReadVariableInt32();

LOGD("[MP] ServerPacketType::CreateControllablePlayer - playerIndex: %u, playerType: %u, health: %u, flags: %u, team: %u, x: %i, y: %i",
playerIndex, playerType, health, flags, teamId, posX, posY);
playerIndex, (std::uint32_t)playerType, health, flags, teamId, posX, posY);

_lastSpawnedActorId = playerIndex;

Expand Down Expand Up @@ -1901,7 +1901,7 @@ namespace Jazz2::Multiplayer
}

ExitType exitType = (ExitType)packet.ReadValue<std::uint8_t>();
LOGD("[MP] ServerPacketType::PlayerWarpIn - playerIndex: %u, exitType: 0x%02x", playerIndex, exitType);
LOGD("[MP] ServerPacketType::PlayerWarpIn - playerIndex: %u, exitType: 0x%02x", playerIndex, (std::uint32_t)exitType);

_root->InvokeAsync([this, exitType]() {
static_cast<Actors::Multiplayer::RemotablePlayer*>(_players[0])->WarpIn(exitType);
Expand Down
2 changes: 1 addition & 1 deletion Sources/Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -891,7 +891,7 @@ void GameEventHandler::OnPacketReceived(const Peer& peer, std::uint8_t channelId
String levelName = String(NoInit, levelLength);
packet.Read(levelName.data(), levelLength);

LOGD("[MP] ServerPacketType::LoadLevel - flags: 0x%02x, gameMode: %u, episode: %s, level: %s", flags, gameMode, episodeName.data(), levelName.data());
LOGD("[MP] ServerPacketType::LoadLevel - flags: 0x%02x, gameMode: %u, episode: %s, level: %s", flags, (std::uint32_t)gameMode, episodeName.data(), levelName.data());

InvokeAsync([this, flags, gameMode, episodeName = std::move(episodeName), levelName = std::move(levelName)]() {
bool isReforged = (flags & 0x01) != 0;
Expand Down

0 comments on commit 4be452d

Please sign in to comment.