Get rid of some global strings to (shrinks release exe size by 3.5MB)

This commit is contained in:
Chris Danford
2003-03-15 19:25:37 +00:00
parent 8f9ac4d0ee
commit ad34d417f6
24 changed files with 471 additions and 421 deletions
+45 -18
View File
@@ -16,21 +16,48 @@
#include "Quad.h"
#include "RandomSample.h"
#define MAX_MINI_MENU_LINES 40
#define MAX_OPTIONS_PER_LINE 20
struct MiniMenuDefinition
#define MAX_MENU_ROWS 20
struct MenuRow
{
char szTitle[64];
int iNumLines;
struct MiniMenuLine
CString name;
bool enabled;
int defaultChoice;
vector<CString> choices;
MenuRow()
{
char szLabel[256];
bool bEnabled;
int iNumOptions;
int iDefaultOption;
char szOptionsText[MAX_OPTIONS_PER_LINE][256];
} lines[MAX_MINI_MENU_LINES];
enabled = true;
defaultChoice = 0;
}
MenuRow( CString n, bool e, CString c0="", CString c1="", CString c2="", CString c3="", CString c4="", CString c5="", CString c6="", CString c7="", CString c8="", CString c9="", CString c10="", CString c11="", CString c12="", CString c13="", CString c14="" )
{
name = n;
enabled = e;
defaultChoice = 0;
#define PUSH( c ) if(c!="") choices.push_back(c);
PUSH(c0);PUSH(c1);PUSH(c2);PUSH(c3);PUSH(c4);PUSH(c5);PUSH(c6);PUSH(c7);PUSH(c8);PUSH(c9);PUSH(c10);PUSH(c11);PUSH(c12);PUSH(c13);PUSH(c14);
printf( "choices.size = %u", choices.size() );
}
};
struct Menu
{
CString title;
vector<MenuRow> rows;
Menu() {}
Menu( CString t, MenuRow r0, MenuRow r1=MenuRow(), MenuRow r2=MenuRow(), MenuRow r3=MenuRow(), MenuRow r4=MenuRow(), MenuRow r5=MenuRow(), MenuRow r6=MenuRow(), MenuRow r7=MenuRow(), MenuRow r8=MenuRow(), MenuRow r9=MenuRow(), MenuRow r10=MenuRow(), MenuRow r11=MenuRow(), MenuRow r12=MenuRow(), MenuRow r13=MenuRow(), MenuRow r14=MenuRow(), MenuRow r15=MenuRow(), MenuRow r16=MenuRow(), MenuRow r17=MenuRow(), MenuRow r18=MenuRow(), MenuRow r19=MenuRow() )
{
title = t;
#define PUSH2( r ) if(r.name!="" || !r.choices.empty()) rows.push_back(r);
PUSH2(r0);PUSH2(r1);PUSH2(r2);PUSH2(r3);PUSH2(r4);PUSH2(r5);PUSH2(r6);PUSH2(r7);PUSH2(r8);PUSH2(r9);PUSH2(r10);PUSH2(r11);PUSH2(r12);PUSH2(r13);PUSH2(r14);PUSH2(r15);PUSH2(r16);PUSH2(r17);PUSH2(r18);PUSH2(r19);
}
};
@@ -38,7 +65,7 @@ class ScreenMiniMenu : public Screen
{
public:
ScreenMiniMenu();
ScreenMiniMenu( MiniMenuDefinition* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel );
ScreenMiniMenu( Menu* pDef, ScreenMessage SM_SendOnOK, ScreenMessage SM_SendOnCancel );
virtual void Update( float fDeltaTime );
virtual void DrawPrimitives();
@@ -63,18 +90,18 @@ protected:
void AfterLineChanged();
void AfterAnswerChanged();
MiniMenuDefinition m_Def;
Menu m_Def;
TransitionFade m_Fade;
BitmapText m_textTitle;
BitmapText m_textLabel[MAX_MINI_MENU_LINES];
BitmapText m_textAnswer[MAX_MINI_MENU_LINES];
BitmapText m_textLabel[MAX_MENU_ROWS];
BitmapText m_textAnswer[MAX_MENU_ROWS];
int m_iCurLine;
int m_iCurAnswers[MAX_MINI_MENU_LINES];
int m_iCurAnswers[MAX_MENU_ROWS];
ScreenMessage m_SMSendOnOK, m_SMSendOnCancel;
public:
static int s_iLastLine;
static int s_iLastAnswers[MAX_MINI_MENU_LINES];
static int s_iLastAnswers[MAX_MENU_ROWS];
};