Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FIX CI? #298

Merged
merged 4 commits into from
Mar 17, 2024
Merged

FIX CI? #298

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7581de2
GitHub: Add workaround for macOS CI issues
dscharrer Mar 17, 2024
28f1e18
GitHub: Update actions/checkout in GitHub Actions workflows to v3
dscharrer Mar 16, 2024
76f1d2a
Update .mailmap
dscharrer Nov 24, 2023
8acd361
Player: Remove hero global
dscharrer Nov 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Update
run: sudo apt-get update
Expand All @@ -37,12 +37,17 @@ jobs:
runs-on: macos-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Update
run: brew update

- name: Workaround for Python install isssues - https://github.com/actions/runner-images/issues/8838
run: brew install python@3 || brew link --overwrite python@3

- name: Dependencies
env:
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: 1
run: brew install boost freetype sdl2 libepoxy qt5 cppunit glm openal-soft

- name: Configure
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Update
run: sudo apt-get update
Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
Expand Down
3 changes: 2 additions & 1 deletion .mailmap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
#

bsxf47 <[email protected]>
Daniel Scharrer <[email protected]> <[email protected]>
Daniel Scharrer <[email protected]> <[email protected]>
Daniel Scharrer <[email protected]> <[email protected]>
Lubosz Sarnecki <[email protected]>
Nuky <[email protected]> <[email protected]>
Nuky <[email protected]> <[email protected]@20e9cde2-dfe0-51a5-a0d6-7922eccdece5>
Expand Down
3 changes: 0 additions & 3 deletions src/core/ArxGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -905,10 +905,7 @@ bool ArxGame::addPaks() {

static void ReleaseSystemObjects() {

delete hero, hero = nullptr;

if(entities.size() > 0 && entities.player() != nullptr) {
entities.player()->obj = nullptr; // already deleted above (hero)
delete entities.player();
arx_assert(entities.size() > 0 && entities.player() == nullptr);
}
Expand Down
4 changes: 1 addition & 3 deletions src/game/Equipment.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,8 +221,7 @@ void ARX_EQUIPMENT_RecreatePlayerMesh() {
arx_assert(entities.player());
Entity * io = entities.player();

if(io->obj != hero)
delete io->obj;
delete io->obj;

io->obj = loadObject("graph/obj3d/interactive/npc/human_base/human_base.teo", false).release();

Expand Down Expand Up @@ -250,7 +249,6 @@ void ARX_EQUIPMENT_RecreatePlayerMesh() {
ARX_INTERACTIVE_Show_Hide_1st(entities.player(), !EXTERNALVIEW);
ARX_INTERACTIVE_HideGore(entities.player(), false);

EERIE_Object_Precompute_Fast_Access(hero);
EERIE_Object_Precompute_Fast_Access(entities.player()->obj);

ARX_INTERACTIVE_RemoveGoreOnIO(entities.player());
Expand Down
8 changes: 3 additions & 5 deletions src/game/Player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ extern long COLLIDED_CLIMB_POLY;
static const float ARX_PLAYER_SKILL_STEALTH_MAX = 100.f;

ARXCHARACTER player;
EERIE_3DOBJ * hero = nullptr;
float currentdistance = 0.f;
float CURRENT_PLAYER_COLOR = 0;
AnimationDuration PLAYER_ROTATION = 0;
Expand Down Expand Up @@ -1083,9 +1082,6 @@ void ARX_PLAYER_Restore_Skin() {
*/
void ARX_PLAYER_LoadHeroAnimsAndMesh() {

hero = loadObject("graph/obj3d/interactive/npc/human_base/human_base.teo", false).release();
PLAYER_SKIN_TC = TextureContainer::Load("graph/obj3d/textures/npc_human_base_hero_head");

herowaitbook = EERIE_ANIMMANAGER_Load("graph/obj3d/anims/npc/human_wait_book.tea");
EERIE_ANIMMANAGER_Load("graph/obj3d/anims/npc/human_normal_wait.tea");
herowait_2h = EERIE_ANIMMANAGER_Load("graph/obj3d/anims/npc/human_wait_book_2handed.tea");
Expand All @@ -1095,7 +1091,9 @@ void ARX_PLAYER_LoadHeroAnimsAndMesh() {
arx_assert(entities.player() == io);
arx_assert(io->idString() == "player");

io->obj = hero;
arx_assert(!io->obj);
io->obj = loadObject("graph/obj3d/interactive/npc/human_base/human_base.teo", false).release();
PLAYER_SKIN_TC = TextureContainer::Load("graph/obj3d/textures/npc_human_base_hero_head");

player.skin = 0;
ARX_PLAYER_Restore_Skin();
Expand Down
1 change: 0 additions & 1 deletion src/game/Player.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,6 @@ struct ARXCHARACTER {
extern float CURRENT_PLAYER_COLOR;

extern ARXCHARACTER player;
extern EERIE_3DOBJ * hero;
extern ANIM_HANDLE * herowaitbook;
extern ANIM_HANDLE * herowait_2h;
extern std::vector<std::string> g_playerQuestLogEntries;
Expand Down
Loading