File tree Expand file tree Collapse file tree 2 files changed +31
-2
lines changed
Expand file tree Collapse file tree 2 files changed +31
-2
lines changed Original file line number Diff line number Diff line change 1+ gh-pages[m
2+ * [32mmain[m
3+ work[m
4+ [31mremotes/origin/HEAD[m -> origin/main
5+ [31mremotes/origin/asdf[m
6+ [31mremotes/origin/fix[m
7+ [31mremotes/origin/fkpsfdijfojwse[m
8+ [31mremotes/origin/gh-pages[m
9+ [31mremotes/origin/iCutscene[m
10+ [31mremotes/origin/lacrimosa[m
11+ [31mremotes/origin/main[m
12+ [31mremotes/origin/music[m
13+ [31mremotes/origin/platteforme[m
14+ [31mremotes/origin/vil[m
15+ [31mremotes/origin/xMath2[m
16+ [31mremotes/origin/znpcmgr[m
17+ [31mremotes/upstream/HEAD[m -> upstream/main
18+ [31mremotes/upstream/cleanup[m
19+ [31mremotes/upstream/gh-pages[m
20+ [31mremotes/upstream/isavegame[m
21+ [31mremotes/upstream/main[m
22+ [31mremotes/upstream/master-2023[m
23+ [31mremotes/upstream/old-master[m
24+ [31mremotes/upstream/pat[m
25+ [31mremotes/upstream/tiki[m
26+ [31mremotes/upstream/xEnt[m
27+ [31mremotes/upstream/zEnt[m
28+ [31mremotes/upstream/zEntPlayer[m
29+ [31mremotes/upstream/zGameState[m
Original file line number Diff line number Diff 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 ;
You can’t perform that action at this time.
0 commit comments