diff --git a/stefgame.suo b/stefgame.suo index 420d484..c06a2cc 100644 Binary files a/stefgame.suo and b/stefgame.suo differ diff --git a/ui/ui_atoms.c b/ui/ui_atoms.c index 3063a70..d12789a 100644 --- a/ui/ui_atoms.c +++ b/ui/ui_atoms.c @@ -263,11 +263,11 @@ static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color ) } else if ( ch >= 'A' && ch <= 'Z' ) { ch -= 'A'; - fcol = (float)propMapB[ch][0] / 256.0f; //256.0f - frow = (float)propMapB[ch][1] / 256.0f; - fwidth = (float)propMapB[ch][2] / 256.0f; + fcol = (float)propMapB[(int)ch][0] / 256.0f; //256.0f + frow = (float)propMapB[(int)ch][1] / 256.0f; + fwidth = (float)propMapB[(int)ch][2] / 256.0f; fheight = (float)PROPB_HEIGHT / 256.0f; - aw = (float)propMapB[ch][2] * uis.scalex; + aw = (float)propMapB[(int)ch][2] * uis.scalex; ah = (float)PROPB_HEIGHT * uis.scaley; trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, uis.charsetPropB ); ax += (aw + (float)PROPB_GAP_WIDTH * uis.scalex); @@ -2588,7 +2588,7 @@ it quits as well. :) const char* illegalStrings[] = { "D4", "d4", "RPG-Y", "rpg-y", "AORP", "aorp" }; -static void UI_AntiPlagiarise ( const char *textLine, int arg ) +/*static void UI_AntiPlagiarise ( const char *textLine, int arg ) { int i; char language[32]; @@ -2611,7 +2611,7 @@ static void UI_AntiPlagiarise ( const char *textLine, int arg ) } } } -} +}*/ #define MAXMENUTEXT 15000 char MenuText[MAXMENUTEXT]; diff --git a/ui/ui_controls2.c b/ui/ui_controls2.c index aaef45c..0edbd42 100644 --- a/ui/ui_controls2.c +++ b/ui/ui_controls2.c @@ -80,7 +80,7 @@ static menubitmap_s s_controls_fonts; static menubitmap_s s_controls_network; static menuframework_s s_controlsother_menu; -static menulist_s s_lookspring_box; +//static menulist_s s_lookspring_box; static menuslider_s s_keyturnspeed_slider; static struct @@ -131,25 +131,25 @@ typedef enum menugraphics_s attackmenu_graphics[AMG_MAX] = { // type timer x y width height file/text graphic, min max target inc style color - MG_GRAPHIC, 0.0, 158, 280, 4, 32, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_MIDLEFT - MG_GRAPHIC, 0.0, 158, 180, 8, 97, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERLEFT - MG_GRAPHIC, 0.0, 158, 315, 8, 100, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERLEFT - MG_GRAPHIC, 0.0, 158, 164, 16, 16, "menu/common/corner_lu.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERCORNER - MG_GRAPHIC, 0.0, 158, 406, 32, 32, "menu/common/newswoosh.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERCORNER + { MG_GRAPHIC, 0.0, 158, 280, 4, 32, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_MIDLEFT + { MG_GRAPHIC, 0.0, 158, 180, 8, 97, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERLEFT + { MG_GRAPHIC, 0.0, 158, 315, 8, 100, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERLEFT + { MG_GRAPHIC, 0.0, 158, 164, 16, 16, "menu/common/corner_lu.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERCORNER + { MG_GRAPHIC, 0.0, 158, 406, 32, 32, "menu/common/newswoosh.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERCORNER - MG_GRAPHIC, 0.0, 177, 164, 280, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERTOP1ST - MG_GRAPHIC, 0.0, 175, 410, 282, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERTOP1ST + { MG_GRAPHIC, 0.0, 177, 164, 280, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERTOP1ST + { MG_GRAPHIC, 0.0, 175, 410, 282, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERTOP1ST - MG_GRAPHIC, 0.0, 457, 164, 34, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERTOP2ND - MG_GRAPHIC, 0.0, 457, 410, 34, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERTOP2ND + { MG_GRAPHIC, 0.0, 457, 164, 34, 8, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERTOP2ND + { MG_GRAPHIC, 0.0, 457, 410, 34, 18, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERTOP2ND - MG_GRAPHIC, 0.0, 494, 164, 128, 128, "menu/common/swoosh_top.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_UPPERSWOOP - MG_GRAPHIC, 0.0, 483, 403, 128, 32, "menu/common/newswoosh_long.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_LOWERSWOOP + { MG_GRAPHIC, 0.0, 494, 164, 128, 128, "menu/common/swoosh_top.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_UPPERSWOOP + { MG_GRAPHIC, 0.0, 483, 403, 128, 32, "menu/common/newswoosh_long.tga",0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_LOWERSWOOP - MG_GRAPHIC, 0.0, 501, 189, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_TOPRIGHT - MG_GRAPHIC, 0.0, 501, 383, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_BOTTOMRIGHT + { MG_GRAPHIC, 0.0, 501, 189, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_TOPRIGHT + { MG_GRAPHIC, 0.0, 501, 383, 110, 17, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_BOTTOMRIGHT - MG_GRAPHIC, 0.0, 501, 206, 110, 177, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL, // AMG_PLAYERBKGRND + { MG_GRAPHIC, 0.0, 501, 206, 110, 177, "menu/common/square.tga", 0, 0, 0, 0, 0, 0, 0, CT_VDKPURPLE1, NULL }, // AMG_PLAYERBKGRND }; static int g_section; @@ -162,10 +162,10 @@ static menuaction_s s_attack_weapon2_action; static menuaction_s s_attack_weapon3_action; static menuaction_s s_attack_weapon4_action; static menuaction_s s_attack_weapon5_action; -static menuaction_s s_attack_weapon6_action; -static menuaction_s s_attack_weapon7_action; -static menuaction_s s_attack_weapon8_action; -static menuaction_s s_attack_weapon9_action; +//static menuaction_s s_attack_weapon6_action; +//static menuaction_s s_attack_weapon7_action; +//static menuaction_s s_attack_weapon8_action; +//static menuaction_s s_attack_weapon9_action; static menuaction_s s_attack_weapon_next_action; static menuaction_s s_attack_weapon_prev_action; static menuaction_s s_attack_waiting_action; @@ -196,7 +196,7 @@ static menuframework_s s_controlscommand_menu; static menuframework_s s_controlsmouse_menu; //atic menulist_s s_joyenable_box; //static menuslider_s s_joythreshold_slider; -static menulist_s s_forcefeedback_box; +//static menulist_s s_forcefeedback_box; static menulist_s s_joyxbutton_box; static menulist_s s_joyybutton_box; @@ -466,7 +466,7 @@ typedef struct static controls_t s_controls; -static vec4_t controls_binding_color = {1.00, 0.43, 0.00, 1.00}; +//static vec4_t controls_binding_color = {1.00, 0.43, 0.00, 1.00}; static bind_t g_bindings[] = { @@ -652,7 +652,7 @@ static void** g_controls[] = g_command_controls }; -static menucommon_s *g_movement_controls[] = +/*static menucommon_s *g_movement_controls[] = { (menucommon_s *)&s_controls.alwaysrun, (menucommon_s *)&s_controls.run, @@ -666,10 +666,10 @@ static menucommon_s *g_movement_controls[] = (menucommon_s *)&s_controls.turnright, (menucommon_s *)&s_controls.sidestep, NULL -}; +};*/ -static menucommon_s *g_looking_controls[] = +/*static menucommon_s *g_looking_controls[] = { (menucommon_s *)&s_controls.sensitivity, (menucommon_s *)&s_controls.smoothmouse, @@ -683,9 +683,9 @@ static menucommon_s *g_looking_controls[] = (menucommon_s *)&s_controls.joyenable, (menucommon_s *)&s_controls.joythreshold, NULL, -}; +};*/ -static menucommon_s *g_misc_controls[] = +/*static menucommon_s *g_misc_controls[] = { (menucommon_s *)&s_controls.showscores, (menucommon_s *)&s_controls.useitem, @@ -698,7 +698,7 @@ static menucommon_s *g_misc_controls[] = (menucommon_s *)&s_controls.gesture, (menucommon_s *)&s_controls.showscores, NULL, -}; +};*/ /* ================= diff --git a/ui/ui_credits.c b/ui/ui_credits.c index 1afce08..82442c6 100644 --- a/ui/ui_credits.c +++ b/ui/ui_credits.c @@ -176,126 +176,144 @@ typedef struct static creditsInfo_t creditsInfo[MAX_MENUS] = { //The d00ds leading this shizzie :) - { - { "PROJECT LEADS" }, - { { NAME_PHENIX }, { TITLE_LEADER } }, - { { NAME_JAY }, { TITLE_LPROG } }, - { { NAME_SHARKY }, { TITLE_L2DAS } }, - { { NAME_TIM }, { TITLE_L3D } }, - { { NAME_WILL }, { TITLE_LMAPPER } } + { + "PROJECT LEADS", + { + { NAME_PHENIX, TITLE_LEADER }, + { NAME_JAY, TITLE_LPROG }, + { NAME_SHARKY, TITLE_L2DAS }, + { NAME_TIM, TITLE_L3D }, + { NAME_WILL, TITLE_LMAPPER } + } }, //The d00ds l33tzor haxxoring this shizzie. { - { "PROGRAMMING" }, - { { NAME_JAY }, { TITLE_LPROG } }, - { { NAME_TIM }, { TITLE_PROG } }, - { { NAME_PHENIX }, { TITLE_PROG } }, - { { NAME_RED }, { TITLE_ADPROG } }, - { { NAME_MARCIN }, { TITLE_PROG } }, // Scooter was originally here...sorry... not enough space! - { { NAME_SCOOTER }, { TITLE_ADPROG } }, - { { NAME_GSIO01 }, { TITLE_PROG } }, + "PROGRAMMING", + { + { NAME_JAY, TITLE_LPROG }, + { NAME_TIM, TITLE_PROG }, + { NAME_PHENIX, TITLE_PROG }, + { NAME_RED, TITLE_ADPROG }, + { NAME_MARCIN, TITLE_PROG }, // Scooter was originally here...sorry... not enough space! + { NAME_SCOOTER, TITLE_ADPROG }, + { NAME_GSIO01, TITLE_PROG }, + } }, //The d00ds painting and texturing this shizzie. { - { "2-D ART" }, - { { NAME_SHARKY }, { TITLE_L2D } }, - { { NAME_SIMMO }, { TITLE_LCARS } }, - { { NAME_TIM }, { TITLE_AD2D } }, - { { NAME_SCOOTER }, { TITLE_AD2D } }, - { { NAME_KURO }, { TITLE_RANKS } }, + "2-D ART", + { + { NAME_SHARKY, TITLE_L2D }, + { NAME_SIMMO, TITLE_LCARS }, + { NAME_TIM, TITLE_AD2D }, + { NAME_SCOOTER, TITLE_AD2D }, + { NAME_KURO, TITLE_RANKS }, + } }, //The d00d modeling this shizzie. I feel so alone rofl. { - { "3-D ART" }, - { { NAME_TIM }, { TITLE_L3D } }, - //{ "Ralph Schoberth", "Enterprise-E LightWave Mesh" }, //FixMe: Put mesh credits in a smaller section below here somehow lol + "3-D ART", + { + { NAME_TIM, TITLE_L3D }, + //{ "Ralph Schoberth", "Enterprise-E LightWave Mesh" }, //FixMe: Put mesh credits in a smaller section below here somehow lol + } }, //The d00ds mapping this shizzie. { - { "LEVEL DESIGN" }, - { { NAME_WILL }, { TITLE_LMAPPER } }, - { { NAME_ANT }, { TITLE_LEVELART } }, - //{ { "Jack Amzadi" }, { "Level Artist" } }, //Seriously... did we see ANYTHING come out of these guys? O_o - //{ { "Johan" }, { "Level Artist" } }, - //{ { "RED-RUM" }, { "Level Artist" } }, - { { NAME_PHENIX }, { TITLE_LEVELART } }, - //{ { NAME_SCOOTER }, { TITLE_LEVELART } }, //I think he wanted to be taken off - //{ { NAME_WILL }, { TITLE_LEVELART } }, + "LEVEL DESIGN", + { + { NAME_WILL, TITLE_LMAPPER }, + { NAME_ANT, TITLE_LEVELART }, + //{ "Jack Amzadi", "Level Artist" }, //Seriously... did we see ANYTHING come out of these guys? O_o + //{ "Johan", "Level Artist" }, + //{ "RED-RUM", "Level Artist" }, + { NAME_PHENIX, TITLE_LEVELART }, + //{ NAME_SCOOTER, TITLE_LEVELART }, //I think he wanted to be taken off + //{ NAME_WILL, TITLE_LEVELART }, + } }, //The d00ds... uh.. soundzor-ing this shizzie. :) { - { "AUDIO DESIGN" }, - { { NAME_SHARKY }, { TITLE_LAUDIO } }, - { { NAME_PHENIX }, { TITLE_ADAUDIO } }, - { { NAME_TIM }, { TITLE_ADAUDIO } }, - { { NAME_SCOOTER }, { TITLE_ADAUDIO } }, - { { NAME_TDP }, { TITLE_ADAUDIO } }, + "AUDIO DESIGN", + { + { NAME_SHARKY, TITLE_LAUDIO }, + { NAME_PHENIX, TITLE_ADAUDIO }, + { NAME_TIM, TITLE_ADAUDIO }, + { NAME_SCOOTER, TITLE_ADAUDIO }, + { NAME_TDP, TITLE_ADAUDIO }, + } }, { - { "ADDITIONAL SUPPORT" }, - { { NAME_SCOOTER, { TITLE_CANON } }, - //{ { "Highlander", { "Public Relations" } }, //He didn't publicly relate anything in this mod, this edition. Plus I want the space at the bottom of this lol - { { NAME_GSIO01, { TITLE_DEUTSCH } }, - { { NAME_JEROEN, { TITLE_NEDERLANDS } }, - { { NAME_MARCIN, { TITLE_NEDERLANDS } }, - { { NAME_LAZ, { TITLE_SKINSMODELS } }, - //{ { NAME_PHENIX, { TITLE_DOCU } }, - //{ { NAME_SHARKY, { TITLE_DOCU } }, - //{ { NAME_RED, { TITLE_DOCU } }, - //{ { NAME_DI, { TITLE_CIN } }, - { { NAME_PARKER, { TITLE_ACAI } }, - { { NAME_HOCKING, { TITLE_AD2D } } + "ADDITIONAL SUPPORT", + { + { NAME_SCOOTER, TITLE_CANON }, + //{ "Highlander", "Public Relations" }, //He didn't publicly relate anything in this mod, this edition. Plus I want the space at the bottom of this lol + { NAME_GSIO01, TITLE_DEUTSCH }, + { NAME_JEROEN, TITLE_NEDERLANDS }, + { NAME_MARCIN, TITLE_NEDERLANDS }, + { NAME_LAZ, TITLE_SKINSMODELS }, + //{ NAME_PHENIX, TITLE_DOCU }, + //{ NAME_SHARKY, TITLE_DOCU }, + //{ NAME_RED, TITLE_DOCU }, + //{ NAME_DI, TITLE_CIN }, + { NAME_PARKER, TITLE_ACAI }, + { NAME_HOCKING, TITLE_AD2D } + } }, //The d00ds beta testing this shizzie { - { "BETA TESTERS" }, - { { "Jordan" }, { "" } }, - { { "sharpkiller" }, { "" } }, - { { "Telex Ferra" }, { "" } }, - { { "AdmiralHocking" }, { "" } }, - { { "Lee Wolfgang" }, { "" } }, - { { "Quince" }, { "" } }, - /*{ { "Alex L." }, { "" } }, - { { "Chase Benedict" }, { "" } }, - { { "Jake Conhale" }, { "" } }, - { { "James Young" }, { "" } }, - { { "Kadratis Velevere" }, { "" } }, - { { "Ricksal0224" }, { "" } }, - { { "SimmerALPHA" }, { "" } }, - { { "Slayer" }, { "" } }, - { { NAME_MARCIN }, { "" } }, - { { "Tuskin" } { "" } }*/ - /*{ { "Alex L." }, { "" } }, - { { "Alex Mcpherson" }, { "" } }, - { { "AlphaOmega" }, { "" } }, - { { "Andrew" }, { "" } }, - { { "Crusader" }, { "" } }, - { { "Diaz" }, { "" } }, - { { "Fred" }, { "" } }, - { { "Jake Conhale" }, { "" } }, - { { "Martin" }, { "" } }, - { { "Mr Fibbles" }, { "" } }, - { { "Myntz" }, { "" } }, - { { "Nuttycomputer" }, { "" } }, - { { "Rigs" }, { "" } },*/ - //{ { "Pending..." }, { "" } } + "BETA TESTERS", + { + { "Jordan", "" }, + { "sharpkiller", "" }, + { "Telex Ferra", "" }, + { "AdmiralHocking", "" }, + { "Lee Wolfgang", "" }, + { "Quince", "" }, + /*{ "Alex L.", "" }, + { "Chase Benedict", "" }, + { "Jake Conhale", "" }, + { "James Young", "" }, + { "Kadratis Velevere", "" }, + { "Ricksal0224", "" }, + { "SimmerALPHA", "" }, + { "Slayer", "" }, + { NAME_MARCIN, "" }, + { "Tuskin" "" }*/ + /*{ "Alex L.", "" }, + { "Alex Mcpherson", "" }, + { "AlphaOmega", "" }, + { "Andrew", "" }, + { "Crusader", "" }, + { "Diaz", "" }, + { "Fred", "" }, + { "Jake Conhale", "" }, + { "Martin", "" }, + { "Mr Fibbles", "" }, + { "Myntz", "" }, + { "Nuttycomputer", "" }, + { "Rigs", "" },*/ + //{ "Pending...", "" } + } }, //Totally awesome d00ds whose input contributed greatly to this shizzie. :) { - { "SPECIAL THANKS" }, - { { NAME_GENE }, { TITLE_TREK } }, - { { NAME_RAVEN }, { TITLE_EF } }, - { { NAME_EFPEEPS }, { TITLE_TEST } }, - { { NAME_STEVE }, { TITLE_PLAGIA } }, - { { NAME_MONROE }, { TITLE_RAVENCODER } } + "SPECIAL THANKS", + { + { NAME_GENE, TITLE_TREK }, + { NAME_RAVEN, TITLE_EF }, + { NAME_EFPEEPS, TITLE_TEST }, + { NAME_STEVE, TITLE_PLAGIA }, + { NAME_MONROE, TITLE_RAVENCODER } + } } };