From 30db8c6fe2129d301660595655bf9b3f12129d1c Mon Sep 17 00:00:00 2001 From: lalien Date: Thu, 18 May 2006 21:19:51 +0000 Subject: [PATCH] Little Alien - Bug fix: STRAIGHT_RANGE was not initialized properly causing enemies become invisible - Game version length changed git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@72 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameVersion.cpp | 8 +++---- GameVersion.h | 2 +- JA2.vcproj | 3 +++ Tactical/opplist.cpp | 53 +++++++++++++++++++++++++++++++++----------- 4 files changed, 48 insertions(+), 18 deletions(-) diff --git a/GameVersion.cpp b/GameVersion.cpp index abfcee93..705c3707 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -13,22 +13,22 @@ #ifdef JA2BETAVERSION //BETA/TEST BUILD VERSION -INT16 zVersionLabel[16] = { L"Beta v. 0.98" }; +INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #elif defined CRIPPLED_VERSION //RELEASE BUILD VERSION -INT16 zVersionLabel[16] = { L"Beta v. 0.98" }; +INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[16] = { L"Release v1.13" }; + INT16 zVersionLabel[256] = { L"Release v1.13.71 2006.05.18" }; #endif -INT8 czVersionNumber[16] = { "Build 04.19.06" }; +INT8 czVersionNumber[16] = { "Build 06.05.18" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/GameVersion.h b/GameVersion.h index 8f1d0d36..0ea506aa 100644 --- a/GameVersion.h +++ b/GameVersion.h @@ -11,7 +11,7 @@ extern "C" { // Keeps track of the game version // -extern INT16 zVersionLabel[16]; +extern INT16 zVersionLabel[256]; extern INT8 czVersionNumber[16]; extern INT16 zTrackingNumber[16]; diff --git a/JA2.vcproj b/JA2.vcproj index 96e2197d..fc523175 100644 --- a/JA2.vcproj +++ b/JA2.vcproj @@ -2319,6 +2319,9 @@ + + diff --git a/Tactical/opplist.cpp b/Tactical/opplist.cpp index 990ee8c9..2aa5ab5c 100644 --- a/Tactical/opplist.cpp +++ b/Tactical/opplist.cpp @@ -168,19 +168,46 @@ void InitSightRange() ANGLE = (INT8)( ANGLE_RATIO * gGameExternalOptions.ubStraightSightRange ); STRAIGHT = (INT8)( STRAIGHT_RATIO * gGameExternalOptions.ubStraightSightRange ); - gbLookDistance[8][8] = - - // LOOKER DIR LOOKEE DIR - // NORTH | NORTHEAST | EAST | SOUTHEAST | SOUTH | SOUTHWEST | WEST | NORTHWEST - /* NORTH */ STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, - /* NORTHEAST */ ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, - /* EAST */ SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, - /* SOUTHEAST */ SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, - /* SOUTH */ BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, - /* SOUTHWEST */ SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, - /* WEST */ SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, - /* NORTHWEST */ ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT - ; + INT8 dummy[15][15]; + + for (int i=0; i<8; i++) + { + dummy[i][i]=STRAIGHT; + dummy[i][i+1]=ANGLE; + dummy[i+1][i]=ANGLE; + dummy[i][i+2]=SIDE; + dummy[i+2][i]=SIDE; + dummy[i][i+3]=SBEHIND; + dummy[i+3][i]=SBEHIND; + dummy[i][i+4]=BEHIND; + dummy[i+4][i]=BEHIND; + dummy[i][i+5]=SBEHIND; + dummy[i+5][i]=SBEHIND; + dummy[i][i+6]=SIDE; + dummy[i+6][i]=SIDE; + dummy[i][i+7]=ANGLE; + dummy[i+7][i]=ANGLE; + } + for (int i=0; i<8; i++) + { + for (int j=0; j<8; j++) + { + gbLookDistance[i][j] = dummy[i][j]; + } + } + //gbLookDistance[8][8] = + //{ + // // LOOKER DIR LOOKEE DIR + // // NORTH | NORTHEAST | EAST | SOUTHEAST | SOUTH | SOUTHWEST | WEST | NORTHWEST + // /* NORTH */ STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, + // /* NORTHEAST */ ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, + // /* EAST */ SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, + // /* SOUTHEAST */ SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, BEHIND, + // /* SOUTH */ BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, SBEHIND, + // /* SOUTHWEST */ SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, SIDE, + // /* WEST */ SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT, ANGLE, + // /* NORTHWEST */ ANGLE, SIDE, SBEHIND, BEHIND, SBEHIND, SIDE, ANGLE, STRAIGHT + // }; }