From 12c6a39177837a5c4dc8928a78140b4c3bb8f47a Mon Sep 17 00:00:00 2001 From: Steven Fuller Date: Mon, 6 Aug 2001 04:07:44 +0000 Subject: 'Undid' stubbing of IndexedFont::IndexedFont and IndexedFont::GetFont(). Initialized ScreenDescriptorBlock to some default values. Now AvP runs and exits with no errors with current main() --- src/stubs2.cpp | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) (limited to 'src/stubs2.cpp') diff --git a/src/stubs2.cpp b/src/stubs2.cpp index 72cb86e..e2c8d8c 100644 --- a/src/stubs2.cpp +++ b/src/stubs2.cpp @@ -27,15 +27,21 @@ void D3D_RenderHUDString_Centred(char *stringPtr, int centreX, int y, int colour /* indexfnt.cpp */ -#if 1 -IndexedFont* IndexedFont::GetFont(FontIndex I_Font_ToGet) +IndexedFont* IndexedFont :: pIndexedFont[ IndexedFonts_MAX_NUMBER_OF_FONTS ]; + +IndexedFont::IndexedFont(FontIndex I_Font_New) { - fprintf(stderr, "IndexedFont::GetFont(%d)\n", I_Font_ToGet); -// return pIndexedFont[ I_Font_ToGet ]; + fprintf(stderr, "IndexedFont::IndexedFont(%d)\n", I_Font_New); + + I_Font_Val = I_Font_New; + + pIndexedFont[ I_Font_New ] = this; +} - return NULL; +IndexedFont::~IndexedFont() +{ + fprintf(stderr, "IndexedFont::~IndexedFont()\n"); } -#endif void IndexedFont::UnloadFont(FontIndex I_Font_ToGet) { @@ -54,16 +60,6 @@ void IndexedFont_Proportional_PF::PFUnLoadHook(FontIndex I_Font_ToGet) fprintf(stderr, "IndexedFont_Proportional_PF::PFUnLoadHook(%d)\n", I_Font_ToGet); } -IndexedFont::IndexedFont(FontIndex I_Font_New) -{ - fprintf(stderr, "IndexedFont::IndexedFont(%d)\n", I_Font_New); -} - -IndexedFont::~IndexedFont() -{ - fprintf(stderr, "IndexedFont::~IndexedFont()\n"); -} - IndexedFont_HUD::IndexedFont_HUD(FontIndex I_Font_New) : IndexedFont(I_Font_New) { fprintf(stderr, "IndexedFont_HUD::IndexedFont_HUD(%d)\n", I_Font_New); -- cgit v1.3