pull in the recent unconditionals merge from master
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
/* NetHack 3.5 vidvga.c $Date$ $Revision$ */
|
||||
/* NetHack 3.5 vidvga.c $NHDT-Date$ $NHDT-Branch$:$NHDT-Revision$ */
|
||||
/* NetHack 3.5 vidvga.c $Date: 2009/05/06 10:49:50 $ $Revision: 1.9 $ */
|
||||
/* SCCS Id: @(#)vidvga.c 3.5 2006/07/08 */
|
||||
/* Copyright (c) NetHack PC Development Team 1995 */
|
||||
/* NetHack may be freely redistributed. See license for details. */
|
||||
@@ -1170,14 +1171,9 @@ vga_DrawCursor()
|
||||
unsigned char first,second;
|
||||
/* char on[2] = {0xFF,0xFF}; */
|
||||
/* char off[2] = {0x00,0x00}; */
|
||||
#ifdef REINCARNATION
|
||||
boolean isrogue = Is_rogue_level(&u.uz);
|
||||
boolean singlebyte = (isrogue || iflags.over_view
|
||||
|| iflags.traditional_view || !inmap);
|
||||
#else
|
||||
boolean singlebyte = (iflags.over_view
|
||||
|| iflags.traditional_view || !inmap);
|
||||
#endif
|
||||
int curtyp;
|
||||
|
||||
if (!cursor_type && inmap) return; /* CURSOR_INVIS - nothing to do */
|
||||
@@ -1375,14 +1371,9 @@ vga_HideCursor()
|
||||
int i,pixx,pixy,x,y;
|
||||
char __far *tmp1;
|
||||
char __far *tmp2;
|
||||
#ifdef REINCARNATION
|
||||
boolean isrogue = Is_rogue_level(&u.uz);
|
||||
boolean singlebyte = (isrogue || iflags.over_view
|
||||
|| iflags.traditional_view || !inmap);
|
||||
#else
|
||||
boolean singlebyte = (iflags.over_view
|
||||
|| iflags.traditional_view || !inmap);
|
||||
#endif
|
||||
int curtyp;
|
||||
|
||||
if (inmap && !cursor_type) return; /* CURSOR_INVIS - nothing to do */
|
||||
|
||||
Reference in New Issue
Block a user