mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2025-01-05 15:11:16 +00:00
fix cursor on Mario head screen (fixes #28)
gDPSetScissor fix originally by Emil
This commit is contained in:
parent
cc4641f2a9
commit
8017d1dfa4
1 changed files with 4 additions and 3 deletions
|
@ -22,6 +22,7 @@
|
||||||
#include "gd_math.h"
|
#include "gd_math.h"
|
||||||
#include "shape_helper.h"
|
#include "shape_helper.h"
|
||||||
|
|
||||||
|
#include "config.h"
|
||||||
#include "gfx_dimensions.h"
|
#include "gfx_dimensions.h"
|
||||||
|
|
||||||
#define MAX_GD_DLS 1000
|
#define MAX_GD_DLS 1000
|
||||||
|
@ -2326,7 +2327,7 @@ void start_view_dl(struct ObjView *view) {
|
||||||
uly = lry - 1.0f;
|
uly = lry - 1.0f;
|
||||||
}
|
}
|
||||||
|
|
||||||
gDPSetScissor(next_gfx(), G_SC_NON_INTERLACE, ulx, uly, lrx, lry);
|
// gDPSetScissor(next_gfx(), G_SC_NON_INTERLACE, ulx, uly, lrx, lry); // N64 only
|
||||||
gSPClearGeometryMode(next_gfx(), 0xFFFFFFFF);
|
gSPClearGeometryMode(next_gfx(), 0xFFFFFFFF);
|
||||||
gSPSetGeometryMode(next_gfx(), G_LIGHTING | G_CULL_BACK | G_SHADING_SMOOTH | G_SHADE);
|
gSPSetGeometryMode(next_gfx(), G_LIGHTING | G_CULL_BACK | G_SHADING_SMOOTH | G_SHADE);
|
||||||
if (view->flags & VIEW_ALLOC_ZBUF) {
|
if (view->flags & VIEW_ALLOC_ZBUF) {
|
||||||
|
@ -2985,9 +2986,9 @@ void update_cursor(void) {
|
||||||
reset_dlnum_indices(sHandShape->gdDls[gGdFrameBuf]);
|
reset_dlnum_indices(sHandShape->gdDls[gGdFrameBuf]);
|
||||||
|
|
||||||
if (gGdCtrl.btnApressed) {
|
if (gGdCtrl.btnApressed) {
|
||||||
gd_put_sprite((u16 *) gd_texture_hand_closed, sHandView->upperLeft.x, sHandView->upperLeft.y, 0x20, 0x20);
|
gd_put_sprite((u16 *) gd_texture_hand_closed, GFX_DIMENSIONS_FROM_LEFT_EDGE(sHandView->upperLeft.x), sHandView->upperLeft.y, 0x20, 0x20);
|
||||||
} else {
|
} else {
|
||||||
gd_put_sprite((u16 *) gd_texture_hand_open, sHandView->upperLeft.x, sHandView->upperLeft.y, 0x20, 0x20);
|
gd_put_sprite((u16 *) gd_texture_hand_open, GFX_DIMENSIONS_FROM_LEFT_EDGE(sHandView->upperLeft.x), sHandView->upperLeft.y, 0x20, 0x20);
|
||||||
}
|
}
|
||||||
gd_enddlsplist_parent();
|
gd_enddlsplist_parent();
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue