Skip to content

Commit c85481d

Browse files
committed
zEntDestructObj: SwapModel 100% match
1 parent 4f2f2a3 commit c85481d

File tree

2 files changed

+31
-2
lines changed

2 files changed

+31
-2
lines changed

q

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
gh-pages
2+
* main
3+
work
4+
remotes/origin/HEAD -> origin/main
5+
remotes/origin/asdf
6+
remotes/origin/fix
7+
remotes/origin/fkpsfdijfojwse
8+
remotes/origin/gh-pages
9+
remotes/origin/iCutscene
10+
remotes/origin/lacrimosa
11+
remotes/origin/main
12+
remotes/origin/music
13+
remotes/origin/platteforme
14+
remotes/origin/vil
15+
remotes/origin/xMath2
16+
remotes/origin/znpcmgr
17+
remotes/upstream/HEAD -> upstream/main
18+
remotes/upstream/cleanup
19+
remotes/upstream/gh-pages
20+
remotes/upstream/isavegame
21+
remotes/upstream/main
22+
remotes/upstream/master-2023
23+
remotes/upstream/old-master
24+
remotes/upstream/pat
25+
remotes/upstream/tiki
26+
remotes/upstream/xEnt
27+
remotes/upstream/zEnt
28+
remotes/upstream/zEntPlayer
29+
remotes/upstream/zGameState

src/SB/Game/zEntDestructObj.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ namespace
2828
RwMatrixCopyMacro(modelInst->Mat, ent->model->Mat);
2929

3030
modelInst->Flags &= 0xBBFC;
31-
modelInst->Flags |= (s16) (ent->model->Flags & 0x4403);
31+
modelInst->Flags |= (u16) (ent->model->Flags & 0x4403);
3232
ent->model = modelInst;
33-
iBoxForModelLocal((xBox*) &ent->bound.box, (xModelInstance *) modelInst);
33+
iBoxForModelLocal( (xBox*)&ent->bound.box.box, (xModelInstance *) modelInst);
3434
zCollGeom_EntSetup((xEnt *) ent);
3535

3636
sfxDestroy = ent->sfx_destroy;

0 commit comments

Comments
 (0)