Commits

balrog  committed 5c17a57

Finally fixed z-fighting -- another stupid config issue.

  • Participants
  • Parent commits 34229dc
  • Branches asm-fixes

Comments (0)

Files changed (2)

File src/Main.cpp

   settings.vsync = (BOOL)Config_ReadInt ("vsync", "Vertical sync", 0);
   settings.fast_crc = (BOOL)Config_ReadInt ("fast_crc", "Fast CRC", 0);
 
-  // screenshots not handled here
   settings.show_fps = (BYTE)Config_ReadInt ("show_fps", "Display performance stats (add together desired flags): 1=FPS counter, 2=VI/s counter, 4=% speed, 8=FPS transparent", 0, TRUE, FALSE);
   settings.clock = (BOOL)Config_ReadInt ("clock", "Clock enabled", 0);
   settings.clock_24_hr = (BOOL)Config_ReadInt ("clock_24_hr", "Clock is 24-hour", 0);
   int clip_zmin = INI_ReadInt ("clip_zmin", -1, 0);
   int clip_zmax = INI_ReadInt ("clip_zmax", -1, 0);
   int adjust_aspect = INI_ReadInt ("adjust_aspect", 1, 0);
-  int zmode_compare_less = INI_ReadInt ("zmode_compare_less", 1, 0);
-  int n64_z_scale = INI_ReadInt ("n64_z_scale", 1, 0);
+  int zmode_compare_less = INI_ReadInt ("zmode_compare_less", -1, 0);
+  int n64_z_scale = INI_ReadInt ("n64_z_scale", -1, 0);
 
   //frame buffer
   int optimize_texrect = INI_ReadInt ("optimize_texrect", -1, 0);

File src/Makefile.nowx

 
 AS = nasm
 ASM_OBJ =
-ASM_OBJ = Texture.o
+#ASM_OBJ = Texture.o
 ifeq ($(OS), Linux)
 ASFLAGS = -O6 -felf -D__linux__ 
 #ASM_OBJ = \