ubergames/rpg-x2
0
0
Fork 0
mirror of https://github.com/UberGames/RPG-X2.git synced 2024-11-28 15:13:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

fixed all compile warning in ui

Browse source
This commit is contained in:
UberGames 2011-06-15 09:13:31 +02:00
parent 685e93ad79
commit 0eed14f78c
4 changed files with 140 additions and 122 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
stefgame.suo
View file

Binary file not shown.

12
ui/ui_atoms.c
View file

@ -263,11 +263,11 @@ static void UI_DrawBannerString2( int x, int y, const char* str, vec4_t color )
} }
else if ( ch >= 'A' && ch <= 'Z' ) { else if ( ch >= 'A' && ch <= 'Z' ) {
ch -= 'A'; ch -= 'A';
fcol = (float)propMapB[ch][0] / 256.0f; //256.0f fcol = (float)propMapB[(int)ch][0] / 256.0f; //256.0f
frow = (float)propMapB[ch][1] / 256.0f; frow = (float)propMapB[(int)ch][1] / 256.0f;
fwidth = (float)propMapB[ch][2] / 256.0f; fwidth = (float)propMapB[(int)ch][2] / 256.0f;
fheight = (float)PROPB_HEIGHT / 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; ah = (float)PROPB_HEIGHT * uis.scaley;
trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, uis.charsetPropB ); trap_R_DrawStretchPic( ax, ay, aw, ah, fcol, frow, fcol+fwidth, frow+fheight, uis.charsetPropB );
ax += (aw + (float)PROPB_GAP_WIDTH * uis.scalex); 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" }; 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; int i;
char language[32]; char language[32];
@ -2611,7 +2611,7 @@ static void UI_AntiPlagiarise ( const char *textLine, int arg )
} }
} }
} }
} }*/
#define MAXMENUTEXT 15000 #define MAXMENUTEXT 15000
char MenuText[MAXMENUTEXT]; char MenuText[MAXMENUTEXT];

54
ui/ui_controls2.c
View file

@ -80,7 +80,7 @@ static menubitmap_s s_controls_fonts;
static menubitmap_s s_controls_network; static menubitmap_s s_controls_network;
static menuframework_s s_controlsother_menu; 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 menuslider_s s_keyturnspeed_slider;
static struct static struct
@ -131,25 +131,25 @@ typedef enum
menugraphics_s attackmenu_graphics[AMG_MAX] = menugraphics_s attackmenu_graphics[AMG_MAX] =
{ {
// type timer x y width height file/text graphic, min max target inc style color // 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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, 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; 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_weapon3_action;
static menuaction_s s_attack_weapon4_action; static menuaction_s s_attack_weapon4_action;
static menuaction_s s_attack_weapon5_action; static menuaction_s s_attack_weapon5_action;
static menuaction_s s_attack_weapon6_action; //static menuaction_s s_attack_weapon6_action;
static menuaction_s s_attack_weapon7_action; //static menuaction_s s_attack_weapon7_action;
static menuaction_s s_attack_weapon8_action; //static menuaction_s s_attack_weapon8_action;
static menuaction_s s_attack_weapon9_action; //static menuaction_s s_attack_weapon9_action;
static menuaction_s s_attack_weapon_next_action; static menuaction_s s_attack_weapon_next_action;
static menuaction_s s_attack_weapon_prev_action; static menuaction_s s_attack_weapon_prev_action;
static menuaction_s s_attack_waiting_action; static menuaction_s s_attack_waiting_action;
@ -196,7 +196,7 @@ static menuframework_s s_controlscommand_menu;
static menuframework_s s_controlsmouse_menu; static menuframework_s s_controlsmouse_menu;
//atic menulist_s s_joyenable_box; //atic menulist_s s_joyenable_box;
//static menuslider_s s_joythreshold_slider; //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_joyxbutton_box;
static menulist_s s_joyybutton_box; static menulist_s s_joyybutton_box;
@ -466,7 +466,7 @@ typedef struct
static controls_t s_controls; 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[] = static bind_t g_bindings[] =
{ {
@ -652,7 +652,7 @@ static void** g_controls[] =
g_command_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.alwaysrun,
(menucommon_s *)&s_controls.run, (menucommon_s *)&s_controls.run,
@ -666,10 +666,10 @@ static menucommon_s *g_movement_controls[] =
(menucommon_s *)&s_controls.turnright, (menucommon_s *)&s_controls.turnright,
(menucommon_s *)&s_controls.sidestep, (menucommon_s *)&s_controls.sidestep,
NULL NULL
}; };*/
static menucommon_s *g_looking_controls[] = /*static menucommon_s *g_looking_controls[] =
{ {
(menucommon_s *)&s_controls.sensitivity, (menucommon_s *)&s_controls.sensitivity,
(menucommon_s *)&s_controls.smoothmouse, (menucommon_s *)&s_controls.smoothmouse,
@ -683,9 +683,9 @@ static menucommon_s *g_looking_controls[] =
(menucommon_s *)&s_controls.joyenable, (menucommon_s *)&s_controls.joyenable,
(menucommon_s *)&s_controls.joythreshold, (menucommon_s *)&s_controls.joythreshold,
NULL, NULL,
}; };*/
static menucommon_s *g_misc_controls[] = /*static menucommon_s *g_misc_controls[] =
{ {
(menucommon_s *)&s_controls.showscores, (menucommon_s *)&s_controls.showscores,
(menucommon_s *)&s_controls.useitem, (menucommon_s *)&s_controls.useitem,
@ -698,7 +698,7 @@ static menucommon_s *g_misc_controls[] =
(menucommon_s *)&s_controls.gesture, (menucommon_s *)&s_controls.gesture,
(menucommon_s *)&s_controls.showscores, (menucommon_s *)&s_controls.showscores,
NULL, NULL,
}; };*/
/* /*
================= =================

196
ui/ui_credits.c
View file

@ -176,126 +176,144 @@ typedef struct
static creditsInfo_t creditsInfo[MAX_MENUS] = static creditsInfo_t creditsInfo[MAX_MENUS] =
{ {
//The d00ds leading this shizzie :) //The d00ds leading this shizzie :)
{ {
{ "PROJECT LEADS" }, "PROJECT LEADS",
{ { NAME_PHENIX }, { TITLE_LEADER } }, {
{ { NAME_JAY }, { TITLE_LPROG } }, { NAME_PHENIX, TITLE_LEADER },
{ { NAME_SHARKY }, { TITLE_L2DAS } }, { NAME_JAY, TITLE_LPROG },
{ { NAME_TIM }, { TITLE_L3D } }, { NAME_SHARKY, TITLE_L2DAS },
{ { NAME_WILL }, { TITLE_LMAPPER } } { NAME_TIM, TITLE_L3D },
{ NAME_WILL, TITLE_LMAPPER }
}
}, },
//The d00ds l33tzor haxxoring this shizzie. //The d00ds l33tzor haxxoring this shizzie.
{ {
{ "PROGRAMMING" }, "PROGRAMMING",
{ { NAME_JAY }, { TITLE_LPROG } }, {
{ { NAME_TIM }, { TITLE_PROG } }, { NAME_JAY, TITLE_LPROG },
{ { NAME_PHENIX }, { TITLE_PROG } }, { NAME_TIM, TITLE_PROG },
{ { NAME_RED }, { TITLE_ADPROG } }, { NAME_PHENIX, TITLE_PROG },
{ { NAME_MARCIN }, { TITLE_PROG } }, // Scooter was originally here...sorry... not enough space! { NAME_RED, TITLE_ADPROG },
{ { NAME_SCOOTER }, { TITLE_ADPROG } }, { NAME_MARCIN, TITLE_PROG }, // Scooter was originally here...sorry... not enough space!
{ { NAME_GSIO01 }, { TITLE_PROG } }, { NAME_SCOOTER, TITLE_ADPROG },
{ NAME_GSIO01, TITLE_PROG },
}
}, },
//The d00ds painting and texturing this shizzie. //The d00ds painting and texturing this shizzie.
{ {
{ "2-D ART" }, "2-D ART",
{ { NAME_SHARKY }, { TITLE_L2D } }, {
{ { NAME_SIMMO }, { TITLE_LCARS } }, { NAME_SHARKY, TITLE_L2D },
{ { NAME_TIM }, { TITLE_AD2D } }, { NAME_SIMMO, TITLE_LCARS },
{ { NAME_SCOOTER }, { TITLE_AD2D } }, { NAME_TIM, TITLE_AD2D },
{ { NAME_KURO }, { TITLE_RANKS } }, { NAME_SCOOTER, TITLE_AD2D },
{ NAME_KURO, TITLE_RANKS },
}
}, },
//The d00d modeling this shizzie. I feel so alone rofl. //The d00d modeling this shizzie. I feel so alone rofl.
{ {
{ "3-D ART" }, "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 { 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. //The d00ds mapping this shizzie.
{ {
{ "LEVEL DESIGN" }, "LEVEL DESIGN",
{ { NAME_WILL }, { TITLE_LMAPPER } }, {
{ { NAME_ANT }, { TITLE_LEVELART } }, { NAME_WILL, TITLE_LMAPPER },
//{ { "Jack Amzadi" }, { "Level Artist" } }, //Seriously... did we see ANYTHING come out of these guys? O_o { NAME_ANT, TITLE_LEVELART },
//{ { "Johan" }, { "Level Artist" } }, //{ "Jack Amzadi", "Level Artist" }, //Seriously... did we see ANYTHING come out of these guys? O_o
//{ { "RED-RUM" }, { "Level Artist" } }, //{ "Johan", "Level Artist" },
{ { NAME_PHENIX }, { TITLE_LEVELART } }, //{ "RED-RUM", "Level Artist" },
//{ { NAME_SCOOTER }, { TITLE_LEVELART } }, //I think he wanted to be taken off { NAME_PHENIX, TITLE_LEVELART },
//{ { NAME_WILL }, { 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. :) //The d00ds... uh.. soundzor-ing this shizzie. :)
{ {
{ "AUDIO DESIGN" }, "AUDIO DESIGN",
{ { NAME_SHARKY }, { TITLE_LAUDIO } }, {
{ { NAME_PHENIX }, { TITLE_ADAUDIO } }, { NAME_SHARKY, TITLE_LAUDIO },
{ { NAME_TIM }, { TITLE_ADAUDIO } }, { NAME_PHENIX, TITLE_ADAUDIO },
{ { NAME_SCOOTER }, { TITLE_ADAUDIO } }, { NAME_TIM, TITLE_ADAUDIO },
{ { NAME_TDP }, { TITLE_ADAUDIO } }, { NAME_SCOOTER, TITLE_ADAUDIO },
{ NAME_TDP, TITLE_ADAUDIO },
}
}, },
{ {
{ "ADDITIONAL SUPPORT" }, "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_SCOOTER, TITLE_CANON },
{ { NAME_GSIO01, { TITLE_DEUTSCH } }, //{ "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_JEROEN, { TITLE_NEDERLANDS } }, { NAME_GSIO01, TITLE_DEUTSCH },
{ { NAME_MARCIN, { TITLE_NEDERLANDS } }, { NAME_JEROEN, TITLE_NEDERLANDS },
{ { NAME_LAZ, { TITLE_SKINSMODELS } }, { NAME_MARCIN, TITLE_NEDERLANDS },
//{ { NAME_PHENIX, { TITLE_DOCU } }, { NAME_LAZ, TITLE_SKINSMODELS },
//{ { NAME_SHARKY, { TITLE_DOCU } }, //{ NAME_PHENIX, TITLE_DOCU },
//{ { NAME_RED, { TITLE_DOCU } }, //{ NAME_SHARKY, TITLE_DOCU },
//{ { NAME_DI, { TITLE_CIN } }, //{ NAME_RED, TITLE_DOCU },
{ { NAME_PARKER, { TITLE_ACAI } }, //{ NAME_DI, TITLE_CIN },
{ { NAME_HOCKING, { TITLE_AD2D } } { NAME_PARKER, TITLE_ACAI },
{ NAME_HOCKING, TITLE_AD2D }
}
}, },
//The d00ds beta testing this shizzie //The d00ds beta testing this shizzie
{ {
{ "BETA TESTERS" }, "BETA TESTERS",
{ { "Jordan" }, { "" } }, {
{ { "sharpkiller" }, { "" } }, { "Jordan", "" },
{ { "Telex Ferra" }, { "" } }, { "sharpkiller", "" },
{ { "AdmiralHocking" }, { "" } }, { "Telex Ferra", "" },
{ { "Lee Wolfgang" }, { "" } }, { "AdmiralHocking", "" },
{ { "Quince" }, { "" } }, { "Lee Wolfgang", "" },
/*{ { "Alex L." }, { "" } }, { "Quince", "" },
{ { "Chase Benedict" }, { "" } }, /*{ "Alex L.", "" },
{ { "Jake Conhale" }, { "" } }, { "Chase Benedict", "" },
{ { "James Young" }, { "" } }, { "Jake Conhale", "" },
{ { "Kadratis Velevere" }, { "" } }, { "James Young", "" },
{ { "Ricksal0224" }, { "" } }, { "Kadratis Velevere", "" },
{ { "SimmerALPHA" }, { "" } }, { "Ricksal0224", "" },
{ { "Slayer" }, { "" } }, { "SimmerALPHA", "" },
{ { NAME_MARCIN }, { "" } }, { "Slayer", "" },
{ { "Tuskin" } { "" } }*/ { NAME_MARCIN, "" },
/*{ { "Alex L." }, { "" } }, { "Tuskin" "" }*/
{ { "Alex Mcpherson" }, { "" } }, /*{ "Alex L.", "" },
{ { "AlphaOmega" }, { "" } }, { "Alex Mcpherson", "" },
{ { "Andrew" }, { "" } }, { "AlphaOmega", "" },
{ { "Crusader" }, { "" } }, { "Andrew", "" },
{ { "Diaz" }, { "" } }, { "Crusader", "" },
{ { "Fred" }, { "" } }, { "Diaz", "" },
{ { "Jake Conhale" }, { "" } }, { "Fred", "" },
{ { "Martin" }, { "" } }, { "Jake Conhale", "" },
{ { "Mr Fibbles" }, { "" } }, { "Martin", "" },
{ { "Myntz" }, { "" } }, { "Mr Fibbles", "" },
{ { "Nuttycomputer" }, { "" } }, { "Myntz", "" },
{ { "Rigs" }, { "" } },*/ { "Nuttycomputer", "" },
//{ { "Pending..." }, { "" } } { "Rigs", "" },*/
//{ "Pending...", "" }
}
}, },
//Totally awesome d00ds whose input contributed greatly to this shizzie. :) //Totally awesome d00ds whose input contributed greatly to this shizzie. :)
{ {
{ "SPECIAL THANKS" }, "SPECIAL THANKS",
{ { NAME_GENE }, { TITLE_TREK } }, {
{ { NAME_RAVEN }, { TITLE_EF } }, { NAME_GENE, TITLE_TREK },
{ { NAME_EFPEEPS }, { TITLE_TEST } }, { NAME_RAVEN, TITLE_EF },
{ { NAME_STEVE }, { TITLE_PLAGIA } }, { NAME_EFPEEPS, TITLE_TEST },
{ { NAME_MONROE }, { TITLE_RAVENCODER } } { NAME_STEVE, TITLE_PLAGIA },
{ NAME_MONROE, TITLE_RAVENCODER }
}
} }
}; };