mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-07-11 14:38:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_map inlines cleanup

Browse Source
This commit is contained in:
LagoLunatic
2024-02-03 18:31:25 -05:00
parent b6b8d14d0c
commit 6c93d0569f
5 changed files with 115 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_com_inf_game.h
+2 -2
View File
@@ -1973,11 +1973,11 @@ inline void dComIfGp_map_deleteImage(int param_0) {
}
inline void dComIfGp_map_setAGBMapSendStopFlg() {
// dMap_c::setAGBMapSendStopFlg();
dMap_c::setAGBMapSendStopFlg();
}
inline void dComIfGp_map_clrAGBMapSendStopFlg() {
// dMap_c::clrAGBMapSendStopFlg();
dMap_c::clrAGBMapSendStopFlg();
}
inline void dComIfGp_createDemo() {
include/d/d_map.h
+97 -69
View File
@@ -153,10 +153,13 @@ public:
class dMap_c {
public:
static u8 getMapAlpha() { return mAlpha; }
static void setMapAlpha(u8 alpha) { mAlpha = alpha; }
static void setIconFreeAlpha(u8 alpha) { mIconFreeAlpha = alpha; }
static void setMapDispMode(u8 mode) { mMapDispMode = mode; }
static s16 getMapDspPosLeftUpX() { return mDispPosLeftUpX; }
static void setMapDispPosLeftUpX(s16 x) { mDispPosLeftUpX = x; }
static s16 getMapDspPosLeftUpY() { return mDispPosLeftUpY; }
static void setMapDispPosLeftUpY(s16 y) { mDispPosLeftUpY = y; }
static void setIconFreePosX(s16 x) { mIconFreePosX = x; }
static void setIconFreePosY(s16 y) { mIconFreePosY = y; }
@@ -166,84 +169,81 @@ public:
static u8 getIconDispMode() { return mIconDispMode; }
static void setIconDispMode(u8 mode) { mIconDispMode = mode; }
void clrAGBMapSendStopFlg() {}
void getMapAlpha() {}
void getMapDspPosLeftUpX() {}
void getMapDspPosLeftUpY() {}
void getMapDspSizeHeight() {}
void getMapDspSizeWidth() {}
void getNowRoom() {}
void isAGBMapSendStopFlg() {}
void isMapDispTypeEnlargementSize() {}
void isMapDispTypeRealSize() {}
void setAGBMapSendStopFlg() {}
void setMapChgSizeEnlargementSize() {}
void setMapChgSizeRealSize() {}
static void setAGBMapSendStopFlg() {}
static void clrAGBMapSendStopFlg() {}
static void isAGBMapSendStopFlg() {}
static void getMapDspSizeHeight() {}
static void getMapDspSizeWidth() {}
static void getNowRoom() {}
static void isMapDispTypeEnlargementSize() {}
static void isMapDispTypeRealSize() {}
static void setMapChgSizeEnlargementSize() {}
static void setMapChgSizeRealSize() {}
static void create();
void isEnableEnlargementScroll();
static void isEnableEnlargementScroll();
static bool isEnableDispMap();
void getKindMapType();
static void getKindMapType();
static void remove();
static void setImage(int, int, f32);
static void deleteImage(int);
void setNowRoom(int);
void mapDrawIconFree(s16, s16, u8);
void mapDrawIconSelf(s16, s16, u8);
void mapDrawFrame(u8);
void mapDrawEnlargementSize(f32, f32, f32, f32, u8);
void mapDrawRealSize(f32, f32, u8);
static void setNowRoom(int);
static void mapDrawIconFree(s16, s16, u8);
static void mapDrawIconSelf(s16, s16, u8);
static void mapDrawFrame(u8);
static void mapDrawEnlargementSize(f32, f32, f32, f32, u8);
static void mapDrawRealSize(f32, f32, u8);
static void mapAGBSendIslandData();
void setPlayerStayAgbMapTypeNow(f32, f32);
void agbMapNoSet(u8, u8);
void agbMapNoSetCall();
void agbIsMsgSend();
void agbResetCursor();
void agbScrollX();
void agbScrollY();
void agbFlashCheck();
void agbIsActive();
void isInDspArea(f32, f32, bool);
void mapAGBSendStatInit();
void mapAGBSendMapMain(f32, f32);
void calcEnlargementSizeParameter(f32, f32);
void calcScissor();
void mapMoveAll(f32, f32, int, f32);
void mapDrawAll(f32, f32, int, f32);
void mapDrawIcon();
void draw(f32, f32, int, f32);
void point2Grid(f32, f32, s8*, s8*);
void point2GridAndLocal(f32, f32, s8*, s8*, s16*, s16*);
void getCheckPointUseGrid(s8, s8);
void getFmapChkPntPrm(int, s8*, s8*, s16*, s16*, u8*);
void setFmapChkDtPrm();
void getFmapChkPntDtPnt(int);
void initPoint();
void setGbaPoint_ocean(u8, f32, f32, s16, u8, u8, u8, u8);
void isPointStayInDspNowRoomAgbScr(s16, s16);
void setCollectPoint(u8, u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
void setGbaPoint_dungeon(u8, f32, f32, s16, u8, u8, u8, u8);
void getPosAgbMapType(f32, f32, bool);
void setGbaPoint(u8, f32, f32, s16, u8, u8, u8, u8);
void setArriveInfo(f32, f32);
void drawPointPlayer(f32, f32, s16);
void drawPointEnemy(f32, f32);
void drawPointAgbCursor(f32, f32);
void drawPointTbox(f32, f32, f32, f32);
void drawPointDoor(f32, f32, f32, f32, s16, u8);
void drawPointRestart(f32, f32, s16, f32, f32);
void drawPointFriend(f32, f32, f32);
void drawPointShip(f32, f32, s16, f32, f32);
void drawPointGc(u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
void drawPointMain(u8, u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
void drawPointAgb(u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
void getTypeAgbGcFromTypeAcs(u8, u8*, u8*);
static void setPlayerStayAgbMapTypeNow(f32, f32);
static void agbMapNoSet(u8, u8);
static void agbMapNoSetCall();
static void agbIsMsgSend();
static void agbResetCursor();
static void agbScrollX();
static void agbScrollY();
static void agbFlashCheck();
static void agbIsActive();
static void isInDspArea(f32, f32, bool);
static void mapAGBSendStatInit();
static void mapAGBSendMapMain(f32, f32);
static void calcEnlargementSizeParameter(f32, f32);
static void calcScissor();
static void mapMoveAll(f32, f32, int, f32);
static void mapDrawAll(f32, f32, int, f32);
static void mapDrawIcon();
static void draw(f32, f32, int, f32);
static void point2Grid(f32, f32, s8*, s8*);
static void point2GridAndLocal(f32, f32, s8*, s8*, s16*, s16*);
static void getCheckPointUseGrid(s8, s8);
static void getFmapChkPntPrm(int, s8*, s8*, s16*, s16*, u8*);
static void setFmapChkDtPrm();
static void getFmapChkPntDtPnt(int);
static void initPoint();
static void setGbaPoint_ocean(u8, f32, f32, s16, u8, u8, u8, u8);
static void isPointStayInDspNowRoomAgbScr(s16, s16);
static void setCollectPoint(u8, u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
static void setGbaPoint_dungeon(u8, f32, f32, s16, u8, u8, u8, u8);
static void getPosAgbMapType(f32, f32, bool);
static void setGbaPoint(u8, f32, f32, s16, u8, u8, u8, u8);
static void setArriveInfo(f32, f32);
static void drawPointPlayer(f32, f32, s16);
static void drawPointEnemy(f32, f32);
static void drawPointAgbCursor(f32, f32);
static void drawPointTbox(f32, f32, f32, f32);
static void drawPointDoor(f32, f32, f32, f32, s16, u8);
static void drawPointRestart(f32, f32, s16, f32, f32);
static void drawPointFriend(f32, f32, f32);
static void drawPointShip(f32, f32, s16, f32, f32);
static void drawPointGc(u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
static void drawPointMain(u8, u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
static void drawPointAgb(u8, f32, f32, f32, s8, s16, u8, u8, u8, u8);
static void getTypeAgbGcFromTypeAcs(u8, u8*, u8*);
static void drawPointSingle(u8, f32, f32, f32, s8, s16, u8, u8, u8);
static void drawActorPointMiniMap(fopAc_ac_c*);
void mapBufferSendAGB_commonCursor();
void mapBufferSendAGB_ocean();
void mapBufferSendAGB_dungeon();
void mapSetPointAll();
static void mapBufferSendAGB_commonCursor();
static void mapBufferSendAGB_ocean();
static void mapBufferSendAGB_dungeon();
static void mapSetPointAll();
static void mapBufferSendAGB(int);
static u8 mAlpha;
@@ -262,5 +262,33 @@ public:
inline void dMap_drawPoint(u8 param_1, f32 param_2, f32 param_3, f32 param_4, s8 param_5, s16 param_6, u8 param_7, u8 param_8, u8 param_9) {
dMap_c::drawPointSingle(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8, param_9);
}
inline void dMap_drawActorPointMiniMap(fopAc_ac_c* actor) { dMap_c::drawActorPointMiniMap(actor); }
inline bool dMap_isEnableDispMap() { return dMap_c::isEnableDispMap(); }
inline void dMap_mapAGBSendIslandData() { dMap_c::mapAGBSendIslandData(); }
inline u8 dMap_getMapAlpha() { return dMap_c::getMapAlpha(); }
inline void dMap_setMapAlpha(u8 alpha) { return dMap_c::setMapAlpha(alpha); }
inline void dMap_setIconFreeAlpha(u8 alpha) { return dMap_c::setIconFreeAlpha(alpha); }
inline void dMap_setMapDispMode(u8 mode) { return dMap_c::setMapDispMode(mode); }
inline s16 dMap_getMapDispPosLeftUpX() { return dMap_c::getMapDspPosLeftUpX(); }
inline void dMap_setMapDispPosLeftUpX(s16 x) { return dMap_c::setMapDispPosLeftUpX(x); }
inline s16 dMap_getMapDispPosLeftUpY() { return dMap_c::getMapDspPosLeftUpY(); }
inline void dMap_setMapDispPosLeftUpY(s16 y) { return dMap_c::setMapDispPosLeftUpY(y); }
inline void dMap_setIconFreePosX(s16 x) { return dMap_c::setIconFreePosX(x); }
inline void dMap_setIconFreePosY(s16 y) { return dMap_c::setIconFreePosY(y); }
inline void dMap_setIconFreeScale(f32 scale) { return dMap_c::setIconFreeScale(scale); }
inline void dMap_setIconSelfAlpha(u8 alpha) { return dMap_c::setIconSelfAlpha(alpha); }
inline void dMap_setIconSelfScale(f32 scale) { return dMap_c::setIconSelfScale(scale); }
inline void dMap_setIconDispMode(u8 mode) { return dMap_c::setIconDispMode(mode); }
inline void dMap_getCheckPointUseGrid(s8, s8) {}
inline void dMap_getFmapChkPntPrm(int, s8*, s8*, s16*, s16*, u8*) {}
inline void dMap_getMapDispSizeHeight() {}
inline void dMap_getMapDispSizeWidth() {}
inline void dMap_isSaveArriveGridUseGridNo(int) {}
inline void dMap_isSaveArriveGridUseGridPos(int, int) {}
inline void dMap_isSaveArriveGrid_UseWorldPos(f32, f32) {}
inline void dMap_onSaveArriveGridUseGridNo(int) {}
inline void dMap_point2Grid(f32, f32, s8*, s8*) {}
#endif /* D_MAP_H */
src/d/actor/d_a_agb.cpp
+4 -4
View File
@@ -137,7 +137,7 @@ int daAgb_c::uploadInitCheck() {
dStage_FileList_dt_c* fili_p =
dComIfGp_roomControl_getStatusRoomDt(roomNo)->getFileListInfo();
if ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_SEA_e && !dMap_c::isEnableDispMap()) ||
if ((dStage_stagInfo_GetSTType(dComIfGp_getStageStagInfo()) != dStageType_SEA_e && !dMap_isEnableDispMap()) ||
(fili_p != NULL && dStage_FileList_dt_CheckAgbCom(fili_p)))
{
l_msgCtrl.init(1);
@@ -307,7 +307,7 @@ int daAgb_c::uploadConnect() {
NameConv();
mDoGac_SendDataSet((u32*)&mPlayerName, sizeof(mPlayerName), 10, 0);
dMap_c::mapAGBSendIslandData();
dMap_mapAGBSendIslandData();
} else {
mDoGaC_GbaReboot();
l_msgCtrl.setMsgStatus(fopMsgStts_MSG_CONTINUES_e);
@@ -1505,8 +1505,8 @@ static int daAgb_Draw(daAgb_c* i_this) {
}
}
dMap_c::drawPointSingle(3, i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z,
i_this->current.roomNo, -0x8000, var_r6, 0, 0);
dMap_drawPoint(3, i_this->current.pos.x, i_this->current.pos.y, i_this->current.pos.z,
i_this->current.roomNo, -0x8000, var_r6, 0, 0);
return 1;
}
src/d/d_meter.cpp
+11 -11
View File
@@ -1950,17 +1950,17 @@ dMeter_map_HIO_c::dMeter_map_HIO_c() {
/* 802059E0-80205A44 .text initMapCtrlDisp__13mapCtrlDisp_cFv */
void mapCtrlDisp_c::initMapCtrlDisp() {
dMap_c::setMapAlpha(0);
dMap_c::setIconFreeAlpha(0);
dMap_c::setMapDispMode(1);
dMap_c::setMapDispPosLeftUpX(g_meter_mapHIO.field_0x8);
dMap_c::setMapDispPosLeftUpY(g_meter_mapHIO.field_0xa);
dMap_c::setIconFreePosX(g_meter_mapHIO.field_0x14);
dMap_c::setIconFreePosY(g_meter_mapHIO.field_0x16);
dMap_c::setIconFreeScale(0.0f);
dMap_c::setIconSelfAlpha(0);
dMap_c::setIconSelfScale(0.0f);
dMap_c::setIconDispMode(0);
dMap_setMapAlpha(0);
dMap_setIconFreeAlpha(0);
dMap_setMapDispMode(1);
dMap_setMapDispPosLeftUpX(g_meter_mapHIO.field_0x8);
dMap_setMapDispPosLeftUpY(g_meter_mapHIO.field_0xa);
dMap_setIconFreePosX(g_meter_mapHIO.field_0x14);
dMap_setIconFreePosY(g_meter_mapHIO.field_0x16);
dMap_setIconFreeScale(0.0f);
dMap_setIconSelfAlpha(0);
dMap_setIconSelfScale(0.0f);
dMap_setIconDispMode(0);
field_0x0 = 0;
field_0x1 = 0;
field_0x2 = 0;
src/f_op/f_op_actor.cpp
+1 -1
View File
@@ -58,7 +58,7 @@ s32 fopAc_Draw(void* pProc) {
fopAcM_OffStatus(actor, fopAcStts_NODRAW_e);
if (dComIfGp_roomControl_getStayNo() >= 0 && fopAcM_checkStatus(actor, fopAcStts_SHOWMAP_e))
dMap_c::drawActorPointMiniMap(actor);
dMap_drawActorPointMiniMap(actor);
}
return ret;