From 21a261406ee7ec309aa176eb957c410299c63236 Mon Sep 17 00:00:00 2001
From: meep-eep <meep-eep@8092fc87-c524-0410-9efc-e669fe64eaf9>
Date: Tue, 26 Aug 2003 01:27:17 +0000
Subject: [PATCH] 2 more melee ship slots, as the PC SC2 had. From chmmravatar.
 Bug #248.

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@1123 8092fc87-c524-0410-9efc-e669fe64eaf9
---
 sc2/ChangeLog                     |   3 +
 sc2/WhatsNew                      |   2 +
 sc2/content/melee/melebkgd.0.png  | Bin 6556 -> 6869 bytes
 sc2/content/melee/melebkgd.28.png | Bin 1454 -> 1468 bytes
 sc2/content/melee/melebkgd.ani    |  52 +++----
 sc2/content/melee/melee.0.png     | Bin 1103 -> 1141 bytes
 sc2/content/melee/melee.1.png     | Bin 1103 -> 1141 bytes
 sc2/src/sc2code/melee.c           | 221 ++++++++++++++++++++++++++----
 sc2/src/sc2code/melee.h           |   8 +-
 sc2/src/sc2code/pickmele.c        |   2 +-
 10 files changed, 232 insertions(+), 56 deletions(-)

diff --git a/sc2/ChangeLog b/sc2/ChangeLog
index 14afc3ab1..69487caca 100644
--- a/sc2/ChangeLog
+++ b/sc2/ChangeLog
@@ -1,4 +1,7 @@
 Changes towards version 0.3:
+- Extra 2 ship slots in supermelee, as in the PC SC2, and all the PC
+  default teams, from chmmravatar (bug #248)
+  NOTE: this breaks old team saves!
 - Made functions for GET_GAME_STATE and SET_GAME_STATE - SvdB
 - Fixed bug with entering closing portals (bug #108) - SvdB+chmmravatar
 - Mouse cursor is now hidden in fullscreen mode (bug #173) -Mika
diff --git a/sc2/WhatsNew b/sc2/WhatsNew
index 0353bd2e2..6344d6e11 100644
--- a/sc2/WhatsNew
+++ b/sc2/WhatsNew
@@ -38,6 +38,8 @@ NEW FEATURES
   options at the Main Menu now
 - Cubic resampling in high quality audio mode
 - PC-style alien outtakes when game is completed
+- 2 more ship slots in melee, as the PC Star Control 2 had.
+- All the standard melee teams from the Star Control 2 PC version.
 
 BUGFIXES
 - Text entry doesn't freeze up lander reports anymore
diff --git a/sc2/content/melee/melebkgd.0.png b/sc2/content/melee/melebkgd.0.png
index d299b474c781a36bbff1c9386b3c18ff7635ba2f..11a563c17c523e23b62744710e61f9046893c8fd 100644
GIT binary patch
delta 6144
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
S*|iq{0000<MNUMnLSTYBrQE6j

delta 5829
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
P3jhEBNkvXXu0mjfd+;a%

diff --git a/sc2/content/melee/melebkgd.28.png b/sc2/content/melee/melebkgd.28.png
index fed46112ed4458a4934a20f2439042311dc17bca..2b9e6665107166684177c32b01d5845afea12adf 100644
GIT binary patch
delta 700
zcmZ3-y@xxpGr-TCmrII^fq{Y7)59eQNdE)kjU3EC^0M29TR@7v#M9T6{W1$XE3<*M
z*zY?)A<hDi$YKTtz9S&aI8~cZ8Ysw;?&#|X)Z5SfCy{ld0UvWclf9>lV@SoVx7QvP
zHW@IqCDy0&gq>hpb3o&!f_6&xzfwl`lNzcDP72!uFYNwSegAV+T=pfKwguv=W6C%B
zZ9n(*Pna3E{JyLY4^Okn@5>>TswY_oH8uPTs80?$J1>%tr`Bw~b@4u~I;NH{kH31J
zx#HRVD!s_O{9cXdpDk6=Z{=M6Z#ycne)-z+3&;C^sQ=qgso0h&ymx-w!}d+-b^q>K
zm>gOEPHg$tUst*1FF$Sm`{-tveER<T|B~ZluI_mv{_||@=i_hl#f;Bz>)U1@U#KW`
z`RMJe46{S&^~s-I(@wvA&h2^sw{zjX`Qcl;?epq9`U`)*{`u@+`Raw1_rpK=mMPBa
z|9JVDy<h#r`SEKc_uKzoxZ%#xj*lDvzFz<5)6>1SVeCH>cRV_@@9z9_`zrUjzb=m3
z{rhwFy=}jJZ~fU)Gkx3s%ELGF-<vng+Wh`qdi~Fv|HJBjec*bzYkTC&FWY~XM(;Rd
zR{rnho9%BOoj+>6rs8?L-;RBs^WS}1`t#QF&sRS@U$19v|9$;O{rY$Ezg~Ug-}iN8
m{qyNMAFWr<-d*CiGyhbCa@?oY3SWUKjKR~@&t;ucLK6Vo4sA&Q

delta 686
zcmdnPy^h<UGr-TCmrII^fq{Y7)59eQNZ$kEjU3ECa*p(8kOXtFlV=DA2gmJ){tq@r
z@-f#lFqQ=Q1^>@|V*Z+efyvj?#WAE}&f9D6CoVEza4577X4AdEs2kvAwV<`6Fh2J{
zP|zvCpURHkuDO;!lly${%^icRqMwqB;$|6NkDXO;Z<oP`TbHk$U{>#+V^j3$#7SjB
zjCx`e(NIl2%#GS{u}@zqZ{B10W%bWP?$4?}d}2!e_x$<fkmC32)92~mIi&t9x}vhw
zH>*#ls3JPZ>w5p1^eC?#OZ$JM-TQmCU-R7T3*SF$|EfM3`oAJaM(XnXchjDI{W4oz
z@AA~<-&e10*0Zg-{qt86>+JuFb=RrI+2-EcQTz3kXnlX{+t{s-FU(lA%6t3S3rQ~V
zJ-Xt7AKHE<UE|%i!}|XI@U5q%&Gnz{FZ><%Jd|5Mr)}Dvf39(%cRZ{=%RYI!HrnsL
z-ugW=x$YHwn|E(!(UBkD|Ge40=kM+HHE&qs_S_fzc;nsK^!KOlM!$bhCV2nDwCghW
z_FCn~#l@Yt9sd8&&Fqrp%s)=u<i30}y8ip#qo?KH8Q!1nYge0F8UOYU+vnt5>)N7o
z>FaaD{on6XoZWePb>_ZDlZ(GTId|suSKIU9HScBr6z#iz{rVUC`uBUkUS|HV`sthf
mmj02?O3zkuPuH8Xb3cDynoHQvH<7@!$KdJe=d#Wzp$Pzo(Pcvb

diff --git a/sc2/content/melee/melebkgd.ani b/sc2/content/melee/melebkgd.ani
index 3734d03c6..66e6e34c8 100755
--- a/sc2/content/melee/melebkgd.ani
+++ b/sc2/content/melee/melebkgd.ani
@@ -1,29 +1,29 @@
 melebkgd.0.png 1 0 0 0
-melebkgd.1.png 0 0 -227 -24
-melebkgd.2.png 0 0 -227 -24
-melebkgd.3.png 0 0 -227 -24
-melebkgd.4.png 0 0 -227 -24
-melebkgd.5.png 0 0 -227 -24
-melebkgd.6.png 0 0 -227 -24
-melebkgd.7.png 0 0 -227 -24
-melebkgd.8.png 0 0 -227 -24
-melebkgd.9.png 0 0 -227 -167
-melebkgd.10.png 0 0 -227 -167
-melebkgd.11.png 0 0 -227 -167
-melebkgd.12.png 0 0 -227 -167
-melebkgd.13.png 0 0 -227 -167
-melebkgd.14.png 0 0 -227 -167
-melebkgd.15.png 0 0 -227 -167
-melebkgd.16.png 0 0 -227 -167
-melebkgd.17.png 0 0 -238 -69
-melebkgd.18.png 0 0 -238 -59
-melebkgd.19.png 0 0 -238 -69
-melebkgd.20.png 0 0 -238 -59
-melebkgd.21.png 0 0 -238 -157
-melebkgd.22.png 0 0 -238 -147
-melebkgd.23.png 0 0 -238 -157
-melebkgd.24.png 0 0 -238 -147
-melebkgd.25.png 1 0 -224 -77
-melebkgd.26.png 0 0 -224 -77
+melebkgd.1.png 0 0 -256 -24
+melebkgd.2.png 0 0 -256 -24
+melebkgd.3.png 0 0 -256 -24
+melebkgd.4.png 0 0 -256 -24
+melebkgd.5.png 0 0 -256 -24
+melebkgd.6.png 0 0 -256 -24
+melebkgd.7.png 0 0 -256 -24
+melebkgd.8.png 0 0 -256 -24
+melebkgd.9.png 0 0 -256 -167
+melebkgd.10.png 0 0 -256 -167
+melebkgd.11.png 0 0 -256 -167
+melebkgd.12.png 0 0 -256 -167
+melebkgd.13.png 0 0 -256 -167
+melebkgd.14.png 0 0 -256 -167
+melebkgd.15.png 0 0 -256 -167
+melebkgd.16.png 0 0 -256 -167
+melebkgd.17.png 0 0 -267 -69
+melebkgd.18.png 0 0 -267 -59
+melebkgd.19.png 0 0 -267 -69
+melebkgd.20.png 0 0 -267 -59
+melebkgd.21.png 0 0 -267 -157
+melebkgd.22.png 0 0 -267 -147
+melebkgd.23.png 0 0 -267 -157
+melebkgd.24.png 0 0 -267 -147
+melebkgd.25.png 1 0 -253 -77
+melebkgd.26.png 0 0 -253 -77
 melebkgd.27.png 1 0 0 50
 melebkgd.28.png 0 0 -2 -22
diff --git a/sc2/content/melee/melee.0.png b/sc2/content/melee/melee.0.png
index a428a38310ca977cc7cc1193f079a81a38e1787e..f54c7344df62639336ddb1e9f520c0650d19095a 100644
GIT binary patch
delta 370
zcmV-&0ge982=xeAiBL{Q4GJ0x0000DNk~Le0001$0000t2m=5B05Yifm;e9(2XskI
zMF-Oa2L%KZ)-W7t00009a7bBm000ie000ie0hKEb8vp<R1ZP1_K>z@;j|==^1+g#>
z1Aq8QL_t(|+U?ar3d0}}g<+4ERbft{2gn`bw%{GiHmC4fbu_jq6iOB)KV=?7viuld
zCT;>|byo{Mp<-19TB4~;Whzsd>SScA5tvH0dyNQ6)lq{*QEg462TUcC4h*Fd=_r;e
z?A2oRDvW9co=Rx@s#R;el2p&tPEw7vV1KIbkyo)mszXd=s{dB`l#++3ZmDR}jilO9
zg9TBgGUsZ_b4eVPuOOG(Q#?kc_m|zGs5UH)sw{3PI2CVJ+N&AYE9N%{-B--r9+>~Z
z_n7LOYK?Kd+Hr_-qSJG_nsP`~kgGvmV!gf|Q<>@~s#<$Y)}bPy`dWAZ-HjIghz~l1
Q*8l(j07*qoM6N<$f~`Z8JOBUy

delta 332
zcmV-S0ki(~2+s&GiBL{Q4GJ0x0000DNk~Le0001m0000t2m=5B02Ky#Z~y=R19L)2
zR0s$N+u={(u~`oTe*tt-PE-GF<TvX8008buL_t(|obA=Y4Z|P|1yGNdQzTCT17wGA
zt>hixnkiVTb^y^<xqqbkONo?Ip6~}~TOftd0!>M(i0C9&xWW~#SX{xEhQSKHUK$<@
zjG`eX1EaWZfxW;A-fTgj3g(8uDq^n&wij_!BjOc|J}>TSf6NbHFXqvSoro)1__G-Q
zeY3m56;BBw62OXGszr9Bq9Y~)qL6xIHRPiTP7xG9`F?7EDQq5@PDAv?Kq=};XN4>9
zYhk@O;JsL5k1TRttZ{b6HSUq$xZ+z;QYt`#{XUVsH=rUJfHcsd=r~$j;fhCv))ba9
e6i7tdrf&}G60u*~LXUR<0000<MNUMnLSTX-jD`{b

diff --git a/sc2/content/melee/melee.1.png b/sc2/content/melee/melee.1.png
index a428a38310ca977cc7cc1193f079a81a38e1787e..802c1332d9bd854d81010d7a9e3c279f2310056e 100644
GIT binary patch
delta 370
zcmV-&0ge982=xeAiBL{Q4GJ0x0000DNk~Le0001$0000t2m=5B05Yifm;e9(2XskI
zMF-Oa2L%Ne$VTZg00009a7bBm000ie000ie0hKEb8vp<R1ZP1_K>z@;j|==^1+g#>
z1Aq8QL_t(|+U?ar3d0}}g<+4ERbft{2gn`bw%{GiHmC4fbu_jq6iOB)KV=?7viuld
zCT;>|byo{Mp<-19TB4~;Whzsd>SScA5tvH0dyNQ6)lq{*QEg462TUcC4h*Fd=_r;e
z?A2oRDvW9co=Rx@s#R;el2p&tPEw7vV1KIbkyo)mszXd=s{dB`l#++3ZmDR}jilO9
zg9TBgGUsZ_b4eVPuOOG(Q#?kc_m|zGs5UH)sw{3PI2CVJ+N&AYE9N%{-B--r9+>~Z
z_n7LOYK?Kd+Hr_-qSJG_nsP`~kgGvmV!gf|Q<>@~s#<$Y)}bPy`dWAZ-HjIghz~l1
Q*8l(j07*qoM6N<$f^_PX-T(jq

delta 332
zcmV-S0ki(~2+s&GiBL{Q4GJ0x0000DNk~Le0001m0000t2m=5B02Ky#Z~y=R19L)2
zR0s$N+u={(u~`oTe*tt-PE-GF<TvX8008buL_t(|obA=Y4Z|P|1yGNdQzTCT17wGA
zt>hixnkiVTb^y^<xqqbkONo?Ip6~}~TOftd0!>M(i0C9&xWW~#SX{xEhQSKHUK$<@
zjG`eX1EaWZfxW;A-fTgj3g(8uDq^n&wij_!BjOc|J}>TSf6NbHFXqvSoro)1__G-Q
zeY3m56;BBw62OXGszr9Bq9Y~)qL6xIHRPiTP7xG9`F?7EDQq5@PDAv?Kq=};XN4>9
zYhk@O;JsL5k1TRttZ{b6HSUq$xZ+z;QYt`#{XUVsH=rUJfHcsd=r~$j;fhCv))ba9
e6i7tdrf&}G60u*~LXUR<0000<MNUMnLSTX-jD`{b

diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c
index b134d06f6..dd5c7e72a 100644
--- a/sc2/src/sc2code/melee.c
+++ b/sc2/src/sc2code/melee.c
@@ -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
diff --git a/sc2/src/sc2code/melee.h b/sc2/src/sc2code/melee.h
index 67c19f589..72610e9f6 100644
--- a/sc2/src/sc2code/melee.h
+++ b/sc2/src/sc2code/melee.h
@@ -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
 
diff --git a/sc2/src/sc2code/pickmele.c b/sc2/src/sc2code/pickmele.c
index 24a0af2d4..326e85023 100644
--- a/sc2/src/sc2code/pickmele.c
+++ b/sc2/src/sc2code/pickmele.c
@@ -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