From 737c7244c4cd0bdb04a501b0140bea61855be011 Mon Sep 17 00:00:00 2001 From: ekeeke31 Date: Tue, 5 May 2009 14:07:47 +0000 Subject: [PATCH] fixed "gun cursor" option --- source/gx/gui/menu.c | 2 +- source/gx/gx_video.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/source/gx/gui/menu.c b/source/gx/gui/menu.c index f946adf..1a8af21 100644 --- a/source/gx/gui/menu.c +++ b/source/gx/gui/menu.c @@ -2264,7 +2264,7 @@ static void ctrlmenu(void) if (input.dev[m->selected-2] == DEVICE_LIGHTGUN) { 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) { diff --git a/source/gx/gx_video.c b/source/gx/gx_video.c index f910c39..64bae74 100644 --- a/source/gx/gx_video.c +++ b/source/gx/gx_video.c @@ -1289,14 +1289,10 @@ void gx_video_Start(void) } /* lightgun textures */ - if ((input.system[1] == SYSTEM_MENACER) || (input.system[1] == SYSTEM_JUSTIFIER)) - { - if (config.gun_cursor) - { - 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); - } - } + if (config.gun_cursor[0] && (input.dev[4] == DEVICE_LIGHTGUN)) + crosshair[0] = gxTextureOpenPNG(Crosshair_p1_png,0); + if (config.gun_cursor[1] && (input.dev[5] == DEVICE_LIGHTGUN)) + crosshair[1] = gxTextureOpenPNG(Crosshair_p2_png,0); /* apply changes on next video update */ bitmap.viewport.changed = 1;