1
0
Fork 0
forked from fte/fteqw

In the UI_SbarInit() function, I changed true to false so the plugin would load.

git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1598 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Lance 2005-11-27 02:33:05 +00:00
parent c877a06196
commit 60e99424cd

View file

@ -490,72 +490,72 @@ void UI_SbarInit(void)
int j; int j;
//main bar (add cvars later) //main bar (add cvars later)
ibarback = Draw_LoadImage("ibar", true); ibarback = Draw_LoadImage("ibar", false);
sbarback = Draw_LoadImage("sbar", true); sbarback = Draw_LoadImage("sbar", false);
con_chars = Draw_LoadImage("conchars", true); con_chars = Draw_LoadImage("conchars", false);
//load images. //load images.
for (i = 0; i < 10; i++) for (i = 0; i < 10; i++)
{ {
pic_num[i] = Draw_LoadImage(va("num_%i", i), true); pic_num[i] = Draw_LoadImage(va("num_%i", i), false);
pic_anum[i] = Draw_LoadImage(va("anum_%i", i), true); pic_anum[i] = Draw_LoadImage(va("anum_%i", i), false);
} }
pic_num[10] = Draw_LoadImage("num_minus", true); pic_num[10] = Draw_LoadImage("num_minus", false);
pic_anum[10] = Draw_LoadImage("anum_minus", true); pic_anum[10] = Draw_LoadImage("anum_minus", false);
pic_num[11] = Draw_LoadImage("num_colon", true); pic_num[11] = Draw_LoadImage("num_colon", false);
pic_num[12] = Draw_LoadImage("num_slash", true); pic_num[12] = Draw_LoadImage("num_slash", false);
for (i = 0; i < numweaps; i++) for (i = 0; i < numweaps; i++)
{ {
gotweapontime[i] = 0; gotweapontime[i] = 0;
pic_weapon[0][i] = Draw_LoadImage(va("inv_%s", weaponabbreviation[i]), true); pic_weapon[0][i] = Draw_LoadImage(va("inv_%s", weaponabbreviation[i]), false);
pic_weapon[1][i] = Draw_LoadImage(va("inv2_%s", weaponabbreviation[i]), true); pic_weapon[1][i] = Draw_LoadImage(va("inv2_%s", weaponabbreviation[i]), false);
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
{ {
pic_weapon[2+j][i] = Draw_LoadImage(va("inva%i_%s", j+1, weaponabbreviation[i]), true); pic_weapon[2+j][i] = Draw_LoadImage(va("inva%i_%s", j+1, weaponabbreviation[i]), false);
} }
} }
for (i = 0; i < numpups; i++) for (i = 0; i < numpups; i++)
{ {
gotpuptime[i] = 0; gotpuptime[i] = 0;
pic_pup[0][i] = Draw_LoadImage(va("sb_%s", pupabbr2[i]), true); pic_pup[0][i] = Draw_LoadImage(va("sb_%s", pupabbr2[i]), false);
for (j = 0; j < 5; j++) for (j = 0; j < 5; j++)
{ {
pic_pup[1+j][i] = Draw_LoadImage(va("sba%i_%s", j+1, pupabbr[i]), true); pic_pup[1+j][i] = Draw_LoadImage(va("sba%i_%s", j+1, pupabbr[i]), false);
} }
} }
pic_armour[0] = Draw_LoadImage("sb_armor1", true); pic_armour[0] = Draw_LoadImage("sb_armor1", false);
pic_armour[1] = Draw_LoadImage("sb_armor2", true); pic_armour[1] = Draw_LoadImage("sb_armor2", false);
pic_armour[2] = Draw_LoadImage("sb_armor3", true); pic_armour[2] = Draw_LoadImage("sb_armor3", false);
pic_ammo[0] = Draw_LoadImage("sb_shells", true); pic_ammo[0] = Draw_LoadImage("sb_shells", false);
pic_ammo[1] = Draw_LoadImage("sb_nails", true); pic_ammo[1] = Draw_LoadImage("sb_nails", false);
pic_ammo[2] = Draw_LoadImage("sb_rocket", true); pic_ammo[2] = Draw_LoadImage("sb_rocket", false);
pic_ammo[3] = Draw_LoadImage("sb_cells", true); pic_ammo[3] = Draw_LoadImage("sb_cells", false);
pic_rune[0] = Draw_LoadImage("sb_sigil1", true); pic_rune[0] = Draw_LoadImage("sb_sigil1", false);
pic_rune[1] = Draw_LoadImage("sb_sigil2", true); pic_rune[1] = Draw_LoadImage("sb_sigil2", false);
pic_rune[2] = Draw_LoadImage("sb_sigil3", true); pic_rune[2] = Draw_LoadImage("sb_sigil3", false);
pic_rune[3] = Draw_LoadImage("sb_sigil4", true); pic_rune[3] = Draw_LoadImage("sb_sigil4", false);
pic_face[0] = Draw_LoadImage("face1", true); pic_face[0] = Draw_LoadImage("face1", false);
pic_face[1] = Draw_LoadImage("face2", true); pic_face[1] = Draw_LoadImage("face2", false);
pic_face[2] = Draw_LoadImage("face3", true); pic_face[2] = Draw_LoadImage("face3", false);
pic_face[3] = Draw_LoadImage("face4", true); pic_face[3] = Draw_LoadImage("face4", false);
pic_face[4] = Draw_LoadImage("face5", true); pic_face[4] = Draw_LoadImage("face5", false);
pic_facep[0] = Draw_LoadImage("face_p1", true); pic_facep[0] = Draw_LoadImage("face_p1", false);
pic_facep[1] = Draw_LoadImage("face_p2", true); pic_facep[1] = Draw_LoadImage("face_p2", false);
pic_facep[2] = Draw_LoadImage("face_p3", true); pic_facep[2] = Draw_LoadImage("face_p3", false);
pic_facep[3] = Draw_LoadImage("face_p4", true); pic_facep[3] = Draw_LoadImage("face_p4", false);
pic_facep[4] = Draw_LoadImage("face_p5", true); pic_facep[4] = Draw_LoadImage("face_p5", false);
pic_facequad = Draw_LoadImage("face_quad", true); pic_facequad = Draw_LoadImage("face_quad", false);
pic_faceinvis = Draw_LoadImage("face_invis", true); pic_faceinvis = Draw_LoadImage("face_invis", false);
pic_faceinvisinvuln = Draw_LoadImage("face_inv2", true); pic_faceinvisinvuln = Draw_LoadImage("face_inv2", false);
pic_faceinvuln = Draw_LoadImage("face_invul1", true); pic_faceinvuln = Draw_LoadImage("face_invul1", false);
pic_faceinvulnquad = Draw_LoadImage("face_invul2", true); pic_faceinvulnquad = Draw_LoadImage("face_invul2", false);
SBar_FlushAll(); SBar_FlushAll();
SBar_ReloadDefaults(); SBar_ReloadDefaults();
@ -1183,7 +1183,6 @@ int Plug_Init(int *args)
Plug_Export("ExecuteCommand", Plug_ExecuteCommand) && Plug_Export("ExecuteCommand", Plug_ExecuteCommand) &&
Plug_Export("MenuEvent", Plug_MenuEvent)) Plug_Export("MenuEvent", Plug_MenuEvent))
{ {
UI_SbarInit();
K_UPARROW = Key_GetKeyCode("uparrow"); K_UPARROW = Key_GetKeyCode("uparrow");
K_DOWNARROW = Key_GetKeyCode("downarrow"); K_DOWNARROW = Key_GetKeyCode("downarrow");
@ -1199,7 +1198,9 @@ int Plug_Init(int *args)
Cmd_AddCommand("sbar_load"); Cmd_AddCommand("sbar_load");
Cmd_AddCommand("sbar_defaults"); Cmd_AddCommand("sbar_defaults");
return true; UI_SbarInit();
return 1;
} }
return false; return 0;
} }