adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2 more melee ship slots, as the PC SC2 had.

Browse Source 
From chmmravatar. Bug #248.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1123 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
meep-eep
2003-08-26 01:27:17 +00:00
parent d4730d96fd
commit 21a261406e
10 changed files with 232 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/sc2code/melee.c
+196 -25
View File
@@ -55,17 +55,18 @@ enum
EDIT_MELEE
};
#define MELEE_X_OFFS 4
#define MELEE_X_OFFS 2
#define MELEE_Y_OFFS 21
#define MELEE_BOX_WIDTH 34
#define MELEE_BOX_HEIGHT 34
#define MELEE_BOX_SPACE 1
#define MENU_X_OFFS 29
#define NAME_AREA_HEIGHT 7
#define MELEE_WIDTH 133
#define MELEE_WIDTH 149
#define MELEE_HEIGHT (48 + NAME_AREA_HEIGHT)
#define INFO_ORIGIN_X 3
#define INFO_ORIGIN_X 4
#define INFO_WIDTH 58
#define TEAM_INFO_ORIGIN_Y 3
#define TEAM_INFO_HEIGHT (SHIP_INFO_HEIGHT + 75)
@@ -575,7 +576,7 @@ DrawMeleeShipStrings (PMELEE_STATE pMS, BYTE NewStarShip)
OldContext = SetContext (StatusContext);
GetContextClipRect (&OldRect);
r = OldRect;
r.corner.x += ((SAFE_X << 1) - 32);
r.corner.x += ((SAFE_X << 1) - 32) + MENU_X_OFFS;
r.corner.y += 76;
r.extent.height = SHIP_INFO_HEIGHT;
SetContextClipRect (&r);
@@ -1757,12 +1758,14 @@ InitPreBuilt (PMELEE_STATE pMS)
pMS->PreBuiltList[0].ShipList[0][3] = MELEE_URQUAN;
pMS->PreBuiltList[0].ShipList[0][4] = MELEE_MELNORME;
pMS->PreBuiltList[0].ShipList[0][5] = MELEE_ORZ;
pMS->PreBuiltList[0].ShipList[1][0] = MELEE_SPATHI;
pMS->PreBuiltList[0].ShipList[1][1] = MELEE_SYREEN;
pMS->PreBuiltList[0].ShipList[1][2] = MELEE_UTWIG;
pMS->PreBuiltList[0].ShipList[0][6] = MELEE_SPATHI;
pMS->PreBuiltList[0].ShipList[1][0] = MELEE_SYREEN;
pMS->PreBuiltList[0].ShipList[1][1] = MELEE_UTWIG;
pMS->PreBuiltList[0].ShipList[1][2] = (BYTE)~0;
pMS->PreBuiltList[0].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[0].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[0].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[0].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[1].TeamName, GAME_STRING (MELEE_STRING_BASE + 5));
pMS->PreBuiltList[1].ShipList[0][0] = MELEE_ARILOU;
@@ -1771,12 +1774,14 @@ InitPreBuilt (PMELEE_STATE pMS)
pMS->PreBuiltList[1].ShipList[0][3] = MELEE_KOHR_AH;
pMS->PreBuiltList[1].ShipList[0][4] = MELEE_MYCON;
pMS->PreBuiltList[1].ShipList[0][5] = MELEE_YEHAT;
pMS->PreBuiltList[1].ShipList[1][0] = MELEE_PKUNK;
pMS->PreBuiltList[1].ShipList[1][1] = MELEE_SUPOX;
pMS->PreBuiltList[1].ShipList[1][2] = MELEE_THRADDASH;
pMS->PreBuiltList[1].ShipList[1][3] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[1].ShipList[1][4] = MELEE_SHOFIXTI;
pMS->PreBuiltList[1].ShipList[0][6] = MELEE_PKUNK;
pMS->PreBuiltList[1].ShipList[1][0] = MELEE_SUPOX;
pMS->PreBuiltList[1].ShipList[1][1] = MELEE_THRADDASH;
pMS->PreBuiltList[1].ShipList[1][2] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[1].ShipList[1][3] = MELEE_SHOFIXTI;
pMS->PreBuiltList[1].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[1].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[1].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[2].TeamName, GAME_STRING (MELEE_STRING_BASE + 6));
pMS->PreBuiltList[2].ShipList[0][0] = MELEE_ANDROSYNTH;
@@ -1785,12 +1790,14 @@ InitPreBuilt (PMELEE_STATE pMS)
pMS->PreBuiltList[2].ShipList[0][3] = MELEE_MELNORME;
pMS->PreBuiltList[2].ShipList[0][4] = MELEE_EARTHLING;
pMS->PreBuiltList[2].ShipList[0][5] = MELEE_KOHR_AH;
pMS->PreBuiltList[2].ShipList[1][0] = MELEE_SUPOX;
pMS->PreBuiltList[2].ShipList[1][1] = MELEE_ORZ;
pMS->PreBuiltList[2].ShipList[1][2] = MELEE_SPATHI;
pMS->PreBuiltList[2].ShipList[1][3] = MELEE_ILWRATH;
pMS->PreBuiltList[2].ShipList[1][4] = MELEE_VUX;
pMS->PreBuiltList[2].ShipList[0][6] = MELEE_SUPOX;
pMS->PreBuiltList[2].ShipList[1][0] = MELEE_ORZ;
pMS->PreBuiltList[2].ShipList[1][1] = MELEE_SPATHI;
pMS->PreBuiltList[2].ShipList[1][2] = MELEE_ILWRATH;
pMS->PreBuiltList[2].ShipList[1][3] = MELEE_VUX;
pMS->PreBuiltList[2].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[2].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[2].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[3].TeamName, GAME_STRING (MELEE_STRING_BASE + 7));
pMS->PreBuiltList[3].ShipList[0][0] = MELEE_CHENJESU;
@@ -1799,12 +1806,14 @@ InitPreBuilt (PMELEE_STATE pMS)
pMS->PreBuiltList[3].ShipList[0][3] = MELEE_CHMMR;
pMS->PreBuiltList[3].ShipList[0][4] = MELEE_KOHR_AH;
pMS->PreBuiltList[3].ShipList[0][5] = MELEE_KOHR_AH;
pMS->PreBuiltList[3].ShipList[0][6] = MELEE_URQUAN;
pMS->PreBuiltList[3].ShipList[1][0] = MELEE_URQUAN;
pMS->PreBuiltList[3].ShipList[1][1] = MELEE_URQUAN;
pMS->PreBuiltList[3].ShipList[1][1] = MELEE_UTWIG;
pMS->PreBuiltList[3].ShipList[1][2] = MELEE_UTWIG;
pMS->PreBuiltList[3].ShipList[1][3] = MELEE_UTWIG;
pMS->PreBuiltList[3].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[3].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[3].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[3].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[4].TeamName, GAME_STRING (MELEE_STRING_BASE + 8));
pMS->PreBuiltList[4].ShipList[0][0] = MELEE_URQUAN;
@@ -1813,12 +1822,174 @@ InitPreBuilt (PMELEE_STATE pMS)
pMS->PreBuiltList[4].ShipList[0][3] = MELEE_SYREEN;
pMS->PreBuiltList[4].ShipList[0][4] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[4].ShipList[0][5] = MELEE_SHOFIXTI;
pMS->PreBuiltList[4].ShipList[1][0] = MELEE_EARTHLING;
pMS->PreBuiltList[4].ShipList[1][1] = MELEE_KOHR_AH;
pMS->PreBuiltList[4].ShipList[1][2] = MELEE_MELNORME;
pMS->PreBuiltList[4].ShipList[1][3] = MELEE_DRUUGE;
pMS->PreBuiltList[4].ShipList[1][4] = MELEE_PKUNK;
pMS->PreBuiltList[4].ShipList[1][5] = MELEE_ORZ;
pMS->PreBuiltList[4].ShipList[0][6] = MELEE_EARTHLING;
pMS->PreBuiltList[4].ShipList[1][0] = MELEE_KOHR_AH;
pMS->PreBuiltList[4].ShipList[1][1] = MELEE_MELNORME;
pMS->PreBuiltList[4].ShipList[1][2] = MELEE_DRUUGE;
pMS->PreBuiltList[4].ShipList[1][3] = MELEE_PKUNK;
pMS->PreBuiltList[4].ShipList[1][4] = MELEE_ORZ;
pMS->PreBuiltList[4].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[4].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[5].TeamName, "Ford's Fighters");
pMS->PreBuiltList[5].ShipList[0][0] = MELEE_CHMMR;
pMS->PreBuiltList[5].ShipList[0][1] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[5].ShipList[0][2] = MELEE_MELNORME;
pMS->PreBuiltList[5].ShipList[0][3] = MELEE_SUPOX;
pMS->PreBuiltList[5].ShipList[0][4] = MELEE_UTWIG;
pMS->PreBuiltList[5].ShipList[0][5] = MELEE_UMGAH;
pMS->PreBuiltList[5].ShipList[0][6] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][0] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][1] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][2] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[5].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[6].TeamName, "Leyland's Lashers");
pMS->PreBuiltList[6].ShipList[0][0] = MELEE_ANDROSYNTH;
pMS->PreBuiltList[6].ShipList[0][1] = MELEE_EARTHLING;
pMS->PreBuiltList[6].ShipList[0][2] = MELEE_MYCON;
pMS->PreBuiltList[6].ShipList[0][3] = MELEE_ORZ;
pMS->PreBuiltList[6].ShipList[0][4] = MELEE_URQUAN;
pMS->PreBuiltList[6].ShipList[0][5] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[0][6] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][0] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][1] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][2] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[6].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[7].TeamName, "The Gregorizers 200");
pMS->PreBuiltList[7].ShipList[0][0] = MELEE_ANDROSYNTH;
pMS->PreBuiltList[7].ShipList[0][1] = MELEE_CHMMR;
pMS->PreBuiltList[7].ShipList[0][2] = MELEE_DRUUGE;
pMS->PreBuiltList[7].ShipList[0][3] = MELEE_MELNORME;
pMS->PreBuiltList[7].ShipList[0][4] = MELEE_EARTHLING;
pMS->PreBuiltList[7].ShipList[0][5] = MELEE_KOHR_AH;
pMS->PreBuiltList[7].ShipList[0][6] = MELEE_SUPOX;
pMS->PreBuiltList[7].ShipList[1][0] = MELEE_ORZ;
pMS->PreBuiltList[7].ShipList[1][1] = MELEE_PKUNK;
pMS->PreBuiltList[7].ShipList[1][2] = MELEE_SPATHI;
pMS->PreBuiltList[7].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[7].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[7].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[7].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[8].TeamName, "300 point Armada!");
pMS->PreBuiltList[8].ShipList[0][0] = MELEE_ANDROSYNTH;
pMS->PreBuiltList[8].ShipList[0][1] = MELEE_CHMMR;
pMS->PreBuiltList[8].ShipList[0][2] = MELEE_CHENJESU;
pMS->PreBuiltList[8].ShipList[0][3] = MELEE_DRUUGE;
pMS->PreBuiltList[8].ShipList[0][4] = MELEE_EARTHLING;
pMS->PreBuiltList[8].ShipList[0][5] = MELEE_KOHR_AH;
pMS->PreBuiltList[8].ShipList[0][6] = MELEE_MELNORME;
pMS->PreBuiltList[8].ShipList[1][0] = MELEE_MYCON;
pMS->PreBuiltList[8].ShipList[1][1] = MELEE_ORZ;
pMS->PreBuiltList[8].ShipList[1][2] = MELEE_PKUNK;
pMS->PreBuiltList[8].ShipList[1][3] = MELEE_SPATHI;
pMS->PreBuiltList[8].ShipList[1][4] = MELEE_SUPOX;
pMS->PreBuiltList[8].ShipList[1][5] = MELEE_URQUAN;
pMS->PreBuiltList[8].ShipList[1][6] = MELEE_YEHAT;
wstrcpy (pMS->PreBuiltList[9].TeamName, "Little Dudes with Attitudes");
pMS->PreBuiltList[9].ShipList[0][0] = MELEE_UMGAH;
pMS->PreBuiltList[9].ShipList[0][1] = MELEE_THRADDASH;
pMS->PreBuiltList[9].ShipList[0][2] = MELEE_SHOFIXTI;
pMS->PreBuiltList[9].ShipList[0][3] = MELEE_EARTHLING;
pMS->PreBuiltList[9].ShipList[0][4] = MELEE_VUX;
pMS->PreBuiltList[9].ShipList[0][5] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[9].ShipList[0][6] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][0] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][1] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][2] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[9].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[10].TeamName, "New Alliance Ships");
pMS->PreBuiltList[10].ShipList[0][0] = MELEE_ARILOU;
pMS->PreBuiltList[10].ShipList[0][1] = MELEE_CHMMR;
pMS->PreBuiltList[10].ShipList[0][2] = MELEE_EARTHLING;
pMS->PreBuiltList[10].ShipList[0][3] = MELEE_ORZ;
pMS->PreBuiltList[10].ShipList[0][4] = MELEE_PKUNK;
pMS->PreBuiltList[10].ShipList[0][5] = MELEE_SHOFIXTI;
pMS->PreBuiltList[10].ShipList[0][6] = MELEE_SUPOX;
pMS->PreBuiltList[10].ShipList[1][0] = MELEE_SYREEN;
pMS->PreBuiltList[10].ShipList[1][1] = MELEE_UTWIG;
pMS->PreBuiltList[10].ShipList[1][2] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[10].ShipList[1][3] = MELEE_YEHAT;
pMS->PreBuiltList[10].ShipList[1][4] = MELEE_DRUUGE;
pMS->PreBuiltList[10].ShipList[1][5] = MELEE_THRADDASH;
pMS->PreBuiltList[10].ShipList[1][6] = MELEE_SPATHI;
wstrcpy (pMS->PreBuiltList[11].TeamName, "Old Alliance Ships");
pMS->PreBuiltList[11].ShipList[0][0] = MELEE_ARILOU;
pMS->PreBuiltList[11].ShipList[0][1] = MELEE_CHENJESU;
pMS->PreBuiltList[11].ShipList[0][2] = MELEE_EARTHLING;
pMS->PreBuiltList[11].ShipList[0][3] = MELEE_MMRNMHRM;
pMS->PreBuiltList[11].ShipList[0][4] = MELEE_SHOFIXTI;
pMS->PreBuiltList[11].ShipList[0][5] = MELEE_SYREEN;
pMS->PreBuiltList[11].ShipList[0][6] = MELEE_YEHAT;
pMS->PreBuiltList[11].ShipList[1][0] = (BYTE)~0;
pMS->PreBuiltList[11].ShipList[1][1] = (BYTE)~0;
pMS->PreBuiltList[11].ShipList[1][2] = (BYTE)~0;
pMS->PreBuiltList[11].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[11].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[11].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[11].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[12].TeamName, "Old Hierarchy Ships");
pMS->PreBuiltList[12].ShipList[0][0] = MELEE_ANDROSYNTH;
pMS->PreBuiltList[12].ShipList[0][1] = MELEE_ILWRATH;
pMS->PreBuiltList[12].ShipList[0][2] = MELEE_MYCON;
pMS->PreBuiltList[12].ShipList[0][3] = MELEE_SPATHI;
pMS->PreBuiltList[12].ShipList[0][4] = MELEE_UMGAH;
pMS->PreBuiltList[12].ShipList[0][5] = MELEE_URQUAN;
pMS->PreBuiltList[12].ShipList[0][6] = MELEE_VUX;
pMS->PreBuiltList[12].ShipList[1][0] = (BYTE)~0;
pMS->PreBuiltList[12].ShipList[1][1] = (BYTE)~0;
pMS->PreBuiltList[12].ShipList[1][2] = (BYTE)~0;
pMS->PreBuiltList[12].ShipList[1][3] = (BYTE)~0;
pMS->PreBuiltList[12].ShipList[1][4] = (BYTE)~0;
pMS->PreBuiltList[12].ShipList[1][5] = (BYTE)~0;
pMS->PreBuiltList[12].ShipList[1][6] = (BYTE)~0;
wstrcpy (pMS->PreBuiltList[13].TeamName, "Star Control 1");
pMS->PreBuiltList[13].ShipList[0][0] = MELEE_ANDROSYNTH;
pMS->PreBuiltList[13].ShipList[0][1] = MELEE_ARILOU;
pMS->PreBuiltList[13].ShipList[0][2] = MELEE_CHENJESU;
pMS->PreBuiltList[13].ShipList[0][3] = MELEE_EARTHLING;
pMS->PreBuiltList[13].ShipList[0][4] = MELEE_ILWRATH;
pMS->PreBuiltList[13].ShipList[0][5] = MELEE_MMRNMHRM;
pMS->PreBuiltList[13].ShipList[0][6] = MELEE_MYCON;
pMS->PreBuiltList[13].ShipList[1][0] = MELEE_SHOFIXTI;
pMS->PreBuiltList[13].ShipList[1][1] = MELEE_SPATHI;
pMS->PreBuiltList[13].ShipList[1][2] = MELEE_SYREEN;
pMS->PreBuiltList[13].ShipList[1][3] = MELEE_UMGAH;
pMS->PreBuiltList[13].ShipList[1][4] = MELEE_URQUAN;
pMS->PreBuiltList[13].ShipList[1][5] = MELEE_VUX;
pMS->PreBuiltList[13].ShipList[1][6] = MELEE_YEHAT;
wstrcpy (pMS->PreBuiltList[14].TeamName, "Star Control 2");
pMS->PreBuiltList[14].ShipList[0][0] = MELEE_CHMMR;
pMS->PreBuiltList[14].ShipList[0][1] = MELEE_DRUUGE;
pMS->PreBuiltList[14].ShipList[0][2] = MELEE_KOHR_AH;
pMS->PreBuiltList[14].ShipList[0][3] = MELEE_MELNORME;
pMS->PreBuiltList[14].ShipList[0][4] = MELEE_ORZ;
pMS->PreBuiltList[14].ShipList[0][5] = MELEE_PKUNK;
pMS->PreBuiltList[14].ShipList[0][6] = MELEE_SLYLANDRO;
pMS->PreBuiltList[14].ShipList[1][0] = MELEE_SUPOX;
pMS->PreBuiltList[14].ShipList[1][1] = MELEE_THRADDASH;
pMS->PreBuiltList[14].ShipList[1][2] = MELEE_UTWIG;
pMS->PreBuiltList[14].ShipList[1][3] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[14].ShipList[1][4] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[14].ShipList[1][5] = MELEE_ZOQFOTPIK;
pMS->PreBuiltList[14].ShipList[1][6] = MELEE_ZOQFOTPIK;
}
void
sc2/src/sc2code/melee.h
+4 -4
View File
@@ -53,8 +53,8 @@ enum
};
#define NUM_MELEE_ROWS 2
// #define NUM_MELEE_COLUMNS 7
#define NUM_MELEE_COLUMNS 6
#define NUM_MELEE_COLUMNS 7
//#define NUM_MELEE_COLUMNS 6
#define ICON_WIDTH 16
#define ICON_HEIGHT 16
@@ -62,9 +62,9 @@ extern FRAME PickMeleeFrame;
#define PICK_BG_COLOR BUILD_COLOR (MAKE_RGB15 (0x00, 0x01, 0x0F), 0x1)
#define MAX_TEAM_CHARS 15
#define MAX_TEAM_CHARS 30
#define MAX_VIS_TEAMS 5
#define NUM_PREBUILT 5
#define NUM_PREBUILT 15
#define NUM_PICK_COLS 5
#define NUM_PICK_ROWS 5
sc2/src/sc2code/pickmele.c
+1 -1
View File
@@ -19,7 +19,7 @@
#include "starcon.h"
#include "melee.h"
#define NUM_MELEE_COLS_ORIG 6
#define NUM_MELEE_COLS_ORIG NUM_MELEE_COLUMNS
#define PICK_X_OFFS 57
#define PICK_Y_OFFS 24
#define PICK_SIDE_OFFS 100