diff --git a/src/menu.c b/src/menu.c
index ff6932df60e4741b38dab3450fb49940762fe20c..faf5b3de0014708b74a59f0ada005fdc1483588b 100644 (file)
--- a/src/menu.c
+++ b/src/menu.c
extern int PL_JUMP,PL_RUN;
extern byte _warp,cheat,p_fly;
-extern byte g_music[8];
+extern char g_music[8];
extern byte savname[7][24],savok[7];
void load_game(int);
};
int p1color=5,p2color=4;
-static byte ibuf[24],input=0;
+static char ibuf[24];
+static byte input=0;
static int icur;
enum{MENU,MSG};
msnd4=Z_getsnd("SWTCHX");
msnd5=Z_getsnd("SUDI");
msnd6=Z_getsnd("TUDI");
- msklh[0]=M_lock(F_getresid("M_SKULL1"));
+ msklh[0]=V_loadvgaimg("M_SKULL1");
// msklh[0]=load_vga("vga\\spr.vga","M_SKULL1");
- msklh[1]=M_lock(F_getresid("M_SKULL2"));
- mbarl=M_lock(F_getresid("M_THERML"));
- mbarm=M_lock(F_getresid("M_THERMM"));
- mbarr=M_lock(F_getresid("M_THERMR"));
- mbaro=M_lock(F_getresid("M_THERMO"));
- mslotl=M_lock(F_getresid("M_LSLEFT"));
- mslotm=M_lock(F_getresid("M_LSCNTR"));
- mslotr=M_lock(F_getresid("M_LSRGHT"));
+ msklh[1]=V_loadvgaimg("M_SKULL2");
+ mbarl=V_loadvgaimg("M_THERML");
+ mbarm=V_loadvgaimg("M_THERMM");
+ mbarr=V_loadvgaimg("M_THERMR");
+ mbaro=V_loadvgaimg("M_THERMO");
+ mslotl=V_loadvgaimg("M_LSLEFT");
+ mslotm=V_loadvgaimg("M_LSCNTR");
+ mslotr=V_loadvgaimg("M_LSRGHT");
K_setkeyproc(G_keyf);
}