fixed "gun cursor" option

This commit is contained in:
ekeeke31 2009-05-05 14:07:47 +00:00
parent 975d2212c6
commit 737c7244c4
2 changed files with 5 additions and 9 deletions

View File

@ -2264,7 +2264,7 @@ static void ctrlmenu(void)
if (input.dev[m->selected-2] == DEVICE_LIGHTGUN) if (input.dev[m->selected-2] == DEVICE_LIGHTGUN)
{ {
items = items_special[2]; items = items_special[2];
special = &config.gun_cursor[player % 3]; special = &config.gun_cursor[m->selected & 1];
} }
else if (input.dev[m->selected-2] == DEVICE_MOUSE) else if (input.dev[m->selected-2] == DEVICE_MOUSE)
{ {

View File

@ -1289,14 +1289,10 @@ void gx_video_Start(void)
} }
/* lightgun textures */ /* lightgun textures */
if ((input.system[1] == SYSTEM_MENACER) || (input.system[1] == SYSTEM_JUSTIFIER)) if (config.gun_cursor[0] && (input.dev[4] == DEVICE_LIGHTGUN))
{ crosshair[0] = gxTextureOpenPNG(Crosshair_p1_png,0);
if (config.gun_cursor) if (config.gun_cursor[1] && (input.dev[5] == DEVICE_LIGHTGUN))
{ crosshair[1] = gxTextureOpenPNG(Crosshair_p2_png,0);
if (input.dev[4] == DEVICE_LIGHTGUN) crosshair[0] = gxTextureOpenPNG(Crosshair_p1_png,0);
if (input.dev[5] == DEVICE_LIGHTGUN) crosshair[1] = gxTextureOpenPNG(Crosshair_p2_png,0);
}
}
/* apply changes on next video update */ /* apply changes on next video update */
bitmap.viewport.changed = 1; bitmap.viewport.changed = 1;