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

Moved code resources into starcon.ls2 as well.

Browse Source 
SetResourceIndex is no longer used after main program init,
and RES_INDEX is for all practical purposes defunct.


git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2958 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
mcmartin
2008-04-06 00:52:14 +00:00
parent 356a2106e9
commit 32940bb214
77 changed files with 252 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/ChangeLog
+1 -1
View File
@@ -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
sc2/content/androsyn.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.androsynth.code
sc2/content/arilou.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.arilou.code
sc2/content/blackurq.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.kohrah.code
sc2/content/chenjesu.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.chenjesu.code
sc2/content/chmmr.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.chmmr.code
sc2/content/druuge.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.druuge.code
sc2/content/human.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.earthling.code
sc2/content/ilwrath.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.ilwrath.code
sc2/content/lastbat.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.lastbat.code
sc2/content/melnorme.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.melnorme.code
sc2/content/mmrnmhrm.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.mmrnmhrm.code
sc2/content/mycon.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.mycon.code
sc2/content/orz.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.orz.code
sc2/content/pkunk.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.pkunk.code
sc2/content/probe.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.probe.code
sc2/content/shofixti.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.shofixti.code
sc2/content/sis_ship.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.sis_ship.code
sc2/content/slylandr.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.slylandro.code
sc2/content/spathi.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.spathi.code
sc2/content/starcon.ls2
+28 -28
View File
@@ -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
sc2/content/supox.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.supox.code
sc2/content/syreen.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.syreen.code
sc2/content/thradd.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.thraddash.code
sc2/content/umgah.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.umgah.code
sc2/content/uqm.rmp
-28
View File
@@ -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
sc2/content/urquan.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.urquan.code
sc2/content/utwig.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.utwig.code
sc2/content/vux.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.vux.code
sc2/content/yehat.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.yehat.code
sc2/content/zoqfot.ls2
-1
View File
@@ -1 +0,0 @@
1 0 8 ship.zoqfotpik.code
sc2/src/sc2code/build.c
+6 -6
View File
@@ -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;
sc2/src/sc2code/build.h
+3 -3
View File
@@ -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);
sc2/src/sc2code/corecode.h
+49
View File
@@ -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_ */
sc2/src/sc2code/encount.c
+2 -2
View File
@@ -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;
sc2/src/sc2code/globdata.c
+8 -14
View File
@@ -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
sc2/src/sc2code/init.c
+1 -1
View File
@@ -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);
sc2/src/sc2code/ires_ind.h
-32
View File
@@ -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
sc2/src/sc2code/loadship.c
+38 -16
View File
@@ -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
sc2/src/sc2code/master.c
+8 -14
View File
@@ -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)
sc2/src/sc2code/master.h
+3 -3
View File
@@ -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);
sc2/src/sc2code/melee.c
+2 -2
View File
@@ -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);
sc2/src/sc2code/pickmele.c
+4 -4
View File
@@ -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);
sc2/src/sc2code/pickship.c
+4 -4
View File
@@ -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;
sc2/src/sc2code/races.h
+37 -2
View File
@@ -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'. */
sc2/src/sc2code/resinst.h
-1
View File
@@ -22,4 +22,3 @@
#include "istrtab.h"
#include "isndres.h"
#include "imusicre.h"
#include "ires_ind.h"
sc2/src/sc2code/ship.c
+1 -1
View File
@@ -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;
sc2/src/sc2code/ships/androsyn/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/arilou/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/blackurq/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/chenjesu/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/chmmr/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/druuge/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/human/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/ilwrath/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/lastbat/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/melnorme/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/mmrnmhrm/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/mycon/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/orz/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/pkunk/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/probe/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/shofixti/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/sis_ship/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/slylandr/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/spathi/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/supox/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/syreen/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/thradd/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/umgah/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/urquan/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/utwig/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/vux/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/yehat/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/ships/zoqfot/icode.h
+1 -1
View File
@@ -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
sc2/src/sc2code/shipyard.c
+1 -1
View File
@@ -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)