mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-11 03:25:52 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_place_name match

Browse Source
This commit is contained in:
Jasper St. Pierre
2023-10-15 21:47:24 -07:00
parent 09c4a4dfc7
commit 9ba5237ac0
5 changed files with 115 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.py
+2 -2
View File
@@ -346,7 +346,7 @@ config.libs = [
Object(NonMatching, "d/d_cloth_packet.cpp"),
Object(NonMatching, "d/actor/d_a_obj.cpp"),
Object(NonMatching, "d/d_a_obj_tribox_static.cpp"),
Object(Matching, "d/d_a_ship_static.cpp"),
Object(Matching, "d/d_a_ship_static.cpp"),
Object(Matching, "d/d_a_boko_static.cpp"),
Object(Matching, "d/d_a_bomb_static.cpp"),
Object(NonMatching, "d/d_a_branch_static.cpp"),
@@ -440,7 +440,7 @@ config.libs = [
Object(NonMatching, "d/actor/d_a_vrbox.cpp"),
Object(NonMatching, "d/actor/d_a_vrbox2.cpp"),
Object(NonMatching, "d/d_auction_screen.cpp"),
Object(NonMatching, "d/d_place_name.cpp"),
Object(Matching, "d/d_place_name.cpp"),
Object(NonMatching, "d/d_camera.cpp"),
Object(NonMatching, "d/d_envse.cpp"),
Object(NonMatching, "d/d_file_error.cpp"),
include/JSystem/J2DGraph/J2DScreen.h
+3 -2
View File
@@ -12,8 +12,9 @@ public:
J2DScreen(J2DPane* parent, bool visible, u32 tag, const JGeometry::TBox2<f32>& bounds)
: J2DPane(parent, visible, tag, bounds)
, mColor()
, mbClipToParent(false)
{}
{
mbClipToParent = false;
}
virtual ~J2DScreen();
virtual u16 getTypeID() { return 0x08; }
include/d/d_com_inf_game.h
+24 -2
View File
@@ -387,6 +387,12 @@ public:
J2DOrthoGraph* getCurrentGrafPort() { return mCurrentGrafPort; }
JKRExpHeap * getExpHeap2D() { return mpExpHeap2D; }
inline u8 getHeapLockFlag() { return mHeapLockFlag; }
inline void setHeapLockFlag(u8 flag) { mHeapLockFlag = flag; }
inline void offHeapLockFlag() { mHeapLockFlag = 0; }
void setMsgArchive(JKRArchive * pArc) { mpMsgArchive = pArc; }
void setDmsgArchive(JKRArchive * pArc) { mpDmsgArchive = pArc; }
void setTmsgArchive(JKRArchive * pArc) { mpTmsgArchive = pArc; }
@@ -564,7 +570,7 @@ public:
/* 0x495F */ u8 field_0x495f;
/* 0x4960 */ u8 field_0x4960;
/* 0x4961 */ u8 field_0x4961;
/* 0x4962 */ u8 field_0x4962;
/* 0x4962 */ u8 mHeapLockFlag;
/* 0x4963 */ u8 field_0x4963;
/* 0x4964 */ u8 mGameLanguage;
/* 0x4965 */ u8 field_0x4965;
@@ -575,7 +581,7 @@ public:
/* 0x4979 */ u8 field_0x4979;
/* 0x497A */ u8 field_0x497a;
/* 0x497B */ u8 field_0x497B[0x497C - 0x497B];
/* 0x497C */ JKRExpHeap* field_0x497c;
/* 0x497C */ JKRExpHeap* mpExpHeap2D;
/* 0x4980 */ int mMesgCameraTagInfo;
/* 0x4984 */ int field_0x4984;
/* 0x4988 */ int field_0x4988[10];
@@ -1527,6 +1533,22 @@ inline J2DOrthoGraph* dComIfGp_getCurrentGrafPort() {
return g_dComIfG_gameInfo.play.getCurrentGrafPort();
}
inline JKRExpHeap * dComIfGp_getExpHeap2D() {
return g_dComIfG_gameInfo.play.getExpHeap2D();
}
inline u8 dComIfGp_getHeapLockFlag() {
return g_dComIfG_gameInfo.play.getHeapLockFlag();
}
inline void dComIfGp_setHeapLockFlag(u8 flag) {
g_dComIfG_gameInfo.play.setHeapLockFlag(flag);
}
inline void dComIfGp_offHeapLockFlag() {
g_dComIfG_gameInfo.play.offHeapLockFlag();
}
/**
* === EVENT ===*/
include/d/d_place_name.h
+23
View File
@@ -0,0 +1,23 @@
#ifndef D_PLACE_NAME_H
#define D_PLACE_NAME_H
#include "d/d_drawlist.h"
#include "f_op/f_op_msg_mng.h"
class J2DScreen;
class dPlace_name_c : public dDlst_base_c {
public:
virtual ~dPlace_name_c() {}
void setScreen(const char*, JKRArchive*);
BOOL _openAnime();
BOOL _closeAnime();
virtual void draw();
public:
/* 0x04 */ J2DScreen * scrn;
/* 0x08 */ fopMsgM_pane_class pane;
};
#endif /* D_PLACE_NAME_H */
src/d/d_place_name.cpp
+63 -33
View File
@@ -8,6 +8,7 @@
#include "d/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "d/d_meter.h"
#include "d/d_place_name.h"
#include "d/d_procname.h"
#include "m_Do/m_Do_dvd_thread.h"
#include "m_Do/m_Do_ext.h"
@@ -19,6 +20,29 @@
enum { dPn_stage_max_e = 19 };
#if VERSION == VERSION_PAL
const char * name_texture[] = {
"pn_01",
"pn_02",
"pn_03",
"pn_04",
"pn_05",
"pn_06",
"pn_07",
"pn_08",
"pn_09",
"pn_10",
"pn_11",
"pn_12",
"pn_13",
"pn_14",
"pn_15",
"pn_16",
"pn_17",
"pn_18",
"pn_19",
};
#else
const char * name_texture[] = {
"/res/placename/pn_01.bti",
"/res/placename/pn_02.bti",
@@ -40,19 +64,7 @@ const char * name_texture[] = {
"/res/placename/pn_18.bti",
"/res/placename/pn_19.bti",
};
class dPlace_name_c : public dDlst_base_c {
public:
~dPlace_name_c() {}
void setScreen(const char*, JKRArchive*);
BOOL _openAnime();
BOOL _closeAnime();
virtual void draw();
public:
/* 0x04 */ J2DScreen * scrn;
/* 0x08 */ fopMsgM_pane_class pane;
};
#endif
class dPn_c : public msg_class {
public:
@@ -74,7 +86,7 @@ public:
/* 80160F60-801610A8 .text setScreen__13dPlace_name_cFPCcP10JKRArchive */
void dPlace_name_c::setScreen(const char* name, JKRArchive* arc) {
scrn = new J2DScreen(NULL, true, 0x726F6F74, JGeometry::TBox2<f32>(0.0f, 0.0f, 640.0f, 480.0f));
JUT_ASSERT(0x5b, scrn != 0);
JUT_ASSERT(VERSION_SELECT(69, 91, 91), scrn != 0);
scrn->set(name, arc);
fopMsgM_setPaneData(&pane, scrn, 0x706e);
@@ -122,33 +134,47 @@ void dPlace_name_c::draw() {
s32 dPn_c::_create() {
s32 rt = dComIfG_resLoad(&mPhs, "PName");
if (dMenu_flag() || g_dComIfG_gameInfo.play.field_0x4962 != 0 || g_dComIfG_gameInfo.play.field_0x4962 != 11 || g_dComIfG_gameInfo.play.field_0x492a != 0)
return;
if (dMenu_flag() || (g_dComIfG_gameInfo.play.getHeapLockFlag() != 0 && g_dComIfG_gameInfo.play.getHeapLockFlag() != 10) || g_dComIfG_gameInfo.play.field_0x492a != 0)
return cPhs_INIT_e;
if (mState == 0) {
if (rt != cPhs_COMPLEATE_e)
return rt;
if (rt == cPhs_COMPLEATE_e) {
dRes_info_c * resInfo = dComIfG_getObjectResInfo("PName");
JUT_ASSERT(VERSION_SELECT(147, 169, 169), resInfo != 0);
dRes_info_c * resInfo = dComIfG_getObjectResInfo("PName");
JUT_ASSERT(0xa9, resInfo != 0);
mpHeap = g_dComIfG_gameInfo.play.getExpHeap2D();
g_dComIfG_gameInfo.play.setHeapLockFlag(10);
JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
dPn_scrn = new dPlace_name_c();
JUT_ASSERT(VERSION_SELECT(155, 177, 177), dPn_scrn != 0);
dPn_scrn->setScreen("place_name.blo", resInfo->getArchive());
mpTIMG = (ResTIMG*)mpHeap->alloc(0x3c00, 0x20);
mDoExt_setCurrentHeap(oldHeap);
mState = 1;
dvd = NULL;
mpHeap = g_dComIfG_gameInfo.play.field_0x497c;
g_dComIfG_gameInfo.play.field_0x4962 = 10;
JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
dPn_scrn = new dPlace_name_c();
JUT_ASSERT(0xb1, dPn_scrn != 0);
dPn_scrn->setScreen("place_name.blo", resInfo->getArchive());
mpTIMG = (ResTIMG*)mpHeap->alloc(0x3c00, 0x20);
mDoExt_setCurrentHeap(oldHeap);
mState = 1;
dvd = NULL;
if (dComIfGp_getNowStageNum() != 0)
#if VERSION == VERSION_PAL
return cPhs_INIT_e;
#else
if (dComIfGp_getNowStageNum() != 0)
return cPhs_INIT_e;
#endif
} else {
return rt;
}
} else if (mState == 1) {
JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
JUT_ASSERT(0xc9, dComIfGp_getNowStageNum() < dPn_stage_max_e);
JUT_ASSERT(VERSION_SELECT(175, 201, 201), dComIfGp_getNowStageNum() < dPn_stage_max_e);
#if VERSION == VERSION_PAL
u32 lang = g_dComIfG_gameInfo.play.mGameLanguage;
char buf[32];
sprintf(buf, "/res/placename/PN%d/pn_%02d_%d.bti", lang, dComIfGp_getNowStageNum() + 1, lang);
dvd = mDoDvdThd_toMainRam_c::create(buf, 0, mpHeap);
#else
dvd = mDoDvdThd_toMainRam_c::create(name_texture[dComIfGp_getNowStageNum()], 0, mpHeap);
#endif
mState = 2;
mDoExt_setCurrentHeap(oldHeap);
return cPhs_INIT_e;
@@ -156,7 +182,11 @@ s32 dPn_c::_create() {
JKRHeap * oldHeap = mDoExt_setCurrentHeap(mpHeap);
if (dvd->sync()) {
memcpy(mpTIMG, dvd->getMemAddress(), 0x3c00);
#if VERSION == VERSION_JPN
DCFlushRangeNoSync(mpTIMG, 0x3c00);
#else
DCStoreRangeNoSync(mpTIMG, 0x3c00);
#endif
((J2DPicture*)dPn_scrn->pane.scrn)->changeTexture(mpTIMG, 0);
mState = 3;
}
@@ -197,7 +227,7 @@ BOOL dPn_c::_delete() {
delete dvd;
mpHeap->free(mpTIMG);
mpHeap->freeAll();
g_dComIfG_gameInfo.play.field_0x4962 = 0;
g_dComIfG_gameInfo.play.offHeapLockFlag();
mDoExt_setCurrentHeap(oldHeap);
dComIfG_resDelete(&mPhs, "PName");
return TRUE;