diff options
| author | TakaRikka <38417346+TakaRikka@users.noreply.github.com> | 2022-10-03 15:26:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-03 18:26:26 -0400 |
| commit | 4913395dbd1a33d794028ceb82579b4baffe954d (patch) | |
| tree | fde72809184e4365eae205b26b14d5fee5698dcd /src/d/map | |
| parent | 03094905214e54b97414be8e6049abe491f3ff16 (diff) | |
d_camera / m_Do_ext / d_particle + minor various wip (#210)
Diffstat (limited to 'src/d/map')
| -rw-r--r-- | src/d/map/d_map_path.cpp | 8 | ||||
| -rw-r--r-- | src/d/map/d_map_path_dmap.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/d/map/d_map_path.cpp b/src/d/map/d_map_path.cpp index b6ef5f15cf..ed5edf5e53 100644 --- a/src/d/map/d_map_path.cpp +++ b/src/d/map/d_map_path.cpp @@ -196,9 +196,9 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p p_image->height = height; p_image->wrapS = GX_CLAMP; p_image->wrapT = GX_CLAMP; - p_image->palettesEnabled = true; - p_image->paletteFormat = 2; - p_image->paletteCount = param_5 * 4; + p_image->indexTexture = true; + p_image->colorFormat = 2; + p_image->numColors = param_5 * 4; p_image->paletteOffset = p_palette - (u8*)p_image; p_image->mipmapEnabled = false; p_image->doEdgeLOD = false; @@ -210,7 +210,7 @@ void dRenderingMap_c::makeResTIMG(ResTIMG* p_image, u16 width, u16 height, u8* p p_image->maxLOD = 0; p_image->mipmapCount = 1; p_image->LODBias = 0; - p_image->texDataOffset = p_data - (u8*)p_image; + p_image->imageOffset = p_data - (u8*)p_image; } /* 8003CDAC-8003CE78 0376EC 00CC+00 0/0 2/2 0/0 .text renderingMap__15dRenderingMap_cFv diff --git a/src/d/map/d_map_path_dmap.cpp b/src/d/map/d_map_path_dmap.cpp index c267e39d18..4b3aaaa8c7 100644 --- a/src/d/map/d_map_path_dmap.cpp +++ b/src/d/map/d_map_path_dmap.cpp @@ -245,7 +245,7 @@ Vec dMapInfo_n::getMapPlayerPos() { Vec pos; fopAc_ac_c* player = daPy_getPlayerActorClass(); if (player != NULL) { - pos = player->mCurrent.mPosition; + pos = player->current.pos; } else { f32 tmp = FLOAT_LABEL(lit_3796); pos.x = tmp; |