diff options
| author | fig02 <fig02srl@gmail.com> | 2021-01-18 16:04:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-18 16:04:04 -0500 |
| commit | 00a5edea71a605e7bdad78892b2863000e53624e (patch) | |
| tree | 8750e088e82191ddda97b566e2dc28d9d999a3a6 /src/code/z_map_exp.c | |
| parent | 20206fba0d1c404c7493c470a0526a5e50cc1576 (diff) | |
Actor Struct Changes (and a few related things) (#617)
* reformat header
* type -> category
* done for now i think
* some more stuff
* first -> head
* focus
* flag comment
* ground -> floor
* remove asm, name wrapper funcs
* name func, format
* review
* targetPriority, format
* git subrepo pull --force tools/ZAPD
subrepo:
subdir: "tools/ZAPD"
merged: "0305ec2c2"
upstream:
origin: "https://github.com/zeldaret/ZAPD.git"
branch: "master"
commit: "0305ec2c2"
git-subrepo:
version: "0.4.3"
origin: "https://github.com/ingydotnet/git-subrepo.git"
commit: "2f68596"
* comment
* review
* feet flags
* horse shadow
Diffstat (limited to 'src/code/z_map_exp.c')
| -rw-r--r-- | src/code/z_map_exp.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/code/z_map_exp.c b/src/code/z_map_exp.c index e81b087fc..fab39d42b 100644 --- a/src/code/z_map_exp.c +++ b/src/code/z_map_exp.c @@ -11,8 +11,8 @@ s16 sEntranceIconMapIndex = 0; void Map_SavePlayerInitialInfo(GlobalContext* globalCtx) { Player* player = PLAYER; - sPlayerInitialPosX = player->actor.posRot.pos.x; - sPlayerInitialPosZ = player->actor.posRot.pos.z; + sPlayerInitialPosX = player->actor.world.pos.x; + sPlayerInitialPosZ = player->actor.world.pos.z; sPlayerInitialDirection = (s16)((0x7FFF - player->actor.shape.rot.y) / 0x400); } @@ -326,8 +326,8 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { gDPSetEnvColor(OVERLAY_DISP++, 0, 0, 0, 255); gDPSetCombineMode(OVERLAY_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); - tempX = player->actor.posRot.pos.x; - tempZ = player->actor.posRot.pos.z; + tempX = player->actor.world.pos.x; + tempZ = player->actor.world.pos.z; tempX /= R_COMPASS_SCALE_X; tempZ /= R_COMPASS_SCALE_Y; Matrix_Translate((R_COMPASS_OFFSET_X + tempX) / 10.0f, (R_COMPASS_OFFSET_Y - tempZ) / 10.0f, 0.0f, MTXMODE_NEW); @@ -531,7 +531,7 @@ void Map_Update(GlobalContext* globalCtx) { } for (floor = 0; floor < 8; floor++) { - if (player->actor.posRot.pos.y > gMapData->floorCoordY[mapIndex][floor]) { + if (player->actor.world.pos.y > gMapData->floorCoordY[mapIndex][floor]) { break; } } |