Skip to content

Commit f82919b

Browse files
AdventureTAdventureT
authored
Merge pull request #7 from InfiniteC0re/master
Fix PGUITRTextureFactory::TextureSet and mark methods
2 parents 1f7843c + ecdf891 commit f82919b

122 files changed

Lines changed: 98595 additions & 95 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.clang-format‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ AlwaysBreakBeforeMultilineStrings: false
2323
AlwaysBreakTemplateDeclarations: No
2424
BinPackArguments: true
2525
BreakBeforeBraces: Custom
26+
ForEachMacros: [T_FOREACH, T_FOREACH_BACK, T_FOREACH_ARRAY, T_FOREACH_ARRAY_BACK]
2627
BraceWrapping:
2728
AfterCaseLabel: false
2829
AfterClass: true

‎OpenJPOG/Source/AOptions.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ TPCCHAR AOptions::sm_szOptionsDir = TNULL;
1313
TPCCHAR AOptions::sm_szOptionsName = "Options";
1414
AOptions *AOptions::ms_pSingleton = TNULL;
1515

16+
// $JPOG: FUNCTION 004674e0
1617
AOptions::AOptions()
1718
{
1819
m_iAutoSaveState = 1;
@@ -22,6 +23,7 @@ AOptions::AOptions()
2223
m_pCurProps = props;
2324
}
2425

26+
// $JPOG: FUNCTION 00474fc0
2527
TBOOL AOptions::GetOption(TPCCHAR a_szProp, TINT &a_iValue)
2628
{
2729
const PPropertyValue *value = m_pCurProps->GetProperty(TSystem::GetCStringPool()->Get(a_szProp));

‎OpenJPOG/Source/AOptions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class AOptions
5151
Result LoadOptions();
5252
Result LoadOptions(TINT a_int, TINT a_int2, const Toshi::TCString &a_szOptionsDir, const Toshi::TCString &a_szOptionsName);
5353

54+
// $JPOG: FUNCTION 00467530
5455
TINT GetAutoSaveState() const
5556
{
5657
return m_iAutoSaveState;

‎OpenJPOG/Source/ASoundManager.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ TOSHI_NAMESPACE_USING
1010

1111
IMPLEMENT_DYNCREATE(ASoundManager, TObject);
1212

13+
// $JPOG: FUNCTION 0068e1f0
1314
TFLOAT ASoundManager::GetPitch(TINT a_iChannel) const
1415
{
1516
TINT freq;

‎OpenJPOG/Source/ASoundManager.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@ class ASoundManager : public Toshi::TObject
2020

2121
public:
2222
TFLOAT GetPitch(TINT a_iChannel) const;
23+
// $JPOG: FUNCTION 00690260
2324
TBOOL GetPaused(TINT a_iChannel) const { return a_iChannel != -1 ? FSOUND_GetPaused(a_iChannel) : TFALSE; }
25+
// $JPOG: FUNCTION 00690290
2426
TFLOAT GetPan(TINT a_iChannel) const { return a_iChannel != -1 ? -1.0f + (FSOUND_GetPan(a_iChannel) / 127.5f) : 0.0f; }
27+
// $JPOG: FUNCTION 0068ffb0
2528
TFLOAT GetSFXVolume() { return 1.0f; };
2629
};

‎OpenJPOG/Source/GUI/AGUIGameHUD.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,17 @@ class AGUIGameHUD
1212

1313
};
1414

15-
// $JPOG: 0046e4e0 FUNCTION
15+
// $JPOG: FUNCTION 0046e4e0
1616
void AddToHUD(HUDComponents a_eHUDComponets)
1717
{
1818
SetHUD(static_cast<HUDComponents>(m_eHUDComponents | a_eHUDComponets));
1919
}
20-
// $JPOG: 0046e500 FUNCTION
20+
// $JPOG: FUNCTION 0046e500
2121
void ToggleHUD(HUDComponents a_eHUDComponets)
2222
{
2323
SetHUD(static_cast<HUDComponents>(m_eHUDComponents ^ a_eHUDComponets));
2424
}
25-
// $JPOG: 00673140 FUNCTION
25+
// $JPOG: FUNCTION 00673140
2626
void SetHUD(HUDComponents a_eHUDComponets)
2727
{
2828
if (a_eHUDComponets == m_eHUDComponents) {
@@ -31,22 +31,22 @@ class AGUIGameHUD
3131
m_eHUDComponents = a_eHUDComponets;
3232
AGUISystem::GetGUISystem()->UpdateHUDComponets();
3333
}
34-
// $JPOG: 0046e4a0 FUNCTION
34+
// $JPOG: FUNCTION 0046e4a0
3535
Toshi::TLString GetHintMessage()
3636
{
3737
return m_LSHintMessage;
3838
}
39-
// $JPOG: 0046e520 FUNCTION
39+
// $JPOG: FUNCTION 0046e520
4040
HUDComponents GetHUD()
4141
{
4242
return m_eHUDComponents;
4343
}
44-
// $JPOG: 00673100 FUNCTION
44+
// $JPOG: FUNCTION 00673100
4545
void ClearBackgroundPicture()
4646
{
4747
m_szBKGMatLib = Toshi::TCString();
4848
}
49-
// $JPOG: 00673110 FUNCTION
49+
// $JPOG: FUNCTION 00673110
5050
void SetBackgroundMatLib(TPCCHAR a_szBKGMatLib)
5151
{
5252
m_szBKGMatLib = a_szBKGMatLib;

‎OpenJPOG/Source/GUI/AGUISystem.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,13 @@ TOSHI_NAMESPACE_USING
1111

1212
IMPLEMENT_DYNCREATE(AGUISystem, TTask)
1313

14+
// $JPOG: FUNCTION 0067b380
1415
AGUISystem::AGUISystem()
1516
{
1617
m_pGUIInterface = TNULL;
1718
}
1819

20+
// $JPOG: FUNCTION 0067bc30
1921
TBOOL AGUISystem::OnCreate()
2022
{
2123
auto pRenderer = g_oTheApp.GetRootTask()->GetRenderInterface();
@@ -26,6 +28,7 @@ TBOOL AGUISystem::OnCreate()
2628
return TBOOL();
2729
}
2830

31+
// $JPOG: FUNCTION 0067c1f0
2932
TBOOL AGUISystem::OnUpdate(TFLOAT a_fDeltaTime)
3033
{
3134
return TBOOL();
@@ -35,6 +38,7 @@ void AGUISystem::UpdateHUDComponets()
3538
{
3639
}
3740

41+
// $JPOG: FUNCTION 0067e3f0
3842
AGUISystem *TOSHI_API AGUISystem::GetGUISystem()
3943
{
4044
return g_oTheApp.GetRootTask()->GetGUISystem();

‎OpenJPOG/Source/GUI/AGUISystem.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ class AGUISystem : public Toshi::TTask
1616
virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) override;
1717

1818
void UpdateHUDComponets();
19+
// $JPOG: FUNCTION 0067e5e0
1920
Toshi::TManagedPtr<Toshi::TGUIInterface> GetGUIInterface() const
2021
{
2122
return m_pGUIInterface;

‎OpenJPOG/Source/Movie/ABINKMoviePlayer.cpp‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ TOSHI_NAMESPACE_USING
1313

1414
static U32 s_iPlayForegroundFast = 0;
1515

16+
// $JPOG: FUNCTION 006d52d0
1617
ABINKMoviePlayer::ABINKMoviePlayer()
1718
{
1819
m_bHasMovieStopped = TTRUE;
@@ -34,6 +35,7 @@ ABINKMoviePlayer::ABINKMoviePlayer()
3435
SetFrameReady(TFALSE);
3536
}
3637

38+
// $JPOG: FUNCTION 006d5370
3739
TBOOL ABINKMoviePlayer::InitializeMoviePlayer()
3840
{
3941
if (!m_bIsBINKInitialized) {
@@ -44,6 +46,7 @@ TBOOL ABINKMoviePlayer::InitializeMoviePlayer()
4446
return TFALSE;
4547
}
4648

49+
// $JPOG: FUNCTION 006d57b0
4750
TBOOL ABINKMoviePlayer::ShutdownMoviePlayer()
4851
{
4952
if (m_bIsBINKInitialized) {
@@ -55,6 +58,7 @@ TBOOL ABINKMoviePlayer::ShutdownMoviePlayer()
5558
return TFALSE;
5659
}
5760

61+
// $JPOG: FUNCTION 006d58b0
5862
TBOOL ABINKMoviePlayer::StartMovie(TPCHAR a_szMovieName, TBOOL a_bUnk1, TPCHAR a_szUnk2, TBOOL a_bUseLocale)
5963
{
6064
TRenderInterface *renderer = g_oTheApp.GetRootTask()->GetRenderInterface();
@@ -123,6 +127,7 @@ TBOOL ABINKMoviePlayer::StartMovie(TPCHAR a_szMovieName, TBOOL a_bUnk1, TPCHAR a
123127
return TTRUE;
124128
}
125129

130+
// $JPOG: FUNCTION 006d5840
126131
TBOOL ABINKMoviePlayer::Update(TFLOAT a_fDeltaTime)
127132
{
128133
if (!m_bHasMovieStopped && m_hBink) {
@@ -136,6 +141,7 @@ TBOOL ABINKMoviePlayer::Update(TFLOAT a_fDeltaTime)
136141
return TFALSE;
137142
}
138143

144+
// $JPOG: FUNCTION 006d5dc0
139145
TBOOL ABINKMoviePlayer::RenderToTexture(TTextureResource *a_pTexture)
140146
{
141147
if (m_hBink) {
@@ -195,6 +201,7 @@ TBOOL ABINKMoviePlayer::RenderToFrameBuffer(TPBYTE a_pDest, TINT a_iDestWidth, T
195201
}
196202

197203

204+
// $JPOG: FUNCTION 006d53a0
198205
TBOOL ABINKMoviePlayer::InitializeVideoResource()
199206
{
200207
TRenderInterface *renderer = g_oTheApp.GetRootTask()->GetRenderInterface();
@@ -221,6 +228,7 @@ TBOOL ABINKMoviePlayer::InitializeVideoResource()
221228
return TTRUE;
222229
}
223230

231+
// $JPOG: FUNCTION 006d5710
224232
TBOOL ABINKMoviePlayer::InitializeAudioResource()
225233
{
226234
TRenderD3DInterface *renderer = g_oTheApp.GetRootTask()->GetRenderInterface();
@@ -236,18 +244,21 @@ TBOOL ABINKMoviePlayer::InitializeAudioResource()
236244
return TTRUE;
237245
}
238246

247+
// $JPOG: FUNCTION 006d57f0
239248
TBOOL ABINKMoviePlayer::FreeVideoResource()
240249
{
241250
return TTRUE;
242251
}
243252

253+
// $JPOG: FUNCTION 006d6400
244254
void ABINKMoviePlayer::SetLocaleInfoA(TPCHAR a_szBuffer)
245255
{
246256
//Toshi::TSystem::GetCStringPool();
247257
//Toshi::TSystem::GetLocale();
248258
sprintf(a_szBuffer, "Data\\Movies\\%s.bik", m_szMovieFileName);
249259
}
250260

261+
// $JPOG: FUNCTION 006d6310
251262
void ABINKMoviePlayer::BinkSleep(TINT a_iMicroseconds)
252263
{
253264
static S32 s_iTotalSleep = 0;
@@ -277,6 +288,7 @@ void ABINKMoviePlayer::BinkSleep(TINT a_iMicroseconds)
277288
}
278289
}
279290

291+
// $JPOG: FUNCTION 006d5f20
280292
TBOOL ABINKMoviePlayer::RenderToTiles()
281293
{
282294
return TBOOL();

‎OpenJPOG/Source/Movie/ABINKMoviePlayer.h‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,17 +33,21 @@ class ABINKMoviePlayer : public AMoviePlayer
3333

3434
virtual TBOOL FreeVideoResource();
3535

36+
// $JPOG: FUNCTION 006d6640
3637
virtual TBOOL FreeAudioResource()
3738
{
3839
delete m_pDirectSound;
3940
return TTRUE;
4041
}
4142
virtual void SetLocaleInfoA(TPCHAR a_szBuffer);
43+
// $JPOG: FUNCTION 006d6580
4244
virtual TTextureResource *GetTexture() { return m_pTextures[m_iCurrentTextureIndex]; }
4345

4446
void BinkSleep(TINT a_iMicroseconds);
4547
TBOOL RenderToTiles();
48+
// $JPOG: FUNCTION 006d6570
4649
TTextureResource *GetCurrentTexture() { return m_pTextures[m_iCurrentTextureIndex]; }
50+
// $JPOG: FUNCTION 006d6540
4751
void SetCurrentTexture(TTextureResource *a_pTexture)
4852
{
4953
if (!m_pTextures[m_iCurrentTextureIndex]) {
@@ -52,11 +56,13 @@ class ABINKMoviePlayer : public AMoviePlayer
5256
}
5357

5458
private:
59+
// $JPOG: FUNCTION 006d6520
5560
static void PTR4 *RADLINK RADMEMALLOC(U32 bytes)
5661
{
5762
return tmalloc(bytes, TNULL, -1);
5863
}
5964

65+
// $JPOG: FUNCTION 006d6510
6066
static void RADLINK RADMEMFREE(void PTR4 *ptr)
6167
{
6268
tfree(ptr);

0 commit comments

Comments
 (0)