1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fixed CTD when trying to add 13th town

Browse Source 
- preparations to increase number of town sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Lesh
2006-11-08 17:04:15 +00:00
parent 099ce17225
commit ac91cfb731
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Map Screen Interface Map.cpp
+2 -2
View File
@@ -378,7 +378,7 @@ UINT32 guiMapBorderHeliSectors;
BOOLEAN sBadSectorsList[ WORLD_MAP_X ][ WORLD_MAP_X ]; BOOLEAN sBadSectorsList[ WORLD_MAP_X ][ WORLD_MAP_X ];
INT16 sBaseSectorList[12];/*={ INT16 sBaseSectorList[ MAX_TOWNS - 1 ];/*={
// NOTE: These co-ordinates must match the top left corner of the 3x3 town tiles cutouts in Interface/MilitiaMaps.sti! // NOTE: These co-ordinates must match the top left corner of the 3x3 town tiles cutouts in Interface/MilitiaMaps.sti!
SECTOR( 9, 1 ), // Omerta SECTOR( 9, 1 ), // Omerta
SECTOR( 13, 2 ), // Drassen SECTOR( 13, 2 ), // Drassen
@@ -396,7 +396,7 @@ INT16 sBaseSectorList[12];/*={
// position of town names on the map // position of town names on the map
// these are no longer PIXELS, but 10 * the X,Y position in SECTORS (fractions possible) to the X-CENTER of the town // these are no longer PIXELS, but 10 * the X,Y position in SECTORS (fractions possible) to the X-CENTER of the town
POINT pTownPoints[13];/*={ POINT pTownPoints[ MAX_TOWNS ];/*={
{ 0 , 0 }, { 0 , 0 },
{ 90, 10}, // Omerta { 90, 10}, // Omerta
{125, 40}, // Drassen {125, 40}, // Drassen
Strategic/Map Screen Interface Map.h
+2 -2
View File
@@ -285,7 +285,7 @@ extern BOOLEAN fFoundTixa;
extern UINT32 guiSubLevel1, guiSubLevel2, guiSubLevel3; extern UINT32 guiSubLevel1, guiSubLevel2, guiSubLevel3;
extern INT16 sBaseSectorList[12]; extern INT16 sBaseSectorList[ MAX_TOWNS - 1 ];
extern POINT pTownPoints[13]; extern POINT pTownPoints[ MAX_TOWNS ];
#endif #endif
Strategic/Strategic Town Loyalty.cpp
+2 -2
View File
@@ -106,8 +106,8 @@ TOWN_LOYALTY gTownLoyalty[ MAX_TOWNS ];
// town name and locations arrays, for town theft and what not // town name and locations arrays, for town theft and what not
INT32 pTownNamesList[ 40 ]; INT32 pTownNamesList [ MAX_TOWN_SECTORS ];
INT32 pTownLocationsList[ 40 ]; INT32 pTownLocationsList [ MAX_TOWN_SECTORS ];
INT32 iTownDistances[ MAX_TOWNS ][ MAX_TOWNS ]; INT32 iTownDistances[ MAX_TOWNS ][ MAX_TOWNS ];
Strategic/mapscreen.h
+2 -1
View File
@@ -10,7 +10,8 @@
#define MAX_TOWN_NAME_LENGHT 32 #define MAX_TOWN_NAME_LENGHT 32
#define MAX_TOWNS 13 #define MAX_TOWNS 13
#define MAX_TOWN_SECTORS 40
// Sector name identifiers // Sector name identifiers
enum Towns enum Towns