From 276a083ab6f02ca635769a178d5714629425d31d Mon Sep 17 00:00:00 2001 From: Chris Taylor Date: Mon, 13 Jun 2005 03:05:45 +0000 Subject: [PATCH] convert_d1_tmap_num now returns 193 for texture number 198 to maintain bijectivity --- ChangeLog | 7 +++++++ main/gamemine.c | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fd814ea..3af542ca 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-06-13 Chris Taylor + + * main/gamemine.c: convert_d1_tmap_num now returns 193 for texture + number 198 to maintain bijectivity, when descent.pig is available + (used to return 167, which is also returned for Descent 1 texture + 132) + 2005-04-05 Bradley Bell * arch/linux/joystick.c, arch/sdl/joy.c, main/kconfig.c: fix some diff --git a/main/gamemine.c b/main/gamemine.c index ad1319ef..242900e8 100644 --- a/main/gamemine.c +++ b/main/gamemine.c @@ -1,4 +1,4 @@ -/* $Id: gamemine.c,v 1.32 2004-12-20 06:34:42 btb Exp $ */ +/* $Id: gamemine.c,v 1.33 2005-06-13 03:05:45 chris Exp $ */ /* THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX SOFTWARE CORPORATION ("PARALLAX"). PARALLAX, IN DISTRIBUTING THE CODE TO @@ -23,7 +23,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED. #endif #ifdef RCS -static char rcsid[] = "$Id: gamemine.c,v 1.32 2004-12-20 06:34:42 btb Exp $"; +static char rcsid[] = "$Id: gamemine.c,v 1.33 2005-06-13 03:05:45 chris Exp $"; #endif #include @@ -288,7 +288,7 @@ short convert_d1_tmap_num(short d1_tmap_num) { case 195: return d1_pig_present ? 166 : 234; case 196: return 225; case 197: return 226; - case 198: return d1_pig_present ? 167 : 225; + case 198: return d1_pig_present ? 193 : 225; case 199: return d1_pig_present ? 168 : 206; //devil:204 case 200: return d1_pig_present ? 169 : 206; //devil:204 case 201: return 227; -- 2.39.2