diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 0ca01f393..9ef396b2d 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,5 +1,5 @@ Changes towards version 0.7: -- Moved all non-CODE resources into starcon.ls2 - Michael +- Moved all resources into starcon.ls2 - Michael - Fixed compile errors when compiling without joystick support - Michael - Added endian-aware integer read functions to uio - SvdB - Introduce the concept of an "InputContext" - SvdB diff --git a/sc2/content/androsyn.ls2 b/sc2/content/androsyn.ls2 deleted file mode 100644 index d657a23f7..000000000 --- a/sc2/content/androsyn.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.androsynth.code diff --git a/sc2/content/arilou.ls2 b/sc2/content/arilou.ls2 deleted file mode 100644 index 0fea4aff9..000000000 --- a/sc2/content/arilou.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.arilou.code diff --git a/sc2/content/blackurq.ls2 b/sc2/content/blackurq.ls2 deleted file mode 100644 index 8545e1011..000000000 --- a/sc2/content/blackurq.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.kohrah.code diff --git a/sc2/content/chenjesu.ls2 b/sc2/content/chenjesu.ls2 deleted file mode 100644 index d6145424d..000000000 --- a/sc2/content/chenjesu.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.chenjesu.code diff --git a/sc2/content/chmmr.ls2 b/sc2/content/chmmr.ls2 deleted file mode 100644 index 129afe98f..000000000 --- a/sc2/content/chmmr.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.chmmr.code diff --git a/sc2/content/druuge.ls2 b/sc2/content/druuge.ls2 deleted file mode 100644 index 2dda9214a..000000000 --- a/sc2/content/druuge.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.druuge.code diff --git a/sc2/content/human.ls2 b/sc2/content/human.ls2 deleted file mode 100644 index aee04d56f..000000000 --- a/sc2/content/human.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.earthling.code diff --git a/sc2/content/ilwrath.ls2 b/sc2/content/ilwrath.ls2 deleted file mode 100644 index a8099b0f4..000000000 --- a/sc2/content/ilwrath.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.ilwrath.code diff --git a/sc2/content/lastbat.ls2 b/sc2/content/lastbat.ls2 deleted file mode 100644 index 86ed7d16c..000000000 --- a/sc2/content/lastbat.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.lastbat.code diff --git a/sc2/content/melnorme.ls2 b/sc2/content/melnorme.ls2 deleted file mode 100644 index 6b3df8c4a..000000000 --- a/sc2/content/melnorme.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.melnorme.code diff --git a/sc2/content/mmrnmhrm.ls2 b/sc2/content/mmrnmhrm.ls2 deleted file mode 100644 index 74f211813..000000000 --- a/sc2/content/mmrnmhrm.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.mmrnmhrm.code diff --git a/sc2/content/mycon.ls2 b/sc2/content/mycon.ls2 deleted file mode 100644 index c40e07778..000000000 --- a/sc2/content/mycon.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.mycon.code diff --git a/sc2/content/orz.ls2 b/sc2/content/orz.ls2 deleted file mode 100644 index 05e7eacd7..000000000 --- a/sc2/content/orz.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.orz.code diff --git a/sc2/content/pkunk.ls2 b/sc2/content/pkunk.ls2 deleted file mode 100644 index e3bd18bec..000000000 --- a/sc2/content/pkunk.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.pkunk.code diff --git a/sc2/content/probe.ls2 b/sc2/content/probe.ls2 deleted file mode 100644 index abfb8264f..000000000 --- a/sc2/content/probe.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.probe.code diff --git a/sc2/content/shofixti.ls2 b/sc2/content/shofixti.ls2 deleted file mode 100644 index c44a6ce9f..000000000 --- a/sc2/content/shofixti.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.shofixti.code diff --git a/sc2/content/sis_ship.ls2 b/sc2/content/sis_ship.ls2 deleted file mode 100644 index 75ffe11b3..000000000 --- a/sc2/content/sis_ship.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.sis_ship.code diff --git a/sc2/content/slylandr.ls2 b/sc2/content/slylandr.ls2 deleted file mode 100644 index c97a63809..000000000 --- a/sc2/content/slylandr.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.slylandro.code diff --git a/sc2/content/spathi.ls2 b/sc2/content/spathi.ls2 deleted file mode 100644 index 4c00ad5b9..000000000 --- a/sc2/content/spathi.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.spathi.code diff --git a/sc2/content/starcon.ls2 b/sc2/content/starcon.ls2 index 2cd116b14..faaca3d43 100644 --- a/sc2/content/starcon.ls2 +++ b/sc2/content/starcon.ls2 @@ -1,30 +1,5 @@ 1 0 4 colortable.scclrtab 2 0 2 graphics.title - 3 0 7 ship.arilou.resources - 4 1 7 ship.chmmr.resources - 5 2 7 ship.earthling.resources - 6 3 7 ship.orz.resources - 7 4 7 ship.pkunk.resources - 8 5 7 ship.shofixti.resources - 9 6 7 ship.spathi.resources - 10 7 7 ship.supox.resources - 11 8 7 ship.thraddash.resources - 12 9 7 ship.utwig.resources - 13 10 7 ship.vux.resources - 14 11 7 ship.yehat.resources - 15 12 7 ship.melnorme.resources - 16 13 7 ship.druuge.resources - 17 14 7 ship.ilwrath.resources - 18 15 7 ship.mycon.resources - 19 16 7 ship.slylandro.resources - 20 17 7 ship.umgah.resources - 21 18 7 ship.urquan.resources - 22 19 7 ship.zoqfotpik.resources - 23 20 7 ship.syreen.resources - 24 21 7 ship.kohrah.resources - 25 22 7 ship.androsynth.resources - 26 23 7 ship.chenjesu.resources - 27 24 7 ship.mmrnmhrm.resources 28 0 3 font.starcon 28 1 2 graphics.status 28 1 3 font.tiny @@ -262,9 +237,6 @@ 163 74 2 graphics.segue 164 75 2 graphics.pickship 189 4 3 font.player -190 49 7 ship.sis_ship.resources -191 50 7 ship.lastbat.resources -192 51 7 ship.probe.resources 193 15 6 music.mainmenu 193 76 2 graphics.newgame 194 77 2 graphics.modules @@ -604,6 +576,7 @@ 523 3 4 comm.zoqfotpik.colortable 523 4 2 comm.zoqfotpik.graphics 700 0 6 ship.androsynth.ditty +700 0 8 ship.androsynth.code 700 1 4 ship.androsynth.text 700 2 5 ship.androsynth.sounds 700 3 2 ship.androsynth.icons @@ -619,6 +592,7 @@ 700 13 2 ship.androsynth.graphics.blazer.small 700 14 2 ship.androsynth.graphics.captain 701 0 6 ship.arilou.ditty +701 0 8 ship.arilou.code 701 1 4 ship.arilou.text 701 2 5 ship.arilou.sounds 701 3 2 ship.arilou.icons @@ -631,6 +605,7 @@ 701 10 2 ship.arilou.graphics.warp.small 701 11 2 ship.arilou.graphics.captain 702 0 6 ship.kohrah.ditty +702 0 8 ship.kohrah.code 702 1 4 ship.kohrah.text 702 2 5 ship.kohrah.sounds 702 3 2 ship.kohrah.icons @@ -646,6 +621,7 @@ 702 13 2 ship.kohrah.graphics.gas.small 702 14 2 ship.kohrah.graphics.captain 703 0 6 ship.chenjesu.ditty +703 0 8 ship.chenjesu.code 703 1 4 ship.chenjesu.text 703 2 5 ship.chenjesu.sounds 703 3 2 ship.chenjesu.icons @@ -661,6 +637,7 @@ 703 13 2 ship.chenjesu.graphics.doggy.small 703 14 2 ship.chenjesu.graphics.captain 704 0 6 ship.chmmr.ditty +704 0 8 ship.chmmr.code 704 1 4 ship.chmmr.text 704 2 5 ship.chmmr.sounds 704 3 2 ship.chmmr.icons @@ -676,6 +653,7 @@ 704 13 2 ship.chmmr.graphics.sat.small 704 14 2 ship.chmmr.graphics.captain 705 0 6 ship.druuge.ditty +705 0 8 ship.druuge.code 705 1 4 ship.druuge.text 705 2 5 ship.druuge.sounds 705 3 2 ship.druuge.icons @@ -688,6 +666,7 @@ 705 10 2 ship.druuge.graphics.can.small 705 11 2 ship.druuge.graphics.captain 706 0 6 ship.earthling.ditty +706 0 8 ship.earthling.code 706 1 4 ship.earthling.text 706 2 5 ship.earthling.sounds 706 3 2 ship.earthling.icons @@ -700,6 +679,7 @@ 706 10 2 ship.earthling.graphics.saturn.small 706 11 2 ship.earthling.graphics.captain 707 0 6 ship.ilwrath.ditty +707 0 8 ship.ilwrath.code 707 1 4 ship.ilwrath.text 707 2 5 ship.ilwrath.sounds 707 3 2 ship.ilwrath.icons @@ -712,6 +692,7 @@ 707 10 2 ship.ilwrath.graphics.fire.small 707 11 2 ship.ilwrath.graphics.captain 708 0 6 ship.lastbat.ditty +708 0 8 ship.lastbat.code 708 1 5 ship.lastbat.sounds 708 2 2 ship.lastbat.graphics.lastbat.large 708 3 2 ship.lastbat.graphics.lastbat.medium @@ -724,6 +705,7 @@ 708 10 2 ship.lastbat.graphics.gen.small 708 11 2 ship.lastbat.graphics.captain 709 0 6 ship.melnorme.ditty +709 0 8 ship.melnorme.code 709 1 4 ship.melnorme.text 709 2 5 ship.melnorme.sounds 709 3 2 ship.melnorme.icons @@ -739,6 +721,7 @@ 709 13 2 ship.melnorme.graphics.confu.small 709 14 2 ship.melnorme.graphics.captain 710 0 6 ship.mmrnmhrm.ditty +710 0 8 ship.mmrnmhrm.code 710 1 4 ship.mmrnmhrm.text 710 2 5 ship.mmrnmhrm.sounds 710 3 2 ship.mmrnmhrm.icons @@ -754,6 +737,7 @@ 710 13 2 ship.mmrnmhrm.graphics.ywing.small 710 14 2 ship.mmrnmhrm.graphics.captain 711 0 6 ship.mycon.ditty +711 0 8 ship.mycon.code 711 1 4 ship.mycon.text 711 2 5 ship.mycon.sounds 711 3 2 ship.mycon.icons @@ -766,6 +750,7 @@ 711 10 2 ship.mycon.graphics.plasma.small 711 11 2 ship.mycon.graphics.captain 712 0 6 ship.orz.ditty +712 0 8 ship.orz.code 712 1 4 ship.orz.text 712 2 5 ship.orz.sounds 712 3 2 ship.orz.icons @@ -781,6 +766,7 @@ 712 13 2 ship.orz.graphics.tur.small 712 14 2 ship.orz.graphics.captain 713 0 6 ship.pkunk.ditty +713 0 8 ship.pkunk.code 713 1 4 ship.pkunk.text 713 2 5 ship.pkunk.sounds 713 3 2 ship.pkunk.icons @@ -793,7 +779,9 @@ 713 10 2 ship.pkunk.graphics.bug.small 713 11 2 ship.pkunk.graphics.captain 714 0 2 ship.probe.meleeicons +714 0 8 ship.probe.code 715 0 6 ship.shofixti.ditty +715 0 8 ship.shofixti.code 715 1 4 ship.shofixti.text 715 2 5 ship.shofixti.sounds 715 3 2 ship.shofixti.icons @@ -813,6 +801,7 @@ 715 17 2 ship.shofixti.graphics.missile.medium 715 18 2 ship.shofixti.graphics.missile.small 716 0 6 ship.sis_ship.ditty +716 0 8 ship.sis_ship.code 716 1 5 ship.sis_ship.sounds 716 2 2 ship.sis_ship.icons 716 3 2 ship.sis_ship.graphics.sis.large @@ -824,6 +813,7 @@ 716 9 2 ship.sis_ship.graphics.captain 716 10 2 ship.sis_ship.graphics.sishyper 717 0 6 ship.slylandro.ditty +717 0 8 ship.slylandro.code 717 1 4 ship.slylandro.text 717 2 5 ship.slylandro.sounds 717 3 2 ship.slylandro.icons @@ -833,6 +823,7 @@ 717 7 2 ship.slylandro.graphics.slylandr.small 717 8 2 ship.slylandro.graphics.captain 718 0 6 ship.spathi.ditty +718 0 8 ship.spathi.code 718 1 4 ship.spathi.text 718 2 5 ship.spathi.sounds 718 3 2 ship.spathi.icons @@ -848,6 +839,7 @@ 718 13 2 ship.spathi.graphics.discrim.small 718 14 2 ship.spathi.graphics.captain 719 0 6 ship.supox.ditty +719 0 8 ship.supox.code 719 1 4 ship.supox.text 719 2 5 ship.supox.sounds 719 3 2 ship.supox.icons @@ -860,6 +852,7 @@ 719 10 2 ship.supox.graphics.gob.small 719 11 2 ship.supox.graphics.captain 720 0 6 ship.syreen.ditty +720 0 8 ship.syreen.code 720 1 4 ship.syreen.text 720 2 5 ship.syreen.sounds 720 3 2 ship.syreen.icons @@ -872,6 +865,7 @@ 720 10 2 ship.syreen.graphics.dagger.small 720 11 2 ship.syreen.graphics.captain 721 0 6 ship.thraddash.ditty +721 0 8 ship.thraddash.code 721 1 4 ship.thraddash.text 721 2 5 ship.thraddash.sounds 721 3 2 ship.thraddash.icons @@ -887,6 +881,7 @@ 721 13 2 ship.thraddash.graphics.nap.small 721 14 2 ship.thraddash.graphics.captain 722 0 6 ship.umgah.ditty +722 0 8 ship.umgah.code 722 1 4 ship.umgah.text 722 2 5 ship.umgah.sounds 722 3 2 ship.umgah.icons @@ -900,6 +895,7 @@ 722 11 2 ship.umgah.graphics.cone.small 722 12 2 ship.umgah.graphics.captain 723 0 6 ship.urquan.ditty +723 0 8 ship.urquan.code 723 1 4 ship.urquan.text 723 2 5 ship.urquan.sounds 723 3 2 ship.urquan.icons @@ -915,6 +911,7 @@ 723 13 2 ship.urquan.graphics.fight.small 723 14 2 ship.urquan.graphics.captain 724 0 6 ship.utwig.ditty +724 0 8 ship.utwig.code 724 1 4 ship.utwig.text 724 2 5 ship.utwig.sounds 724 3 2 ship.utwig.icons @@ -927,6 +924,7 @@ 724 10 2 ship.utwig.graphics.lan.small 724 11 2 ship.utwig.graphics.captain 725 0 6 ship.vux.ditty +725 0 8 ship.vux.code 725 1 4 ship.vux.text 725 2 5 ship.vux.sounds 725 3 2 ship.vux.icons @@ -940,6 +938,7 @@ 725 11 2 ship.vux.graphics.slime 725 12 2 ship.vux.graphics.captain 726 0 6 ship.yehat.ditty +726 0 8 ship.yehat.code 726 1 4 ship.yehat.text 726 2 5 ship.yehat.sounds 726 3 2 ship.yehat.icons @@ -955,6 +954,7 @@ 726 13 2 ship.yehat.graphics.shield.small 726 14 2 ship.yehat.graphics.captain 727 0 6 ship.zoqfotpik.ditty +727 0 8 ship.zoqfotpik.code 727 1 4 ship.zoqfotpik.text 727 2 5 ship.zoqfotpik.sounds 727 3 2 ship.zoqfotpik.icons diff --git a/sc2/content/supox.ls2 b/sc2/content/supox.ls2 deleted file mode 100644 index 2db6fd1e5..000000000 --- a/sc2/content/supox.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.supox.code diff --git a/sc2/content/syreen.ls2 b/sc2/content/syreen.ls2 deleted file mode 100644 index face80084..000000000 --- a/sc2/content/syreen.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.syreen.code diff --git a/sc2/content/thradd.ls2 b/sc2/content/thradd.ls2 deleted file mode 100644 index 8ec75432d..000000000 --- a/sc2/content/thradd.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.thraddash.code diff --git a/sc2/content/umgah.ls2 b/sc2/content/umgah.ls2 deleted file mode 100644 index 18323ea1f..000000000 --- a/sc2/content/umgah.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.umgah.code diff --git a/sc2/content/uqm.rmp b/sc2/content/uqm.rmp index 18331e4d2..32c3a6535 100644 --- a/sc2/content/uqm.rmp +++ b/sc2/content/uqm.rmp @@ -554,7 +554,6 @@ ship.androsynth.graphics.bubble.small = GFXRES:androsyn/bubble.sml ship.androsynth.graphics.captain = GFXRES:androsyn/andcap.ani ship.androsynth.icons = GFXRES:androsyn/andicons.ani ship.androsynth.meleeicons = GFXRES:androsyn/andmicon.ani -ship.androsynth.resources = RES_INDEX:androsyn.ls2 ship.androsynth.sounds = SNDRES:androsyn/andsound.snd ship.androsynth.text = STRTAB:androsyn/andtext.txt ship.arilou.code = CODE:arilou/arilou.cod @@ -568,7 +567,6 @@ ship.arilou.graphics.warp.medium = GFXRES:arilou/warp.med ship.arilou.graphics.warp.small = GFXRES:arilou/warp.sml ship.arilou.icons = GFXRES:arilou/ariicons.ani ship.arilou.meleeicons = GFXRES:arilou/arimicon.ani -ship.arilou.resources = RES_INDEX:arilou.ls2 ship.arilou.sounds = SNDRES:arilou/arisound.snd ship.arilou.text = STRTAB:arilou/aritext.txt ship.chenjesu.code = CODE:chenjesu/chenjesu.cod @@ -585,7 +583,6 @@ ship.chenjesu.graphics.spark.medium = GFXRES:chenjesu/spark.med ship.chenjesu.graphics.spark.small = GFXRES:chenjesu/spark.sml ship.chenjesu.icons = GFXRES:chenjesu/cheicons.ani ship.chenjesu.meleeicons = GFXRES:chenjesu/chemicon.ani -ship.chenjesu.resources = RES_INDEX:chenjesu.ls2 ship.chenjesu.sounds = SNDRES:chenjesu/chesound.snd ship.chenjesu.text = STRTAB:chenjesu/chetext.txt ship.chmmr.code = CODE:chmmr/chmmr.cod @@ -602,7 +599,6 @@ ship.chmmr.graphics.sat.medium = GFXRES:chmmr/satmed.ani ship.chmmr.graphics.sat.small = GFXRES:chmmr/satsml.ani ship.chmmr.icons = GFXRES:chmmr/chmicons.ani ship.chmmr.meleeicons = GFXRES:chmmr/chmmicon.ani -ship.chmmr.resources = RES_INDEX:chmmr.ls2 ship.chmmr.sounds = SNDRES:chmmr/chmsound.snd ship.chmmr.text = STRTAB:chmmr/chmtext.txt ship.druuge.code = CODE:druuge/druuge.cod @@ -616,7 +612,6 @@ ship.druuge.graphics.druuge.medium = GFXRES:druuge/druuge.med ship.druuge.graphics.druuge.small = GFXRES:druuge/druuge.sml ship.druuge.icons = GFXRES:druuge/druicons.ani ship.druuge.meleeicons = GFXRES:druuge/drumicon.ani -ship.druuge.resources = RES_INDEX:druuge.ls2 ship.druuge.sounds = SNDRES:druuge/drusound.snd ship.druuge.text = STRTAB:druuge/drutext.txt ship.earthling.code = CODE:human/human.cod @@ -630,7 +625,6 @@ ship.earthling.graphics.saturn.medium = GFXRES:human/saturn.med ship.earthling.graphics.saturn.small = GFXRES:human/saturn.sml ship.earthling.icons = GFXRES:human/humicons.ani ship.earthling.meleeicons = GFXRES:human/hummicon.ani -ship.earthling.resources = RES_INDEX:human.ls2 ship.earthling.sounds = SNDRES:human/humsound.snd ship.earthling.text = STRTAB:human/humtext.txt ship.ilwrath.code = CODE:ilwrath/ilwrath.cod @@ -644,7 +638,6 @@ ship.ilwrath.graphics.ilwrath.medium = GFXRES:ilwrath/ilwrath.med ship.ilwrath.graphics.ilwrath.small = GFXRES:ilwrath/ilwrath.sml ship.ilwrath.icons = GFXRES:ilwrath/ilwicons.ani ship.ilwrath.meleeicons = GFXRES:ilwrath/ilwmicon.ani -ship.ilwrath.resources = RES_INDEX:ilwrath.ls2 ship.ilwrath.sounds = SNDRES:ilwrath/ilwsound.snd ship.ilwrath.text = STRTAB:ilwrath/ilwtext.txt ship.kohrah.code = CODE:blackurq/blackurq.cod @@ -661,7 +654,6 @@ ship.kohrah.graphics.gas.medium = GFXRES:blackurq/gasmed.ani ship.kohrah.graphics.gas.small = GFXRES:blackurq/gassml.ani ship.kohrah.icons = GFXRES:blackurq/blaicons.ani ship.kohrah.meleeicons = GFXRES:blackurq/blamicon.ani -ship.kohrah.resources = RES_INDEX:blackurq.ls2 ship.kohrah.sounds = SNDRES:blackurq/blasound.snd ship.kohrah.text = STRTAB:blackurq/blatext.txt ship.lastbat.code = CODE:lastbat/lastbat.cod @@ -675,7 +667,6 @@ ship.lastbat.graphics.lastbat.small = GFXRES:lastbat/lastbat.sml ship.lastbat.graphics.sen.large = GFXRES:lastbat/senbig.ani ship.lastbat.graphics.sen.medium = GFXRES:lastbat/senmed.ani ship.lastbat.graphics.sen.small = GFXRES:lastbat/sensml.ani -ship.lastbat.resources = RES_INDEX:lastbat.ls2 ship.lastbat.sounds = SNDRES:lastbat/lassound.snd ship.melnorme.code = CODE:melnorme/melnorme.cod ship.melnorme.ditty = MUSICRES:melnorme/melditty.mod @@ -691,7 +682,6 @@ ship.melnorme.graphics.pump.medium = GFXRES:melnorme/pumpmed.ani ship.melnorme.graphics.pump.small = GFXRES:melnorme/pumpsml.ani ship.melnorme.icons = GFXRES:melnorme/melicons.ani ship.melnorme.meleeicons = GFXRES:melnorme/melmicon.ani -ship.melnorme.resources = RES_INDEX:melnorme.ls2 ship.melnorme.sounds = SNDRES:melnorme/melsound.snd ship.melnorme.text = STRTAB:melnorme/meltext.txt ship.mmrnmhrm.code = CODE:mmrnmhrm/mmrnmhrm.cod @@ -708,7 +698,6 @@ ship.mmrnmhrm.graphics.ywing.medium = GFXRES:mmrnmhrm/ywing.med ship.mmrnmhrm.graphics.ywing.small = GFXRES:mmrnmhrm/ywing.sml ship.mmrnmhrm.icons = GFXRES:mmrnmhrm/mmricons.ani ship.mmrnmhrm.meleeicons = GFXRES:mmrnmhrm/mmrmicon.ani -ship.mmrnmhrm.resources = RES_INDEX:mmrnmhrm.ls2 ship.mmrnmhrm.sounds = SNDRES:mmrnmhrm/mmrsound.snd ship.mmrnmhrm.text = STRTAB:mmrnmhrm/mmrtext.txt ship.mycon.code = CODE:mycon/mycon.cod @@ -722,7 +711,6 @@ ship.mycon.graphics.plasma.medium = GFXRES:mycon/plasma.med ship.mycon.graphics.plasma.small = GFXRES:mycon/plasma.sml ship.mycon.icons = GFXRES:mycon/mycicons.ani ship.mycon.meleeicons = GFXRES:mycon/mycmicon.ani -ship.mycon.resources = RES_INDEX:mycon.ls2 ship.mycon.sounds = SNDRES:mycon/mycsound.snd ship.mycon.text = STRTAB:mycon/myctext.txt ship.orz.code = CODE:orz/orz.cod @@ -739,7 +727,6 @@ ship.orz.graphics.tur.medium = GFXRES:orz/turmed.ani ship.orz.graphics.tur.small = GFXRES:orz/tursml.ani ship.orz.icons = GFXRES:orz/orzicons.ani ship.orz.meleeicons = GFXRES:orz/orzmicon.ani -ship.orz.resources = RES_INDEX:orz.ls2 ship.orz.sounds = SNDRES:orz/orzsound.snd ship.orz.text = STRTAB:orz/orztext.txt ship.pkunk.code = CODE:pkunk/pkunk.cod @@ -753,12 +740,10 @@ ship.pkunk.graphics.pkunk.medium = GFXRES:pkunk/pkunk.med ship.pkunk.graphics.pkunk.small = GFXRES:pkunk/pkunk.sml ship.pkunk.icons = GFXRES:pkunk/pkuicons.ani ship.pkunk.meleeicons = GFXRES:pkunk/pkumicon.ani -ship.pkunk.resources = RES_INDEX:pkunk.ls2 ship.pkunk.sounds = SNDRES:pkunk/pkusound.snd ship.pkunk.text = STRTAB:pkunk/pkutext.txt ship.probe.code = CODE:probe/probe.cod ship.probe.meleeicons = GFXRES:probe/promicon.ani -ship.probe.resources = RES_INDEX:probe.ls2 ship.shofixti.code = CODE:shofixti/shofixti.cod ship.shofixti.ditty = MUSICRES:shofixti/shoditty.mod ship.shofixti.graphics.captain = GFXRES:shofixti/shocap.ani @@ -777,7 +762,6 @@ ship.shofixti.graphics.shofixti.medium = GFXRES:shofixti/shofixti.med ship.shofixti.graphics.shofixti.small = GFXRES:shofixti/shofixti.sml ship.shofixti.icons = GFXRES:shofixti/shoicons.ani ship.shofixti.meleeicons = GFXRES:shofixti/shomicon.ani -ship.shofixti.resources = RES_INDEX:shofixti.ls2 ship.shofixti.sounds = SNDRES:shofixti/shosound.snd ship.shofixti.text = STRTAB:shofixti/shotext.txt ship.sis_ship.code = CODE:sis_ship/sis.cod @@ -791,7 +775,6 @@ ship.sis_ship.graphics.sis.medium = GFXRES:sis_ship/sis.med ship.sis_ship.graphics.sis.small = GFXRES:sis_ship/sis.sml ship.sis_ship.graphics.sishyper = GFXRES:sis_ship/sishyper.ani ship.sis_ship.icons = GFXRES:sis_ship/sisicons.ani -ship.sis_ship.resources = RES_INDEX:sis_ship.ls2 ship.sis_ship.sounds = SNDRES:sis_ship/sissound.snd ship.slylandro.code = CODE:slylandr/slylandr.cod ship.slylandro.ditty = MUSICRES:slylandr/slyditty.mod @@ -801,7 +784,6 @@ ship.slylandro.graphics.slylandr.medium = GFXRES:slylandr/slylandr.med ship.slylandro.graphics.slylandr.small = GFXRES:slylandr/slylandr.sml ship.slylandro.icons = GFXRES:slylandr/slyicons.ani ship.slylandro.meleeicons = GFXRES:slylandr/slymicon.ani -ship.slylandro.resources = RES_INDEX:slylandr.ls2 ship.slylandro.sounds = SNDRES:slylandr/slysound.snd ship.slylandro.text = STRTAB:slylandr/slytext.txt ship.spathi.code = CODE:spathi/spathi.cod @@ -818,7 +800,6 @@ ship.spathi.graphics.spathi.medium = GFXRES:spathi/spathi.med ship.spathi.graphics.spathi.small = GFXRES:spathi/spathi.sml ship.spathi.icons = GFXRES:spathi/spaicons.ani ship.spathi.meleeicons = GFXRES:spathi/spamicon.ani -ship.spathi.resources = RES_INDEX:spathi.ls2 ship.spathi.sounds = SNDRES:spathi/spasound.snd ship.spathi.text = STRTAB:spathi/spatext.txt ship.supox.code = CODE:supox/supox.cod @@ -832,7 +813,6 @@ ship.supox.graphics.supox.medium = GFXRES:supox/supox.med ship.supox.graphics.supox.small = GFXRES:supox/supox.sml ship.supox.icons = GFXRES:supox/supicons.ani ship.supox.meleeicons = GFXRES:supox/supmicon.ani -ship.supox.resources = RES_INDEX:supox.ls2 ship.supox.sounds = SNDRES:supox/supsound.snd ship.supox.text = STRTAB:supox/suptext.txt ship.syreen.code = CODE:syreen/syreen.cod @@ -846,7 +826,6 @@ ship.syreen.graphics.syreen.medium = GFXRES:syreen/syreen.med ship.syreen.graphics.syreen.small = GFXRES:syreen/syreen.sml ship.syreen.icons = GFXRES:syreen/syricons.ani ship.syreen.meleeicons = GFXRES:syreen/syrmicon.ani -ship.syreen.resources = RES_INDEX:syreen.ls2 ship.syreen.sounds = SNDRES:syreen/syrsound.snd ship.syreen.text = STRTAB:syreen/syrtext.txt ship.thraddash.code = CODE:thradd/thradd.cod @@ -863,7 +842,6 @@ ship.thraddash.graphics.thradd.medium = GFXRES:thradd/thradd.med ship.thraddash.graphics.thradd.small = GFXRES:thradd/thradd.sml ship.thraddash.icons = GFXRES:thradd/thricons.ani ship.thraddash.meleeicons = GFXRES:thradd/thrmicon.ani -ship.thraddash.resources = RES_INDEX:thradd.ls2 ship.thraddash.sounds = SNDRES:thradd/thrsound.snd ship.thraddash.text = STRTAB:thradd/thrtext.txt ship.umgah.code = CODE:umgah/umgah.cod @@ -878,7 +856,6 @@ ship.umgah.graphics.umgah.medium = GFXRES:umgah/umgah.med ship.umgah.graphics.umgah.small = GFXRES:umgah/umgah.sml ship.umgah.icons = GFXRES:umgah/umgicons.ani ship.umgah.meleeicons = GFXRES:umgah/umgmicon.ani -ship.umgah.resources = RES_INDEX:umgah.ls2 ship.umgah.sounds = SNDRES:umgah/umgsound.snd ship.umgah.text = STRTAB:umgah/umgtext.txt ship.urquan.code = CODE:urquan/urquan.cod @@ -895,7 +872,6 @@ ship.urquan.graphics.urquan.medium = GFXRES:urquan/urquan.med ship.urquan.graphics.urquan.small = GFXRES:urquan/urquan.sml ship.urquan.icons = GFXRES:urquan/urqicons.ani ship.urquan.meleeicons = GFXRES:urquan/urqmicon.ani -ship.urquan.resources = RES_INDEX:urquan.ls2 ship.urquan.sounds = SNDRES:urquan/urqsound.snd ship.urquan.text = STRTAB:urquan/urqtext.txt ship.utwig.code = CODE:utwig/utwig.cod @@ -909,7 +885,6 @@ ship.utwig.graphics.utwig.medium = GFXRES:utwig/utwig.med ship.utwig.graphics.utwig.small = GFXRES:utwig/utwig.sml ship.utwig.icons = GFXRES:utwig/utwicons.ani ship.utwig.meleeicons = GFXRES:utwig/utwmicon.ani -ship.utwig.resources = RES_INDEX:utwig.ls2 ship.utwig.sounds = SNDRES:utwig/utwsound.snd ship.utwig.text = STRTAB:utwig/utwtext.txt ship.vux.code = CODE:vux/vux.cod @@ -924,7 +899,6 @@ ship.vux.graphics.vux.medium = GFXRES:vux/vux.med ship.vux.graphics.vux.small = GFXRES:vux/vux.sml ship.vux.icons = GFXRES:vux/vuxicons.ani ship.vux.meleeicons = GFXRES:vux/vuxmicon.ani -ship.vux.resources = RES_INDEX:vux.ls2 ship.vux.sounds = SNDRES:vux/vuxsound.snd ship.vux.text = STRTAB:vux/vuxtext.txt ship.yehat.code = CODE:yehat/yehat.cod @@ -941,7 +915,6 @@ ship.yehat.graphics.yehat.medium = GFXRES:yehat/yehat.med ship.yehat.graphics.yehat.small = GFXRES:yehat/yehat.sml ship.yehat.icons = GFXRES:yehat/yehicons.ani ship.yehat.meleeicons = GFXRES:yehat/yehmicon.ani -ship.yehat.resources = RES_INDEX:yehat.ls2 ship.yehat.sounds = SNDRES:yehat/yehsound.snd ship.yehat.text = STRTAB:yehat/yehtext.txt ship.zoqfotpik.code = CODE:zoqfot/zoqfot.cod @@ -958,7 +931,6 @@ ship.zoqfotpik.graphics.zoqfot.medium = GFXRES:zoqfot/zoqfot.med ship.zoqfotpik.graphics.zoqfot.small = GFXRES:zoqfot/zoqfot.sml ship.zoqfotpik.icons = GFXRES:zoqfot/zoqicons.ani ship.zoqfotpik.meleeicons = GFXRES:zoqfot/zoqmicon.ani -ship.zoqfotpik.resources = RES_INDEX:zoqfot.ls2 ship.zoqfotpik.sounds = SNDRES:zoqfot/zoqsound.snd ship.zoqfotpik.text = STRTAB:zoqfot/zoqtext.txt slides.ending = STRTAB:slides/ending/ending.txt diff --git a/sc2/content/urquan.ls2 b/sc2/content/urquan.ls2 deleted file mode 100644 index 0918778b8..000000000 --- a/sc2/content/urquan.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.urquan.code diff --git a/sc2/content/utwig.ls2 b/sc2/content/utwig.ls2 deleted file mode 100644 index 52654b76f..000000000 --- a/sc2/content/utwig.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.utwig.code diff --git a/sc2/content/vux.ls2 b/sc2/content/vux.ls2 deleted file mode 100644 index aa630e288..000000000 --- a/sc2/content/vux.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.vux.code diff --git a/sc2/content/yehat.ls2 b/sc2/content/yehat.ls2 deleted file mode 100644 index dbe9125ba..000000000 --- a/sc2/content/yehat.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.yehat.code diff --git a/sc2/content/zoqfot.ls2 b/sc2/content/zoqfot.ls2 deleted file mode 100644 index bbd2e03f9..000000000 --- a/sc2/content/zoqfot.ls2 +++ /dev/null @@ -1 +0,0 @@ - 1 0 8 ship.zoqfotpik.code diff --git a/sc2/src/sc2code/build.c b/sc2/src/sc2code/build.c index 788eff06e..f2b9bfbc1 100644 --- a/sc2/src/sc2code/build.c +++ b/sc2/src/sc2code/build.c @@ -27,7 +27,7 @@ // Allocate a new STARSHIP or SHIP_FRAGMENT and put it in the queue HLINK -Build (QUEUE *pQueue, DWORD RaceResIndex) +Build (QUEUE *pQueue, SPECIES_ID SpeciesID) { HLINK hNewShip; SHIP_BASE *ShipPtr; @@ -41,7 +41,7 @@ Build (QUEUE *pQueue, DWORD RaceResIndex) ShipPtr = (SHIP_BASE *) LockLink (pQueue, hNewShip); memset (ShipPtr, 0, GetLinkSize (pQueue)); - ShipPtr->RaceResIndex = RaceResIndex; + ShipPtr->SpeciesID = SpeciesID; UnlockLink (pQueue, hNewShip); PutQueue (pQueue, hNewShip); @@ -320,7 +320,7 @@ GetIndexFromStarShip (QUEUE *pShipQ, HLINK hStarShip) } BYTE -NameCaptain (QUEUE *pQueue, DWORD RaceResIndex) +NameCaptain (QUEUE *pQueue, SPECIES_ID SpeciesID) { BYTE name_index; HLINK hStarShip; @@ -341,7 +341,7 @@ NameCaptain (QUEUE *pQueue, DWORD RaceResIndex) ShipPtr = (SHIP_BASE *) LockLink (pQueue, hStarShip); hNextShip = _GetSuccLink (ShipPtr); - if (ShipPtr->RaceResIndex == RaceResIndex) + if (ShipPtr->SpeciesID == SpeciesID) test_name_index = ShipPtr->captains_name_index; UnlockLink (pQueue, hStarShip); @@ -374,8 +374,8 @@ CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level) captains_name_index = 0; else captains_name_index = NameCaptain (pDstQueue, - TemplatePtr->RaceResIndex); - hBuiltShip = Build (pDstQueue, TemplatePtr->RaceResIndex); + TemplatePtr->SpeciesID); + hBuiltShip = Build (pDstQueue, TemplatePtr->SpeciesID); if (hBuiltShip) { SHIP_FRAGMENT *ShipFragPtr; diff --git a/sc2/src/sc2code/build.h b/sc2/src/sc2code/build.h index 8a48ffb11..6bc885759 100644 --- a/sc2/src/sc2code/build.h +++ b/sc2/src/sc2code/build.h @@ -37,11 +37,11 @@ & (NUM_CAPTAINS_NAMES - 1)) \ + NAME_OFFSET) -extern HLINK Build (QUEUE *pQueue, DWORD RaceResIndex); +extern HLINK Build (QUEUE *pQueue, SPECIES_ID SpeciesID); extern HSHIPFRAG CloneShipFragment (COUNT shipIndex, QUEUE *pDstQueue, COUNT crew_level); extern HLINK GetStarShipFromIndex (QUEUE *pShipQ, COUNT Index); -extern BYTE NameCaptain (QUEUE *pQueue, DWORD RaceResIndex); +extern BYTE NameCaptain (QUEUE *pQueue, SPECIES_ID SpeciesID); /* Possible values for the 'state' argument of * COUNT ActivateStarShip (COUNT which_ship, SIZE state) @@ -63,7 +63,7 @@ extern COUNT GetIndexFromStarShip (QUEUE *pShipQ, HLINK hStarShip); extern int SetEscortCrewComplement (COUNT which_ship, COUNT crew_level, BYTE captain); -extern RACE_DESC *load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData); +extern RACE_DESC *load_ship (SPECIES_ID SpeciesID, BOOLEAN LoadBattleData); extern void free_ship (RACE_DESC *RaceDescPtr, BOOLEAN FreeIconData, BOOLEAN FreeBattleData); diff --git a/sc2/src/sc2code/corecode.h b/sc2/src/sc2code/corecode.h new file mode 100644 index 000000000..11bd44991 --- /dev/null +++ b/sc2/src/sc2code/corecode.h @@ -0,0 +1,49 @@ +/* + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + +#ifndef CORECODE_H_ +#define CORECODE_H_ + +#include "ships/androsyn/icode.h" +#include "ships/arilou/icode.h" +#include "ships/blackurq/icode.h" +#include "ships/chenjesu/icode.h" +#include "ships/chmmr/icode.h" +#include "ships/druuge/icode.h" +#include "ships/human/icode.h" +#include "ships/ilwrath/icode.h" +#include "ships/lastbat/icode.h" +#include "ships/melnorme/icode.h" +#include "ships/mmrnmhrm/icode.h" +#include "ships/mycon/icode.h" +#include "ships/orz/icode.h" +#include "ships/pkunk/icode.h" +#include "ships/probe/icode.h" +#include "ships/shofixti/icode.h" +#include "ships/sis_ship/icode.h" +#include "ships/slylandr/icode.h" +#include "ships/spathi/icode.h" +#include "ships/supox/icode.h" +#include "ships/syreen/icode.h" +#include "ships/thradd/icode.h" +#include "ships/umgah/icode.h" +#include "ships/urquan/icode.h" +#include "ships/utwig/icode.h" +#include "ships/vux/icode.h" +#include "ships/yehat/icode.h" +#include "ships/zoqfot/icode.h" + +#endif /* CORECODE_H_ */ diff --git a/sc2/src/sc2code/encount.c b/sc2/src/sc2code/encount.c index e21a4721e..6fe63727c 100644 --- a/sc2/src/sc2code/encount.c +++ b/sc2/src/sc2code/encount.c @@ -132,7 +132,7 @@ BuildBattle (COUNT which_player) hBuiltShip = Build (&race_q[which_player], FragPtr->race_id == SAMATRA_SHIP ? - SAMATRA_RES_INDEX : FragPtr->RaceResIndex); + SA_MATRA_ID : FragPtr->SpeciesID); if (hBuiltShip) { BuiltShipPtr = LockStarShip (&race_q[which_player], hBuiltShip); @@ -156,7 +156,7 @@ BuildBattle (COUNT which_player) } if (which_player == 0 - && (hBuiltShip = Build (&race_q[0], SIS_RES_INDEX))) + && (hBuiltShip = Build (&race_q[0], SIS_SHIP_ID))) { BuiltShipPtr = LockStarShip (&race_q[0], hBuiltShip); BuiltShipPtr->captains_name_index = 0; diff --git a/sc2/src/sc2code/globdata.c b/sc2/src/sc2code/globdata.c index f5c422fd5..44b11a97c 100644 --- a/sc2/src/sc2code/globdata.c +++ b/sc2/src/sc2code/globdata.c @@ -194,36 +194,30 @@ InitSIS (void) { COUNT num_ships; - RES_TYPE rt; - RES_INSTANCE ri; - RES_PACKAGE rp; + SPECIES_ID s_id = ARILOU_ID; - rt = GET_TYPE (ARILOU_SHIP_INDEX); - ri = GET_INSTANCE (ARILOU_SHIP_INDEX); - rp = GET_PACKAGE (ARILOU_SHIP_INDEX); - - num_ships = (GET_PACKAGE (BLACKURQ_SHIP_INDEX) - rp + 1) + num_ships = KOHR_AH_ID - s_id + 1 + 2; /* Yehat Rebels and Ur-Quan probe */ InitQueue (&GLOBAL (avail_race_q), num_ships, sizeof (FLEET_INFO)); for (i = 0; i < num_ships; ++i) { - DWORD ship_ref; + SPECIES_ID ship_ref; HFLEETINFO hFleet; FLEET_INFO *FleetPtr; if (i < num_ships - 2) - ship_ref = MAKE_RESOURCE (rp++, rt, ri++); + ship_ref = s_id++; else if (i == num_ships - 2) - ship_ref = YEHAT_SHIP_INDEX; + ship_ref = YEHAT_ID; else /* (i == num_ships - 1) */ - ship_ref = PROBE_RES_INDEX; + ship_ref = UR_QUAN_PROBE_ID; hFleet = AllocLink (&GLOBAL (avail_race_q)); if (!hFleet) continue; FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hFleet); - FleetPtr->RaceResIndex = ship_ref; + FleetPtr->SpeciesID = ship_ref; if (i < num_ships - 1) { @@ -240,7 +234,7 @@ InitSIS (void) else { // Ur-Quan probe. - RACE_DESC *RDPtr = load_ship (FleetPtr->RaceResIndex, + RACE_DESC *RDPtr = load_ship (FleetPtr->SpeciesID, FALSE); if (RDPtr) { // Grab a copy of loaded icons and strings diff --git a/sc2/src/sc2code/init.c b/sc2/src/sc2code/init.c index 3eb3f70d9..a00a3a21f 100644 --- a/sc2/src/sc2code/init.c +++ b/sc2/src/sc2code/init.c @@ -156,7 +156,7 @@ BuildSIS (void) HSTARSHIP hStarShip; STARSHIP *StarShipPtr; - hStarShip = Build (&race_q[0], SIS_RES_INDEX); + hStarShip = Build (&race_q[0], SIS_SHIP_ID); if (!hStarShip) return 0; StarShipPtr = LockStarShip (&race_q[0], hStarShip); diff --git a/sc2/src/sc2code/ires_ind.h b/sc2/src/sc2code/ires_ind.h deleted file mode 100644 index 418b7a5c3..000000000 --- a/sc2/src/sc2code/ires_ind.h +++ /dev/null @@ -1,32 +0,0 @@ -/* This file was auto-generated by the gen_resfiles utility and - should not be edited directly. Modify the master resource list - instead and regenerate. */ - -#define ARILOU_SHIP_INDEX 0x00600007L -#define CHMMR_SHIP_INDEX 0x00800107L -#define EARTHLING_SHIP_INDEX 0x00a00207L -#define ORZ_SHIP_INDEX 0x00c00307L -#define PKUNK_SHIP_INDEX 0x00e00407L -#define SHOFIXTI_SHIP_INDEX 0x01000507L -#define SPATHI_SHIP_INDEX 0x01200607L -#define SUPOX_SHIP_INDEX 0x01400707L -#define THRADD_SHIP_INDEX 0x01600807L -#define UTWIG_SHIP_INDEX 0x01800907L -#define VUX_SHIP_INDEX 0x01a00a07L -#define YEHAT_SHIP_INDEX 0x01c00b07L -#define MELNORME_SHIP_INDEX 0x01e00c07L -#define DRUUGE_SHIP_INDEX 0x02000d07L -#define ILWRATH_SHIP_INDEX 0x02200e07L -#define MYCON_SHIP_INDEX 0x02400f07L -#define SLYLANDRO_SHIP_INDEX 0x02601007L -#define UMGAH_SHIP_INDEX 0x02801107L -#define URQUAN_SHIP_INDEX 0x02a01207L -#define ZOQFOTPIK_SHIP_INDEX 0x02c01307L -#define SYREEN_SHIP_INDEX 0x02e01407L -#define BLACKURQ_SHIP_INDEX 0x03001507L -#define ANDROSYN_SHIP_INDEX 0x03201607L -#define CHENJESU_SHIP_INDEX 0x03401707L -#define MMRNMHRM_SHIP_INDEX 0x03601807L -#define SIS_RES_INDEX 0x17c03107L -#define SAMATRA_RES_INDEX 0x17e03207L -#define PROBE_RES_INDEX 0x18003307L diff --git a/sc2/src/sc2code/loadship.c b/sc2/src/sc2code/loadship.c index 63ca3406d..0b23a5626 100644 --- a/sc2/src/sc2code/loadship.c +++ b/sc2/src/sc2code/loadship.c @@ -18,30 +18,54 @@ #include "build.h" #include "coderes.h" +#include "corecode.h" #include "globdata.h" #include "nameref.h" #include "races.h" +static RESOURCE code_resources[] = { + NULL_RESOURCE, + ARILOU_CODE, + CHMMR_CODE, + HUMAN_CODE, + ORZ_CODE, + PKUNK_CODE, + SHOFIXTI_CODE, + SPATHI_CODE, + SUPOX_CODE, + THRADDASH_CODE, + UTWIG_CODE, + VUX_CODE, + YEHAT_CODE, + MELNORME_CODE, + DRUUGE_CODE, + ILWRATH_CODE, + MYCON_CODE, + SLYLANDRO_CODE, + UMGAH_CODE, + URQUAN_CODE, + ZOQFOTPIK_CODE, + SYREEN_CODE, + KOHR_AH_CODE, + ANDROSYNTH_CODE, + CHENJESU_CODE, + MMRNMHRM_CODE, + SIS_CODE, + SAMATRA_CODE, + PROBE_CODE }; RACE_DESC * -load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData) +load_ship (SPECIES_ID SpeciesID, BOOLEAN LoadBattleData) { - RESOURCE_INDEX h, hOldIndex; RACE_DESC *RDPtr = 0; -#define INITIAL_CODE_RES MAKE_RESOURCE (1, CODE, 0) void *CodeRef; - - h = OpenResourceIndexInstance (RaceResIndex); - if (!h) - return 0; - - hOldIndex = SetResourceIndex (h); - - CodeRef = CaptureCodeRes (LoadCodeRes (INITIAL_CODE_RES), - &GlobData, &RDPtr); - - SetResourceIndex (hOldIndex); + if (SpeciesID >= NUM_SPECIES_ID) + return NULL; + + CodeRef = CaptureCodeRes (LoadCodeRes (code_resources[SpeciesID]), + &GlobData, (void **)(&RDPtr)); + if (!CodeRef) goto BadLoad; RDPtr->CodeRef = CodeRef; @@ -120,8 +144,6 @@ load_ship (DWORD RaceResIndex, BOOLEAN LoadBattleData) } ExitFunc: - CloseResourceIndex (h); - return RDPtr; // TODO: We should really free the resources that did load here diff --git a/sc2/src/sc2code/master.c b/sc2/src/sc2code/master.c index b374d2f8c..84e5e2473 100644 --- a/sc2/src/sc2code/master.c +++ b/sc2/src/sc2code/master.c @@ -30,14 +30,8 @@ void LoadMasterShipList (void (* YieldProcessing)(void)) { COUNT num_entries; - RES_TYPE rt; - RES_INSTANCE ri; - RES_PACKAGE rp; - - rt = GET_TYPE (ARILOU_SHIP_INDEX); - ri = GET_INSTANCE (ARILOU_SHIP_INDEX); - rp = GET_PACKAGE (ARILOU_SHIP_INDEX); - num_entries = NUM_MELEE_SHIPS; + SPECIES_ID s_id = ARILOU_ID; + num_entries = LAST_MELEE_ID - ARILOU_ID + 1; InitQueue (&master_q, num_entries, sizeof (MASTER_SHIP_INFO)); while (num_entries--) { @@ -57,8 +51,8 @@ LoadMasterShipList (void (* YieldProcessing)(void)) YieldProcessing (); BuiltPtr = LockMasterShip (&master_q, hBuiltShip); - BuiltPtr->RaceResIndex = MAKE_RESOURCE (rp++, rt, ri++); - RDPtr = load_ship (BuiltPtr->RaceResIndex, FALSE); + BuiltPtr->SpeciesID = s_id++; + RDPtr = load_ship (BuiltPtr->SpeciesID, FALSE); if (!RDPtr) { UnlockMasterShip (&master_q, hBuiltShip); @@ -123,7 +117,7 @@ FreeMasterShipList (void) } HMASTERSHIP -FindMasterShip (DWORD ship_ref) +FindMasterShip (SPECIES_ID ship_ref) { HMASTERSHIP hStarShip, hNextShip; @@ -134,7 +128,7 @@ FindMasterShip (DWORD ship_ref) MasterPtr = LockMasterShip (&master_q, hStarShip); hNextShip = _GetSuccLink (MasterPtr); - ref = MasterPtr->RaceResIndex; + ref = MasterPtr->SpeciesID; UnlockMasterShip (&master_q, hStarShip); if (ref == ship_ref) @@ -145,7 +139,7 @@ FindMasterShip (DWORD ship_ref) } int -FindMasterShipIndex (DWORD ship_ref) +FindMasterShipIndex (SPECIES_ID ship_ref) { HMASTERSHIP hStarShip, hNextShip; int index; @@ -158,7 +152,7 @@ FindMasterShipIndex (DWORD ship_ref) MasterPtr = LockMasterShip (&master_q, hStarShip); hNextShip = _GetSuccLink (MasterPtr); - ref = MasterPtr->RaceResIndex; + ref = MasterPtr->SpeciesID; UnlockMasterShip (&master_q, hStarShip); if (ref == ship_ref) diff --git a/sc2/src/sc2code/master.h b/sc2/src/sc2code/master.h index 91d5bccc6..50160c0f1 100644 --- a/sc2/src/sc2code/master.h +++ b/sc2/src/sc2code/master.h @@ -28,7 +28,7 @@ typedef struct HMASTERSHIP pred; HMASTERSHIP succ; - DWORD RaceResIndex; + SPECIES_ID SpeciesID; SHIP_INFO ShipInfo; FLEET_STUFF Fleet; @@ -52,8 +52,8 @@ LockMasterShip (const QUEUE *pq, HMASTERSHIP h) extern void LoadMasterShipList (void (* YieldProcessing)(void)); extern void FreeMasterShipList (void); -extern HMASTERSHIP FindMasterShip (DWORD ship_ref); -extern int FindMasterShipIndex (DWORD ship_ref); +extern HMASTERSHIP FindMasterShip (SPECIES_ID ship_ref); +extern int FindMasterShipIndex (SPECIES_ID ship_ref); COUNT GetShipCostFromIndex (unsigned Index); FRAME GetShipIconsFromIndex (unsigned Index); FRAME GetShipMeleeIconsFromIndex (unsigned Index); diff --git a/sc2/src/sc2code/melee.c b/sc2/src/sc2code/melee.c index 8729ad9ab..da23b849d 100644 --- a/sc2/src/sc2code/melee.c +++ b/sc2/src/sc2code/melee.c @@ -1648,8 +1648,8 @@ BuildAndDrawShipList (MELEE_STATE *pMS) MasterPtr = LockMasterShip (&master_q, hMasterShip); captains_name_index = NameCaptain (&race_q[side], - MasterPtr->RaceResIndex); - hBuiltShip = Build (&race_q[side], MasterPtr->RaceResIndex); + MasterPtr->SpeciesID); + hBuiltShip = Build (&race_q[side], MasterPtr->SpeciesID); // Draw the icon. row = GetShipRow (index); diff --git a/sc2/src/sc2code/pickmele.c b/sc2/src/sc2code/pickmele.c index f26cbecf2..e3d6ba083 100644 --- a/sc2/src/sc2code/pickmele.c +++ b/sc2/src/sc2code/pickmele.c @@ -60,7 +60,7 @@ MeleeShipByQueueIndex (const QUEUE *queue, COUNT index) if (StarShipPtr->index == index) { hNextShip = hShip; - if (StarShipPtr->RaceResIndex == 0) + if (StarShipPtr->SpeciesID == NO_ID) hShip = 0; UnlockStarShip (queue, hNextShip); break; @@ -82,7 +82,7 @@ MeleeShipByUsedIndex (const QUEUE *queue, COUNT index) for (hShip = GetHeadLink (queue); hShip != 0; hShip = hNextShip) { STARSHIP *StarShipPtr = LockStarShip (queue, hShip); - if (StarShipPtr->RaceResIndex && index-- == 0) + if ((StarShipPtr->SpeciesID != NO_ID) && index-- == 0) { UnlockStarShip (queue, hShip); break; @@ -369,7 +369,7 @@ GetRaceQueueValue (const QUEUE *queue) { STARSHIP *StarShipPtr = LockStarShip (queue, hBattleShip); hNextShip = _GetSuccLink (StarShipPtr); - if (StarShipPtr->RaceResIndex == 0) + if (StarShipPtr->SpeciesID == NO_ID) continue; // Not active any more. result += StarShipPtr->ship_cost; @@ -506,7 +506,7 @@ MeleeShipDeath (STARSHIP *ship, COUNT which_player) { FRAME frame; // Deactivate fleet position. - ship->RaceResIndex = 0; + ship->SpeciesID = NO_ID; frame = SetAbsFrameIndex (PickMeleeFrame, which_player); CrossOutShip (frame, ship->index); diff --git a/sc2/src/sc2code/pickship.c b/sc2/src/sc2code/pickship.c index 0ab67bdcc..ca2a5357e 100644 --- a/sc2/src/sc2code/pickship.c +++ b/sc2/src/sc2code/pickship.c @@ -147,7 +147,7 @@ ChangeSelection: { StarShipPtr = LockStarShip (&race_q[0], hBattleShip); if (StarShipPtr->index == ship_index - && StarShipPtr->RaceResIndex) + && (StarShipPtr->SpeciesID != NO_ID)) { UnlockStarShip (&race_q[0], hBattleShip); break; @@ -388,7 +388,7 @@ GetEncounterStarShip (STARSHIP *LastStarShipPtr, COUNT which_player) /* Record crew left after the battle */ FragPtr->crew_level = SPtr->crew_level; if (GLOBAL (CurrentActivity) & IN_BATTLE) - SPtr->RaceResIndex = 0; + SPtr->SpeciesID = NO_ID; // deactivates the ship } else /* if infinite ships */ @@ -523,10 +523,10 @@ DrawArmadaPickShip (BOOLEAN draw_salvage_frame, RECT *pPickRect) r.corner = s.origin; SetContextForeGroundColor (BLACK_COLOR); DrawFilledRectangle (&r); - if (StarShipPtr->RaceResIndex || StarShipPtr->crew_level == 0) + if ((StarShipPtr->SpeciesID != NO_ID) || (StarShipPtr->crew_level == 0)) { DrawStamp (&s); - if (StarShipPtr->RaceResIndex == 0) + if (StarShipPtr->SpeciesID == NO_ID) { /* Dead ship - mark with an X. */ s.origin.x -= 1; diff --git a/sc2/src/sc2code/races.h b/sc2/src/sc2code/races.h index a0337b6e5..fc2b63a78 100644 --- a/sc2/src/sc2code/races.h +++ b/sc2/src/sc2code/races.h @@ -55,6 +55,41 @@ typedef HLINK HSTARSHIP; #define PLAYER_CAPTAIN (1 << 13) /* The protagonist himself is on board. He gets a different color. */ +/* These track the old resource package orderings for the ship resource indices */ +typedef enum +{ + NO_ID, + ARILOU_ID, + CHMMR_ID, + EARTHLING_ID, + ORZ_ID, + PKUNK_ID, + SHOFIXTI_ID, + SPATHI_ID, + SUPOX_ID, + THRADDASH_ID, + UTWIG_ID, + VUX_ID, + YEHAT_ID, + MELNORME_ID, + DRUUGE_ID, + ILWRATH_ID, + MYCON_ID, + SLYLANDRO_ID, + UMGAH_ID, + UR_QUAN_ID, + ZOQFOTPIK_ID, + SYREEN_ID, + KOHR_AH_ID, + ANDROSYNTH_ID, + CHENJESU_ID, + MMRNMHRM_ID, + LAST_MELEE_ID = MMRNMHRM_ID, + SIS_SHIP_ID, + SA_MATRA_ID, + UR_QUAN_PROBE_ID, + NUM_SPECIES_ID +} SPECIES_ID; typedef struct captain_stuff { @@ -178,7 +213,7 @@ struct race_desc HLINK pred; \ HLINK succ; \ \ - DWORD RaceResIndex; \ + SPECIES_ID SpeciesID; \ BYTE captains_name_index \ /* Also used in full-game to detect if a STARSHIP is an escort * or the flagship (captains_name_index == 0) */ @@ -283,7 +318,7 @@ typedef struct HFLEETINFO pred; HFLEETINFO succ; - DWORD RaceResIndex; + SPECIES_ID SpeciesID; UWORD ship_flags; /* 0, GOOD_GUY, or BAD_GUY */ BYTE days_left; /* Days left before the fleet reachers 'dest_loc'. */ diff --git a/sc2/src/sc2code/resinst.h b/sc2/src/sc2code/resinst.h index b37fc95b6..c876abc28 100644 --- a/sc2/src/sc2code/resinst.h +++ b/sc2/src/sc2code/resinst.h @@ -22,4 +22,3 @@ #include "istrtab.h" #include "isndres.h" #include "imusicre.h" -#include "ires_ind.h" diff --git a/sc2/src/sc2code/ship.c b/sc2/src/sc2code/ship.c index d8c2103c6..060b5e225 100644 --- a/sc2/src/sc2code/ship.c +++ b/sc2/src/sc2code/ship.c @@ -381,7 +381,7 @@ spawn_ship (STARSHIP *StarShipPtr) HELEMENT hShip; RACE_DESC *RDPtr; - RDPtr = load_ship (StarShipPtr->RaceResIndex, TRUE); + RDPtr = load_ship (StarShipPtr->SpeciesID, TRUE); if (!RDPtr) return FALSE; diff --git a/sc2/src/sc2code/ships/androsyn/icode.h b/sc2/src/sc2code/ships/androsyn/icode.h index 7aeb332b4..701ff1a46 100644 --- a/sc2/src/sc2code/ships/androsyn/icode.h +++ b/sc2/src/sc2code/ships/androsyn/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ANDROSYNTH_CODE 0x00200008L +#define ANDROSYNTH_CODE 0x57800008L diff --git a/sc2/src/sc2code/ships/arilou/icode.h b/sc2/src/sc2code/ships/arilou/icode.h index ca2079e6f..cce90a69f 100644 --- a/sc2/src/sc2code/ships/arilou/icode.h +++ b/sc2/src/sc2code/ships/arilou/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_CODE 0x00200008L +#define ARILOU_CODE 0x57a00008L diff --git a/sc2/src/sc2code/ships/blackurq/icode.h b/sc2/src/sc2code/ships/blackurq/icode.h index f27d14b64..3aebae594 100644 --- a/sc2/src/sc2code/ships/blackurq/icode.h +++ b/sc2/src/sc2code/ships/blackurq/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define KOHR_AH_CODE 0x00200008L +#define KOHR_AH_CODE 0x57c00008L diff --git a/sc2/src/sc2code/ships/chenjesu/icode.h b/sc2/src/sc2code/ships/chenjesu/icode.h index c84e9a3e4..0e947c4f8 100644 --- a/sc2/src/sc2code/ships/chenjesu/icode.h +++ b/sc2/src/sc2code/ships/chenjesu/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHENJESU_CODE 0x00200008L +#define CHENJESU_CODE 0x57e00008L diff --git a/sc2/src/sc2code/ships/chmmr/icode.h b/sc2/src/sc2code/ships/chmmr/icode.h index 4ee34babc..fe710baf6 100644 --- a/sc2/src/sc2code/ships/chmmr/icode.h +++ b/sc2/src/sc2code/ships/chmmr/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_CODE 0x00200008L +#define CHMMR_CODE 0x58000008L diff --git a/sc2/src/sc2code/ships/druuge/icode.h b/sc2/src/sc2code/ships/druuge/icode.h index e127e39eb..029ba652c 100644 --- a/sc2/src/sc2code/ships/druuge/icode.h +++ b/sc2/src/sc2code/ships/druuge/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_CODE 0x00200008L +#define DRUUGE_CODE 0x58200008L diff --git a/sc2/src/sc2code/ships/human/icode.h b/sc2/src/sc2code/ships/human/icode.h index 4dea81b2b..2366d09a2 100644 --- a/sc2/src/sc2code/ships/human/icode.h +++ b/sc2/src/sc2code/ships/human/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define HUMAN_CODE 0x00200008L +#define HUMAN_CODE 0x58400008L diff --git a/sc2/src/sc2code/ships/ilwrath/icode.h b/sc2/src/sc2code/ships/ilwrath/icode.h index 5ff9530cb..43afcdc79 100644 --- a/sc2/src/sc2code/ships/ilwrath/icode.h +++ b/sc2/src/sc2code/ships/ilwrath/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_CODE 0x00200008L +#define ILWRATH_CODE 0x58600008L diff --git a/sc2/src/sc2code/ships/lastbat/icode.h b/sc2/src/sc2code/ships/lastbat/icode.h index f88501f80..3185d244e 100644 --- a/sc2/src/sc2code/ships/lastbat/icode.h +++ b/sc2/src/sc2code/ships/lastbat/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SAMATRA_CODE 0x00200008L +#define SAMATRA_CODE 0x58800008L diff --git a/sc2/src/sc2code/ships/melnorme/icode.h b/sc2/src/sc2code/ships/melnorme/icode.h index d020f497b..38ea87098 100644 --- a/sc2/src/sc2code/ships/melnorme/icode.h +++ b/sc2/src/sc2code/ships/melnorme/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_CODE 0x00200008L +#define MELNORME_CODE 0x58a00008L diff --git a/sc2/src/sc2code/ships/mmrnmhrm/icode.h b/sc2/src/sc2code/ships/mmrnmhrm/icode.h index 895519eea..e9dce4353 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/icode.h +++ b/sc2/src/sc2code/ships/mmrnmhrm/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MMRNMHRM_CODE 0x00200008L +#define MMRNMHRM_CODE 0x58c00008L diff --git a/sc2/src/sc2code/ships/mycon/icode.h b/sc2/src/sc2code/ships/mycon/icode.h index 231798131..b36a69b8b 100644 --- a/sc2/src/sc2code/ships/mycon/icode.h +++ b/sc2/src/sc2code/ships/mycon/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_CODE 0x00200008L +#define MYCON_CODE 0x58e00008L diff --git a/sc2/src/sc2code/ships/orz/icode.h b/sc2/src/sc2code/ships/orz/icode.h index e804c2202..9b1553c7a 100644 --- a/sc2/src/sc2code/ships/orz/icode.h +++ b/sc2/src/sc2code/ships/orz/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_CODE 0x00200008L +#define ORZ_CODE 0x59000008L diff --git a/sc2/src/sc2code/ships/pkunk/icode.h b/sc2/src/sc2code/ships/pkunk/icode.h index 72504d6fe..fa91d1d3d 100644 --- a/sc2/src/sc2code/ships/pkunk/icode.h +++ b/sc2/src/sc2code/ships/pkunk/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_CODE 0x00200008L +#define PKUNK_CODE 0x59200008L diff --git a/sc2/src/sc2code/ships/probe/icode.h b/sc2/src/sc2code/ships/probe/icode.h index 171152ce0..9690b144a 100644 --- a/sc2/src/sc2code/ships/probe/icode.h +++ b/sc2/src/sc2code/ships/probe/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PROBE_CODE 0x00200008L +#define PROBE_CODE 0x59400008L diff --git a/sc2/src/sc2code/ships/shofixti/icode.h b/sc2/src/sc2code/ships/shofixti/icode.h index e100bb2e7..f296a3e1a 100644 --- a/sc2/src/sc2code/ships/shofixti/icode.h +++ b/sc2/src/sc2code/ships/shofixti/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_CODE 0x00200008L +#define SHOFIXTI_CODE 0x59600008L diff --git a/sc2/src/sc2code/ships/sis_ship/icode.h b/sc2/src/sc2code/ships/sis_ship/icode.h index 0e47e2fd7..e78268b74 100644 --- a/sc2/src/sc2code/ships/sis_ship/icode.h +++ b/sc2/src/sc2code/ships/sis_ship/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SIS_CODE 0x00200008L +#define SIS_CODE 0x59800008L diff --git a/sc2/src/sc2code/ships/slylandr/icode.h b/sc2/src/sc2code/ships/slylandr/icode.h index a6d893ee7..a6ae4afe0 100644 --- a/sc2/src/sc2code/ships/slylandr/icode.h +++ b/sc2/src/sc2code/ships/slylandr/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_CODE 0x00200008L +#define SLYLANDRO_CODE 0x59a00008L diff --git a/sc2/src/sc2code/ships/spathi/icode.h b/sc2/src/sc2code/ships/spathi/icode.h index d969c0b66..8e3049b82 100644 --- a/sc2/src/sc2code/ships/spathi/icode.h +++ b/sc2/src/sc2code/ships/spathi/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_CODE 0x00200008L +#define SPATHI_CODE 0x59c00008L diff --git a/sc2/src/sc2code/ships/supox/icode.h b/sc2/src/sc2code/ships/supox/icode.h index 7f6fbdca0..ed3bf187c 100644 --- a/sc2/src/sc2code/ships/supox/icode.h +++ b/sc2/src/sc2code/ships/supox/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_CODE 0x00200008L +#define SUPOX_CODE 0x59e00008L diff --git a/sc2/src/sc2code/ships/syreen/icode.h b/sc2/src/sc2code/ships/syreen/icode.h index ff7d76d64..62e06d10d 100644 --- a/sc2/src/sc2code/ships/syreen/icode.h +++ b/sc2/src/sc2code/ships/syreen/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_CODE 0x00200008L +#define SYREEN_CODE 0x5a000008L diff --git a/sc2/src/sc2code/ships/thradd/icode.h b/sc2/src/sc2code/ships/thradd/icode.h index cedeb86b4..e9f2c52ea 100644 --- a/sc2/src/sc2code/ships/thradd/icode.h +++ b/sc2/src/sc2code/ships/thradd/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADDASH_CODE 0x00200008L +#define THRADDASH_CODE 0x5a200008L diff --git a/sc2/src/sc2code/ships/umgah/icode.h b/sc2/src/sc2code/ships/umgah/icode.h index fe2230a6b..4893f32ea 100644 --- a/sc2/src/sc2code/ships/umgah/icode.h +++ b/sc2/src/sc2code/ships/umgah/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_CODE 0x00200008L +#define UMGAH_CODE 0x5a400008L diff --git a/sc2/src/sc2code/ships/urquan/icode.h b/sc2/src/sc2code/ships/urquan/icode.h index 7fd967c34..7cc38ffdc 100644 --- a/sc2/src/sc2code/ships/urquan/icode.h +++ b/sc2/src/sc2code/ships/urquan/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_CODE 0x00200008L +#define URQUAN_CODE 0x5a600008L diff --git a/sc2/src/sc2code/ships/utwig/icode.h b/sc2/src/sc2code/ships/utwig/icode.h index aa3e90759..2b9df65f7 100644 --- a/sc2/src/sc2code/ships/utwig/icode.h +++ b/sc2/src/sc2code/ships/utwig/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_CODE 0x00200008L +#define UTWIG_CODE 0x5a800008L diff --git a/sc2/src/sc2code/ships/vux/icode.h b/sc2/src/sc2code/ships/vux/icode.h index 5141598a5..7dc158bd9 100644 --- a/sc2/src/sc2code/ships/vux/icode.h +++ b/sc2/src/sc2code/ships/vux/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_CODE 0x00200008L +#define VUX_CODE 0x5aa00008L diff --git a/sc2/src/sc2code/ships/yehat/icode.h b/sc2/src/sc2code/ships/yehat/icode.h index 69f85d94b..033c2e827 100644 --- a/sc2/src/sc2code/ships/yehat/icode.h +++ b/sc2/src/sc2code/ships/yehat/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_CODE 0x00200008L +#define YEHAT_CODE 0x5ac00008L diff --git a/sc2/src/sc2code/ships/zoqfot/icode.h b/sc2/src/sc2code/ships/zoqfot/icode.h index 9f51e35c1..60128df65 100644 --- a/sc2/src/sc2code/ships/zoqfot/icode.h +++ b/sc2/src/sc2code/ships/zoqfot/icode.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_CODE 0x00200008L +#define ZOQFOTPIK_CODE 0x5ae00008L diff --git a/sc2/src/sc2code/shipyard.c b/sc2/src/sc2code/shipyard.c index f7bc2edcf..b6f9d5a16 100644 --- a/sc2/src/sc2code/shipyard.c +++ b/sc2/src/sc2code/shipyard.c @@ -130,7 +130,7 @@ SpinStarShip (HFLEETINFO hStarShip) FLEET_INFO *FleetPtr; FleetPtr = LockFleetInfo (&GLOBAL (avail_race_q), hStarShip); - Index = FindMasterShipIndex (FleetPtr->RaceResIndex); + Index = FindMasterShipIndex (FleetPtr->SpeciesID); UnlockFleetInfo (&GLOBAL (avail_race_q), hStarShip); if (Index >= 0 && Index < NUM_MELEE_SHIPS) diff --git a/tools/resmap/resources.csv b/tools/resmap/resources.csv index be5960cee..3ff705617 100644 --- a/tools/resmap/resources.csv +++ b/tools/resmap/resources.csv @@ -14,34 +14,6 @@ sc2code/imusicre.h,starcon.ls2,BATTLE_MUSIC,261,12,6,music.battle,MUSICRES,lbm/b sc2code/imusicre.h,starcon.ls2,CREDITS_MUSIC,282,13,6,music.credits,--,-- sc2code/imusicre.h,starcon.ls2,MELEE_MUSIC,161,14,6,music.meleemenu,--,-- sc2code/imusicre.h,starcon.ls2,MAINMENU_MUSIC,193,15,6,music.mainmenu,--,-- -sc2code/ires_ind.h,starcon.ls2,ARILOU_SHIP_INDEX,3,0,7,ship.arilou.resources,RES_INDEX,arilou.ls2 -sc2code/ires_ind.h,starcon.ls2,CHMMR_SHIP_INDEX,4,1,7,ship.chmmr.resources,RES_INDEX,chmmr.ls2 -sc2code/ires_ind.h,starcon.ls2,EARTHLING_SHIP_INDEX,5,2,7,ship.earthling.resources,RES_INDEX,human.ls2 -sc2code/ires_ind.h,starcon.ls2,ORZ_SHIP_INDEX,6,3,7,ship.orz.resources,RES_INDEX,orz.ls2 -sc2code/ires_ind.h,starcon.ls2,PKUNK_SHIP_INDEX,7,4,7,ship.pkunk.resources,RES_INDEX,pkunk.ls2 -sc2code/ires_ind.h,starcon.ls2,SHOFIXTI_SHIP_INDEX,8,5,7,ship.shofixti.resources,RES_INDEX,shofixti.ls2 -sc2code/ires_ind.h,starcon.ls2,SPATHI_SHIP_INDEX,9,6,7,ship.spathi.resources,RES_INDEX,spathi.ls2 -sc2code/ires_ind.h,starcon.ls2,SUPOX_SHIP_INDEX,10,7,7,ship.supox.resources,RES_INDEX,supox.ls2 -sc2code/ires_ind.h,starcon.ls2,THRADD_SHIP_INDEX,11,8,7,ship.thraddash.resources,RES_INDEX,thradd.ls2 -sc2code/ires_ind.h,starcon.ls2,UTWIG_SHIP_INDEX,12,9,7,ship.utwig.resources,RES_INDEX,utwig.ls2 -sc2code/ires_ind.h,starcon.ls2,VUX_SHIP_INDEX,13,10,7,ship.vux.resources,RES_INDEX,vux.ls2 -sc2code/ires_ind.h,starcon.ls2,YEHAT_SHIP_INDEX,14,11,7,ship.yehat.resources,RES_INDEX,yehat.ls2 -sc2code/ires_ind.h,starcon.ls2,MELNORME_SHIP_INDEX,15,12,7,ship.melnorme.resources,RES_INDEX,melnorme.ls2 -sc2code/ires_ind.h,starcon.ls2,DRUUGE_SHIP_INDEX,16,13,7,ship.druuge.resources,RES_INDEX,druuge.ls2 -sc2code/ires_ind.h,starcon.ls2,ILWRATH_SHIP_INDEX,17,14,7,ship.ilwrath.resources,RES_INDEX,ilwrath.ls2 -sc2code/ires_ind.h,starcon.ls2,MYCON_SHIP_INDEX,18,15,7,ship.mycon.resources,RES_INDEX,mycon.ls2 -sc2code/ires_ind.h,starcon.ls2,SLYLANDRO_SHIP_INDEX,19,16,7,ship.slylandro.resources,RES_INDEX,slylandr.ls2 -sc2code/ires_ind.h,starcon.ls2,UMGAH_SHIP_INDEX,20,17,7,ship.umgah.resources,RES_INDEX,umgah.ls2 -sc2code/ires_ind.h,starcon.ls2,URQUAN_SHIP_INDEX,21,18,7,ship.urquan.resources,RES_INDEX,urquan.ls2 -sc2code/ires_ind.h,starcon.ls2,ZOQFOTPIK_SHIP_INDEX,22,19,7,ship.zoqfotpik.resources,RES_INDEX,zoqfot.ls2 -sc2code/ires_ind.h,starcon.ls2,SYREEN_SHIP_INDEX,23,20,7,ship.syreen.resources,RES_INDEX,syreen.ls2 -sc2code/ires_ind.h,starcon.ls2,BLACKURQ_SHIP_INDEX,24,21,7,ship.kohrah.resources,RES_INDEX,blackurq.ls2 -sc2code/ires_ind.h,starcon.ls2,ANDROSYN_SHIP_INDEX,25,22,7,ship.androsynth.resources,RES_INDEX,androsyn.ls2 -sc2code/ires_ind.h,starcon.ls2,CHENJESU_SHIP_INDEX,26,23,7,ship.chenjesu.resources,RES_INDEX,chenjesu.ls2 -sc2code/ires_ind.h,starcon.ls2,MMRNMHRM_SHIP_INDEX,27,24,7,ship.mmrnmhrm.resources,RES_INDEX,mmrnmhrm.ls2 -sc2code/ires_ind.h,starcon.ls2,SIS_RES_INDEX,190,49,7,ship.sis_ship.resources,RES_INDEX,sis_ship.ls2 -sc2code/ires_ind.h,starcon.ls2,SAMATRA_RES_INDEX,191,50,7,ship.lastbat.resources,RES_INDEX,lastbat.ls2 -sc2code/ires_ind.h,starcon.ls2,PROBE_RES_INDEX,192,51,7,ship.probe.resources,RES_INDEX,probe.ls2 sc2code/ifontres.h,starcon.ls2,STARCON_FONT,28,0,3,font.starcon,FONTRES,lbm/starcon.fon sc2code/ifontres.h,starcon.ls2,TINY_FONT,28,1,3,font.tiny,FONTRES,lbm/tiny.fon sc2code/ifontres.h,starcon.ls2,MICRO_FONT,30,2,3,font.micro,FONTRES,lbm/micro.fon @@ -603,7 +575,7 @@ sc2code/comm/orz/ifontres.h,starcon.ls2,ORZ_FONT,508,1,3,comm.orz.font,FONTRES,c sc2code/comm/orz/istrtab.h,starcon.ls2,ORZ_CONVERSATION_PHRASES,508,2,4,comm.orz.dialogue,STRTAB,comm/orz/orz.txt sc2code/comm/orz/istrtab.h,starcon.ls2,ORZ_COLOR_MAP,508,3,4,comm.orz.colortable,STRTAB,comm/orz/orz.ct sc2code/comm/orz/igfxres.h,starcon.ls2,ORZ_PMAP_ANIM,508,4,2,comm.orz.graphics,GFXRES,comm/orz/orz.ani -sc2code/ships/druuge/icode.h,druuge.ls2,DRUUGE_CODE,1,0,8,ship.druuge.code,CODE,druuge/druuge.cod +sc2code/ships/druuge/icode.h,starcon.ls2,DRUUGE_CODE,705,0,8,ship.druuge.code,CODE,druuge/druuge.cod sc2code/ships/druuge/imusicre.h,starcon.ls2,DRUUGE_VICTORY_SONG,705,0,6,ship.druuge.ditty,MUSICRES,druuge/druditty.mod sc2code/ships/druuge/istrtab.h,starcon.ls2,DRUUGE_RACE_STRINGS,705,1,4,ship.druuge.text,STRTAB,druuge/drutext.txt sc2code/ships/druuge/isndres.h,starcon.ls2,DRUUGE_SHIP_SOUNDS,705,2,5,ship.druuge.sounds,SNDRES,druuge/drusound.snd @@ -616,7 +588,7 @@ sc2code/ships/druuge/igfxres.h,starcon.ls2,DRUUGE_CANNON_BIG_MASK_PMAP_ANIM,705, sc2code/ships/druuge/igfxres.h,starcon.ls2,DRUUGE_CANNON_MED_MASK_PMAP_ANIM,705,9,2,ship.druuge.graphics.can.medium,GFXRES,druuge/canmed.ani sc2code/ships/druuge/igfxres.h,starcon.ls2,DRUUGE_CANNON_SML_MASK_PMAP_ANIM,705,10,2,ship.druuge.graphics.can.small,GFXRES,druuge/cansml.ani sc2code/ships/druuge/igfxres.h,starcon.ls2,DRUUGE_CAPT_MASK_PMAP_ANIM,705,11,2,ship.druuge.graphics.captain,GFXRES,druuge/drucap.ani -sc2code/ships/slylandr/icode.h,slylandr.ls2,SLYLANDRO_CODE,1,0,8,ship.slylandro.code,CODE,slylandr/slylandr.cod +sc2code/ships/slylandr/icode.h,starcon.ls2,SLYLANDRO_CODE,717,0,8,ship.slylandro.code,CODE,slylandr/slylandr.cod sc2code/ships/slylandr/imusicre.h,starcon.ls2,SLYLANDRO_VICTORY_SONG,717,0,6,ship.slylandro.ditty,MUSICRES,slylandr/slyditty.mod sc2code/ships/slylandr/istrtab.h,starcon.ls2,SLYLANDRO_RACE_STRINGS,717,1,4,ship.slylandro.text,STRTAB,slylandr/slytext.txt sc2code/ships/slylandr/isndres.h,starcon.ls2,SLYLANDRO_SHIP_SOUNDS,717,2,5,ship.slylandro.sounds,SNDRES,slylandr/slysound.snd @@ -626,7 +598,7 @@ sc2code/ships/slylandr/igfxres.h,starcon.ls2,SLYLANDRO_BIG_MASK_PMAP_ANIM,717,5, sc2code/ships/slylandr/igfxres.h,starcon.ls2,SLYLANDRO_MED_MASK_PMAP_ANIM,717,6,2,ship.slylandro.graphics.slylandr.medium,GFXRES,slylandr/slylandr.med sc2code/ships/slylandr/igfxres.h,starcon.ls2,SLYLANDRO_SML_MASK_PMAP_ANIM,717,7,2,ship.slylandro.graphics.slylandr.small,GFXRES,slylandr/slylandr.sml sc2code/ships/slylandr/igfxres.h,starcon.ls2,SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM,717,8,2,ship.slylandro.graphics.captain,GFXRES,slylandr/slycap.ani -sc2code/ships/utwig/icode.h,utwig.ls2,UTWIG_CODE,1,0,8,ship.utwig.code,CODE,utwig/utwig.cod +sc2code/ships/utwig/icode.h,starcon.ls2,UTWIG_CODE,724,0,8,ship.utwig.code,CODE,utwig/utwig.cod sc2code/ships/utwig/imusicre.h,starcon.ls2,UTWIG_VICTORY_SONG,724,0,6,ship.utwig.ditty,MUSICRES,utwig/utwditty.mod sc2code/ships/utwig/istrtab.h,starcon.ls2,UTWIG_RACE_STRINGS,724,1,4,ship.utwig.text,STRTAB,utwig/utwtext.txt sc2code/ships/utwig/isndres.h,starcon.ls2,UTWIG_SHIP_SOUNDS,724,2,5,ship.utwig.sounds,SNDRES,utwig/utwsound.snd @@ -639,7 +611,7 @@ sc2code/ships/utwig/igfxres.h,starcon.ls2,LANCE_BIG_MASK_PMAP_ANIM,724,8,2,ship. sc2code/ships/utwig/igfxres.h,starcon.ls2,LANCE_MED_MASK_PMAP_ANIM,724,9,2,ship.utwig.graphics.lan.medium,GFXRES,utwig/lanmed.ani sc2code/ships/utwig/igfxres.h,starcon.ls2,LANCE_SML_MASK_PMAP_ANIM,724,10,2,ship.utwig.graphics.lan.small,GFXRES,utwig/lansml.ani sc2code/ships/utwig/igfxres.h,starcon.ls2,UTWIG_CAPTAIN_MASK_PMAP_ANIM,724,11,2,ship.utwig.graphics.captain,GFXRES,utwig/utwcap.ani -sc2code/ships/urquan/icode.h,urquan.ls2,URQUAN_CODE,1,0,8,ship.urquan.code,CODE,urquan/urquan.cod +sc2code/ships/urquan/icode.h,starcon.ls2,URQUAN_CODE,723,0,8,ship.urquan.code,CODE,urquan/urquan.cod sc2code/ships/urquan/imusicre.h,starcon.ls2,URQUAN_VICTORY_SONG,723,0,6,ship.urquan.ditty,MUSICRES,urquan/urqditty.mod sc2code/ships/urquan/istrtab.h,starcon.ls2,URQUAN_RACE_STRINGS,723,1,4,ship.urquan.text,STRTAB,urquan/urqtext.txt sc2code/ships/urquan/isndres.h,starcon.ls2,URQUAN_SHIP_SOUNDS,723,2,5,ship.urquan.sounds,SNDRES,urquan/urqsound.snd @@ -655,7 +627,7 @@ sc2code/ships/urquan/igfxres.h,starcon.ls2,FIGHTER_BIG_MASK_PMAP_ANIM,723,11,2,s sc2code/ships/urquan/igfxres.h,starcon.ls2,FIGHTER_MED_MASK_PMAP_ANIM,723,12,2,ship.urquan.graphics.fight.medium,GFXRES,urquan/fight.med sc2code/ships/urquan/igfxres.h,starcon.ls2,FIGHTER_SML_MASK_PMAP_ANIM,723,13,2,ship.urquan.graphics.fight.small,GFXRES,urquan/fight.sml sc2code/ships/urquan/igfxres.h,starcon.ls2,URQUAN_CAPTAIN_MASK_PMAP_ANIM,723,14,2,ship.urquan.graphics.captain,GFXRES,urquan/urqcap.ani -sc2code/ships/chmmr/icode.h,chmmr.ls2,CHMMR_CODE,1,0,8,ship.chmmr.code,CODE,chmmr/chmmr.cod +sc2code/ships/chmmr/icode.h,starcon.ls2,CHMMR_CODE,704,0,8,ship.chmmr.code,CODE,chmmr/chmmr.cod sc2code/ships/chmmr/imusicre.h,starcon.ls2,CHMMR_VICTORY_SONG,704,0,6,ship.chmmr.ditty,MUSICRES,chmmr/chmditty.mod sc2code/ships/chmmr/istrtab.h,starcon.ls2,CHMMR_RACE_STRINGS,704,1,4,ship.chmmr.text,STRTAB,chmmr/chmtext.txt sc2code/ships/chmmr/isndres.h,starcon.ls2,CHMMR_SHIP_SOUNDS,704,2,5,ship.chmmr.sounds,SNDRES,chmmr/chmsound.snd @@ -671,7 +643,7 @@ sc2code/ships/chmmr/igfxres.h,starcon.ls2,SATELLITE_BIG_MASK_PMAP_ANIM,704,11,2, sc2code/ships/chmmr/igfxres.h,starcon.ls2,SATELLITE_MED_MASK_PMAP_ANIM,704,12,2,ship.chmmr.graphics.sat.medium,GFXRES,chmmr/satmed.ani sc2code/ships/chmmr/igfxres.h,starcon.ls2,SATELLITE_SML_MASK_PMAP_ANIM,704,13,2,ship.chmmr.graphics.sat.small,GFXRES,chmmr/satsml.ani sc2code/ships/chmmr/igfxres.h,starcon.ls2,CHMMR_CAPTAIN_MASK_PMAP_ANIM,704,14,2,ship.chmmr.graphics.captain,GFXRES,chmmr/chmcap.ani -sc2code/ships/mycon/icode.h,mycon.ls2,MYCON_CODE,1,0,8,ship.mycon.code,CODE,mycon/mycon.cod +sc2code/ships/mycon/icode.h,starcon.ls2,MYCON_CODE,711,0,8,ship.mycon.code,CODE,mycon/mycon.cod sc2code/ships/mycon/imusicre.h,starcon.ls2,MYCON_VICTORY_SONG,711,0,6,ship.mycon.ditty,MUSICRES,mycon/mycditty.mod sc2code/ships/mycon/istrtab.h,starcon.ls2,MYCON_RACE_STRINGS,711,1,4,ship.mycon.text,STRTAB,mycon/myctext.txt sc2code/ships/mycon/isndres.h,starcon.ls2,MYCON_SHIP_SOUNDS,711,2,5,ship.mycon.sounds,SNDRES,mycon/mycsound.snd @@ -684,7 +656,7 @@ sc2code/ships/mycon/igfxres.h,starcon.ls2,PLASMA_BIG_MASK_PMAP_ANIM,711,8,2,ship sc2code/ships/mycon/igfxres.h,starcon.ls2,PLASMA_MED_MASK_PMAP_ANIM,711,9,2,ship.mycon.graphics.plasma.medium,GFXRES,mycon/plasma.med sc2code/ships/mycon/igfxres.h,starcon.ls2,PLASMA_SML_MASK_PMAP_ANIM,711,10,2,ship.mycon.graphics.plasma.small,GFXRES,mycon/plasma.sml sc2code/ships/mycon/igfxres.h,starcon.ls2,MYCON_CAPTAIN_MASK_PMAP_ANIM,711,11,2,ship.mycon.graphics.captain,GFXRES,mycon/myccap.ani -sc2code/ships/shofixti/icode.h,shofixti.ls2,SHOFIXTI_CODE,1,0,8,ship.shofixti.code,CODE,shofixti/shofixti.cod +sc2code/ships/shofixti/icode.h,starcon.ls2,SHOFIXTI_CODE,715,0,8,ship.shofixti.code,CODE,shofixti/shofixti.cod sc2code/ships/shofixti/imusicre.h,starcon.ls2,SHOFIXTI_VICTORY_SONG,715,0,6,ship.shofixti.ditty,MUSICRES,shofixti/shoditty.mod sc2code/ships/shofixti/istrtab.h,starcon.ls2,SHOFIXTI_RACE_STRINGS,715,1,4,ship.shofixti.text,STRTAB,shofixti/shotext.txt sc2code/ships/shofixti/isndres.h,starcon.ls2,SHOFIXTI_SHIP_SOUNDS,715,2,5,ship.shofixti.sounds,SNDRES,shofixti/shosound.snd @@ -704,7 +676,7 @@ sc2code/ships/shofixti/igfxres.h,starcon.ls2,OLDSHOF_CAPTAIN_MASK_PMAP_ANIM,715, sc2code/ships/shofixti/igfxres.h,starcon.ls2,DART_BIG_MASK_PMAP_ANIM,715,16,2,ship.shofixti.graphics.missile.large,GFXRES,shofixti/missile.big sc2code/ships/shofixti/igfxres.h,starcon.ls2,DART_MED_MASK_PMAP_ANIM,715,17,2,ship.shofixti.graphics.missile.medium,GFXRES,shofixti/missile.med sc2code/ships/shofixti/igfxres.h,starcon.ls2,DART_SML_MASK_PMAP_ANIM,715,18,2,ship.shofixti.graphics.missile.small,GFXRES,shofixti/missile.sml -sc2code/ships/blackurq/icode.h,blackurq.ls2,KOHR_AH_CODE,1,0,8,ship.kohrah.code,CODE,blackurq/blackurq.cod +sc2code/ships/blackurq/icode.h,starcon.ls2,KOHR_AH_CODE,702,0,8,ship.kohrah.code,CODE,blackurq/blackurq.cod sc2code/ships/blackurq/imusicre.h,starcon.ls2,KOHR_AH_VICTORY_SONG,702,0,6,ship.kohrah.ditty,MUSICRES,blackurq/bladitty.mod sc2code/ships/blackurq/istrtab.h,starcon.ls2,KOHR_AH_RACE_STRINGS,702,1,4,ship.kohrah.text,STRTAB,blackurq/blatext.txt sc2code/ships/blackurq/isndres.h,starcon.ls2,KOHR_AH_SHIP_SOUNDS,702,2,5,ship.kohrah.sounds,SNDRES,blackurq/blasound.snd @@ -720,7 +692,7 @@ sc2code/ships/blackurq/igfxres.h,starcon.ls2,GAS_BIG_MASK_PMAP_ANIM,702,11,2,shi sc2code/ships/blackurq/igfxres.h,starcon.ls2,GAS_MED_MASK_PMAP_ANIM,702,12,2,ship.kohrah.graphics.gas.medium,GFXRES,blackurq/gasmed.ani sc2code/ships/blackurq/igfxres.h,starcon.ls2,GAS_SML_MASK_PMAP_ANIM,702,13,2,ship.kohrah.graphics.gas.small,GFXRES,blackurq/gassml.ani sc2code/ships/blackurq/igfxres.h,starcon.ls2,KOHR_AH_CAPTAIN_MASK_PMAP_ANIM,702,14,2,ship.kohrah.graphics.captain,GFXRES,blackurq/blacap.ani -sc2code/ships/melnorme/icode.h,melnorme.ls2,MELNORME_CODE,1,0,8,ship.melnorme.code,CODE,melnorme/melnorme.cod +sc2code/ships/melnorme/icode.h,starcon.ls2,MELNORME_CODE,709,0,8,ship.melnorme.code,CODE,melnorme/melnorme.cod sc2code/ships/melnorme/imusicre.h,starcon.ls2,MELNORME_VICTORY_SONG,709,0,6,ship.melnorme.ditty,MUSICRES,melnorme/melditty.mod sc2code/ships/melnorme/istrtab.h,starcon.ls2,MELNORME_RACE_STRINGS,709,1,4,ship.melnorme.text,STRTAB,melnorme/meltext.txt sc2code/ships/melnorme/isndres.h,starcon.ls2,MELNORME_SHIP_SOUNDS,709,2,5,ship.melnorme.sounds,SNDRES,melnorme/melsound.snd @@ -736,7 +708,7 @@ sc2code/ships/melnorme/igfxres.h,starcon.ls2,CONFUSE_BIG_MASK_PMAP_ANIM,709,11,2 sc2code/ships/melnorme/igfxres.h,starcon.ls2,CONFUSE_MED_MASK_PMAP_ANIM,709,12,2,ship.melnorme.graphics.confu.medium,GFXRES,melnorme/confumed.ani sc2code/ships/melnorme/igfxres.h,starcon.ls2,CONFUSE_SML_MASK_PMAP_ANIM,709,13,2,ship.melnorme.graphics.confu.small,GFXRES,melnorme/confusml.ani sc2code/ships/melnorme/igfxres.h,starcon.ls2,MELNORME_CAPTAIN_MASK_PMAP_ANIM,709,14,2,ship.melnorme.graphics.captain,GFXRES,melnorme/melcap.ani -sc2code/ships/zoqfot/icode.h,zoqfot.ls2,ZOQFOTPIK_CODE,1,0,8,ship.zoqfotpik.code,CODE,zoqfot/zoqfot.cod +sc2code/ships/zoqfot/icode.h,starcon.ls2,ZOQFOTPIK_CODE,727,0,8,ship.zoqfotpik.code,CODE,zoqfot/zoqfot.cod sc2code/ships/zoqfot/imusicre.h,starcon.ls2,ZOQFOTPIK_VICTORY_SONG,727,0,6,ship.zoqfotpik.ditty,MUSICRES,zoqfot/zoqditty.mod sc2code/ships/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_RACE_STRINGS,727,1,4,ship.zoqfotpik.text,STRTAB,zoqfot/zoqtext.txt sc2code/ships/zoqfot/isndres.h,starcon.ls2,ZOQFOTPIK_SHIP_SOUNDS,727,2,5,ship.zoqfotpik.sounds,SNDRES,zoqfot/zoqsound.snd @@ -752,7 +724,7 @@ sc2code/ships/zoqfot/igfxres.h,starcon.ls2,STINGER_BIG_MASK_PMAP_ANIM,727,11,2,s sc2code/ships/zoqfot/igfxres.h,starcon.ls2,STINGER_MED_MASK_PMAP_ANIM,727,12,2,ship.zoqfotpik.graphics.sti.medium,GFXRES,zoqfot/stimed.ani sc2code/ships/zoqfot/igfxres.h,starcon.ls2,STINGER_SML_MASK_PMAP_ANIM,727,13,2,ship.zoqfotpik.graphics.sti.small,GFXRES,zoqfot/stisml.ani sc2code/ships/zoqfot/igfxres.h,starcon.ls2,ZOQFOTPIK_CAPTAIN_MASK_PMAP_ANIM,727,14,2,ship.zoqfotpik.graphics.captain,GFXRES,zoqfot/zoqcap.ani -sc2code/ships/vux/icode.h,vux.ls2,VUX_CODE,1,0,8,ship.vux.code,CODE,vux/vux.cod +sc2code/ships/vux/icode.h,starcon.ls2,VUX_CODE,725,0,8,ship.vux.code,CODE,vux/vux.cod sc2code/ships/vux/imusicre.h,starcon.ls2,VUX_VICTORY_SONG,725,0,6,ship.vux.ditty,MUSICRES,vux/vuxditty.mod sc2code/ships/vux/istrtab.h,starcon.ls2,VUX_RACE_STRINGS,725,1,4,ship.vux.text,STRTAB,vux/vuxtext.txt sc2code/ships/vux/isndres.h,starcon.ls2,VUX_SHIP_SOUNDS,725,2,5,ship.vux.sounds,SNDRES,vux/vuxsound.snd @@ -766,7 +738,7 @@ sc2code/ships/vux/igfxres.h,starcon.ls2,LIMPETS_MED_MASK_PMAP_ANIM,725,9,2,ship. sc2code/ships/vux/igfxres.h,starcon.ls2,LIMPETS_SML_MASK_PMAP_ANIM,725,10,2,ship.vux.graphics.limpets.small,GFXRES,vux/limpets.sml sc2code/ships/vux/igfxres.h,starcon.ls2,SLIME_MASK_PMAP_ANIM,725,11,2,ship.vux.graphics.slime,GFXRES,vux/slime.ani sc2code/ships/vux/igfxres.h,starcon.ls2,VUX_CAPTAIN_MASK_PMAP_ANIM,725,12,2,ship.vux.graphics.captain,GFXRES,vux/vuxcap.ani -sc2code/ships/arilou/icode.h,arilou.ls2,ARILOU_CODE,1,0,8,ship.arilou.code,CODE,arilou/arilou.cod +sc2code/ships/arilou/icode.h,starcon.ls2,ARILOU_CODE,701,0,8,ship.arilou.code,CODE,arilou/arilou.cod sc2code/ships/arilou/imusicre.h,starcon.ls2,ARILOU_VICTORY_SONG,701,0,6,ship.arilou.ditty,MUSICRES,arilou/ariditty.mod sc2code/ships/arilou/istrtab.h,starcon.ls2,ARILOU_RACE_STRINGS,701,1,4,ship.arilou.text,STRTAB,arilou/aritext.txt sc2code/ships/arilou/isndres.h,starcon.ls2,ARILOU_SHIP_SOUNDS,701,2,5,ship.arilou.sounds,SNDRES,arilou/arisound.snd @@ -779,7 +751,7 @@ sc2code/ships/arilou/igfxres.h,starcon.ls2,WARP_BIG_MASK_PMAP_ANIM,701,8,2,ship. sc2code/ships/arilou/igfxres.h,starcon.ls2,WARP_MED_MASK_PMAP_ANIM,701,9,2,ship.arilou.graphics.warp.medium,GFXRES,arilou/warp.med sc2code/ships/arilou/igfxres.h,starcon.ls2,WARP_SML_MASK_PMAP_ANIM,701,10,2,ship.arilou.graphics.warp.small,GFXRES,arilou/warp.sml sc2code/ships/arilou/igfxres.h,starcon.ls2,ARILOU_CAPTAIN_MASK_PMAP_ANIM,701,11,2,ship.arilou.graphics.captain,GFXRES,arilou/aricap.ani -sc2code/ships/spathi/icode.h,spathi.ls2,SPATHI_CODE,1,0,8,ship.spathi.code,CODE,spathi/spathi.cod +sc2code/ships/spathi/icode.h,starcon.ls2,SPATHI_CODE,718,0,8,ship.spathi.code,CODE,spathi/spathi.cod sc2code/ships/spathi/imusicre.h,starcon.ls2,SPATHI_VICTORY_SONG,718,0,6,ship.spathi.ditty,MUSICRES,spathi/spaditty.mod sc2code/ships/spathi/istrtab.h,starcon.ls2,SPATHI_RACE_STRINGS,718,1,4,ship.spathi.text,STRTAB,spathi/spatext.txt sc2code/ships/spathi/isndres.h,starcon.ls2,SPATHI_SHIP_SOUNDS,718,2,5,ship.spathi.sounds,SNDRES,spathi/spasound.snd @@ -795,7 +767,7 @@ sc2code/ships/spathi/igfxres.h,starcon.ls2,DISCRIM_BIG_MASK_PMAP_ANIM,718,11,2,s sc2code/ships/spathi/igfxres.h,starcon.ls2,DISCRIM_MED_MASK_PMAP_ANIM,718,12,2,ship.spathi.graphics.discrim.medium,GFXRES,spathi/discrim.med sc2code/ships/spathi/igfxres.h,starcon.ls2,DISCRIM_SML_MASK_PMAP_ANIM,718,13,2,ship.spathi.graphics.discrim.small,GFXRES,spathi/discrim.sml sc2code/ships/spathi/igfxres.h,starcon.ls2,SPATHI_CAPTAIN_MASK_PMAP_ANIM,718,14,2,ship.spathi.graphics.captain,GFXRES,spathi/spacap.ani -sc2code/ships/pkunk/icode.h,pkunk.ls2,PKUNK_CODE,1,0,8,ship.pkunk.code,CODE,pkunk/pkunk.cod +sc2code/ships/pkunk/icode.h,starcon.ls2,PKUNK_CODE,713,0,8,ship.pkunk.code,CODE,pkunk/pkunk.cod sc2code/ships/pkunk/imusicre.h,starcon.ls2,PKUNK_VICTORY_SONG,713,0,6,ship.pkunk.ditty,MUSICRES,pkunk/pkuditty.mod sc2code/ships/pkunk/istrtab.h,starcon.ls2,PKUNK_RACE_STRINGS,713,1,4,ship.pkunk.text,STRTAB,pkunk/pkutext.txt sc2code/ships/pkunk/isndres.h,starcon.ls2,PKUNK_SHIP_SOUNDS,713,2,5,ship.pkunk.sounds,SNDRES,pkunk/pkusound.snd @@ -808,7 +780,7 @@ sc2code/ships/pkunk/igfxres.h,starcon.ls2,BUG_BIG_MASK_PMAP_ANIM,713,8,2,ship.pk sc2code/ships/pkunk/igfxres.h,starcon.ls2,BUG_MED_MASK_PMAP_ANIM,713,9,2,ship.pkunk.graphics.bug.medium,GFXRES,pkunk/bugmed.ani sc2code/ships/pkunk/igfxres.h,starcon.ls2,BUG_SML_MASK_PMAP_ANIM,713,10,2,ship.pkunk.graphics.bug.small,GFXRES,pkunk/bugsml.ani sc2code/ships/pkunk/igfxres.h,starcon.ls2,PKUNK_CAPTAIN_MASK_PMAP_ANIM,713,11,2,ship.pkunk.graphics.captain,GFXRES,pkunk/pkucap.ani -sc2code/ships/human/icode.h,human.ls2,HUMAN_CODE,1,0,8,ship.earthling.code,CODE,human/human.cod +sc2code/ships/human/icode.h,starcon.ls2,HUMAN_CODE,706,0,8,ship.earthling.code,CODE,human/human.cod sc2code/ships/human/imusicre.h,starcon.ls2,HUMAN_VICTORY_SONG,706,0,6,ship.earthling.ditty,MUSICRES,human/humditty.mod sc2code/ships/human/istrtab.h,starcon.ls2,HUMAN_RACE_STRINGS,706,1,4,ship.earthling.text,STRTAB,human/humtext.txt sc2code/ships/human/isndres.h,starcon.ls2,HUMAN_SHIP_SOUNDS,706,2,5,ship.earthling.sounds,SNDRES,human/humsound.snd @@ -821,7 +793,7 @@ sc2code/ships/human/igfxres.h,starcon.ls2,SATURN_BIG_MASK_PMAP_ANIM,706,8,2,ship sc2code/ships/human/igfxres.h,starcon.ls2,SATURN_MED_MASK_PMAP_ANIM,706,9,2,ship.earthling.graphics.saturn.medium,GFXRES,human/saturn.med sc2code/ships/human/igfxres.h,starcon.ls2,SATURN_SML_MASK_PMAP_ANIM,706,10,2,ship.earthling.graphics.saturn.small,GFXRES,human/saturn.sml sc2code/ships/human/igfxres.h,starcon.ls2,HUMAN_CAPTAIN_MASK_PMAP_ANIM,706,11,2,ship.earthling.graphics.captain,GFXRES,human/humcap.ani -sc2code/ships/umgah/icode.h,umgah.ls2,UMGAH_CODE,1,0,8,ship.umgah.code,CODE,umgah/umgah.cod +sc2code/ships/umgah/icode.h,starcon.ls2,UMGAH_CODE,722,0,8,ship.umgah.code,CODE,umgah/umgah.cod sc2code/ships/umgah/imusicre.h,starcon.ls2,UMGAH_VICTORY_SONG,722,0,6,ship.umgah.ditty,MUSICRES,umgah/umgditty.mod sc2code/ships/umgah/istrtab.h,starcon.ls2,UMGAH_RACE_STRINGS,722,1,4,ship.umgah.text,STRTAB,umgah/umgtext.txt sc2code/ships/umgah/isndres.h,starcon.ls2,UMGAH_SHIP_SOUNDS,722,2,5,ship.umgah.sounds,SNDRES,umgah/umgsound.snd @@ -835,7 +807,7 @@ sc2code/ships/umgah/igfxres.h,starcon.ls2,CONE_BIG_MASK_ANIM,722,9,2,ship.umgah. sc2code/ships/umgah/igfxres.h,starcon.ls2,CONE_MED_MASK_ANIM,722,10,2,ship.umgah.graphics.cone.medium,GFXRES,umgah/cone.med sc2code/ships/umgah/igfxres.h,starcon.ls2,CONE_SML_MASK_ANIM,722,11,2,ship.umgah.graphics.cone.small,GFXRES,umgah/cone.sml sc2code/ships/umgah/igfxres.h,starcon.ls2,UMGAH_CAPTAIN_MASK_PMAP_ANIM,722,12,2,ship.umgah.graphics.captain,GFXRES,umgah/umgcap.ani -sc2code/ships/chenjesu/icode.h,chenjesu.ls2,CHENJESU_CODE,1,0,8,ship.chenjesu.code,CODE,chenjesu/chenjesu.cod +sc2code/ships/chenjesu/icode.h,starcon.ls2,CHENJESU_CODE,703,0,8,ship.chenjesu.code,CODE,chenjesu/chenjesu.cod sc2code/ships/chenjesu/imusicre.h,starcon.ls2,CHENJESU_VICTORY_SONG,703,0,6,ship.chenjesu.ditty,MUSICRES,chenjesu/cheditty.mod sc2code/ships/chenjesu/istrtab.h,starcon.ls2,CHENJESU_RACE_STRINGS,703,1,4,ship.chenjesu.text,STRTAB,chenjesu/chetext.txt sc2code/ships/chenjesu/isndres.h,starcon.ls2,CHENJESU_SHIP_SOUNDS,703,2,5,ship.chenjesu.sounds,SNDRES,chenjesu/chesound.snd @@ -851,7 +823,7 @@ sc2code/ships/chenjesu/igfxres.h,starcon.ls2,DOGGY_BIG_MASK_PMAP_ANIM,703,11,2,s sc2code/ships/chenjesu/igfxres.h,starcon.ls2,DOGGY_MED_MASK_PMAP_ANIM,703,12,2,ship.chenjesu.graphics.doggy.medium,GFXRES,chenjesu/doggy.med sc2code/ships/chenjesu/igfxres.h,starcon.ls2,DOGGY_SML_MASK_PMAP_ANIM,703,13,2,ship.chenjesu.graphics.doggy.small,GFXRES,chenjesu/doggy.sml sc2code/ships/chenjesu/igfxres.h,starcon.ls2,CHENJESU_CAPTAIN_MASK_PMAP_ANIM,703,14,2,ship.chenjesu.graphics.captain,GFXRES,chenjesu/checap.ani -sc2code/ships/sis_ship/icode.h,sis_ship.ls2,SIS_CODE,1,0,8,ship.sis_ship.code,CODE,sis_ship/sis.cod +sc2code/ships/sis_ship/icode.h,starcon.ls2,SIS_CODE,716,0,8,ship.sis_ship.code,CODE,sis_ship/sis.cod sc2code/ships/sis_ship/imusicre.h,starcon.ls2,SIS_VICTORY_SONG,716,0,6,ship.sis_ship.ditty,MUSICRES,sis_ship/sisditty.mod sc2code/ships/sis_ship/isndres.h,starcon.ls2,SIS_SHIP_SOUNDS,716,1,5,ship.sis_ship.sounds,SNDRES,sis_ship/sissound.snd sc2code/ships/sis_ship/igfxres.h,starcon.ls2,SIS_ICON_MASK_PMAP_ANIM,716,2,2,ship.sis_ship.icons,GFXRES,sis_ship/sisicons.ani @@ -863,7 +835,7 @@ sc2code/ships/sis_ship/igfxres.h,starcon.ls2,BLASTER_MED_MASK_PMAP_ANIM,716,7,2, sc2code/ships/sis_ship/igfxres.h,starcon.ls2,BLASTER_SML_MASK_PMAP_ANIM,716,8,2,ship.sis_ship.graphics.blas.small,GFXRES,sis_ship/blassml.ani sc2code/ships/sis_ship/igfxres.h,starcon.ls2,SIS_CAPTAIN_MASK_PMAP_ANIM,716,9,2,ship.sis_ship.graphics.captain,GFXRES,sis_ship/siscap.ani sc2code/ships/sis_ship/igfxres.h,starcon.ls2,SIS_HYPER_MASK_PMAP_ANIM,716,10,2,ship.sis_ship.graphics.sishyper,GFXRES,sis_ship/sishyper.ani -sc2code/ships/ilwrath/icode.h,ilwrath.ls2,ILWRATH_CODE,1,0,8,ship.ilwrath.code,CODE,ilwrath/ilwrath.cod +sc2code/ships/ilwrath/icode.h,starcon.ls2,ILWRATH_CODE,707,0,8,ship.ilwrath.code,CODE,ilwrath/ilwrath.cod sc2code/ships/ilwrath/imusicre.h,starcon.ls2,ILWRATH_VICTORY_SONG,707,0,6,ship.ilwrath.ditty,MUSICRES,ilwrath/ilwditty.mod sc2code/ships/ilwrath/istrtab.h,starcon.ls2,ILWRATH_RACE_STRINGS,707,1,4,ship.ilwrath.text,STRTAB,ilwrath/ilwtext.txt sc2code/ships/ilwrath/isndres.h,starcon.ls2,ILWRATH_SHIP_SOUNDS,707,2,5,ship.ilwrath.sounds,SNDRES,ilwrath/ilwsound.snd @@ -876,7 +848,7 @@ sc2code/ships/ilwrath/igfxres.h,starcon.ls2,FIRE_BIG_MASK_PMAP_ANIM,707,8,2,ship sc2code/ships/ilwrath/igfxres.h,starcon.ls2,FIRE_MED_MASK_PMAP_ANIM,707,9,2,ship.ilwrath.graphics.fire.medium,GFXRES,ilwrath/fire.med sc2code/ships/ilwrath/igfxres.h,starcon.ls2,FIRE_SML_MASK_PMAP_ANIM,707,10,2,ship.ilwrath.graphics.fire.small,GFXRES,ilwrath/fire.sml sc2code/ships/ilwrath/igfxres.h,starcon.ls2,ILWRATH_CAPTAIN_MASK_PMAP_ANIM,707,11,2,ship.ilwrath.graphics.captain,GFXRES,ilwrath/ilwcap.ani -sc2code/ships/syreen/icode.h,syreen.ls2,SYREEN_CODE,1,0,8,ship.syreen.code,CODE,syreen/syreen.cod +sc2code/ships/syreen/icode.h,starcon.ls2,SYREEN_CODE,720,0,8,ship.syreen.code,CODE,syreen/syreen.cod sc2code/ships/syreen/imusicre.h,starcon.ls2,SYREEN_VICTORY_SONG,720,0,6,ship.syreen.ditty,MUSICRES,syreen/syrditty.mod sc2code/ships/syreen/istrtab.h,starcon.ls2,SYREEN_RACE_STRINGS,720,1,4,ship.syreen.text,STRTAB,syreen/syrtext.txt sc2code/ships/syreen/isndres.h,starcon.ls2,SYREEN_SHIP_SOUNDS,720,2,5,ship.syreen.sounds,SNDRES,syreen/syrsound.snd @@ -889,9 +861,9 @@ sc2code/ships/syreen/igfxres.h,starcon.ls2,DAGGER_BIG_MASK_PMAP_ANIM,720,8,2,shi sc2code/ships/syreen/igfxres.h,starcon.ls2,DAGGER_MED_MASK_PMAP_ANIM,720,9,2,ship.syreen.graphics.dagger.medium,GFXRES,syreen/dagger.med sc2code/ships/syreen/igfxres.h,starcon.ls2,DAGGER_SML_MASK_PMAP_ANIM,720,10,2,ship.syreen.graphics.dagger.small,GFXRES,syreen/dagger.sml sc2code/ships/syreen/igfxres.h,starcon.ls2,SYREEN_CAPTAIN_MASK_PMAP_ANIM,720,11,2,ship.syreen.graphics.captain,GFXRES,syreen/syrcap.ani -sc2code/ships/probe/icode.h,probe.ls2,PROBE_CODE,1,0,8,ship.probe.code,CODE,probe/probe.cod +sc2code/ships/probe/icode.h,starcon.ls2,PROBE_CODE,714,0,8,ship.probe.code,CODE,probe/probe.cod sc2code/ships/probe/igfxres.h,starcon.ls2,PROBE_MICON_MASK_PMAP_ANIM,714,0,2,ship.probe.meleeicons,GFXRES,probe/promicon.ani -sc2code/ships/mmrnmhrm/icode.h,mmrnmhrm.ls2,MMRNMHRM_CODE,1,0,8,ship.mmrnmhrm.code,CODE,mmrnmhrm/mmrnmhrm.cod +sc2code/ships/mmrnmhrm/icode.h,starcon.ls2,MMRNMHRM_CODE,710,0,8,ship.mmrnmhrm.code,CODE,mmrnmhrm/mmrnmhrm.cod sc2code/ships/mmrnmhrm/imusicre.h,starcon.ls2,MMRNMHRM_VICTORY_SONG,710,0,6,ship.mmrnmhrm.ditty,MUSICRES,mmrnmhrm/mmrditty.mod sc2code/ships/mmrnmhrm/istrtab.h,starcon.ls2,MMRNMHRM_RACE_STRINGS,710,1,4,ship.mmrnmhrm.text,STRTAB,mmrnmhrm/mmrtext.txt sc2code/ships/mmrnmhrm/isndres.h,starcon.ls2,MMRNMHRM_SHIP_SOUNDS,710,2,5,ship.mmrnmhrm.sounds,SNDRES,mmrnmhrm/mmrsound.snd @@ -907,7 +879,7 @@ sc2code/ships/mmrnmhrm/igfxres.h,starcon.ls2,YWING_BIG_MASK_PMAP_ANIM,710,11,2,s sc2code/ships/mmrnmhrm/igfxres.h,starcon.ls2,YWING_MED_MASK_PMAP_ANIM,710,12,2,ship.mmrnmhrm.graphics.ywing.medium,GFXRES,mmrnmhrm/ywing.med sc2code/ships/mmrnmhrm/igfxres.h,starcon.ls2,YWING_SML_MASK_PMAP_ANIM,710,13,2,ship.mmrnmhrm.graphics.ywing.small,GFXRES,mmrnmhrm/ywing.sml sc2code/ships/mmrnmhrm/igfxres.h,starcon.ls2,MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM,710,14,2,ship.mmrnmhrm.graphics.captain,GFXRES,mmrnmhrm/mmrcap.ani -sc2code/ships/yehat/icode.h,yehat.ls2,YEHAT_CODE,1,0,8,ship.yehat.code,CODE,yehat/yehat.cod +sc2code/ships/yehat/icode.h,starcon.ls2,YEHAT_CODE,726,0,8,ship.yehat.code,CODE,yehat/yehat.cod sc2code/ships/yehat/imusicre.h,starcon.ls2,YEHAT_VICTORY_SONG,726,0,6,ship.yehat.ditty,MUSICRES,yehat/yehditty.mod sc2code/ships/yehat/istrtab.h,starcon.ls2,YEHAT_RACE_STRINGS,726,1,4,ship.yehat.text,STRTAB,yehat/yehtext.txt sc2code/ships/yehat/isndres.h,starcon.ls2,YEHAT_SHIP_SOUNDS,726,2,5,ship.yehat.sounds,SNDRES,yehat/yehsound.snd @@ -923,7 +895,7 @@ sc2code/ships/yehat/igfxres.h,starcon.ls2,SHIELD_BIG_MASK_ANIM,726,11,2,ship.yeh sc2code/ships/yehat/igfxres.h,starcon.ls2,SHIELD_MED_MASK_ANIM,726,12,2,ship.yehat.graphics.shield.medium,GFXRES,yehat/shield.med sc2code/ships/yehat/igfxres.h,starcon.ls2,SHIELD_SML_MASK_ANIM,726,13,2,ship.yehat.graphics.shield.small,GFXRES,yehat/shield.sml sc2code/ships/yehat/igfxres.h,starcon.ls2,YEHAT_CAPTAIN_MASK_PMAP_ANIM,726,14,2,ship.yehat.graphics.captain,GFXRES,yehat/yehcap.ani -sc2code/ships/lastbat/icode.h,lastbat.ls2,SAMATRA_CODE,1,0,8,ship.lastbat.code,CODE,lastbat/lastbat.cod +sc2code/ships/lastbat/icode.h,starcon.ls2,SAMATRA_CODE,708,0,8,ship.lastbat.code,CODE,lastbat/lastbat.cod sc2code/ships/lastbat/imusicre.h,starcon.ls2,SAMATRA_VICTORY_SONG,708,0,6,ship.lastbat.ditty,--,-- sc2code/ships/lastbat/isndres.h,starcon.ls2,SAMATRA_SHIP_SOUNDS,708,1,5,ship.lastbat.sounds,SNDRES,lastbat/lassound.snd sc2code/ships/lastbat/igfxres.h,starcon.ls2,SAMATRA_BIG_MASK_ANIM,708,2,2,ship.lastbat.graphics.lastbat.large,GFXRES,lastbat/lastbat.big @@ -936,7 +908,7 @@ sc2code/ships/lastbat/igfxres.h,starcon.ls2,GENERATOR_BIG_MASK_ANIM,708,8,2,ship sc2code/ships/lastbat/igfxres.h,starcon.ls2,GENERATOR_MED_MASK_PMAP_ANIM,708,9,2,ship.lastbat.graphics.gen.medium,GFXRES,lastbat/genmed.ani sc2code/ships/lastbat/igfxres.h,starcon.ls2,GENERATOR_SML_MASK_PMAP_ANIM,708,10,2,ship.lastbat.graphics.gen.small,GFXRES,lastbat/gensml.ani sc2code/ships/lastbat/igfxres.h,starcon.ls2,SAMATRA_CAPTAIN_MASK_PMAP_ANIM,708,11,2,ship.lastbat.graphics.captain,GFXRES,lastbat/lascap.ani -sc2code/ships/supox/icode.h,supox.ls2,SUPOX_CODE,1,0,8,ship.supox.code,CODE,supox/supox.cod +sc2code/ships/supox/icode.h,starcon.ls2,SUPOX_CODE,719,0,8,ship.supox.code,CODE,supox/supox.cod sc2code/ships/supox/imusicre.h,starcon.ls2,SUPOX_VICTORY_SONG,719,0,6,ship.supox.ditty,MUSICRES,supox/supditty.mod sc2code/ships/supox/istrtab.h,starcon.ls2,SUPOX_RACE_STRINGS,719,1,4,ship.supox.text,STRTAB,supox/suptext.txt sc2code/ships/supox/isndres.h,starcon.ls2,SUPOX_SHIP_SOUNDS,719,2,5,ship.supox.sounds,SNDRES,supox/supsound.snd @@ -949,7 +921,7 @@ sc2code/ships/supox/igfxres.h,starcon.ls2,GOB_BIG_MASK_PMAP_ANIM,719,8,2,ship.su sc2code/ships/supox/igfxres.h,starcon.ls2,GOB_MED_MASK_PMAP_ANIM,719,9,2,ship.supox.graphics.gob.medium,GFXRES,supox/gobmed.ani sc2code/ships/supox/igfxres.h,starcon.ls2,GOB_SML_MASK_PMAP_ANIM,719,10,2,ship.supox.graphics.gob.small,GFXRES,supox/gobsml.ani sc2code/ships/supox/igfxres.h,starcon.ls2,SUPOX_CAPTAIN_MASK_PMAP_ANIM,719,11,2,ship.supox.graphics.captain,GFXRES,supox/supcap.ani -sc2code/ships/thradd/icode.h,thradd.ls2,THRADDASH_CODE,1,0,8,ship.thraddash.code,CODE,thradd/thradd.cod +sc2code/ships/thradd/icode.h,starcon.ls2,THRADDASH_CODE,721,0,8,ship.thraddash.code,CODE,thradd/thradd.cod sc2code/ships/thradd/imusicre.h,starcon.ls2,THRADDASH_VICTORY_SONG,721,0,6,ship.thraddash.ditty,MUSICRES,thradd/thrditty.mod sc2code/ships/thradd/istrtab.h,starcon.ls2,THRADDASH_RACE_STRINGS,721,1,4,ship.thraddash.text,STRTAB,thradd/thrtext.txt sc2code/ships/thradd/isndres.h,starcon.ls2,THRADDASH_SHIP_SOUNDS,721,2,5,ship.thraddash.sounds,SNDRES,thradd/thrsound.snd @@ -965,7 +937,7 @@ sc2code/ships/thradd/igfxres.h,starcon.ls2,NAPALM_BIG_MASK_PMAP_ANIM,721,11,2,sh sc2code/ships/thradd/igfxres.h,starcon.ls2,NAPALM_MED_MASK_PMAP_ANIM,721,12,2,ship.thraddash.graphics.nap.medium,GFXRES,thradd/napmed.ani sc2code/ships/thradd/igfxres.h,starcon.ls2,NAPALM_SML_MASK_PMAP_ANIM,721,13,2,ship.thraddash.graphics.nap.small,GFXRES,thradd/napsml.ani sc2code/ships/thradd/igfxres.h,starcon.ls2,THRADDASH_CAPTAIN_MASK_PMAP_ANIM,721,14,2,ship.thraddash.graphics.captain,GFXRES,thradd/thrcap.ani -sc2code/ships/androsyn/icode.h,androsyn.ls2,ANDROSYNTH_CODE,1,0,8,ship.androsynth.code,CODE,androsyn/androsyn.cod +sc2code/ships/androsyn/icode.h,starcon.ls2,ANDROSYNTH_CODE,700,0,8,ship.androsynth.code,CODE,androsyn/androsyn.cod sc2code/ships/androsyn/imusicre.h,starcon.ls2,ANDROSYNTH_VICTORY_SONG,700,0,6,ship.androsynth.ditty,MUSICRES,androsyn/andditty.mod sc2code/ships/androsyn/istrtab.h,starcon.ls2,ANDROSYNTH_RACE_STRINGS,700,1,4,ship.androsynth.text,STRTAB,androsyn/andtext.txt sc2code/ships/androsyn/isndres.h,starcon.ls2,ANDROSYNTH_SHIP_SOUNDS,700,2,5,ship.androsynth.sounds,SNDRES,androsyn/andsound.snd @@ -981,7 +953,7 @@ sc2code/ships/androsyn/igfxres.h,starcon.ls2,BLAZER_BIG_MASK_PMAP_ANIM,700,11,2, sc2code/ships/androsyn/igfxres.h,starcon.ls2,BLAZER_MED_MASK_PMAP_ANIM,700,12,2,ship.androsynth.graphics.blazer.medium,GFXRES,androsyn/blazer.med sc2code/ships/androsyn/igfxres.h,starcon.ls2,BLAZER_SML_MASK_PMAP_ANIM,700,13,2,ship.androsynth.graphics.blazer.small,GFXRES,androsyn/blazer.sml sc2code/ships/androsyn/igfxres.h,starcon.ls2,ANDROSYNTH_CAPT_MASK_PMAP_ANIM,700,14,2,ship.androsynth.graphics.captain,GFXRES,androsyn/andcap.ani -sc2code/ships/orz/icode.h,orz.ls2,ORZ_CODE,1,0,8,ship.orz.code,CODE,orz/orz.cod +sc2code/ships/orz/icode.h,starcon.ls2,ORZ_CODE,712,0,8,ship.orz.code,CODE,orz/orz.cod sc2code/ships/orz/imusicre.h,starcon.ls2,ORZ_VICTORY_SONG,712,0,6,ship.orz.ditty,MUSICRES,orz/orzditty.mod sc2code/ships/orz/istrtab.h,starcon.ls2,ORZ_RACE_STRINGS,712,1,4,ship.orz.text,STRTAB,orz/orztext.txt sc2code/ships/orz/isndres.h,starcon.ls2,ORZ_SHIP_SOUNDS,712,2,5,ship.orz.sounds,SNDRES,orz/orzsound.snd