diff --git a/sc2/ChangeLog b/sc2/ChangeLog index 08cee3166..ed1003885 100644 --- a/sc2/ChangeLog +++ b/sc2/ChangeLog @@ -1,4 +1,5 @@ Changes towards version 0.7: +- Revamped resource system to only use .rmp files - Michael - Isolated all constructed resources into cons_res.c - Michael - Fixed a crash when conversing with music disabled - Michael - Moved all resources into starcon.ls2 - Michael diff --git a/sc2/content/starcon.ls2 b/sc2/content/starcon.ls2 deleted file mode 100644 index faaca3d43..000000000 --- a/sc2/content/starcon.ls2 +++ /dev/null @@ -1,971 +0,0 @@ - 1 0 4 colortable.scclrtab - 2 0 2 graphics.title - 28 0 3 font.starcon - 28 1 2 graphics.status - 28 1 3 font.tiny - 28 1 4 text.starcon - 28 2 2 graphics.activity - 29 3 2 graphics.playmenu - 30 2 3 font.micro - 31 4 2 graphics.flagstat - 31 5 2 graphics.miscdata - 31 287 2 graphics.fontgrad - 32 0 5 sounds.menu - 33 1 5 sounds.game - 34 6 2 graphics.stars - 34 7 2 graphics.astbig - 34 8 2 graphics.astmed - 34 9 2 graphics.astsml - 34 10 2 graphics.blabig - 34 11 2 graphics.blamed - 34 12 2 graphics.blasml - 34 13 2 graphics.boobig - 34 14 2 graphics.boomed - 34 15 2 graphics.boosml - 35 16 2 graphics.ambanim - 36 2 4 colortable.hyperpal - 36 17 2 graphics.hyperstr - 37 3 4 colortable.arispace - 37 18 2 graphics.arispace - 38 0 6 music.hyper - 39 1 6 music.arispace - 40 19 2 graphics.obbkgnd - 41 4 4 colortable.orbplan - 41 20 2 graphics.sis_ip - 41 21 2 graphics.orbplan - 41 22 2 graphics.ip_sun - 41 96 4 colortable.ip_sun - 42 2 5 sounds.landsnds - 42 23 2 graphics.lander - 42 24 2 graphics.quake - 42 25 2 graphics.lightnin - 42 26 2 graphics.lavaspot - 42 27 2 graphics.lndrshld - 42 28 2 graphics.launch - 42 29 2 graphics.return - 43 30 2 graphics.orbview - 44 31 2 graphics.eartmask - 45 32 2 graphics.lifecan - 46 33 2 graphics.life.0 - 47 34 2 graphics.life.1 - 48 35 2 graphics.life.2 - 49 36 2 graphics.life.3 - 50 37 2 graphics.life.4 - 51 38 2 graphics.life.5 - 52 39 2 graphics.life.6 - 53 40 2 graphics.life.7 - 54 41 2 graphics.life.8 - 55 42 2 graphics.life.9 - 56 43 2 graphics.life.10 - 57 44 2 graphics.life.11 - 58 45 2 graphics.life.12 - 59 46 2 graphics.life.13 - 60 47 2 graphics.life.14 - 61 48 2 graphics.life.15 - 62 49 2 graphics.life.16 - 63 50 2 graphics.life.17 - 64 51 2 graphics.life.18 - 65 52 2 graphics.life.19 - 66 53 2 graphics.life.20 - 67 54 2 graphics.life.21 - 68 55 2 graphics.life.22 - 69 56 2 graphics.life.23 - 70 57 2 graphics.life.24 - 71 58 2 graphics.life.25 - 72 5 4 planet.oolite.colortable - 72 6 4 planet.oolite.translatetable - 73 5 4 planet.yttric.colortable - 73 6 4 planet.yttric.translatetable - 74 5 4 planet.quasidegenerate.colortable - 74 6 4 planet.quasidegenerate.translatetable - 75 5 4 planet.lanthanide.colortable - 75 6 4 planet.lanthanide.translatetable - 76 5 4 planet.treasure.colortable - 76 6 4 planet.treasure.translatetable - 77 5 4 planet.urea.colortable - 77 6 4 planet.urea.translatetable - 78 5 4 planet.metal.colortable - 78 6 4 planet.metal.translatetable - 79 5 4 planet.radioactive.colortable - 79 6 4 planet.radioactive.translatetable - 80 5 4 planet.opalescent.colortable - 80 6 4 planet.opalescent.translatetable - 81 5 4 planet.cyanic.colortable - 81 6 4 planet.cyanic.translatetable - 82 5 4 planet.acid.colortable - 82 6 4 planet.acid.translatetable - 83 5 4 planet.alkali.colortable - 83 6 4 planet.alkali.translatetable - 84 5 4 planet.halide.colortable - 84 6 4 planet.halide.translatetable - 85 5 4 planet.green.colortable - 85 6 4 planet.green.translatetable - 86 5 4 planet.copper.colortable - 86 6 4 planet.copper.translatetable - 87 5 4 planet.carbide.colortable - 87 6 4 planet.carbide.translatetable - 88 5 4 planet.ultramarine.colortable - 88 6 4 planet.ultramarine.translatetable - 89 5 4 planet.noble.colortable - 89 6 4 planet.noble.translatetable - 90 5 4 planet.azure.colortable - 90 6 4 planet.azure.translatetable - 91 5 4 planet.chondrite.colortable - 91 6 4 planet.chondrite.translatetable - 92 5 4 planet.purple.colortable - 92 6 4 planet.purple.translatetable - 93 5 4 planet.superdense.colortable - 93 6 4 planet.superdense.translatetable - 94 5 4 planet.pellucid.colortable - 94 6 4 planet.pellucid.translatetable - 95 5 4 planet.dust.colortable - 95 6 4 planet.dust.translatetable - 96 5 4 planet.crimson.colortable - 96 6 4 planet.crimson.translatetable - 97 5 4 planet.cimmerian.colortable - 97 6 4 planet.cimmerian.translatetable - 98 5 4 planet.infrared.colortable - 98 6 4 planet.infrared.translatetable - 99 5 4 planet.selenic.colortable - 99 6 4 planet.selenic.translatetable -100 5 4 planet.auric.colortable -100 6 4 planet.auric.translatetable -101 5 4 planet.fluorescent.colortable -101 6 4 planet.fluorescent.translatetable -102 5 4 planet.ultraviolet.colortable -102 6 4 planet.ultraviolet.translatetable -103 5 4 planet.plutonic.colortable -103 6 4 planet.plutonic.translatetable -104 5 4 planet.rainbow.colortable -104 6 4 planet.rainbow.translatetable -105 5 4 planet.shattered.colortable -105 6 4 planet.shattered.translatetable -106 5 4 planet.sapphire.colortable -106 6 4 planet.sapphire.translatetable -107 5 4 planet.organic.colortable -107 6 4 planet.organic.translatetable -108 5 4 planet.xenolithic.colortable -108 6 4 planet.xenolithic.translatetable -109 5 4 planet.redux.colortable -109 6 4 planet.redux.translatetable -110 5 4 planet.primordial.colortable -110 6 4 planet.primordial.translatetable -111 5 4 planet.emerald.colortable -111 6 4 planet.emerald.translatetable -112 5 4 planet.chlorine.colortable -112 6 4 planet.chlorine.translatetable -113 5 4 planet.magnetic.colortable -113 6 4 planet.magnetic.translatetable -114 5 4 planet.water.colortable -114 6 4 planet.water.translatetable -115 5 4 planet.telluric.colortable -115 6 4 planet.telluric.translatetable -116 5 4 planet.hydrocarbon.colortable -116 6 4 planet.hydrocarbon.translatetable -117 5 4 planet.iodine.colortable -117 6 4 planet.iodine.translatetable -118 5 4 planet.vinylogous.colortable -118 6 4 planet.vinylogous.translatetable -119 5 4 planet.ruby.colortable -119 6 4 planet.ruby.translatetable -120 5 4 planet.magma.colortable -120 6 4 planet.magma.translatetable -121 5 4 planet.maroon.colortable -121 6 4 planet.maroon.translatetable -122 5 4 planet.bluegas.colortable -122 6 4 planet.bluegas.translatetable -123 5 4 planet.cyangas.colortable -123 6 4 planet.cyangas.translatetable -124 5 4 planet.greengas.colortable -124 6 4 planet.greengas.translatetable -125 5 4 planet.greygas.colortable -125 6 4 planet.greygas.translatetable -126 5 4 planet.orangegas.colortable -126 6 4 planet.orangegas.translatetable -127 5 4 planet.purplegas.colortable -127 6 4 planet.purplegas.translatetable -128 5 4 planet.redgas.colortable -128 6 4 planet.redgas.translatetable -129 5 4 planet.violetgas.colortable -129 6 4 planet.violetgas.translatetable -130 5 4 planet.yellowgas.colortable -130 6 4 planet.yellowgas.translatetable -138 3 3 font.lander -138 288 2 graphics.landfeff -139 59 2 graphics.moonbase -139 77 4 text.moonbase -140 60 2 graphics.maidens -140 78 4 text.maidens -141 79 4 text.chmmrbas -142 61 2 graphics.aquhelix -142 80 4 text.aquhelix -143 62 2 graphics.drutrans -143 81 4 text.drutrans -144 63 2 graphics.taadevic -144 82 4 text.taadevic -145 64 2 graphics.sundevic -145 83 4 text.sundevic -146 65 2 graphics.syrvault -146 84 4 text.syrvault -147 66 2 graphics.urqwreck -147 85 4 text.urqwreck -148 67 2 graphics.utwbomb -148 86 4 text.utwbomb -149 87 4 text.vuxbeast -150 68 2 graphics.eggcase -150 88 4 text.eggcase -151 69 2 graphics.spapluto -151 89 4 text.spapluto -152 90 4 text.burruins -153 91 4 text.andruins -154 92 4 text.sphere -155 93 4 text.spindle -156 70 2 graphics.ruins -157 94 4 text.ruins -158 71 2 graphics.umgtrans -158 95 4 text.umgtrans -159 2 6 music.space -160 3 6 music.orbit1 -160 4 6 music.orbit2 -160 5 6 music.orbit3 -160 6 6 music.orbit4 -160 7 6 music.orbit5 -161 14 6 music.meleemenu -161 72 2 graphics.melebkgd -162 73 2 graphics.melee -163 8 6 music.redalert -163 74 2 graphics.segue -164 75 2 graphics.pickship -189 4 3 font.player -193 15 6 music.mainmenu -193 76 2 graphics.newgame -194 77 2 graphics.modules -195 78 2 graphics.sismods -195 79 2 graphics.outfit -196 9 6 music.outfit -197 80 2 graphics.sisblu -197 81 2 graphics.shipyard -197 97 4 colortable.dockpani -198 10 6 music.shipyard -199 11 6 music.starbase -199 82 2 graphics.starbase -200 83 2 planet.samatra.large -201 84 2 planet.slaveshield.large -201 85 2 planet.slaveshield.medium -201 86 2 planet.slaveshield.small -202 87 2 planet.oolite.large -202 88 2 planet.oolite.medium -202 89 2 planet.oolite.small -203 90 2 planet.yttric.large -203 91 2 planet.yttric.medium -203 92 2 planet.yttric.small -204 93 2 planet.quasidegenerate.large -204 94 2 planet.quasidegenerate.medium -204 95 2 planet.quasidegenerate.small -205 96 2 planet.lanthanide.large -205 97 2 planet.lanthanide.medium -205 98 2 planet.lanthanide.small -206 99 2 planet.treasure.large -206 100 2 planet.treasure.medium -206 101 2 planet.treasure.small -207 102 2 planet.urea.large -207 103 2 planet.urea.medium -207 104 2 planet.urea.small -208 105 2 planet.metal.large -208 106 2 planet.metal.medium -208 107 2 planet.metal.small -209 108 2 planet.radioactive.large -209 109 2 planet.radioactive.medium -209 110 2 planet.radioactive.small -210 111 2 planet.opalescent.large -210 112 2 planet.opalescent.medium -210 113 2 planet.opalescent.small -211 114 2 planet.cyanic.large -211 115 2 planet.cyanic.medium -211 116 2 planet.cyanic.small -212 117 2 planet.acid.large -212 118 2 planet.acid.medium -212 119 2 planet.acid.small -213 120 2 planet.alkali.large -213 121 2 planet.alkali.medium -213 122 2 planet.alkali.small -214 123 2 planet.halide.large -214 124 2 planet.halide.medium -214 125 2 planet.halide.small -215 126 2 planet.green.large -215 127 2 planet.green.medium -215 128 2 planet.green.small -216 129 2 planet.copper.large -216 130 2 planet.copper.medium -216 131 2 planet.copper.small -217 132 2 planet.carbide.large -217 133 2 planet.carbide.medium -217 134 2 planet.carbide.small -218 135 2 planet.ultramarine.large -218 136 2 planet.ultramarine.medium -218 137 2 planet.ultramarine.small -219 138 2 planet.noble.large -219 139 2 planet.noble.medium -219 140 2 planet.noble.small -220 141 2 planet.azure.large -220 142 2 planet.azure.medium -220 143 2 planet.azure.small -221 144 2 planet.chondrite.large -221 145 2 planet.chondrite.medium -221 146 2 planet.chondrite.small -222 147 2 planet.purple.large -222 148 2 planet.purple.medium -222 149 2 planet.purple.small -223 150 2 planet.superdense.large -223 151 2 planet.superdense.medium -223 152 2 planet.superdense.small -224 153 2 planet.pellucid.large -224 154 2 planet.pellucid.medium -224 155 2 planet.pellucid.small -225 156 2 planet.dust.large -225 157 2 planet.dust.medium -225 158 2 planet.dust.small -226 159 2 planet.crimson.large -226 160 2 planet.crimson.medium -226 161 2 planet.crimson.small -227 162 2 planet.cimmerian.large -227 163 2 planet.cimmerian.medium -227 164 2 planet.cimmerian.small -228 165 2 planet.infrared.large -228 166 2 planet.infrared.medium -228 167 2 planet.infrared.small -229 168 2 planet.selenic.large -229 169 2 planet.selenic.medium -229 170 2 planet.selenic.small -230 171 2 planet.auric.large -230 172 2 planet.auric.medium -230 173 2 planet.auric.small -231 174 2 planet.fluorescent.large -231 175 2 planet.fluorescent.medium -231 176 2 planet.fluorescent.small -232 177 2 planet.ultraviolet.large -232 178 2 planet.ultraviolet.medium -232 179 2 planet.ultraviolet.small -233 180 2 planet.plutonic.large -233 181 2 planet.plutonic.medium -233 182 2 planet.plutonic.small -234 183 2 planet.rainbow.large -234 184 2 planet.rainbow.medium -234 185 2 planet.rainbow.small -235 186 2 planet.shattered.large -235 187 2 planet.shattered.medium -235 188 2 planet.shattered.small -236 189 2 planet.sapphire.large -236 190 2 planet.sapphire.medium -236 191 2 planet.sapphire.small -237 192 2 planet.organic.large -237 193 2 planet.organic.medium -237 194 2 planet.organic.small -238 195 2 planet.xenolithic.large -238 196 2 planet.xenolithic.medium -238 197 2 planet.xenolithic.small -239 198 2 planet.redux.large -239 199 2 planet.redux.medium -239 200 2 planet.redux.small -240 201 2 planet.primordial.large -240 202 2 planet.primordial.medium -240 203 2 planet.primordial.small -241 204 2 planet.emerald.large -241 205 2 planet.emerald.medium -241 206 2 planet.emerald.small -242 207 2 planet.chlorine.large -242 208 2 planet.chlorine.medium -242 209 2 planet.chlorine.small -243 210 2 planet.magnetic.large -243 211 2 planet.magnetic.medium -243 212 2 planet.magnetic.small -244 213 2 planet.water.large -244 214 2 planet.water.medium -244 215 2 planet.water.small -245 216 2 planet.telluric.large -245 217 2 planet.telluric.medium -245 218 2 planet.telluric.small -246 219 2 planet.hydrocarbon.large -246 220 2 planet.hydrocarbon.medium -246 221 2 planet.hydrocarbon.small -247 222 2 planet.iodine.large -247 223 2 planet.iodine.medium -247 224 2 planet.iodine.small -248 225 2 planet.vinylogous.large -248 226 2 planet.vinylogous.medium -248 227 2 planet.vinylogous.small -249 228 2 planet.ruby.large -249 229 2 planet.ruby.medium -249 230 2 planet.ruby.small -250 231 2 planet.magma.large -250 232 2 planet.magma.medium -250 233 2 planet.magma.small -251 234 2 planet.maroon.large -251 235 2 planet.maroon.medium -251 236 2 planet.maroon.small -252 237 2 planet.bluegas.large -252 238 2 planet.bluegas.medium -252 239 2 planet.bluegas.small -253 240 2 planet.cyangas.large -253 241 2 planet.cyangas.medium -253 242 2 planet.cyangas.small -254 243 2 planet.greengas.large -254 244 2 planet.greengas.medium -254 245 2 planet.greengas.small -255 246 2 planet.greygas.large -255 247 2 planet.greygas.medium -255 248 2 planet.greygas.small -256 249 2 planet.orangegas.large -256 250 2 planet.orangegas.medium -256 251 2 planet.orangegas.small -257 252 2 planet.purplegas.large -257 253 2 planet.purplegas.medium -257 254 2 planet.purplegas.small -258 255 2 planet.redgas.large -258 256 2 planet.redgas.medium -258 257 2 planet.redgas.small -259 258 2 planet.violetgas.large -259 259 2 planet.violetgas.medium -259 260 2 planet.violetgas.small -260 261 2 planet.yellowgas.large -260 262 2 planet.yellowgas.medium -260 263 2 planet.yellowgas.small -261 12 6 music.battle -262 264 2 credits.background -282 13 6 music.credits -283 284 2 graphics.sisskeleton -284 285 2 graphics.orbenter -285 286 2 graphics.setupmenu -285 287 4 text.setupmenu -286 98 4 slides.intro -287 99 4 slides.ending -288 5 3 credits.font.pt13 -288 6 3 credits.font.pt17 -288 7 3 credits.font.pt45 -289 100 4 credits.credits -290 101 4 text.joyalpha -500 0 6 comm.arilou.music -500 1 3 comm.arilou.font -500 2 4 comm.arilou.dialogue -500 3 2 comm.arilou.graphics -500 4 4 comm.arilou.colortable -501 0 6 comm.kohrah.music -501 1 3 comm.kohrah.font -501 2 4 comm.kohrah.dialogue -501 3 4 comm.kohrah.colortable -501 4 2 comm.kohrah.graphics -502 0 6 comm.chmmr.music -502 1 3 comm.chmmr.font -502 2 4 comm.chmmr.dialogue -502 3 4 comm.chmmr.colortable -502 4 2 comm.chmmr.graphics -503 0 6 comm.commander.music -503 1 6 comm.starbase.music -503 2 6 comm.comlowpw.music -503 3 3 comm.commander.font -503 4 4 comm.commander.colortable -503 5 4 comm.commander.dialogue -503 6 4 comm.starbase.dialogue -503 7 2 comm.commander.graphics -504 0 6 comm.druuge.music -504 1 3 comm.druuge.font -504 2 4 comm.druuge.dialogue -504 3 4 comm.druuge.colortable -504 4 2 comm.druuge.graphics -505 0 6 comm.ilwrath.music -505 1 3 comm.ilwrath.font -505 2 4 comm.ilwrath.dialogue -505 3 4 comm.ilwrath.colortable -505 4 2 comm.ilwrath.graphics -506 0 6 comm.melnorme.music -506 1 3 comm.melnorme.font -506 2 4 comm.melnorme.dialogue -506 3 4 comm.melnorme.colortable -506 4 2 comm.melnorme.graphics -507 0 6 comm.mycon.music -507 1 3 comm.mycon.font -507 2 4 comm.mycon.dialogue -507 3 4 comm.mycon.colortable -507 4 2 comm.mycon.graphics -508 0 6 comm.orz.music -508 1 3 comm.orz.font -508 2 4 comm.orz.dialogue -508 3 4 comm.orz.colortable -508 4 2 comm.orz.graphics -509 0 6 comm.pkunk.music -509 1 3 comm.pkunk.font -509 2 4 comm.pkunk.dialogue -509 3 4 comm.pkunk.colortable -509 4 2 comm.pkunk.graphics -510 0 6 comm.shofixti.music -510 1 3 comm.shofixti.font -510 2 4 comm.shofixti.dialogue -510 3 4 comm.shofixti.colortable -510 4 2 comm.shofixti.graphics -511 0 6 comm.slyhome.music -511 1 3 comm.slyhome.font -511 2 4 comm.slyhome.dialogue -511 3 4 comm.slyhome.colortable -511 4 2 comm.slyhome.graphics -512 0 6 comm.slylandro.music -512 1 3 comm.slylandro.font -512 2 4 comm.slylandro.dialogue -512 3 4 comm.slylandro.colortable -512 4 2 comm.slylandro.graphics -513 0 6 comm.spathi.music -513 1 6 comm.spahome.music -513 2 6 comm.spafwiff.music -513 3 3 comm.spathi.font -513 4 4 comm.spathi.dialogue -513 5 4 comm.spahome.colortable -513 6 4 comm.spahome.dialogue -513 7 4 comm.spathi.colortable -513 8 2 comm.spathi.graphics -513 9 2 comm.spahome.graphics -514 0 6 comm.supox.music -514 1 3 comm.supox.font -514 2 4 comm.supox.dialogue -514 3 4 comm.supox.colortable -514 4 2 comm.supox.graphics -515 0 6 comm.syreen.music -515 1 3 comm.syreen.font -515 2 4 comm.syreen.dialogue -515 3 4 comm.syreen.colortable -515 4 2 comm.syreen.graphics -516 0 6 comm.talkingpet.music -516 1 3 comm.talkingpet.font -516 2 4 comm.talkingpet.dialogue -516 3 4 comm.talkingpet.colortable -516 4 2 comm.talkingpet.graphics -517 0 6 comm.thraddash.music -517 1 3 comm.thraddash.font -517 2 4 comm.thraddash.dialogue -517 3 4 comm.thraddash.colortable -517 4 2 comm.thraddash.graphics -518 0 6 comm.umgah.music -518 1 3 comm.umgah.font -518 2 4 comm.umgah.dialogue -518 3 4 comm.umgah.colortable -518 4 2 comm.umgah.graphics -519 0 6 comm.urquan.music -519 1 3 comm.urquan.font -519 2 4 comm.urquan.dialogue -519 3 4 comm.urquan.colortable -519 4 2 comm.urquan.graphics -520 0 6 comm.utwig.music -520 1 6 comm.utwigult.music -520 2 3 comm.utwig.font -520 3 4 comm.utwig.dialogue -520 4 4 comm.utwig.colortable -520 5 2 comm.utwig.graphics -521 0 6 comm.vux.music -521 1 3 comm.vux.font -521 2 4 comm.vux.dialogue -521 3 4 comm.vux.colortable -521 4 2 comm.vux.graphics -522 0 6 comm.yehat.music -522 1 6 comm.yehat.rebel.music -522 2 3 comm.yehat.font -522 3 4 comm.yehat.dialogue -522 4 4 comm.yehat.rebel.dialogue -522 5 4 comm.yehat.colortable -522 6 2 comm.yehat.graphics -523 0 6 comm.zoqfotpik.music -523 1 3 comm.zoqfotpik.font -523 2 4 comm.zoqfotpik.dialogue -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 -700 4 2 ship.androsynth.meleeicons -700 5 2 ship.androsynth.graphics.androsyn.large -700 6 2 ship.androsynth.graphics.androsyn.medium -700 7 2 ship.androsynth.graphics.androsyn.small -700 8 2 ship.androsynth.graphics.bubble.large -700 9 2 ship.androsynth.graphics.bubble.medium -700 10 2 ship.androsynth.graphics.bubble.small -700 11 2 ship.androsynth.graphics.blazer.large -700 12 2 ship.androsynth.graphics.blazer.medium -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 -701 4 2 ship.arilou.meleeicons -701 5 2 ship.arilou.graphics.arilou.large -701 6 2 ship.arilou.graphics.arilou.medium -701 7 2 ship.arilou.graphics.arilou.small -701 8 2 ship.arilou.graphics.warp.large -701 9 2 ship.arilou.graphics.warp.medium -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 -702 4 2 ship.kohrah.meleeicons -702 5 2 ship.kohrah.graphics.blackurq.large -702 6 2 ship.kohrah.graphics.blackurq.medium -702 7 2 ship.kohrah.graphics.blackurq.small -702 8 2 ship.kohrah.graphics.buz.large -702 9 2 ship.kohrah.graphics.buz.medium -702 10 2 ship.kohrah.graphics.buz.small -702 11 2 ship.kohrah.graphics.gas.large -702 12 2 ship.kohrah.graphics.gas.medium -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 -703 4 2 ship.chenjesu.meleeicons -703 5 2 ship.chenjesu.graphics.chenjesu.large -703 6 2 ship.chenjesu.graphics.chenjesu.medium -703 7 2 ship.chenjesu.graphics.chenjesu.small -703 8 2 ship.chenjesu.graphics.spark.large -703 9 2 ship.chenjesu.graphics.spark.medium -703 10 2 ship.chenjesu.graphics.spark.small -703 11 2 ship.chenjesu.graphics.doggy.large -703 12 2 ship.chenjesu.graphics.doggy.medium -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 -704 4 2 ship.chmmr.meleeicons -704 5 2 ship.chmmr.graphics.chmmr.large -704 6 2 ship.chmmr.graphics.chmmr.medium -704 7 2 ship.chmmr.graphics.chmmr.small -704 8 2 ship.chmmr.graphics.muz.large -704 9 2 ship.chmmr.graphics.muz.medium -704 10 2 ship.chmmr.graphics.muz.small -704 11 2 ship.chmmr.graphics.sat.large -704 12 2 ship.chmmr.graphics.sat.medium -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 -705 4 2 ship.druuge.meleeicons -705 5 2 ship.druuge.graphics.druuge.large -705 6 2 ship.druuge.graphics.druuge.medium -705 7 2 ship.druuge.graphics.druuge.small -705 8 2 ship.druuge.graphics.can.large -705 9 2 ship.druuge.graphics.can.medium -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 -706 4 2 ship.earthling.meleeicons -706 5 2 ship.earthling.graphics.human.large -706 6 2 ship.earthling.graphics.human.medium -706 7 2 ship.earthling.graphics.human.small -706 8 2 ship.earthling.graphics.saturn.large -706 9 2 ship.earthling.graphics.saturn.medium -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 -707 4 2 ship.ilwrath.meleeicons -707 5 2 ship.ilwrath.graphics.ilwrath.large -707 6 2 ship.ilwrath.graphics.ilwrath.medium -707 7 2 ship.ilwrath.graphics.ilwrath.small -707 8 2 ship.ilwrath.graphics.fire.large -707 9 2 ship.ilwrath.graphics.fire.medium -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 -708 4 2 ship.lastbat.graphics.lastbat.small -708 5 2 ship.lastbat.graphics.sen.large -708 6 2 ship.lastbat.graphics.sen.medium -708 7 2 ship.lastbat.graphics.sen.small -708 8 2 ship.lastbat.graphics.gen.large -708 9 2 ship.lastbat.graphics.gen.medium -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 -709 4 2 ship.melnorme.meleeicons -709 5 2 ship.melnorme.graphics.melnorme.large -709 6 2 ship.melnorme.graphics.melnorme.medium -709 7 2 ship.melnorme.graphics.melnorme.small -709 8 2 ship.melnorme.graphics.pump.large -709 9 2 ship.melnorme.graphics.pump.medium -709 10 2 ship.melnorme.graphics.pump.small -709 11 2 ship.melnorme.graphics.confu.large -709 12 2 ship.melnorme.graphics.confu.medium -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 -710 4 2 ship.mmrnmhrm.meleeicons -710 5 2 ship.mmrnmhrm.graphics.mmrnmhrm.large -710 6 2 ship.mmrnmhrm.graphics.mmrnmhrm.medium -710 7 2 ship.mmrnmhrm.graphics.mmrnmhrm.small -710 8 2 ship.mmrnmhrm.graphics.torp.large -710 9 2 ship.mmrnmhrm.graphics.torp.medium -710 10 2 ship.mmrnmhrm.graphics.torp.small -710 11 2 ship.mmrnmhrm.graphics.ywing.large -710 12 2 ship.mmrnmhrm.graphics.ywing.medium -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 -711 4 2 ship.mycon.meleeicons -711 5 2 ship.mycon.graphics.mycon.large -711 6 2 ship.mycon.graphics.mycon.medium -711 7 2 ship.mycon.graphics.mycon.small -711 8 2 ship.mycon.graphics.plasma.large -711 9 2 ship.mycon.graphics.plasma.medium -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 -712 4 2 ship.orz.meleeicons -712 5 2 ship.orz.graphics.orz.large -712 6 2 ship.orz.graphics.orz.medium -712 7 2 ship.orz.graphics.orz.small -712 8 2 ship.orz.graphics.how.large -712 9 2 ship.orz.graphics.how.medium -712 10 2 ship.orz.graphics.how.small -712 11 2 ship.orz.graphics.tur.large -712 12 2 ship.orz.graphics.tur.medium -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 -713 4 2 ship.pkunk.meleeicons -713 5 2 ship.pkunk.graphics.pkunk.large -713 6 2 ship.pkunk.graphics.pkunk.medium -713 7 2 ship.pkunk.graphics.pkunk.small -713 8 2 ship.pkunk.graphics.bug.large -713 9 2 ship.pkunk.graphics.bug.medium -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 -715 4 2 ship.shofixti.meleeicons -715 5 2 ship.shofixti.graphics.shofixti.large -715 6 2 ship.shofixti.graphics.shofixti.medium -715 7 2 ship.shofixti.graphics.shofixti.small -715 8 2 ship.shofixti.graphics.destruct.large -715 9 2 ship.shofixti.graphics.destruct.medium -715 10 2 ship.shofixti.graphics.destruct.small -715 11 2 ship.shofixti.graphics.captain -715 12 2 ship.shofixti.graphics.oldshof.large -715 13 2 ship.shofixti.graphics.oldshof.medium -715 14 2 ship.shofixti.graphics.oldshof.small -715 15 2 ship.shofixti.graphics.oldcaptain -715 16 2 ship.shofixti.graphics.missile.large -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 -716 4 2 ship.sis_ship.graphics.sis.medium -716 5 2 ship.sis_ship.graphics.sis.small -716 6 2 ship.sis_ship.graphics.blas.large -716 7 2 ship.sis_ship.graphics.blas.medium -716 8 2 ship.sis_ship.graphics.blas.small -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 -717 4 2 ship.slylandro.meleeicons -717 5 2 ship.slylandro.graphics.slylandr.large -717 6 2 ship.slylandro.graphics.slylandr.medium -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 -718 4 2 ship.spathi.meleeicons -718 5 2 ship.spathi.graphics.spathi.large -718 6 2 ship.spathi.graphics.spathi.medium -718 7 2 ship.spathi.graphics.spathi.small -718 8 2 ship.spathi.graphics.missile.large -718 9 2 ship.spathi.graphics.missile.medium -718 10 2 ship.spathi.graphics.missile.small -718 11 2 ship.spathi.graphics.discrim.large -718 12 2 ship.spathi.graphics.discrim.medium -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 -719 4 2 ship.supox.meleeicons -719 5 2 ship.supox.graphics.supox.large -719 6 2 ship.supox.graphics.supox.medium -719 7 2 ship.supox.graphics.supox.small -719 8 2 ship.supox.graphics.gob.large -719 9 2 ship.supox.graphics.gob.medium -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 -720 4 2 ship.syreen.meleeicons -720 5 2 ship.syreen.graphics.syreen.large -720 6 2 ship.syreen.graphics.syreen.medium -720 7 2 ship.syreen.graphics.syreen.small -720 8 2 ship.syreen.graphics.dagger.large -720 9 2 ship.syreen.graphics.dagger.medium -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 -721 4 2 ship.thraddash.meleeicons -721 5 2 ship.thraddash.graphics.thradd.large -721 6 2 ship.thraddash.graphics.thradd.medium -721 7 2 ship.thraddash.graphics.thradd.small -721 8 2 ship.thraddash.graphics.hor.large -721 9 2 ship.thraddash.graphics.hor.medium -721 10 2 ship.thraddash.graphics.hor.small -721 11 2 ship.thraddash.graphics.nap.large -721 12 2 ship.thraddash.graphics.nap.medium -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 -722 4 2 ship.umgah.meleeicons -722 5 2 ship.umgah.graphics.umgah.large -722 6 2 ship.umgah.graphics.umgah.medium -722 7 2 ship.umgah.graphics.umgah.small -722 8 2 ship.umgah.graphics.spritz -722 9 2 ship.umgah.graphics.cone.large -722 10 2 ship.umgah.graphics.cone.medium -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 -723 4 2 ship.urquan.meleeicons -723 5 2 ship.urquan.graphics.urquan.large -723 6 2 ship.urquan.graphics.urquan.medium -723 7 2 ship.urquan.graphics.urquan.small -723 8 2 ship.urquan.graphics.fusion.large -723 9 2 ship.urquan.graphics.fusion.medium -723 10 2 ship.urquan.graphics.fusion.small -723 11 2 ship.urquan.graphics.fight.large -723 12 2 ship.urquan.graphics.fight.medium -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 -724 4 2 ship.utwig.meleeicons -724 5 2 ship.utwig.graphics.utwig.large -724 6 2 ship.utwig.graphics.utwig.medium -724 7 2 ship.utwig.graphics.utwig.small -724 8 2 ship.utwig.graphics.lan.large -724 9 2 ship.utwig.graphics.lan.medium -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 -725 4 2 ship.vux.meleeicons -725 5 2 ship.vux.graphics.vux.large -725 6 2 ship.vux.graphics.vux.medium -725 7 2 ship.vux.graphics.vux.small -725 8 2 ship.vux.graphics.limpets.large -725 9 2 ship.vux.graphics.limpets.medium -725 10 2 ship.vux.graphics.limpets.small -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 -726 4 2 ship.yehat.meleeicons -726 5 2 ship.yehat.graphics.yehat.large -726 6 2 ship.yehat.graphics.yehat.medium -726 7 2 ship.yehat.graphics.yehat.small -726 8 2 ship.yehat.graphics.missile.large -726 9 2 ship.yehat.graphics.missile.medium -726 10 2 ship.yehat.graphics.missile.small -726 11 2 ship.yehat.graphics.shield.large -726 12 2 ship.yehat.graphics.shield.medium -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 -727 4 2 ship.zoqfotpik.meleeicons -727 5 2 ship.zoqfotpik.graphics.zoqfot.large -727 6 2 ship.zoqfotpik.graphics.zoqfot.medium -727 7 2 ship.zoqfotpik.graphics.zoqfot.small -727 8 2 ship.zoqfotpik.graphics.spit.large -727 9 2 ship.zoqfotpik.graphics.spit.medium -727 10 2 ship.zoqfotpik.graphics.spit.small -727 11 2 ship.zoqfotpik.graphics.sti.large -727 12 2 ship.zoqfotpik.graphics.sti.medium -727 13 2 ship.zoqfotpik.graphics.sti.small -727 14 2 ship.zoqfotpik.graphics.captain diff --git a/sc2/src/options.c b/sc2/src/options.c index 8bed3f95e..5eb73af84 100644 --- a/sc2/src/options.c +++ b/sc2/src/options.c @@ -429,15 +429,40 @@ mountDirZips (uio_MountHandle *contentHandle, uio_DirHandle *dirHandle, const ch uio_DirList_free (dirList); } +int +loadIndices (uio_DirHandle *dir) +{ + uio_DirList *indices; + int i; + + indices = uio_getDirList (dir, "", ".rmp$", + match_MATCH_REGEX); + + if (indices != NULL) + { + int i; + + for (i = 0; i < indices->numNames; i++) + { + log_add (log_Debug, "Loading resouce index '%s'", indices->names[i]); + LoadResourceIndex (dir, indices->names[i]); + } + } + uio_DirList_free (indices); + + /* Return the number of index files loaded. */ + return i; +} + BOOLEAN loadAddon (const char *addon) { uio_DirHandle *addonsDir, *addonDir; - uio_DirList *indices; - + addonsDir = uio_openDirRelative (contentDir, "addons", 0); if (addonsDir == NULL) - { // No addon dir found. + { + // No addon dir found. log_add (log_Warning, "Warning: There's no 'addons' " "directory in the 'content' directory;\n\t'--addon' " "options are ignored."); @@ -450,27 +475,14 @@ loadAddon (const char *addon) uio_closeDir (addonsDir); return FALSE; } - - indices = uio_getDirList (addonDir, "", ".rmp$", - match_MATCH_REGEX); - if (indices != NULL) - { - int i; - - for (i = 0; i < indices->numNames; i++) - { - res_LoadFilename (addonDir, indices->names[i]); - } - } - uio_DirList_free (indices); + loadIndices (addonDir); + uio_closeDir (addonDir); uio_closeDir (addonsDir); return TRUE; } - - void prepareAddons (const char **addons) { diff --git a/sc2/src/options.h b/sc2/src/options.h index ff678479d..d482d7617 100644 --- a/sc2/src/options.h +++ b/sc2/src/options.h @@ -73,6 +73,7 @@ void prepareSaveDir (void); void prepareAddons (const char **addons); BOOLEAN loadAddon (const char *addon); +int loadIndices (uio_DirHandle *baseDir); #endif diff --git a/sc2/src/sc2code/comm/arilou/ifontres.h b/sc2/src/sc2code/comm/arilou/ifontres.h index 0da21be45..0e135dddb 100644 --- a/sc2/src/sc2code/comm/arilou/ifontres.h +++ b/sc2/src/sc2code/comm/arilou/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_FONT 0x3e800103L +#define ARILOU_FONT "comm.arilou.font" diff --git a/sc2/src/sc2code/comm/arilou/igfxres.h b/sc2/src/sc2code/comm/arilou/igfxres.h index 753590403..d90cafa14 100644 --- a/sc2/src/sc2code/comm/arilou/igfxres.h +++ b/sc2/src/sc2code/comm/arilou/igfxres.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_PMAP_ANIM 0x3e800302L -#define ARILOU_COLOR_MAP 0x3e800404L +#define ARILOU_PMAP_ANIM "comm.arilou.graphics" +#define ARILOU_COLOR_MAP "comm.arilou.colortable" diff --git a/sc2/src/sc2code/comm/arilou/imusicre.h b/sc2/src/sc2code/comm/arilou/imusicre.h index f9cbfcccf..625488bf3 100644 --- a/sc2/src/sc2code/comm/arilou/imusicre.h +++ b/sc2/src/sc2code/comm/arilou/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_MUSIC 0x3e800006L +#define ARILOU_MUSIC "comm.arilou.music" diff --git a/sc2/src/sc2code/comm/arilou/istrtab.h b/sc2/src/sc2code/comm/arilou/istrtab.h index dd0c56698..368375d1c 100644 --- a/sc2/src/sc2code/comm/arilou/istrtab.h +++ b/sc2/src/sc2code/comm/arilou/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_CONVERSATION_PHRASES 0x3e800204L +#define ARILOU_CONVERSATION_PHRASES "comm.arilou.dialogue" diff --git a/sc2/src/sc2code/comm/blackur/ifontres.h b/sc2/src/sc2code/comm/blackur/ifontres.h index 1ae512940..0da1652cf 100644 --- a/sc2/src/sc2code/comm/blackur/ifontres.h +++ b/sc2/src/sc2code/comm/blackur/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define BLACKURQ_FONT 0x3ea00103L +#define BLACKURQ_FONT "comm.kohrah.font" diff --git a/sc2/src/sc2code/comm/blackur/igfxres.h b/sc2/src/sc2code/comm/blackur/igfxres.h index 003014e44..bf01594c6 100644 --- a/sc2/src/sc2code/comm/blackur/igfxres.h +++ b/sc2/src/sc2code/comm/blackur/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define BLACKURQ_PMAP_ANIM 0x3ea00402L +#define BLACKURQ_PMAP_ANIM "comm.kohrah.graphics" diff --git a/sc2/src/sc2code/comm/blackur/imusicre.h b/sc2/src/sc2code/comm/blackur/imusicre.h index 10820632c..4873fe3a8 100644 --- a/sc2/src/sc2code/comm/blackur/imusicre.h +++ b/sc2/src/sc2code/comm/blackur/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define BLACKURQ_MUSIC 0x3ea00006L +#define BLACKURQ_MUSIC "comm.kohrah.music" diff --git a/sc2/src/sc2code/comm/blackur/istrtab.h b/sc2/src/sc2code/comm/blackur/istrtab.h index 1691a227b..357e911d5 100644 --- a/sc2/src/sc2code/comm/blackur/istrtab.h +++ b/sc2/src/sc2code/comm/blackur/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define BLACKURQ_CONVERSATION_PHRASES 0x3ea00204L -#define BLACKURQ_COLOR_MAP 0x3ea00304L +#define BLACKURQ_CONVERSATION_PHRASES "comm.kohrah.dialogue" +#define BLACKURQ_COLOR_MAP "comm.kohrah.colortable" diff --git a/sc2/src/sc2code/comm/chmmr/ifontres.h b/sc2/src/sc2code/comm/chmmr/ifontres.h index 6bb16faf7..808cbc7fa 100644 --- a/sc2/src/sc2code/comm/chmmr/ifontres.h +++ b/sc2/src/sc2code/comm/chmmr/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_FONT 0x3ec00103L +#define CHMMR_FONT "comm.chmmr.font" diff --git a/sc2/src/sc2code/comm/chmmr/igfxres.h b/sc2/src/sc2code/comm/chmmr/igfxres.h index 94c433d88..5b951eb29 100644 --- a/sc2/src/sc2code/comm/chmmr/igfxres.h +++ b/sc2/src/sc2code/comm/chmmr/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_PMAP_ANIM 0x3ec00402L +#define CHMMR_PMAP_ANIM "comm.chmmr.graphics" diff --git a/sc2/src/sc2code/comm/chmmr/imusicre.h b/sc2/src/sc2code/comm/chmmr/imusicre.h index b96a10b03..50de46f6b 100644 --- a/sc2/src/sc2code/comm/chmmr/imusicre.h +++ b/sc2/src/sc2code/comm/chmmr/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_MUSIC 0x3ec00006L +#define CHMMR_MUSIC "comm.chmmr.music" diff --git a/sc2/src/sc2code/comm/chmmr/istrtab.h b/sc2/src/sc2code/comm/chmmr/istrtab.h index e361e1021..8ddc5c465 100644 --- a/sc2/src/sc2code/comm/chmmr/istrtab.h +++ b/sc2/src/sc2code/comm/chmmr/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_CONVERSATION_PHRASES 0x3ec00204L -#define CHMMR_COLOR_MAP 0x3ec00304L +#define CHMMR_CONVERSATION_PHRASES "comm.chmmr.dialogue" +#define CHMMR_COLOR_MAP "comm.chmmr.colortable" diff --git a/sc2/src/sc2code/comm/comandr/ifontres.h b/sc2/src/sc2code/comm/comandr/ifontres.h index c685b49f1..5fdded06d 100644 --- a/sc2/src/sc2code/comm/comandr/ifontres.h +++ b/sc2/src/sc2code/comm/comandr/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define COMMANDER_FONT 0x3ee00303L +#define COMMANDER_FONT "comm.commander.font" diff --git a/sc2/src/sc2code/comm/comandr/igfxres.h b/sc2/src/sc2code/comm/comandr/igfxres.h index 8a5a9b319..5775978a4 100644 --- a/sc2/src/sc2code/comm/comandr/igfxres.h +++ b/sc2/src/sc2code/comm/comandr/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define COMMANDER_PMAP_ANIM 0x3ee00702L +#define COMMANDER_PMAP_ANIM "comm.commander.graphics" diff --git a/sc2/src/sc2code/comm/comandr/imusicre.h b/sc2/src/sc2code/comm/comandr/imusicre.h index f8084352f..ff2ee28bf 100644 --- a/sc2/src/sc2code/comm/comandr/imusicre.h +++ b/sc2/src/sc2code/comm/comandr/imusicre.h @@ -2,6 +2,6 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define COMMANDER_MUSIC 0x3ee00006L -#define STARBASE_ALT_MUSIC 0x3ee00106L -#define COMMANDER_LOWPOW_MUSIC 0x3ee00206L +#define COMMANDER_MUSIC "comm.commander.music" +#define STARBASE_ALT_MUSIC "comm.starbase.music" +#define COMMANDER_LOWPOW_MUSIC "comm.comlowpw.music" diff --git a/sc2/src/sc2code/comm/comandr/istrtab.h b/sc2/src/sc2code/comm/comandr/istrtab.h index 8509ff379..11c8a6be4 100644 --- a/sc2/src/sc2code/comm/comandr/istrtab.h +++ b/sc2/src/sc2code/comm/comandr/istrtab.h @@ -2,6 +2,6 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define COMMANDER_COLOR_MAP 0x3ee00404L -#define COMMANDER_CONVERSATION_PHRASES 0x3ee00504L -#define STARBASE_CONVERSATION_PHRASES 0x3ee00604L +#define COMMANDER_COLOR_MAP "comm.commander.colortable" +#define COMMANDER_CONVERSATION_PHRASES "comm.commander.dialogue" +#define STARBASE_CONVERSATION_PHRASES "comm.starbase.dialogue" diff --git a/sc2/src/sc2code/comm/druuge/ifontres.h b/sc2/src/sc2code/comm/druuge/ifontres.h index fdaa8de1c..59daa532e 100644 --- a/sc2/src/sc2code/comm/druuge/ifontres.h +++ b/sc2/src/sc2code/comm/druuge/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_FONT 0x3f000103L +#define DRUUGE_FONT "comm.druuge.font" diff --git a/sc2/src/sc2code/comm/druuge/igfxres.h b/sc2/src/sc2code/comm/druuge/igfxres.h index c94b84039..3c59f1af0 100644 --- a/sc2/src/sc2code/comm/druuge/igfxres.h +++ b/sc2/src/sc2code/comm/druuge/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_PMAP_ANIM 0x3f000402L +#define DRUUGE_PMAP_ANIM "comm.druuge.graphics" diff --git a/sc2/src/sc2code/comm/druuge/imusicre.h b/sc2/src/sc2code/comm/druuge/imusicre.h index c9937b46a..ae1b7de74 100644 --- a/sc2/src/sc2code/comm/druuge/imusicre.h +++ b/sc2/src/sc2code/comm/druuge/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_MUSIC 0x3f000006L +#define DRUUGE_MUSIC "comm.druuge.music" diff --git a/sc2/src/sc2code/comm/druuge/istrtab.h b/sc2/src/sc2code/comm/druuge/istrtab.h index 1eadaf76a..c0c28e3ba 100644 --- a/sc2/src/sc2code/comm/druuge/istrtab.h +++ b/sc2/src/sc2code/comm/druuge/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_CONVERSATION_PHRASES 0x3f000204L -#define DRUUGE_COLOR_MAP 0x3f000304L +#define DRUUGE_CONVERSATION_PHRASES "comm.druuge.dialogue" +#define DRUUGE_COLOR_MAP "comm.druuge.colortable" diff --git a/sc2/src/sc2code/comm/ilwrath/ifontres.h b/sc2/src/sc2code/comm/ilwrath/ifontres.h index f441115b1..9637b0377 100644 --- a/sc2/src/sc2code/comm/ilwrath/ifontres.h +++ b/sc2/src/sc2code/comm/ilwrath/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_FONT 0x3f200103L +#define ILWRATH_FONT "comm.ilwrath.font" diff --git a/sc2/src/sc2code/comm/ilwrath/igfxres.h b/sc2/src/sc2code/comm/ilwrath/igfxres.h index c119a6f05..b58e285be 100644 --- a/sc2/src/sc2code/comm/ilwrath/igfxres.h +++ b/sc2/src/sc2code/comm/ilwrath/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_PMAP_ANIM 0x3f200402L +#define ILWRATH_PMAP_ANIM "comm.ilwrath.graphics" diff --git a/sc2/src/sc2code/comm/ilwrath/imusicre.h b/sc2/src/sc2code/comm/ilwrath/imusicre.h index 25a271356..7c5f0b322 100644 --- a/sc2/src/sc2code/comm/ilwrath/imusicre.h +++ b/sc2/src/sc2code/comm/ilwrath/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_MUSIC 0x3f200006L +#define ILWRATH_MUSIC "comm.ilwrath.music" diff --git a/sc2/src/sc2code/comm/ilwrath/istrtab.h b/sc2/src/sc2code/comm/ilwrath/istrtab.h index 7195f1a12..73a281bbd 100644 --- a/sc2/src/sc2code/comm/ilwrath/istrtab.h +++ b/sc2/src/sc2code/comm/ilwrath/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_CONVERSATION_PHRASES 0x3f200204L -#define ILWRATH_COLOR_MAP 0x3f200304L +#define ILWRATH_CONVERSATION_PHRASES "comm.ilwrath.dialogue" +#define ILWRATH_COLOR_MAP "comm.ilwrath.colortable" diff --git a/sc2/src/sc2code/comm/melnorm/ifontres.h b/sc2/src/sc2code/comm/melnorm/ifontres.h index d36f694f8..deec3afab 100644 --- a/sc2/src/sc2code/comm/melnorm/ifontres.h +++ b/sc2/src/sc2code/comm/melnorm/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_FONT 0x3f400103L +#define MELNORME_FONT "comm.melnorme.font" diff --git a/sc2/src/sc2code/comm/melnorm/igfxres.h b/sc2/src/sc2code/comm/melnorm/igfxres.h index 565fb2d06..192d9c9fd 100644 --- a/sc2/src/sc2code/comm/melnorm/igfxres.h +++ b/sc2/src/sc2code/comm/melnorm/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_PMAP_ANIM 0x3f400402L +#define MELNORME_PMAP_ANIM "comm.melnorme.graphics" diff --git a/sc2/src/sc2code/comm/melnorm/imusicre.h b/sc2/src/sc2code/comm/melnorm/imusicre.h index 83144ddab..69d5bec89 100644 --- a/sc2/src/sc2code/comm/melnorm/imusicre.h +++ b/sc2/src/sc2code/comm/melnorm/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_MUSIC 0x3f400006L +#define MELNORME_MUSIC "comm.melnorme.music" diff --git a/sc2/src/sc2code/comm/melnorm/istrtab.h b/sc2/src/sc2code/comm/melnorm/istrtab.h index faf11465d..2dab59142 100644 --- a/sc2/src/sc2code/comm/melnorm/istrtab.h +++ b/sc2/src/sc2code/comm/melnorm/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_CONVERSATION_PHRASES 0x3f400204L -#define MELNORME_COLOR_MAP 0x3f400304L +#define MELNORME_CONVERSATION_PHRASES "comm.melnorme.dialogue" +#define MELNORME_COLOR_MAP "comm.melnorme.colortable" diff --git a/sc2/src/sc2code/comm/mycon/ifontres.h b/sc2/src/sc2code/comm/mycon/ifontres.h index 1051ff145..564e1efc3 100644 --- a/sc2/src/sc2code/comm/mycon/ifontres.h +++ b/sc2/src/sc2code/comm/mycon/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_FONT 0x3f600103L +#define MYCON_FONT "comm.mycon.font" diff --git a/sc2/src/sc2code/comm/mycon/igfxres.h b/sc2/src/sc2code/comm/mycon/igfxres.h index 972d9459a..7b1b71b31 100644 --- a/sc2/src/sc2code/comm/mycon/igfxres.h +++ b/sc2/src/sc2code/comm/mycon/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_PMAP_ANIM 0x3f600402L +#define MYCON_PMAP_ANIM "comm.mycon.graphics" diff --git a/sc2/src/sc2code/comm/mycon/imusicre.h b/sc2/src/sc2code/comm/mycon/imusicre.h index 2fdc4fe2d..2d8ae5d79 100644 --- a/sc2/src/sc2code/comm/mycon/imusicre.h +++ b/sc2/src/sc2code/comm/mycon/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_MUSIC 0x3f600006L +#define MYCON_MUSIC "comm.mycon.music" diff --git a/sc2/src/sc2code/comm/mycon/istrtab.h b/sc2/src/sc2code/comm/mycon/istrtab.h index cee6db6a4..6b83b80e9 100644 --- a/sc2/src/sc2code/comm/mycon/istrtab.h +++ b/sc2/src/sc2code/comm/mycon/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_CONVERSATION_PHRASES 0x3f600204L -#define MYCON_COLOR_MAP 0x3f600304L +#define MYCON_CONVERSATION_PHRASES "comm.mycon.dialogue" +#define MYCON_COLOR_MAP "comm.mycon.colortable" diff --git a/sc2/src/sc2code/comm/orz/ifontres.h b/sc2/src/sc2code/comm/orz/ifontres.h index 659f00773..e15cda517 100644 --- a/sc2/src/sc2code/comm/orz/ifontres.h +++ b/sc2/src/sc2code/comm/orz/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_FONT 0x3f800103L +#define ORZ_FONT "comm.orz.font" diff --git a/sc2/src/sc2code/comm/orz/igfxres.h b/sc2/src/sc2code/comm/orz/igfxres.h index d69b2a94a..0fe117937 100644 --- a/sc2/src/sc2code/comm/orz/igfxres.h +++ b/sc2/src/sc2code/comm/orz/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_PMAP_ANIM 0x3f800402L +#define ORZ_PMAP_ANIM "comm.orz.graphics" diff --git a/sc2/src/sc2code/comm/orz/imusicre.h b/sc2/src/sc2code/comm/orz/imusicre.h index fe6a36eae..a6174aaef 100644 --- a/sc2/src/sc2code/comm/orz/imusicre.h +++ b/sc2/src/sc2code/comm/orz/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_MUSIC 0x3f800006L +#define ORZ_MUSIC "comm.orz.music" diff --git a/sc2/src/sc2code/comm/orz/istrtab.h b/sc2/src/sc2code/comm/orz/istrtab.h index 699cd96f2..25649a757 100644 --- a/sc2/src/sc2code/comm/orz/istrtab.h +++ b/sc2/src/sc2code/comm/orz/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_CONVERSATION_PHRASES 0x3f800204L -#define ORZ_COLOR_MAP 0x3f800304L +#define ORZ_CONVERSATION_PHRASES "comm.orz.dialogue" +#define ORZ_COLOR_MAP "comm.orz.colortable" diff --git a/sc2/src/sc2code/comm/pkunk/ifontres.h b/sc2/src/sc2code/comm/pkunk/ifontres.h index 9807f50cc..bdd73344a 100644 --- a/sc2/src/sc2code/comm/pkunk/ifontres.h +++ b/sc2/src/sc2code/comm/pkunk/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_FONT 0x3fa00103L +#define PKUNK_FONT "comm.pkunk.font" diff --git a/sc2/src/sc2code/comm/pkunk/igfxres.h b/sc2/src/sc2code/comm/pkunk/igfxres.h index b0278767e..fb24d6b71 100644 --- a/sc2/src/sc2code/comm/pkunk/igfxres.h +++ b/sc2/src/sc2code/comm/pkunk/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_PMAP_ANIM 0x3fa00402L +#define PKUNK_PMAP_ANIM "comm.pkunk.graphics" diff --git a/sc2/src/sc2code/comm/pkunk/imusicre.h b/sc2/src/sc2code/comm/pkunk/imusicre.h index 0e8808033..105a65cde 100644 --- a/sc2/src/sc2code/comm/pkunk/imusicre.h +++ b/sc2/src/sc2code/comm/pkunk/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_MUSIC 0x3fa00006L +#define PKUNK_MUSIC "comm.pkunk.music" diff --git a/sc2/src/sc2code/comm/pkunk/istrtab.h b/sc2/src/sc2code/comm/pkunk/istrtab.h index 55c93a612..c2eb0ad08 100644 --- a/sc2/src/sc2code/comm/pkunk/istrtab.h +++ b/sc2/src/sc2code/comm/pkunk/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_CONVERSATION_PHRASES 0x3fa00204L -#define PKUNK_COLOR_MAP 0x3fa00304L +#define PKUNK_CONVERSATION_PHRASES "comm.pkunk.dialogue" +#define PKUNK_COLOR_MAP "comm.pkunk.colortable" diff --git a/sc2/src/sc2code/comm/shofixt/ifontres.h b/sc2/src/sc2code/comm/shofixt/ifontres.h index 7ecd360bd..6cccd9a0d 100644 --- a/sc2/src/sc2code/comm/shofixt/ifontres.h +++ b/sc2/src/sc2code/comm/shofixt/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_FONT 0x3fc00103L +#define SHOFIXTI_FONT "comm.shofixti.font" diff --git a/sc2/src/sc2code/comm/shofixt/igfxres.h b/sc2/src/sc2code/comm/shofixt/igfxres.h index 96bb23cb2..ed37d88b8 100644 --- a/sc2/src/sc2code/comm/shofixt/igfxres.h +++ b/sc2/src/sc2code/comm/shofixt/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_PMAP_ANIM 0x3fc00402L +#define SHOFIXTI_PMAP_ANIM "comm.shofixti.graphics" diff --git a/sc2/src/sc2code/comm/shofixt/imusicre.h b/sc2/src/sc2code/comm/shofixt/imusicre.h index 3596bb117..7cc490258 100644 --- a/sc2/src/sc2code/comm/shofixt/imusicre.h +++ b/sc2/src/sc2code/comm/shofixt/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_MUSIC 0x3fc00006L +#define SHOFIXTI_MUSIC "comm.shofixti.music" diff --git a/sc2/src/sc2code/comm/shofixt/istrtab.h b/sc2/src/sc2code/comm/shofixt/istrtab.h index a5346ee7e..e4d71cc22 100644 --- a/sc2/src/sc2code/comm/shofixt/istrtab.h +++ b/sc2/src/sc2code/comm/shofixt/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_CONVERSATION_PHRASES 0x3fc00204L -#define SHOFIXTI_COLOR_MAP 0x3fc00304L +#define SHOFIXTI_CONVERSATION_PHRASES "comm.shofixti.dialogue" +#define SHOFIXTI_COLOR_MAP "comm.shofixti.colortable" diff --git a/sc2/src/sc2code/comm/slyhome/ifontres.h b/sc2/src/sc2code/comm/slyhome/ifontres.h index 856e42b91..b37ba0912 100644 --- a/sc2/src/sc2code/comm/slyhome/ifontres.h +++ b/sc2/src/sc2code/comm/slyhome/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_FONT 0x3fe00103L +#define SLYLANDRO_FONT "comm.slyhome.font" diff --git a/sc2/src/sc2code/comm/slyhome/igfxres.h b/sc2/src/sc2code/comm/slyhome/igfxres.h index 2c17162ec..3a17cebb1 100644 --- a/sc2/src/sc2code/comm/slyhome/igfxres.h +++ b/sc2/src/sc2code/comm/slyhome/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_PMAP_ANIM 0x3fe00402L +#define SLYLANDRO_PMAP_ANIM "comm.slyhome.graphics" diff --git a/sc2/src/sc2code/comm/slyhome/imusicre.h b/sc2/src/sc2code/comm/slyhome/imusicre.h index 163a867a6..0a729350a 100644 --- a/sc2/src/sc2code/comm/slyhome/imusicre.h +++ b/sc2/src/sc2code/comm/slyhome/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_MUSIC 0x3fe00006L +#define SLYLANDRO_MUSIC "comm.slyhome.music" diff --git a/sc2/src/sc2code/comm/slyhome/istrtab.h b/sc2/src/sc2code/comm/slyhome/istrtab.h index 8a3d82dfd..a1ac4f22f 100644 --- a/sc2/src/sc2code/comm/slyhome/istrtab.h +++ b/sc2/src/sc2code/comm/slyhome/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_CONVERSATION_PHRASES 0x3fe00204L -#define SLYLANDRO_COLOR_MAP 0x3fe00304L +#define SLYLANDRO_CONVERSATION_PHRASES "comm.slyhome.dialogue" +#define SLYLANDRO_COLOR_MAP "comm.slyhome.colortable" diff --git a/sc2/src/sc2code/comm/slyland/ifontres.h b/sc2/src/sc2code/comm/slyland/ifontres.h index 0d62851ec..6ad5cc772 100644 --- a/sc2/src/sc2code/comm/slyland/ifontres.h +++ b/sc2/src/sc2code/comm/slyland/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLAND_FONT 0x40000103L +#define SLYLAND_FONT "comm.slylandro.font" diff --git a/sc2/src/sc2code/comm/slyland/igfxres.h b/sc2/src/sc2code/comm/slyland/igfxres.h index 46100a8c1..5ea09505d 100644 --- a/sc2/src/sc2code/comm/slyland/igfxres.h +++ b/sc2/src/sc2code/comm/slyland/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLAND_PMAP_ANIM 0x40000402L +#define SLYLAND_PMAP_ANIM "comm.slylandro.graphics" diff --git a/sc2/src/sc2code/comm/slyland/imusicre.h b/sc2/src/sc2code/comm/slyland/imusicre.h index 071e22b15..0a299d450 100644 --- a/sc2/src/sc2code/comm/slyland/imusicre.h +++ b/sc2/src/sc2code/comm/slyland/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLAND_MUSIC 0x40000006L +#define SLYLAND_MUSIC "comm.slylandro.music" diff --git a/sc2/src/sc2code/comm/slyland/istrtab.h b/sc2/src/sc2code/comm/slyland/istrtab.h index c759954fd..b888456af 100644 --- a/sc2/src/sc2code/comm/slyland/istrtab.h +++ b/sc2/src/sc2code/comm/slyland/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLAND_CONVERSATION_PHRASES 0x40000204L -#define SLYLAND_COLOR_MAP 0x40000304L +#define SLYLAND_CONVERSATION_PHRASES "comm.slylandro.dialogue" +#define SLYLAND_COLOR_MAP "comm.slylandro.colortable" diff --git a/sc2/src/sc2code/comm/spathi/ifontres.h b/sc2/src/sc2code/comm/spathi/ifontres.h index 8ba396987..1413454ab 100644 --- a/sc2/src/sc2code/comm/spathi/ifontres.h +++ b/sc2/src/sc2code/comm/spathi/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_FONT 0x40200303L +#define SPATHI_FONT "comm.spathi.font" diff --git a/sc2/src/sc2code/comm/spathi/igfxres.h b/sc2/src/sc2code/comm/spathi/igfxres.h index fa0eccd3a..131ca8b45 100644 --- a/sc2/src/sc2code/comm/spathi/igfxres.h +++ b/sc2/src/sc2code/comm/spathi/igfxres.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_PMAP_ANIM 0x40200802L -#define SPATHI_HOME_PMAP_ANIM 0x40200902L +#define SPATHI_PMAP_ANIM "comm.spathi.graphics" +#define SPATHI_HOME_PMAP_ANIM "comm.spahome.graphics" diff --git a/sc2/src/sc2code/comm/spathi/imusicre.h b/sc2/src/sc2code/comm/spathi/imusicre.h index 98b055f59..1c60412a2 100644 --- a/sc2/src/sc2code/comm/spathi/imusicre.h +++ b/sc2/src/sc2code/comm/spathi/imusicre.h @@ -2,6 +2,6 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_MUSIC 0x40200006L -#define SPAHOME_MUSIC 0x40200106L -#define FWIFFO_MUSIC 0x40200206L +#define SPATHI_MUSIC "comm.spathi.music" +#define SPAHOME_MUSIC "comm.spahome.music" +#define FWIFFO_MUSIC "comm.spafwiff.music" diff --git a/sc2/src/sc2code/comm/spathi/istrtab.h b/sc2/src/sc2code/comm/spathi/istrtab.h index dc1bb95bc..590919c9c 100644 --- a/sc2/src/sc2code/comm/spathi/istrtab.h +++ b/sc2/src/sc2code/comm/spathi/istrtab.h @@ -2,7 +2,7 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_CONVERSATION_PHRASES 0x40200404L -#define SPATHI_HOME_COLOR_MAP 0x40200504L -#define SPATHI_HOME_CONVERSATION_PHRASES 0x40200604L -#define SPATHI_COLOR_MAP 0x40200704L +#define SPATHI_CONVERSATION_PHRASES "comm.spathi.dialogue" +#define SPATHI_HOME_COLOR_MAP "comm.spahome.colortable" +#define SPATHI_HOME_CONVERSATION_PHRASES "comm.spahome.dialogue" +#define SPATHI_COLOR_MAP "comm.spathi.colortable" diff --git a/sc2/src/sc2code/comm/supox/ifontres.h b/sc2/src/sc2code/comm/supox/ifontres.h index 7d2de62e6..6d3390b67 100644 --- a/sc2/src/sc2code/comm/supox/ifontres.h +++ b/sc2/src/sc2code/comm/supox/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_FONT 0x40400103L +#define SUPOX_FONT "comm.supox.font" diff --git a/sc2/src/sc2code/comm/supox/igfxres.h b/sc2/src/sc2code/comm/supox/igfxres.h index e28cd04b8..a5d8fddf6 100644 --- a/sc2/src/sc2code/comm/supox/igfxres.h +++ b/sc2/src/sc2code/comm/supox/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_PMAP_ANIM 0x40400402L +#define SUPOX_PMAP_ANIM "comm.supox.graphics" diff --git a/sc2/src/sc2code/comm/supox/imusicre.h b/sc2/src/sc2code/comm/supox/imusicre.h index 8eaee898c..89716cea6 100644 --- a/sc2/src/sc2code/comm/supox/imusicre.h +++ b/sc2/src/sc2code/comm/supox/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_MUSIC 0x40400006L +#define SUPOX_MUSIC "comm.supox.music" diff --git a/sc2/src/sc2code/comm/supox/istrtab.h b/sc2/src/sc2code/comm/supox/istrtab.h index 179367906..eddd1cd47 100644 --- a/sc2/src/sc2code/comm/supox/istrtab.h +++ b/sc2/src/sc2code/comm/supox/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_CONVERSATION_PHRASES 0x40400204L -#define SUPOX_COLOR_MAP 0x40400304L +#define SUPOX_CONVERSATION_PHRASES "comm.supox.dialogue" +#define SUPOX_COLOR_MAP "comm.supox.colortable" diff --git a/sc2/src/sc2code/comm/syreen/ifontres.h b/sc2/src/sc2code/comm/syreen/ifontres.h index be56e9b46..280ecf6bf 100644 --- a/sc2/src/sc2code/comm/syreen/ifontres.h +++ b/sc2/src/sc2code/comm/syreen/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_FONT 0x40600103L +#define SYREEN_FONT "comm.syreen.font" diff --git a/sc2/src/sc2code/comm/syreen/igfxres.h b/sc2/src/sc2code/comm/syreen/igfxres.h index d551af464..ee7f2f41b 100644 --- a/sc2/src/sc2code/comm/syreen/igfxres.h +++ b/sc2/src/sc2code/comm/syreen/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_PMAP_ANIM 0x40600402L +#define SYREEN_PMAP_ANIM "comm.syreen.graphics" diff --git a/sc2/src/sc2code/comm/syreen/imusicre.h b/sc2/src/sc2code/comm/syreen/imusicre.h index c66f942ef..369e791e3 100644 --- a/sc2/src/sc2code/comm/syreen/imusicre.h +++ b/sc2/src/sc2code/comm/syreen/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_MUSIC 0x40600006L +#define SYREEN_MUSIC "comm.syreen.music" diff --git a/sc2/src/sc2code/comm/syreen/istrtab.h b/sc2/src/sc2code/comm/syreen/istrtab.h index ab6f3cf85..24ad4a398 100644 --- a/sc2/src/sc2code/comm/syreen/istrtab.h +++ b/sc2/src/sc2code/comm/syreen/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_CONVERSATION_PHRASES 0x40600204L -#define SYREEN_COLOR_MAP 0x40600304L +#define SYREEN_CONVERSATION_PHRASES "comm.syreen.dialogue" +#define SYREEN_COLOR_MAP "comm.syreen.colortable" diff --git a/sc2/src/sc2code/comm/talkpet/ifontres.h b/sc2/src/sc2code/comm/talkpet/ifontres.h index 853d563c5..ff89a7d18 100644 --- a/sc2/src/sc2code/comm/talkpet/ifontres.h +++ b/sc2/src/sc2code/comm/talkpet/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define TALKING_PET_FONT 0x40800103L +#define TALKING_PET_FONT "comm.talkingpet.font" diff --git a/sc2/src/sc2code/comm/talkpet/igfxres.h b/sc2/src/sc2code/comm/talkpet/igfxres.h index 742d79bdc..a6ddac3d3 100644 --- a/sc2/src/sc2code/comm/talkpet/igfxres.h +++ b/sc2/src/sc2code/comm/talkpet/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define TALKING_PET_PMAP_ANIM 0x40800402L +#define TALKING_PET_PMAP_ANIM "comm.talkingpet.graphics" diff --git a/sc2/src/sc2code/comm/talkpet/imusicre.h b/sc2/src/sc2code/comm/talkpet/imusicre.h index af91d47b9..787f15b8d 100644 --- a/sc2/src/sc2code/comm/talkpet/imusicre.h +++ b/sc2/src/sc2code/comm/talkpet/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define TALKING_PET_MUSIC 0x40800006L +#define TALKING_PET_MUSIC "comm.talkingpet.music" diff --git a/sc2/src/sc2code/comm/talkpet/istrtab.h b/sc2/src/sc2code/comm/talkpet/istrtab.h index 2e4f72f27..2bcd0e344 100644 --- a/sc2/src/sc2code/comm/talkpet/istrtab.h +++ b/sc2/src/sc2code/comm/talkpet/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define TALKING_PET_CONVERSATION_PHRASES 0x40800204L -#define TALKING_PET_COLOR_MAP 0x40800304L +#define TALKING_PET_CONVERSATION_PHRASES "comm.talkingpet.dialogue" +#define TALKING_PET_COLOR_MAP "comm.talkingpet.colortable" diff --git a/sc2/src/sc2code/comm/thradd/ifontres.h b/sc2/src/sc2code/comm/thradd/ifontres.h index d3e111812..3e90228e1 100644 --- a/sc2/src/sc2code/comm/thradd/ifontres.h +++ b/sc2/src/sc2code/comm/thradd/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADD_FONT 0x40a00103L +#define THRADD_FONT "comm.thraddash.font" diff --git a/sc2/src/sc2code/comm/thradd/igfxres.h b/sc2/src/sc2code/comm/thradd/igfxres.h index 9678d3bf0..1b6e1d7d4 100644 --- a/sc2/src/sc2code/comm/thradd/igfxres.h +++ b/sc2/src/sc2code/comm/thradd/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADD_PMAP_ANIM 0x40a00402L +#define THRADD_PMAP_ANIM "comm.thraddash.graphics" diff --git a/sc2/src/sc2code/comm/thradd/imusicre.h b/sc2/src/sc2code/comm/thradd/imusicre.h index 526d2f048..85e19cfba 100644 --- a/sc2/src/sc2code/comm/thradd/imusicre.h +++ b/sc2/src/sc2code/comm/thradd/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADD_MUSIC 0x40a00006L +#define THRADD_MUSIC "comm.thraddash.music" diff --git a/sc2/src/sc2code/comm/thradd/istrtab.h b/sc2/src/sc2code/comm/thradd/istrtab.h index cf793a3db..9682fdbc9 100644 --- a/sc2/src/sc2code/comm/thradd/istrtab.h +++ b/sc2/src/sc2code/comm/thradd/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADD_CONVERSATION_PHRASES 0x40a00204L -#define THRADD_COLOR_MAP 0x40a00304L +#define THRADD_CONVERSATION_PHRASES "comm.thraddash.dialogue" +#define THRADD_COLOR_MAP "comm.thraddash.colortable" diff --git a/sc2/src/sc2code/comm/umgah/ifontres.h b/sc2/src/sc2code/comm/umgah/ifontres.h index e96b84099..c02106992 100644 --- a/sc2/src/sc2code/comm/umgah/ifontres.h +++ b/sc2/src/sc2code/comm/umgah/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_FONT 0x40c00103L +#define UMGAH_FONT "comm.umgah.font" diff --git a/sc2/src/sc2code/comm/umgah/igfxres.h b/sc2/src/sc2code/comm/umgah/igfxres.h index 20710c499..19ea82c32 100644 --- a/sc2/src/sc2code/comm/umgah/igfxres.h +++ b/sc2/src/sc2code/comm/umgah/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_PMAP_ANIM 0x40c00402L +#define UMGAH_PMAP_ANIM "comm.umgah.graphics" diff --git a/sc2/src/sc2code/comm/umgah/imusicre.h b/sc2/src/sc2code/comm/umgah/imusicre.h index 032b27768..3a4d1baa5 100644 --- a/sc2/src/sc2code/comm/umgah/imusicre.h +++ b/sc2/src/sc2code/comm/umgah/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_MUSIC 0x40c00006L +#define UMGAH_MUSIC "comm.umgah.music" diff --git a/sc2/src/sc2code/comm/umgah/istrtab.h b/sc2/src/sc2code/comm/umgah/istrtab.h index 30fb9471d..906ee285d 100644 --- a/sc2/src/sc2code/comm/umgah/istrtab.h +++ b/sc2/src/sc2code/comm/umgah/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_CONVERSATION_PHRASES 0x40c00204L -#define UMGAH_COLOR_MAP 0x40c00304L +#define UMGAH_CONVERSATION_PHRASES "comm.umgah.dialogue" +#define UMGAH_COLOR_MAP "comm.umgah.colortable" diff --git a/sc2/src/sc2code/comm/urquan/ifontres.h b/sc2/src/sc2code/comm/urquan/ifontres.h index d80ef8e4c..98168564c 100644 --- a/sc2/src/sc2code/comm/urquan/ifontres.h +++ b/sc2/src/sc2code/comm/urquan/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_FONT 0x40e00103L +#define URQUAN_FONT "comm.urquan.font" diff --git a/sc2/src/sc2code/comm/urquan/igfxres.h b/sc2/src/sc2code/comm/urquan/igfxres.h index 4475b89c5..c7ab0672a 100644 --- a/sc2/src/sc2code/comm/urquan/igfxres.h +++ b/sc2/src/sc2code/comm/urquan/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_PMAP_ANIM 0x40e00402L +#define URQUAN_PMAP_ANIM "comm.urquan.graphics" diff --git a/sc2/src/sc2code/comm/urquan/imusicre.h b/sc2/src/sc2code/comm/urquan/imusicre.h index 2cc920e83..21788952c 100644 --- a/sc2/src/sc2code/comm/urquan/imusicre.h +++ b/sc2/src/sc2code/comm/urquan/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_MUSIC 0x40e00006L +#define URQUAN_MUSIC "comm.urquan.music" diff --git a/sc2/src/sc2code/comm/urquan/istrtab.h b/sc2/src/sc2code/comm/urquan/istrtab.h index eb0062843..48aa71472 100644 --- a/sc2/src/sc2code/comm/urquan/istrtab.h +++ b/sc2/src/sc2code/comm/urquan/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_CONVERSATION_PHRASES 0x40e00204L -#define URQUAN_COLOR_MAP 0x40e00304L +#define URQUAN_CONVERSATION_PHRASES "comm.urquan.dialogue" +#define URQUAN_COLOR_MAP "comm.urquan.colortable" diff --git a/sc2/src/sc2code/comm/utwig/ifontres.h b/sc2/src/sc2code/comm/utwig/ifontres.h index 89660c999..290bfc426 100644 --- a/sc2/src/sc2code/comm/utwig/ifontres.h +++ b/sc2/src/sc2code/comm/utwig/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_FONT 0x41000203L +#define UTWIG_FONT "comm.utwig.font" diff --git a/sc2/src/sc2code/comm/utwig/igfxres.h b/sc2/src/sc2code/comm/utwig/igfxres.h index 498a3620a..42d09abfa 100644 --- a/sc2/src/sc2code/comm/utwig/igfxres.h +++ b/sc2/src/sc2code/comm/utwig/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_PMAP_ANIM 0x41000502L +#define UTWIG_PMAP_ANIM "comm.utwig.graphics" diff --git a/sc2/src/sc2code/comm/utwig/imusicre.h b/sc2/src/sc2code/comm/utwig/imusicre.h index 8050a2292..5c4817796 100644 --- a/sc2/src/sc2code/comm/utwig/imusicre.h +++ b/sc2/src/sc2code/comm/utwig/imusicre.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_MUSIC 0x41000006L -#define UTWIG_ULTRON_MUSIC 0x41000106L +#define UTWIG_MUSIC "comm.utwig.music" +#define UTWIG_ULTRON_MUSIC "comm.utwigult.music" diff --git a/sc2/src/sc2code/comm/utwig/istrtab.h b/sc2/src/sc2code/comm/utwig/istrtab.h index beccdd5c1..0d3a60f12 100644 --- a/sc2/src/sc2code/comm/utwig/istrtab.h +++ b/sc2/src/sc2code/comm/utwig/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_CONVERSATION_PHRASES 0x41000304L -#define UTWIG_COLOR_MAP 0x41000404L +#define UTWIG_CONVERSATION_PHRASES "comm.utwig.dialogue" +#define UTWIG_COLOR_MAP "comm.utwig.colortable" diff --git a/sc2/src/sc2code/comm/vux/ifontres.h b/sc2/src/sc2code/comm/vux/ifontres.h index e5402d1cf..4f53feb25 100644 --- a/sc2/src/sc2code/comm/vux/ifontres.h +++ b/sc2/src/sc2code/comm/vux/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_FONT 0x41200103L +#define VUX_FONT "comm.vux.font" diff --git a/sc2/src/sc2code/comm/vux/igfxres.h b/sc2/src/sc2code/comm/vux/igfxres.h index 8631897ed..e0e18ebdb 100644 --- a/sc2/src/sc2code/comm/vux/igfxres.h +++ b/sc2/src/sc2code/comm/vux/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_PMAP_ANIM 0x41200402L +#define VUX_PMAP_ANIM "comm.vux.graphics" diff --git a/sc2/src/sc2code/comm/vux/imusicre.h b/sc2/src/sc2code/comm/vux/imusicre.h index 17953e5fa..cdb3e0c5b 100644 --- a/sc2/src/sc2code/comm/vux/imusicre.h +++ b/sc2/src/sc2code/comm/vux/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_MUSIC 0x41200006L +#define VUX_MUSIC "comm.vux.music" diff --git a/sc2/src/sc2code/comm/vux/istrtab.h b/sc2/src/sc2code/comm/vux/istrtab.h index 14efeb322..b3fb11fe3 100644 --- a/sc2/src/sc2code/comm/vux/istrtab.h +++ b/sc2/src/sc2code/comm/vux/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_CONVERSATION_PHRASES 0x41200204L -#define VUX_COLOR_MAP 0x41200304L +#define VUX_CONVERSATION_PHRASES "comm.vux.dialogue" +#define VUX_COLOR_MAP "comm.vux.colortable" diff --git a/sc2/src/sc2code/comm/yehat/ifontres.h b/sc2/src/sc2code/comm/yehat/ifontres.h index 2e01c10a0..2ac172a76 100644 --- a/sc2/src/sc2code/comm/yehat/ifontres.h +++ b/sc2/src/sc2code/comm/yehat/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_FONT 0x41400203L +#define YEHAT_FONT "comm.yehat.font" diff --git a/sc2/src/sc2code/comm/yehat/igfxres.h b/sc2/src/sc2code/comm/yehat/igfxres.h index dd2d98936..21ed09d6d 100644 --- a/sc2/src/sc2code/comm/yehat/igfxres.h +++ b/sc2/src/sc2code/comm/yehat/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_PMAP_ANIM 0x41400602L +#define YEHAT_PMAP_ANIM "comm.yehat.graphics" diff --git a/sc2/src/sc2code/comm/yehat/imusicre.h b/sc2/src/sc2code/comm/yehat/imusicre.h index 64cca1e24..214b77cd2 100644 --- a/sc2/src/sc2code/comm/yehat/imusicre.h +++ b/sc2/src/sc2code/comm/yehat/imusicre.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_MUSIC 0x41400006L -#define REBEL_MUSIC 0x41400106L +#define YEHAT_MUSIC "comm.yehat.music" +#define REBEL_MUSIC "comm.yehat.rebel.music" diff --git a/sc2/src/sc2code/comm/yehat/istrtab.h b/sc2/src/sc2code/comm/yehat/istrtab.h index 6aa69355d..4504abb4d 100644 --- a/sc2/src/sc2code/comm/yehat/istrtab.h +++ b/sc2/src/sc2code/comm/yehat/istrtab.h @@ -2,6 +2,6 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_CONVERSATION_PHRASES 0x41400304L -#define REBEL_CONVERSATION_PHRASES 0x41400404L -#define YEHAT_COLOR_MAP 0x41400504L +#define YEHAT_CONVERSATION_PHRASES "comm.yehat.dialogue" +#define REBEL_CONVERSATION_PHRASES "comm.yehat.rebel.dialogue" +#define YEHAT_COLOR_MAP "comm.yehat.colortable" diff --git a/sc2/src/sc2code/comm/zoqfot/ifontres.h b/sc2/src/sc2code/comm/zoqfot/ifontres.h index 120779d0a..86e66b55a 100644 --- a/sc2/src/sc2code/comm/zoqfot/ifontres.h +++ b/sc2/src/sc2code/comm/zoqfot/ifontres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_FONT 0x41600103L +#define ZOQFOTPIK_FONT "comm.zoqfotpik.font" diff --git a/sc2/src/sc2code/comm/zoqfot/igfxres.h b/sc2/src/sc2code/comm/zoqfot/igfxres.h index 5044e9dc2..f098c53a5 100644 --- a/sc2/src/sc2code/comm/zoqfot/igfxres.h +++ b/sc2/src/sc2code/comm/zoqfot/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_PMAP_ANIM 0x41600402L +#define ZOQFOTPIK_PMAP_ANIM "comm.zoqfotpik.graphics" diff --git a/sc2/src/sc2code/comm/zoqfot/imusicre.h b/sc2/src/sc2code/comm/zoqfot/imusicre.h index 9ec7c8653..4a7fa53d6 100644 --- a/sc2/src/sc2code/comm/zoqfot/imusicre.h +++ b/sc2/src/sc2code/comm/zoqfot/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_MUSIC 0x41600006L +#define ZOQFOTPIK_MUSIC "comm.zoqfotpik.music" diff --git a/sc2/src/sc2code/comm/zoqfot/istrtab.h b/sc2/src/sc2code/comm/zoqfot/istrtab.h index eed0251da..e3856cd7c 100644 --- a/sc2/src/sc2code/comm/zoqfot/istrtab.h +++ b/sc2/src/sc2code/comm/zoqfot/istrtab.h @@ -2,5 +2,5 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_CONVERSATION_PHRASES 0x41600204L -#define ZOQFOTPIK_COLOR_MAP 0x41600304L +#define ZOQFOTPIK_CONVERSATION_PHRASES "comm.zoqfotpik.dialogue" +#define ZOQFOTPIK_COLOR_MAP "comm.zoqfotpik.colortable" diff --git a/sc2/src/sc2code/cons_res.c b/sc2/src/sc2code/cons_res.c index 4500958e6..8a75dbb29 100644 --- a/sc2/src/sc2code/cons_res.c +++ b/sc2/src/sc2code/cons_res.c @@ -16,20 +16,40 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include + +#include "cons_res.h" #include "element.h" #include "resinst.h" #include "nameref.h" #include "setup.h" +static const char *planet_types[] = { + "oolite", "yttric", "quasidegenerate", "lanthanide", "treasure", + "urea", "metal", "radioactive", "opalescent", "cyanic", + "acid", "alkali", "halide", "green", "copper", + "carbide", "ultramarine", "noble", "azure", "chondrite", + "purple", "superdense", "pellucid", "dust", "crimson", + "cimmerian", "infrared", "selenic", "auric", "fluorescent", + "ultraviolet", "plutonic", "rainbow", "shattered", "sapphire", + "organic", "xenolithic", "redux", "primordial", "emerald", + "chlorine", "magnetic", "water", "telluric", "hydrocarbon", + "iodine", "vinylogous", "ruby", "magma", "maroon", + "bluegas", "cyangas", "greengas", "greygas", "orangegas", + "purplegas", "redgas", "violetgas", "yellowgas" +}; + +static const char *planet_sizes[] = { + "large", "medium", "small" +}; + FRAME planet[NUM_VIEWS]; +static char buffer[80]; void load_gravity_well (BYTE selector) { COUNT i; - RES_TYPE rt; - RES_INSTANCE ri; - RES_PACKAGE rp; if (selector == NUMBER_OF_PLANET_TYPES) { @@ -40,26 +60,21 @@ load_gravity_well (BYTE selector) } else { + const char *ptype; if (selector & PLANET_SHIELDED) { - rt = GET_TYPE (SHIELDED_BIG_MASK_PMAP_ANIM); - ri = GET_INSTANCE (SHIELDED_BIG_MASK_PMAP_ANIM); - rp = GET_PACKAGE (SHIELDED_BIG_MASK_PMAP_ANIM); + ptype = "slaveshield"; } else { - rt = GET_TYPE (PLANET00_BIG_MASK_PMAP_ANIM); - ri = GET_INSTANCE (PLANET00_BIG_MASK_PMAP_ANIM) - + (selector * NUM_VIEWS); - rp = GET_PACKAGE (PLANET00_BIG_MASK_PMAP_ANIM) - + selector; + ptype = planet_types[selector]; } - for (i = 0; i < NUM_VIEWS; ++i, ++ri) + for (i = 0; i < NUM_VIEWS; ++i) { - planet[i] = CaptureDrawable ( - LoadGraphic (MAKE_RESOURCE (rp, rt, ri)) - ); + snprintf (buffer, 79, "planet.%s.%s", ptype, planet_sizes[i]); + buffer[79] = '\0'; + planet[i] = CaptureDrawable (LoadGraphic (buffer)); } } @@ -80,18 +95,15 @@ free_gravity_well (void) FRAME load_life_form (BYTE selector) { - return CaptureDrawable (LoadGraphic (MAKE_RESOURCE ( - GET_PACKAGE (LIFE00_MASK_PMAP_ANIM) + selector, - GFXRES, - GET_INSTANCE (LIFE00_MASK_PMAP_ANIM) + selector))); + snprintf (buffer, 79, "graphics.life.%d", selector); + buffer[79] = '\0'; /* Shouldn't be necessary, but better safe than sorry */ + return CaptureDrawable (LoadGraphic (buffer)); } MUSIC_REF load_orbit_theme (BYTE selector) { - RES_PACKAGE rp = GET_PACKAGE (ORBIT1_MUSIC); - RES_INSTANCE ri = GET_INSTANCE (ORBIT1_MUSIC) + selector; - RES_TYPE rt = GET_TYPE (ORBIT1_MUSIC); - - return LoadMusic (MAKE_RESOURCE (rp, rt, ri)); + snprintf (buffer, 79, "music.orbit%d", selector + 1); + buffer[79] = '\0'; /* Shouldn't be necessary, but better safe than sorry */ + return LoadMusic (buffer); } diff --git a/sc2/src/sc2code/credits.c b/sc2/src/sc2code/credits.c index 6dbd45b52..53b186e99 100644 --- a/sc2/src/sc2code/credits.c +++ b/sc2/src/sc2code/credits.c @@ -50,7 +50,7 @@ static FRAME CreditsBack; typedef struct { int size; - DWORD res; + RESOURCE res; FONT font; } FONT_SIZE_DEF; diff --git a/sc2/src/sc2code/dummy.c b/sc2/src/sc2code/dummy.c index 6abaa8577..83e9f36e8 100644 --- a/sc2/src/sc2code/dummy.c +++ b/sc2/src/sc2code/dummy.c @@ -325,7 +325,7 @@ InstallCodeResType (COUNT code_type) void * -LoadCodeResInstance (DWORD res) +LoadCodeResInstance (RESOURCE res) { void *hData; diff --git a/sc2/src/sc2code/ifontres.h b/sc2/src/sc2code/ifontres.h index 0c2d427b7..22b60cba0 100644 --- a/sc2/src/sc2code/ifontres.h +++ b/sc2/src/sc2code/ifontres.h @@ -2,11 +2,11 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define STARCON_FONT 0x03800003L -#define TINY_FONT 0x03800103L -#define MICRO_FONT 0x03c00203L -#define LANDER_FONT 0x11400303L -#define PLAYER_FONT 0x17a00403L -#define PT13AA_FONT 0x24000503L -#define PT17AA_FONT 0x24000603L -#define PT45AA_FONT 0x24000703L +#define STARCON_FONT "font.starcon" +#define TINY_FONT "font.tiny" +#define MICRO_FONT "font.micro" +#define LANDER_FONT "font.lander" +#define PLAYER_FONT "font.player" +#define PT13AA_FONT "credits.font.pt13" +#define PT17AA_FONT "credits.font.pt17" +#define PT45AA_FONT "credits.font.pt45" diff --git a/sc2/src/sc2code/igfxres.h b/sc2/src/sc2code/igfxres.h index 89a3ec747..1150436ea 100644 --- a/sc2/src/sc2code/igfxres.h +++ b/sc2/src/sc2code/igfxres.h @@ -2,273 +2,273 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define TITLE_ANIM 0x00400002L -#define STATUS_MASK_PMAP_ANIM 0x03800102L -#define ACTIVITY_ANIM 0x03800202L -#define PLAYMENU_ANIM 0x03a00302L -#define FLAGSTAT_MASK_PMAP_ANIM 0x03e00402L -#define MISCDATA_MASK_PMAP_ANIM 0x03e00502L -#define FONTGRAD_PMAP_ANIM 0x03e11f02L -#define STAR_MASK_PMAP_ANIM 0x04400602L -#define ASTEROID_BIG_MASK_PMAP_ANIM 0x04400702L -#define ASTEROID_MED_MASK_PMAP_ANIM 0x04400802L -#define ASTEROID_SML_MASK_PMAP_ANIM 0x04400902L -#define BLAST_BIG_MASK_PMAP_ANIM 0x04400a02L -#define BLAST_MED_MASK_PMAP_ANIM 0x04400b02L -#define BLAST_SML_MASK_PMAP_ANIM 0x04400c02L -#define BOOM_BIG_MASK_PMAP_ANIM 0x04400d02L -#define BOOM_MED_MASK_PMAP_ANIM 0x04400e02L -#define BOOM_SML_MASK_PMAP_ANIM 0x04400f02L -#define AMBIENT_MASK_PMAP_ANIM 0x04601002L -#define HYPERSTARS_MASK_PMAP_ANIM 0x04801102L -#define ARISPACE_MASK_PMAP_ANIM 0x04a01202L -#define IPBKGND_MASK_PMAP_ANIM 0x05001302L -#define SISIP_MASK_PMAP_ANIM 0x05201402L -#define ORBPLAN_MASK_PMAP_ANIM 0x05201502L -#define SUN_MASK_PMAP_ANIM 0x05201602L -#define LANDER_MASK_PMAP_ANIM 0x05401702L -#define QUAKE_MASK_PMAP_ANIM 0x05401802L -#define LIGHTNING_MASK_ANIM 0x05401902L -#define LAVA_MASK_PMAP_ANIM 0x05401a02L -#define LANDER_SHIELD_MASK_ANIM 0x05401b02L -#define LANDER_LAUNCH_MASK_PMAP_ANIM 0x05401c02L -#define LANDER_RETURN_MASK_PMAP_ANIM 0x05401d02L -#define ORBIT_VIEW_ANIM 0x05601e02L -#define EARTH_MASK_ANIM 0x05801f02L -#define CANNISTER_MASK_PMAP_ANIM 0x05a02002L -#define LIFE00_MASK_PMAP_ANIM 0x05c02102L -#define LIFE01_MASK_PMAP_ANIM 0x05e02202L -#define LIFE02_MASK_PMAP_ANIM 0x06002302L -#define LIFE03_MASK_PMAP_ANIM 0x06202402L -#define LIFE04_MASK_PMAP_ANIM 0x06402502L -#define LIFE05_MASK_PMAP_ANIM 0x06602602L -#define LIFE06_MASK_PMAP_ANIM 0x06802702L -#define LIFE07_MASK_PMAP_ANIM 0x06a02802L -#define LIFE08_MASK_PMAP_ANIM 0x06c02902L -#define LIFE09_MASK_PMAP_ANIM 0x06e02a02L -#define LIFE10_MASK_PMAP_ANIM 0x07002b02L -#define LIFE11_MASK_PMAP_ANIM 0x07202c02L -#define LIFE12_MASK_PMAP_ANIM 0x07402d02L -#define LIFE13_MASK_PMAP_ANIM 0x07602e02L -#define LIFE14_MASK_PMAP_ANIM 0x07802f02L -#define LIFE15_MASK_PMAP_ANIM 0x07a03002L -#define LIFE16_MASK_PMAP_ANIM 0x07c03102L -#define LIFE17_MASK_PMAP_ANIM 0x07e03202L -#define LIFE18_MASK_PMAP_ANIM 0x08003302L -#define LIFE19_MASK_PMAP_ANIM 0x08203402L -#define LIFE20_MASK_PMAP_ANIM 0x08403502L -#define LIFE21_MASK_PMAP_ANIM 0x08603602L -#define LIFE22_MASK_PMAP_ANIM 0x08803702L -#define LIFE23_MASK_PMAP_ANIM 0x08a03802L -#define LIFE24_MASK_PMAP_ANIM 0x08c03902L -#define LIFE25_MASK_PMAP_ANIM 0x08e03a02L -#define LANDER_FONTEFF_PMAP_ANIM 0x11412002L -#define MOONBASE_MASK_PMAP_ANIM 0x11603b02L -#define MAIDENS_MASK_PMAP_ANIM 0x11803c02L -#define AQUA_MASK_PMAP_ANIM 0x11c03d02L -#define BURV_BCS_MASK_PMAP_ANIM 0x11e03e02L -#define TAALO_DEVICE_MASK_PMAP_ANIM 0x12003f02L -#define SUN_DEVICE_MASK_PMAP_ANIM 0x12204002L -#define VAULT_MASK_PMAP_ANIM 0x12404102L -#define WRECK_MASK_PMAP_ANIM 0x12604202L -#define BOMB_MASK_PMAP_ANIM 0x12804302L -#define EGG_CASE_MASK_PMAP_ANIM 0x12c04402L -#define SPAPLUTO_MASK_PMAP_ANIM 0x12e04502L -#define RUINS_MASK_PMAP_ANIM 0x13804602L -#define UMGAH_BCS_MASK_PMAP_ANIM 0x13c04702L -#define MELEE_SCREEN_PMAP_ANIM 0x14204802L -#define MELEE_PICK_MASK_PMAP_ANIM 0x14404902L -#define SEGUE_PMAP_ANIM 0x14604a02L -#define SC2_PICK_PMAP_ANIM 0x14804b02L -#define RESTART_PMAP_ANIM 0x18204c02L -#define MODULES_PMAP_ANIM 0x18404d02L -#define SISMODS_MASK_PMAP_ANIM 0x18604e02L -#define OUTFIT_PMAP_ANIM 0x18604f02L -#define SISBLU_MASK_ANIM 0x18a05002L -#define SHIPYARD_PMAP_ANIM 0x18a05102L -#define STARBASE_ANIM 0x18e05202L -#define SAMATRA_BIG_MASK_PMAP_ANIM 0x19005302L -#define SHIELDED_BIG_MASK_PMAP_ANIM 0x19205402L -#define SHIELDED_MED_MASK_PMAP_ANIM 0x19205502L -#define SHIELDED_SML_MASK_PMAP_ANIM 0x19205602L -#define PLANET00_BIG_MASK_PMAP_ANIM 0x19405702L -#define PLANET00_MED_MASK_PMAP_ANIM 0x19405802L -#define PLANET00_SML_MASK_PMAP_ANIM 0x19405902L -#define PLANET01_BIG_MASK_PMAP_ANIM 0x19605a02L -#define PLANET01_MED_MASK_PMAP_ANIM 0x19605b02L -#define PLANET01_SML_MASK_PMAP_ANIM 0x19605c02L -#define PLANET02_BIG_MASK_PMAP_ANIM 0x19805d02L -#define PLANET02_MED_MASK_PMAP_ANIM 0x19805e02L -#define PLANET02_SML_MASK_PMAP_ANIM 0x19805f02L -#define PLANET03_BIG_MASK_PMAP_ANIM 0x19a06002L -#define PLANET03_MED_MASK_PMAP_ANIM 0x19a06102L -#define PLANET03_SML_MASK_PMAP_ANIM 0x19a06202L -#define PLANET04_BIG_MASK_PMAP_ANIM 0x19c06302L -#define PLANET04_MED_MASK_PMAP_ANIM 0x19c06402L -#define PLANET04_SML_MASK_PMAP_ANIM 0x19c06502L -#define PLANET05_BIG_MASK_PMAP_ANIM 0x19e06602L -#define PLANET05_MED_MASK_PMAP_ANIM 0x19e06702L -#define PLANET05_SML_MASK_PMAP_ANIM 0x19e06802L -#define PLANET06_BIG_MASK_PMAP_ANIM 0x1a006902L -#define PLANET06_MED_MASK_PMAP_ANIM 0x1a006a02L -#define PLANET06_SML_MASK_PMAP_ANIM 0x1a006b02L -#define PLANET07_BIG_MASK_PMAP_ANIM 0x1a206c02L -#define PLANET07_MED_MASK_PMAP_ANIM 0x1a206d02L -#define PLANET07_SML_MASK_PMAP_ANIM 0x1a206e02L -#define PLANET08_BIG_MASK_PMAP_ANIM 0x1a406f02L -#define PLANET08_MED_MASK_PMAP_ANIM 0x1a407002L -#define PLANET08_SML_MASK_PMAP_ANIM 0x1a407102L -#define PLANET09_BIG_MASK_PMAP_ANIM 0x1a607202L -#define PLANET09_MED_MASK_PMAP_ANIM 0x1a607302L -#define PLANET09_SML_MASK_PMAP_ANIM 0x1a607402L -#define PLANET10_BIG_MASK_PMAP_ANIM 0x1a807502L -#define PLANET10_MED_MASK_PMAP_ANIM 0x1a807602L -#define PLANET10_SML_MASK_PMAP_ANIM 0x1a807702L -#define PLANET11_BIG_MASK_PMAP_ANIM 0x1aa07802L -#define PLANET11_MED_MASK_PMAP_ANIM 0x1aa07902L -#define PLANET11_SML_MASK_PMAP_ANIM 0x1aa07a02L -#define PLANET12_BIG_MASK_PMAP_ANIM 0x1ac07b02L -#define PLANET12_MED_MASK_PMAP_ANIM 0x1ac07c02L -#define PLANET12_SML_MASK_PMAP_ANIM 0x1ac07d02L -#define PLANET13_BIG_MASK_PMAP_ANIM 0x1ae07e02L -#define PLANET13_MED_MASK_PMAP_ANIM 0x1ae07f02L -#define PLANET13_SML_MASK_PMAP_ANIM 0x1ae08002L -#define PLANET14_BIG_MASK_PMAP_ANIM 0x1b008102L -#define PLANET14_MED_MASK_PMAP_ANIM 0x1b008202L -#define PLANET14_SML_MASK_PMAP_ANIM 0x1b008302L -#define PLANET15_BIG_MASK_PMAP_ANIM 0x1b208402L -#define PLANET15_MED_MASK_PMAP_ANIM 0x1b208502L -#define PLANET15_SML_MASK_PMAP_ANIM 0x1b208602L -#define PLANET16_BIG_MASK_PMAP_ANIM 0x1b408702L -#define PLANET16_MED_MASK_PMAP_ANIM 0x1b408802L -#define PLANET16_SML_MASK_PMAP_ANIM 0x1b408902L -#define PLANET17_BIG_MASK_PMAP_ANIM 0x1b608a02L -#define PLANET17_MED_MASK_PMAP_ANIM 0x1b608b02L -#define PLANET17_SML_MASK_PMAP_ANIM 0x1b608c02L -#define PLANET18_BIG_MASK_PMAP_ANIM 0x1b808d02L -#define PLANET18_MED_MASK_PMAP_ANIM 0x1b808e02L -#define PLANET18_SML_MASK_PMAP_ANIM 0x1b808f02L -#define PLANET19_BIG_MASK_PMAP_ANIM 0x1ba09002L -#define PLANET19_MED_MASK_PMAP_ANIM 0x1ba09102L -#define PLANET19_SML_MASK_PMAP_ANIM 0x1ba09202L -#define PLANET20_BIG_MASK_PMAP_ANIM 0x1bc09302L -#define PLANET20_MED_MASK_PMAP_ANIM 0x1bc09402L -#define PLANET20_SML_MASK_PMAP_ANIM 0x1bc09502L -#define PLANET21_BIG_MASK_PMAP_ANIM 0x1be09602L -#define PLANET21_MED_MASK_PMAP_ANIM 0x1be09702L -#define PLANET21_SML_MASK_PMAP_ANIM 0x1be09802L -#define PLANET22_BIG_MASK_PMAP_ANIM 0x1c009902L -#define PLANET22_MED_MASK_PMAP_ANIM 0x1c009a02L -#define PLANET22_SML_MASK_PMAP_ANIM 0x1c009b02L -#define PLANET23_BIG_MASK_PMAP_ANIM 0x1c209c02L -#define PLANET23_MED_MASK_PMAP_ANIM 0x1c209d02L -#define PLANET23_SML_MASK_PMAP_ANIM 0x1c209e02L -#define PLANET24_BIG_MASK_PMAP_ANIM 0x1c409f02L -#define PLANET24_MED_MASK_PMAP_ANIM 0x1c40a002L -#define PLANET24_SML_MASK_PMAP_ANIM 0x1c40a102L -#define PLANET25_BIG_MASK_PMAP_ANIM 0x1c60a202L -#define PLANET25_MED_MASK_PMAP_ANIM 0x1c60a302L -#define PLANET25_SML_MASK_PMAP_ANIM 0x1c60a402L -#define PLANET26_BIG_MASK_PMAP_ANIM 0x1c80a502L -#define PLANET26_MED_MASK_PMAP_ANIM 0x1c80a602L -#define PLANET26_SML_MASK_PMAP_ANIM 0x1c80a702L -#define PLANET27_BIG_MASK_PMAP_ANIM 0x1ca0a802L -#define PLANET27_MED_MASK_PMAP_ANIM 0x1ca0a902L -#define PLANET27_SML_MASK_PMAP_ANIM 0x1ca0aa02L -#define PLANET28_BIG_MASK_PMAP_ANIM 0x1cc0ab02L -#define PLANET28_MED_MASK_PMAP_ANIM 0x1cc0ac02L -#define PLANET28_SML_MASK_PMAP_ANIM 0x1cc0ad02L -#define PLANET29_BIG_MASK_PMAP_ANIM 0x1ce0ae02L -#define PLANET29_MED_MASK_PMAP_ANIM 0x1ce0af02L -#define PLANET29_SML_MASK_PMAP_ANIM 0x1ce0b002L -#define PLANET30_BIG_MASK_PMAP_ANIM 0x1d00b102L -#define PLANET30_MED_MASK_PMAP_ANIM 0x1d00b202L -#define PLANET30_SML_MASK_PMAP_ANIM 0x1d00b302L -#define PLANET31_BIG_MASK_PMAP_ANIM 0x1d20b402L -#define PLANET31_MED_MASK_PMAP_ANIM 0x1d20b502L -#define PLANET31_SML_MASK_PMAP_ANIM 0x1d20b602L -#define PLANET32_BIG_MASK_PMAP_ANIM 0x1d40b702L -#define PLANET32_MED_MASK_PMAP_ANIM 0x1d40b802L -#define PLANET32_SML_MASK_PMAP_ANIM 0x1d40b902L -#define PLANET33_BIG_MASK_PMAP_ANIM 0x1d60ba02L -#define PLANET33_MED_MASK_PMAP_ANIM 0x1d60bb02L -#define PLANET33_SML_MASK_PMAP_ANIM 0x1d60bc02L -#define PLANET34_BIG_MASK_PMAP_ANIM 0x1d80bd02L -#define PLANET34_MED_MASK_PMAP_ANIM 0x1d80be02L -#define PLANET34_SML_MASK_PMAP_ANIM 0x1d80bf02L -#define PLANET35_BIG_MASK_PMAP_ANIM 0x1da0c002L -#define PLANET35_MED_MASK_PMAP_ANIM 0x1da0c102L -#define PLANET35_SML_MASK_PMAP_ANIM 0x1da0c202L -#define PLANET36_BIG_MASK_PMAP_ANIM 0x1dc0c302L -#define PLANET36_MED_MASK_PMAP_ANIM 0x1dc0c402L -#define PLANET36_SML_MASK_PMAP_ANIM 0x1dc0c502L -#define PLANET37_BIG_MASK_PMAP_ANIM 0x1de0c602L -#define PLANET37_MED_MASK_PMAP_ANIM 0x1de0c702L -#define PLANET37_SML_MASK_PMAP_ANIM 0x1de0c802L -#define PLANET38_BIG_MASK_PMAP_ANIM 0x1e00c902L -#define PLANET38_MED_MASK_PMAP_ANIM 0x1e00ca02L -#define PLANET38_SML_MASK_PMAP_ANIM 0x1e00cb02L -#define PLANET39_BIG_MASK_PMAP_ANIM 0x1e20cc02L -#define PLANET39_MED_MASK_PMAP_ANIM 0x1e20cd02L -#define PLANET39_SML_MASK_PMAP_ANIM 0x1e20ce02L -#define PLANET40_BIG_MASK_PMAP_ANIM 0x1e40cf02L -#define PLANET40_MED_MASK_PMAP_ANIM 0x1e40d002L -#define PLANET40_SML_MASK_PMAP_ANIM 0x1e40d102L -#define PLANET41_BIG_MASK_PMAP_ANIM 0x1e60d202L -#define PLANET41_MED_MASK_PMAP_ANIM 0x1e60d302L -#define PLANET41_SML_MASK_PMAP_ANIM 0x1e60d402L -#define PLANET42_BIG_MASK_PMAP_ANIM 0x1e80d502L -#define PLANET42_MED_MASK_PMAP_ANIM 0x1e80d602L -#define PLANET42_SML_MASK_PMAP_ANIM 0x1e80d702L -#define PLANET43_BIG_MASK_PMAP_ANIM 0x1ea0d802L -#define PLANET43_MED_MASK_PMAP_ANIM 0x1ea0d902L -#define PLANET43_SML_MASK_PMAP_ANIM 0x1ea0da02L -#define PLANET44_BIG_MASK_PMAP_ANIM 0x1ec0db02L -#define PLANET44_MED_MASK_PMAP_ANIM 0x1ec0dc02L -#define PLANET44_SML_MASK_PMAP_ANIM 0x1ec0dd02L -#define PLANET45_BIG_MASK_PMAP_ANIM 0x1ee0de02L -#define PLANET45_MED_MASK_PMAP_ANIM 0x1ee0df02L -#define PLANET45_SML_MASK_PMAP_ANIM 0x1ee0e002L -#define PLANET46_BIG_MASK_PMAP_ANIM 0x1f00e102L -#define PLANET46_MED_MASK_PMAP_ANIM 0x1f00e202L -#define PLANET46_SML_MASK_PMAP_ANIM 0x1f00e302L -#define PLANET47_BIG_MASK_PMAP_ANIM 0x1f20e402L -#define PLANET47_MED_MASK_PMAP_ANIM 0x1f20e502L -#define PLANET47_SML_MASK_PMAP_ANIM 0x1f20e602L -#define PLANET48_BIG_MASK_PMAP_ANIM 0x1f40e702L -#define PLANET48_MED_MASK_PMAP_ANIM 0x1f40e802L -#define PLANET48_SML_MASK_PMAP_ANIM 0x1f40e902L -#define PLANET49_BIG_MASK_PMAP_ANIM 0x1f60ea02L -#define PLANET49_MED_MASK_PMAP_ANIM 0x1f60eb02L -#define PLANET49_SML_MASK_PMAP_ANIM 0x1f60ec02L -#define PLANET50_BIG_MASK_PMAP_ANIM 0x1f80ed02L -#define PLANET50_MED_MASK_PMAP_ANIM 0x1f80ee02L -#define PLANET50_SML_MASK_PMAP_ANIM 0x1f80ef02L -#define PLANET51_BIG_MASK_PMAP_ANIM 0x1fa0f002L -#define PLANET51_MED_MASK_PMAP_ANIM 0x1fa0f102L -#define PLANET51_SML_MASK_PMAP_ANIM 0x1fa0f202L -#define PLANET52_BIG_MASK_PMAP_ANIM 0x1fc0f302L -#define PLANET52_MED_MASK_PMAP_ANIM 0x1fc0f402L -#define PLANET52_SML_MASK_PMAP_ANIM 0x1fc0f502L -#define PLANET53_BIG_MASK_PMAP_ANIM 0x1fe0f602L -#define PLANET53_MED_MASK_PMAP_ANIM 0x1fe0f702L -#define PLANET53_SML_MASK_PMAP_ANIM 0x1fe0f802L -#define PLANET54_BIG_MASK_PMAP_ANIM 0x2000f902L -#define PLANET54_MED_MASK_PMAP_ANIM 0x2000fa02L -#define PLANET54_SML_MASK_PMAP_ANIM 0x2000fb02L -#define PLANET55_BIG_MASK_PMAP_ANIM 0x2020fc02L -#define PLANET55_MED_MASK_PMAP_ANIM 0x2020fd02L -#define PLANET55_SML_MASK_PMAP_ANIM 0x2020fe02L -#define PLANET56_BIG_MASK_PMAP_ANIM 0x2040ff02L -#define PLANET56_MED_MASK_PMAP_ANIM 0x20410002L -#define PLANET56_SML_MASK_PMAP_ANIM 0x20410102L -#define PLANET57_BIG_MASK_PMAP_ANIM 0x20610202L -#define PLANET57_MED_MASK_PMAP_ANIM 0x20610302L -#define PLANET57_SML_MASK_PMAP_ANIM 0x20610402L -#define PLANET58_BIG_MASK_PMAP_ANIM 0x20810502L -#define PLANET58_MED_MASK_PMAP_ANIM 0x20810602L -#define PLANET58_SML_MASK_PMAP_ANIM 0x20810702L -#define CREDITS_BACK_ANIM 0x20c10802L -#define SISSKEL_MASK_PMAP_ANIM 0x23611c02L -#define ORBENTER_PMAP_ANIM 0x23811d02L -#define MENUBKG_PMAP_ANIM 0x23a11e02L +#define TITLE_ANIM "graphics.title" +#define STATUS_MASK_PMAP_ANIM "graphics.status" +#define ACTIVITY_ANIM "graphics.activity" +#define PLAYMENU_ANIM "graphics.playmenu" +#define FLAGSTAT_MASK_PMAP_ANIM "graphics.flagstat" +#define MISCDATA_MASK_PMAP_ANIM "graphics.miscdata" +#define FONTGRAD_PMAP_ANIM "graphics.fontgrad" +#define STAR_MASK_PMAP_ANIM "graphics.stars" +#define ASTEROID_BIG_MASK_PMAP_ANIM "graphics.astbig" +#define ASTEROID_MED_MASK_PMAP_ANIM "graphics.astmed" +#define ASTEROID_SML_MASK_PMAP_ANIM "graphics.astsml" +#define BLAST_BIG_MASK_PMAP_ANIM "graphics.blabig" +#define BLAST_MED_MASK_PMAP_ANIM "graphics.blamed" +#define BLAST_SML_MASK_PMAP_ANIM "graphics.blasml" +#define BOOM_BIG_MASK_PMAP_ANIM "graphics.boobig" +#define BOOM_MED_MASK_PMAP_ANIM "graphics.boomed" +#define BOOM_SML_MASK_PMAP_ANIM "graphics.boosml" +#define AMBIENT_MASK_PMAP_ANIM "graphics.ambanim" +#define HYPERSTARS_MASK_PMAP_ANIM "graphics.hyperstr" +#define ARISPACE_MASK_PMAP_ANIM "graphics.arispace" +#define IPBKGND_MASK_PMAP_ANIM "graphics.obbkgnd" +#define SISIP_MASK_PMAP_ANIM "graphics.sis_ip" +#define ORBPLAN_MASK_PMAP_ANIM "graphics.orbplan" +#define SUN_MASK_PMAP_ANIM "graphics.ip_sun" +#define LANDER_MASK_PMAP_ANIM "graphics.lander" +#define QUAKE_MASK_PMAP_ANIM "graphics.quake" +#define LIGHTNING_MASK_ANIM "graphics.lightnin" +#define LAVA_MASK_PMAP_ANIM "graphics.lavaspot" +#define LANDER_SHIELD_MASK_ANIM "graphics.lndrshld" +#define LANDER_LAUNCH_MASK_PMAP_ANIM "graphics.launch" +#define LANDER_RETURN_MASK_PMAP_ANIM "graphics.return" +#define ORBIT_VIEW_ANIM "graphics.orbview" +#define EARTH_MASK_ANIM "graphics.eartmask" +#define CANNISTER_MASK_PMAP_ANIM "graphics.lifecan" +#define LIFE00_MASK_PMAP_ANIM "graphics.life.0" +#define LIFE01_MASK_PMAP_ANIM "graphics.life.1" +#define LIFE02_MASK_PMAP_ANIM "graphics.life.2" +#define LIFE03_MASK_PMAP_ANIM "graphics.life.3" +#define LIFE04_MASK_PMAP_ANIM "graphics.life.4" +#define LIFE05_MASK_PMAP_ANIM "graphics.life.5" +#define LIFE06_MASK_PMAP_ANIM "graphics.life.6" +#define LIFE07_MASK_PMAP_ANIM "graphics.life.7" +#define LIFE08_MASK_PMAP_ANIM "graphics.life.8" +#define LIFE09_MASK_PMAP_ANIM "graphics.life.9" +#define LIFE10_MASK_PMAP_ANIM "graphics.life.10" +#define LIFE11_MASK_PMAP_ANIM "graphics.life.11" +#define LIFE12_MASK_PMAP_ANIM "graphics.life.12" +#define LIFE13_MASK_PMAP_ANIM "graphics.life.13" +#define LIFE14_MASK_PMAP_ANIM "graphics.life.14" +#define LIFE15_MASK_PMAP_ANIM "graphics.life.15" +#define LIFE16_MASK_PMAP_ANIM "graphics.life.16" +#define LIFE17_MASK_PMAP_ANIM "graphics.life.17" +#define LIFE18_MASK_PMAP_ANIM "graphics.life.18" +#define LIFE19_MASK_PMAP_ANIM "graphics.life.19" +#define LIFE20_MASK_PMAP_ANIM "graphics.life.20" +#define LIFE21_MASK_PMAP_ANIM "graphics.life.21" +#define LIFE22_MASK_PMAP_ANIM "graphics.life.22" +#define LIFE23_MASK_PMAP_ANIM "graphics.life.23" +#define LIFE24_MASK_PMAP_ANIM "graphics.life.24" +#define LIFE25_MASK_PMAP_ANIM "graphics.life.25" +#define LANDER_FONTEFF_PMAP_ANIM "graphics.landfeff" +#define MOONBASE_MASK_PMAP_ANIM "graphics.moonbase" +#define MAIDENS_MASK_PMAP_ANIM "graphics.maidens" +#define AQUA_MASK_PMAP_ANIM "graphics.aquhelix" +#define BURV_BCS_MASK_PMAP_ANIM "graphics.drutrans" +#define TAALO_DEVICE_MASK_PMAP_ANIM "graphics.taadevic" +#define SUN_DEVICE_MASK_PMAP_ANIM "graphics.sundevic" +#define VAULT_MASK_PMAP_ANIM "graphics.syrvault" +#define WRECK_MASK_PMAP_ANIM "graphics.urqwreck" +#define BOMB_MASK_PMAP_ANIM "graphics.utwbomb" +#define EGG_CASE_MASK_PMAP_ANIM "graphics.eggcase" +#define SPAPLUTO_MASK_PMAP_ANIM "graphics.spapluto" +#define RUINS_MASK_PMAP_ANIM "graphics.ruins" +#define UMGAH_BCS_MASK_PMAP_ANIM "graphics.umgtrans" +#define MELEE_SCREEN_PMAP_ANIM "graphics.melebkgd" +#define MELEE_PICK_MASK_PMAP_ANIM "graphics.melee" +#define SEGUE_PMAP_ANIM "graphics.segue" +#define SC2_PICK_PMAP_ANIM "graphics.pickship" +#define RESTART_PMAP_ANIM "graphics.newgame" +#define MODULES_PMAP_ANIM "graphics.modules" +#define SISMODS_MASK_PMAP_ANIM "graphics.sismods" +#define OUTFIT_PMAP_ANIM "graphics.outfit" +#define SISBLU_MASK_ANIM "graphics.sisblu" +#define SHIPYARD_PMAP_ANIM "graphics.shipyard" +#define STARBASE_ANIM "graphics.starbase" +#define SAMATRA_BIG_MASK_PMAP_ANIM "planet.samatra.large" +#define SHIELDED_BIG_MASK_PMAP_ANIM "planet.slaveshield.large" +#define SHIELDED_MED_MASK_PMAP_ANIM "planet.slaveshield.medium" +#define SHIELDED_SML_MASK_PMAP_ANIM "planet.slaveshield.small" +#define PLANET00_BIG_MASK_PMAP_ANIM "planet.oolite.large" +#define PLANET00_MED_MASK_PMAP_ANIM "planet.oolite.medium" +#define PLANET00_SML_MASK_PMAP_ANIM "planet.oolite.small" +#define PLANET01_BIG_MASK_PMAP_ANIM "planet.yttric.large" +#define PLANET01_MED_MASK_PMAP_ANIM "planet.yttric.medium" +#define PLANET01_SML_MASK_PMAP_ANIM "planet.yttric.small" +#define PLANET02_BIG_MASK_PMAP_ANIM "planet.quasidegenerate.large" +#define PLANET02_MED_MASK_PMAP_ANIM "planet.quasidegenerate.medium" +#define PLANET02_SML_MASK_PMAP_ANIM "planet.quasidegenerate.small" +#define PLANET03_BIG_MASK_PMAP_ANIM "planet.lanthanide.large" +#define PLANET03_MED_MASK_PMAP_ANIM "planet.lanthanide.medium" +#define PLANET03_SML_MASK_PMAP_ANIM "planet.lanthanide.small" +#define PLANET04_BIG_MASK_PMAP_ANIM "planet.treasure.large" +#define PLANET04_MED_MASK_PMAP_ANIM "planet.treasure.medium" +#define PLANET04_SML_MASK_PMAP_ANIM "planet.treasure.small" +#define PLANET05_BIG_MASK_PMAP_ANIM "planet.urea.large" +#define PLANET05_MED_MASK_PMAP_ANIM "planet.urea.medium" +#define PLANET05_SML_MASK_PMAP_ANIM "planet.urea.small" +#define PLANET06_BIG_MASK_PMAP_ANIM "planet.metal.large" +#define PLANET06_MED_MASK_PMAP_ANIM "planet.metal.medium" +#define PLANET06_SML_MASK_PMAP_ANIM "planet.metal.small" +#define PLANET07_BIG_MASK_PMAP_ANIM "planet.radioactive.large" +#define PLANET07_MED_MASK_PMAP_ANIM "planet.radioactive.medium" +#define PLANET07_SML_MASK_PMAP_ANIM "planet.radioactive.small" +#define PLANET08_BIG_MASK_PMAP_ANIM "planet.opalescent.large" +#define PLANET08_MED_MASK_PMAP_ANIM "planet.opalescent.medium" +#define PLANET08_SML_MASK_PMAP_ANIM "planet.opalescent.small" +#define PLANET09_BIG_MASK_PMAP_ANIM "planet.cyanic.large" +#define PLANET09_MED_MASK_PMAP_ANIM "planet.cyanic.medium" +#define PLANET09_SML_MASK_PMAP_ANIM "planet.cyanic.small" +#define PLANET10_BIG_MASK_PMAP_ANIM "planet.acid.large" +#define PLANET10_MED_MASK_PMAP_ANIM "planet.acid.medium" +#define PLANET10_SML_MASK_PMAP_ANIM "planet.acid.small" +#define PLANET11_BIG_MASK_PMAP_ANIM "planet.alkali.large" +#define PLANET11_MED_MASK_PMAP_ANIM "planet.alkali.medium" +#define PLANET11_SML_MASK_PMAP_ANIM "planet.alkali.small" +#define PLANET12_BIG_MASK_PMAP_ANIM "planet.halide.large" +#define PLANET12_MED_MASK_PMAP_ANIM "planet.halide.medium" +#define PLANET12_SML_MASK_PMAP_ANIM "planet.halide.small" +#define PLANET13_BIG_MASK_PMAP_ANIM "planet.green.large" +#define PLANET13_MED_MASK_PMAP_ANIM "planet.green.medium" +#define PLANET13_SML_MASK_PMAP_ANIM "planet.green.small" +#define PLANET14_BIG_MASK_PMAP_ANIM "planet.copper.large" +#define PLANET14_MED_MASK_PMAP_ANIM "planet.copper.medium" +#define PLANET14_SML_MASK_PMAP_ANIM "planet.copper.small" +#define PLANET15_BIG_MASK_PMAP_ANIM "planet.carbide.large" +#define PLANET15_MED_MASK_PMAP_ANIM "planet.carbide.medium" +#define PLANET15_SML_MASK_PMAP_ANIM "planet.carbide.small" +#define PLANET16_BIG_MASK_PMAP_ANIM "planet.ultramarine.large" +#define PLANET16_MED_MASK_PMAP_ANIM "planet.ultramarine.medium" +#define PLANET16_SML_MASK_PMAP_ANIM "planet.ultramarine.small" +#define PLANET17_BIG_MASK_PMAP_ANIM "planet.noble.large" +#define PLANET17_MED_MASK_PMAP_ANIM "planet.noble.medium" +#define PLANET17_SML_MASK_PMAP_ANIM "planet.noble.small" +#define PLANET18_BIG_MASK_PMAP_ANIM "planet.azure.large" +#define PLANET18_MED_MASK_PMAP_ANIM "planet.azure.medium" +#define PLANET18_SML_MASK_PMAP_ANIM "planet.azure.small" +#define PLANET19_BIG_MASK_PMAP_ANIM "planet.chondrite.large" +#define PLANET19_MED_MASK_PMAP_ANIM "planet.chondrite.medium" +#define PLANET19_SML_MASK_PMAP_ANIM "planet.chondrite.small" +#define PLANET20_BIG_MASK_PMAP_ANIM "planet.purple.large" +#define PLANET20_MED_MASK_PMAP_ANIM "planet.purple.medium" +#define PLANET20_SML_MASK_PMAP_ANIM "planet.purple.small" +#define PLANET21_BIG_MASK_PMAP_ANIM "planet.superdense.large" +#define PLANET21_MED_MASK_PMAP_ANIM "planet.superdense.medium" +#define PLANET21_SML_MASK_PMAP_ANIM "planet.superdense.small" +#define PLANET22_BIG_MASK_PMAP_ANIM "planet.pellucid.large" +#define PLANET22_MED_MASK_PMAP_ANIM "planet.pellucid.medium" +#define PLANET22_SML_MASK_PMAP_ANIM "planet.pellucid.small" +#define PLANET23_BIG_MASK_PMAP_ANIM "planet.dust.large" +#define PLANET23_MED_MASK_PMAP_ANIM "planet.dust.medium" +#define PLANET23_SML_MASK_PMAP_ANIM "planet.dust.small" +#define PLANET24_BIG_MASK_PMAP_ANIM "planet.crimson.large" +#define PLANET24_MED_MASK_PMAP_ANIM "planet.crimson.medium" +#define PLANET24_SML_MASK_PMAP_ANIM "planet.crimson.small" +#define PLANET25_BIG_MASK_PMAP_ANIM "planet.cimmerian.large" +#define PLANET25_MED_MASK_PMAP_ANIM "planet.cimmerian.medium" +#define PLANET25_SML_MASK_PMAP_ANIM "planet.cimmerian.small" +#define PLANET26_BIG_MASK_PMAP_ANIM "planet.infrared.large" +#define PLANET26_MED_MASK_PMAP_ANIM "planet.infrared.medium" +#define PLANET26_SML_MASK_PMAP_ANIM "planet.infrared.small" +#define PLANET27_BIG_MASK_PMAP_ANIM "planet.selenic.large" +#define PLANET27_MED_MASK_PMAP_ANIM "planet.selenic.medium" +#define PLANET27_SML_MASK_PMAP_ANIM "planet.selenic.small" +#define PLANET28_BIG_MASK_PMAP_ANIM "planet.auric.large" +#define PLANET28_MED_MASK_PMAP_ANIM "planet.auric.medium" +#define PLANET28_SML_MASK_PMAP_ANIM "planet.auric.small" +#define PLANET29_BIG_MASK_PMAP_ANIM "planet.fluorescent.large" +#define PLANET29_MED_MASK_PMAP_ANIM "planet.fluorescent.medium" +#define PLANET29_SML_MASK_PMAP_ANIM "planet.fluorescent.small" +#define PLANET30_BIG_MASK_PMAP_ANIM "planet.ultraviolet.large" +#define PLANET30_MED_MASK_PMAP_ANIM "planet.ultraviolet.medium" +#define PLANET30_SML_MASK_PMAP_ANIM "planet.ultraviolet.small" +#define PLANET31_BIG_MASK_PMAP_ANIM "planet.plutonic.large" +#define PLANET31_MED_MASK_PMAP_ANIM "planet.plutonic.medium" +#define PLANET31_SML_MASK_PMAP_ANIM "planet.plutonic.small" +#define PLANET32_BIG_MASK_PMAP_ANIM "planet.rainbow.large" +#define PLANET32_MED_MASK_PMAP_ANIM "planet.rainbow.medium" +#define PLANET32_SML_MASK_PMAP_ANIM "planet.rainbow.small" +#define PLANET33_BIG_MASK_PMAP_ANIM "planet.shattered.large" +#define PLANET33_MED_MASK_PMAP_ANIM "planet.shattered.medium" +#define PLANET33_SML_MASK_PMAP_ANIM "planet.shattered.small" +#define PLANET34_BIG_MASK_PMAP_ANIM "planet.sapphire.large" +#define PLANET34_MED_MASK_PMAP_ANIM "planet.sapphire.medium" +#define PLANET34_SML_MASK_PMAP_ANIM "planet.sapphire.small" +#define PLANET35_BIG_MASK_PMAP_ANIM "planet.organic.large" +#define PLANET35_MED_MASK_PMAP_ANIM "planet.organic.medium" +#define PLANET35_SML_MASK_PMAP_ANIM "planet.organic.small" +#define PLANET36_BIG_MASK_PMAP_ANIM "planet.xenolithic.large" +#define PLANET36_MED_MASK_PMAP_ANIM "planet.xenolithic.medium" +#define PLANET36_SML_MASK_PMAP_ANIM "planet.xenolithic.small" +#define PLANET37_BIG_MASK_PMAP_ANIM "planet.redux.large" +#define PLANET37_MED_MASK_PMAP_ANIM "planet.redux.medium" +#define PLANET37_SML_MASK_PMAP_ANIM "planet.redux.small" +#define PLANET38_BIG_MASK_PMAP_ANIM "planet.primordial.large" +#define PLANET38_MED_MASK_PMAP_ANIM "planet.primordial.medium" +#define PLANET38_SML_MASK_PMAP_ANIM "planet.primordial.small" +#define PLANET39_BIG_MASK_PMAP_ANIM "planet.emerald.large" +#define PLANET39_MED_MASK_PMAP_ANIM "planet.emerald.medium" +#define PLANET39_SML_MASK_PMAP_ANIM "planet.emerald.small" +#define PLANET40_BIG_MASK_PMAP_ANIM "planet.chlorine.large" +#define PLANET40_MED_MASK_PMAP_ANIM "planet.chlorine.medium" +#define PLANET40_SML_MASK_PMAP_ANIM "planet.chlorine.small" +#define PLANET41_BIG_MASK_PMAP_ANIM "planet.magnetic.large" +#define PLANET41_MED_MASK_PMAP_ANIM "planet.magnetic.medium" +#define PLANET41_SML_MASK_PMAP_ANIM "planet.magnetic.small" +#define PLANET42_BIG_MASK_PMAP_ANIM "planet.water.large" +#define PLANET42_MED_MASK_PMAP_ANIM "planet.water.medium" +#define PLANET42_SML_MASK_PMAP_ANIM "planet.water.small" +#define PLANET43_BIG_MASK_PMAP_ANIM "planet.telluric.large" +#define PLANET43_MED_MASK_PMAP_ANIM "planet.telluric.medium" +#define PLANET43_SML_MASK_PMAP_ANIM "planet.telluric.small" +#define PLANET44_BIG_MASK_PMAP_ANIM "planet.hydrocarbon.large" +#define PLANET44_MED_MASK_PMAP_ANIM "planet.hydrocarbon.medium" +#define PLANET44_SML_MASK_PMAP_ANIM "planet.hydrocarbon.small" +#define PLANET45_BIG_MASK_PMAP_ANIM "planet.iodine.large" +#define PLANET45_MED_MASK_PMAP_ANIM "planet.iodine.medium" +#define PLANET45_SML_MASK_PMAP_ANIM "planet.iodine.small" +#define PLANET46_BIG_MASK_PMAP_ANIM "planet.vinylogous.large" +#define PLANET46_MED_MASK_PMAP_ANIM "planet.vinylogous.medium" +#define PLANET46_SML_MASK_PMAP_ANIM "planet.vinylogous.small" +#define PLANET47_BIG_MASK_PMAP_ANIM "planet.ruby.large" +#define PLANET47_MED_MASK_PMAP_ANIM "planet.ruby.medium" +#define PLANET47_SML_MASK_PMAP_ANIM "planet.ruby.small" +#define PLANET48_BIG_MASK_PMAP_ANIM "planet.magma.large" +#define PLANET48_MED_MASK_PMAP_ANIM "planet.magma.medium" +#define PLANET48_SML_MASK_PMAP_ANIM "planet.magma.small" +#define PLANET49_BIG_MASK_PMAP_ANIM "planet.maroon.large" +#define PLANET49_MED_MASK_PMAP_ANIM "planet.maroon.medium" +#define PLANET49_SML_MASK_PMAP_ANIM "planet.maroon.small" +#define PLANET50_BIG_MASK_PMAP_ANIM "planet.bluegas.large" +#define PLANET50_MED_MASK_PMAP_ANIM "planet.bluegas.medium" +#define PLANET50_SML_MASK_PMAP_ANIM "planet.bluegas.small" +#define PLANET51_BIG_MASK_PMAP_ANIM "planet.cyangas.large" +#define PLANET51_MED_MASK_PMAP_ANIM "planet.cyangas.medium" +#define PLANET51_SML_MASK_PMAP_ANIM "planet.cyangas.small" +#define PLANET52_BIG_MASK_PMAP_ANIM "planet.greengas.large" +#define PLANET52_MED_MASK_PMAP_ANIM "planet.greengas.medium" +#define PLANET52_SML_MASK_PMAP_ANIM "planet.greengas.small" +#define PLANET53_BIG_MASK_PMAP_ANIM "planet.greygas.large" +#define PLANET53_MED_MASK_PMAP_ANIM "planet.greygas.medium" +#define PLANET53_SML_MASK_PMAP_ANIM "planet.greygas.small" +#define PLANET54_BIG_MASK_PMAP_ANIM "planet.orangegas.large" +#define PLANET54_MED_MASK_PMAP_ANIM "planet.orangegas.medium" +#define PLANET54_SML_MASK_PMAP_ANIM "planet.orangegas.small" +#define PLANET55_BIG_MASK_PMAP_ANIM "planet.purplegas.large" +#define PLANET55_MED_MASK_PMAP_ANIM "planet.purplegas.medium" +#define PLANET55_SML_MASK_PMAP_ANIM "planet.purplegas.small" +#define PLANET56_BIG_MASK_PMAP_ANIM "planet.redgas.large" +#define PLANET56_MED_MASK_PMAP_ANIM "planet.redgas.medium" +#define PLANET56_SML_MASK_PMAP_ANIM "planet.redgas.small" +#define PLANET57_BIG_MASK_PMAP_ANIM "planet.violetgas.large" +#define PLANET57_MED_MASK_PMAP_ANIM "planet.violetgas.medium" +#define PLANET57_SML_MASK_PMAP_ANIM "planet.violetgas.small" +#define PLANET58_BIG_MASK_PMAP_ANIM "planet.yellowgas.large" +#define PLANET58_MED_MASK_PMAP_ANIM "planet.yellowgas.medium" +#define PLANET58_SML_MASK_PMAP_ANIM "planet.yellowgas.small" +#define CREDITS_BACK_ANIM "credits.background" +#define SISSKEL_MASK_PMAP_ANIM "graphics.sisskeleton" +#define ORBENTER_PMAP_ANIM "graphics.orbenter" +#define MENUBKG_PMAP_ANIM "graphics.setupmenu" diff --git a/sc2/src/sc2code/imusicre.h b/sc2/src/sc2code/imusicre.h index b1663bf8d..c03822e56 100644 --- a/sc2/src/sc2code/imusicre.h +++ b/sc2/src/sc2code/imusicre.h @@ -2,19 +2,19 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define HYPERSPACE_MUSIC 0x04c00006L -#define QUASISPACE_MUSIC 0x04e00106L -#define IP_MUSIC 0x13e00206L -#define ORBIT1_MUSIC 0x14000306L -#define ORBIT2_MUSIC 0x14000406L -#define ORBIT3_MUSIC 0x14000506L -#define ORBIT4_MUSIC 0x14000606L -#define ORBIT5_MUSIC 0x14000706L -#define MELEE_MUSIC 0x14200e06L -#define REDALERT_MUSIC 0x14600806L -#define MAINMENU_MUSIC 0x18200f06L -#define OUTFIT_MUSIC 0x18800906L -#define SHIPYARD_MUSIC 0x18c00a06L -#define STARBASE_MUSIC 0x18e00b06L -#define BATTLE_MUSIC 0x20a00c06L -#define CREDITS_MUSIC 0x23400d06L +#define HYPERSPACE_MUSIC "music.hyper" +#define QUASISPACE_MUSIC "music.arispace" +#define IP_MUSIC "music.space" +#define ORBIT1_MUSIC "music.orbit1" +#define ORBIT2_MUSIC "music.orbit2" +#define ORBIT3_MUSIC "music.orbit3" +#define ORBIT4_MUSIC "music.orbit4" +#define ORBIT5_MUSIC "music.orbit5" +#define MELEE_MUSIC "music.meleemenu" +#define REDALERT_MUSIC "music.redalert" +#define MAINMENU_MUSIC "music.mainmenu" +#define OUTFIT_MUSIC "music.outfit" +#define SHIPYARD_MUSIC "music.shipyard" +#define STARBASE_MUSIC "music.starbase" +#define BATTLE_MUSIC "music.battle" +#define CREDITS_MUSIC "music.credits" diff --git a/sc2/src/sc2code/isndres.h b/sc2/src/sc2code/isndres.h index 4fdf7e5fb..89664e3c0 100644 --- a/sc2/src/sc2code/isndres.h +++ b/sc2/src/sc2code/isndres.h @@ -2,6 +2,6 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MENU_SOUNDS 0x04000005L -#define GAME_SOUNDS 0x04200105L -#define LANDER_SOUNDS 0x05400205L +#define MENU_SOUNDS "sounds.menu" +#define GAME_SOUNDS "sounds.game" +#define LANDER_SOUNDS "sounds.landsnds" diff --git a/sc2/src/sc2code/istrtab.h b/sc2/src/sc2code/istrtab.h index 4f132a7c0..faa1d37a2 100644 --- a/sc2/src/sc2code/istrtab.h +++ b/sc2/src/sc2code/istrtab.h @@ -2,152 +2,152 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define STARCON_COLOR_MAP 0x00200004L -#define STARCON_GAME_STRINGS 0x03800104L -#define HYPER_COLOR_TAB 0x04800204L -#define ARISPACE_COLOR_TAB 0x04a00304L -#define ORBPLAN_COLOR_MAP 0x05200404L -#define IPSUN_COLOR_MAP 0x05206004L -#define OOLITE_COLOR_TAB 0x09000504L -#define OOLITE_XLAT_TAB 0x09000604L -#define YTTRIC_COLOR_TAB 0x09200504L -#define YTTRIC_XLAT_TAB 0x09200604L -#define QUASI_DEGENERATE_COLOR_TAB 0x09400504L -#define QUASI_DEGENERATE_XLAT_TAB 0x09400604L -#define LANTHANIDE_COLOR_TAB 0x09600504L -#define LANTHANIDE_XLAT_TAB 0x09600604L -#define TREASURE_COLOR_TAB 0x09800504L -#define TREASURE_XLAT_TAB 0x09800604L -#define UREA_COLOR_TAB 0x09a00504L -#define UREA_XLAT_TAB 0x09a00604L -#define METAL_COLOR_TAB 0x09c00504L -#define METAL_XLAT_TAB 0x09c00604L -#define RADIOACTIVE_COLOR_TAB 0x09e00504L -#define RADIOACTIVE_XLAT_TAB 0x09e00604L -#define OPALESCENT_COLOR_TAB 0x0a000504L -#define OPALESCENT_XLAT_TAB 0x0a000604L -#define CYANIC_COLOR_TAB 0x0a200504L -#define CYANIC_XLAT_TAB 0x0a200604L -#define ACID_COLOR_TAB 0x0a400504L -#define ACID_XLAT_TAB 0x0a400604L -#define ALKALI_COLOR_TAB 0x0a600504L -#define ALKALI_XLAT_TAB 0x0a600604L -#define HALIDE_COLOR_TAB 0x0a800504L -#define HALIDE_XLAT_TAB 0x0a800604L -#define GREEN_COLOR_TAB 0x0aa00504L -#define GREEN_XLAT_TAB 0x0aa00604L -#define COPPER_COLOR_TAB 0x0ac00504L -#define COPPER_XLAT_TAB 0x0ac00604L -#define CARBIDE_COLOR_TAB 0x0ae00504L -#define CARBIDE_XLAT_TAB 0x0ae00604L -#define ULTRAMARINE_COLOR_TAB 0x0b000504L -#define ULTRAMARINE_XLAT_TAB 0x0b000604L -#define NOBLE_COLOR_TAB 0x0b200504L -#define NOBLE_XLAT_TAB 0x0b200604L -#define AZURE_COLOR_TAB 0x0b400504L -#define AZURE_XLAT_TAB 0x0b400604L -#define CHONDRITE_COLOR_TAB 0x0b600504L -#define CHONDRITE_XLAT_TAB 0x0b600604L -#define PURPLE_COLOR_TAB 0x0b800504L -#define PURPLE_XLAT_TAB 0x0b800604L -#define SUPER_DENSE_COLOR_TAB 0x0ba00504L -#define SUPER_DENSE_XLAT_TAB 0x0ba00604L -#define PELLUCID_COLOR_TAB 0x0bc00504L -#define PELLUCID_XLAT_TAB 0x0bc00604L -#define DUST_COLOR_TAB 0x0be00504L -#define DUST_XLAT_TAB 0x0be00604L -#define CRIMSON_COLOR_TAB 0x0c000504L -#define CRIMSON_XLAT_TAB 0x0c000604L -#define CIMMERIAN_COLOR_TAB 0x0c200504L -#define CIMMERIAN_XLAT_TAB 0x0c200604L -#define INFRARED_COLOR_TAB 0x0c400504L -#define INFRARED_XLAT_TAB 0x0c400604L -#define SELENIC_COLOR_TAB 0x0c600504L -#define SELENIC_XLAT_TAB 0x0c600604L -#define AURIC_COLOR_TAB 0x0c800504L -#define AURIC_XLAT_TAB 0x0c800604L -#define FLUORESCENT_COLOR_TAB 0x0ca00504L -#define FLUORESCENT_XLAT_TAB 0x0ca00604L -#define ULTRAVIOLET_COLOR_TAB 0x0cc00504L -#define ULTRAVIOLET_XLAT_TAB 0x0cc00604L -#define PLUTONIC_COLOR_TAB 0x0ce00504L -#define PLUTONIC_XLAT_TAB 0x0ce00604L -#define RAINBOW_COLOR_TAB 0x0d000504L -#define RAINBOW_XLAT_TAB 0x0d000604L -#define SHATTERED_COLOR_TAB 0x0d200504L -#define SHATTERED_XLAT_TAB 0x0d200604L -#define SAPPHIRE_COLOR_TAB 0x0d400504L -#define SAPPHIRE_XLAT_TAB 0x0d400604L -#define ORGANIC_COLOR_TAB 0x0d600504L -#define ORGANIC_XLAT_TAB 0x0d600604L -#define XENOLITHIC_COLOR_TAB 0x0d800504L -#define XENOLITHIC_XLAT_TAB 0x0d800604L -#define REDUX_COLOR_TAB 0x0da00504L -#define REDUX_XLAT_TAB 0x0da00604L -#define PRIMORDIAL_COLOR_TAB 0x0dc00504L -#define PRIMORDIAL_XLAT_TAB 0x0dc00604L -#define EMERALD_COLOR_TAB 0x0de00504L -#define EMERALD_XLAT_TAB 0x0de00604L -#define CHLORINE_COLOR_TAB 0x0e000504L -#define CHLORINE_XLAT_TAB 0x0e000604L -#define MAGNETIC_COLOR_TAB 0x0e200504L -#define MAGNETIC_XLAT_TAB 0x0e200604L -#define WATER_COLOR_TAB 0x0e400504L -#define WATER_XLAT_TAB 0x0e400604L -#define TELLURIC_COLOR_TAB 0x0e600504L -#define TELLURIC_XLAT_TAB 0x0e600604L -#define HYDROCARBON_COLOR_TAB 0x0e800504L -#define HYDROCARBON_XLAT_TAB 0x0e800604L -#define IODINE_COLOR_TAB 0x0ea00504L -#define IODINE_XLAT_TAB 0x0ea00604L -#define VINYLOGOUS_COLOR_TAB 0x0ec00504L -#define VINYLOGOUS_XLAT_TAB 0x0ec00604L -#define RUBY_COLOR_TAB 0x0ee00504L -#define RUBY_XLAT_TAB 0x0ee00604L -#define MAGMA_COLOR_TAB 0x0f000504L -#define MAGMA_XLAT_TAB 0x0f000604L -#define MAROON_COLOR_TAB 0x0f200504L -#define MAROON_XLAT_TAB 0x0f200604L -#define BLU_GAS_COLOR_TAB 0x0f400504L -#define BLU_GAS_XLAT_TAB 0x0f400604L -#define CYA_GAS_COLOR_TAB 0x0f600504L -#define CYA_GAS_XLAT_TAB 0x0f600604L -#define GRN_GAS_COLOR_TAB 0x0f800504L -#define GRN_GAS_XLAT_TAB 0x0f800604L -#define GRY_GAS_COLOR_TAB 0x0fa00504L -#define GRY_GAS_XLAT_TAB 0x0fa00604L -#define ORA_GAS_COLOR_TAB 0x0fc00504L -#define ORA_GAS_XLAT_TAB 0x0fc00604L -#define PUR_GAS_COLOR_TAB 0x0fe00504L -#define PUR_GAS_XLAT_TAB 0x0fe00604L -#define RED_GAS_COLOR_TAB 0x10000504L -#define RED_GAS_XLAT_TAB 0x10000604L -#define VIO_GAS_COLOR_TAB 0x10200504L -#define VIO_GAS_XLAT_TAB 0x10200604L -#define YEL_GAS_COLOR_TAB 0x10400504L -#define YEL_GAS_XLAT_TAB 0x10400604L -#define MOONBASE_STRTAB 0x11604d04L -#define MAIDENS_STRTAB 0x11804e04L -#define CHMMR_BASE_STRTAB 0x11a04f04L -#define AQUA_STRTAB 0x11c05004L -#define BURV_BCS_STRTAB 0x11e05104L -#define TAALO_DEVICE_STRTAB 0x12005204L -#define SUN_DEVICE_STRTAB 0x12205304L -#define VAULT_STRTAB 0x12405404L -#define WRECK_STRTAB 0x12605504L -#define BOMB_STRTAB 0x12805604L -#define BEAST_STRTAB 0x12a05704L -#define EGG_CASE_STRTAB 0x12c05804L -#define SPAPLUTO_STRTAB 0x12e05904L -#define BURV_RUINS_STRTAB 0x13005a04L -#define ANDROSYNTH_RUINS_STRTAB 0x13205b04L -#define DRUUGE_RUINS_STRTAB 0x13405c04L -#define PKUNK_RUINS_STRTAB 0x13605d04L -#define RUINS_STRTAB 0x13a05e04L -#define UMGAH_BCS_STRTAB 0x13c05f04L -#define HANGAR_COLOR_TAB 0x18a06104L -#define SETUP_MENU_STRTAB 0x23a11f04L -#define INTROPRES_STRTAB 0x23c06204L -#define FINALPRES_STRTAB 0x23e06304L -#define CREDITS_STRTAB 0x24206404L -#define JOYSTICK_ALPHA_STRTAB 0x24406504L +#define STARCON_COLOR_MAP "colortable.scclrtab" +#define STARCON_GAME_STRINGS "text.starcon" +#define HYPER_COLOR_TAB "colortable.hyperpal" +#define ARISPACE_COLOR_TAB "colortable.arispace" +#define ORBPLAN_COLOR_MAP "colortable.orbplan" +#define IPSUN_COLOR_MAP "colortable.ip_sun" +#define OOLITE_COLOR_TAB "planet.oolite.colortable" +#define OOLITE_XLAT_TAB "planet.oolite.translatetable" +#define YTTRIC_COLOR_TAB "planet.yttric.colortable" +#define YTTRIC_XLAT_TAB "planet.yttric.translatetable" +#define QUASI_DEGENERATE_COLOR_TAB "planet.quasidegenerate.colortable" +#define QUASI_DEGENERATE_XLAT_TAB "planet.quasidegenerate.translatetable" +#define LANTHANIDE_COLOR_TAB "planet.lanthanide.colortable" +#define LANTHANIDE_XLAT_TAB "planet.lanthanide.translatetable" +#define TREASURE_COLOR_TAB "planet.treasure.colortable" +#define TREASURE_XLAT_TAB "planet.treasure.translatetable" +#define UREA_COLOR_TAB "planet.urea.colortable" +#define UREA_XLAT_TAB "planet.urea.translatetable" +#define METAL_COLOR_TAB "planet.metal.colortable" +#define METAL_XLAT_TAB "planet.metal.translatetable" +#define RADIOACTIVE_COLOR_TAB "planet.radioactive.colortable" +#define RADIOACTIVE_XLAT_TAB "planet.radioactive.translatetable" +#define OPALESCENT_COLOR_TAB "planet.opalescent.colortable" +#define OPALESCENT_XLAT_TAB "planet.opalescent.translatetable" +#define CYANIC_COLOR_TAB "planet.cyanic.colortable" +#define CYANIC_XLAT_TAB "planet.cyanic.translatetable" +#define ACID_COLOR_TAB "planet.acid.colortable" +#define ACID_XLAT_TAB "planet.acid.translatetable" +#define ALKALI_COLOR_TAB "planet.alkali.colortable" +#define ALKALI_XLAT_TAB "planet.alkali.translatetable" +#define HALIDE_COLOR_TAB "planet.halide.colortable" +#define HALIDE_XLAT_TAB "planet.halide.translatetable" +#define GREEN_COLOR_TAB "planet.green.colortable" +#define GREEN_XLAT_TAB "planet.green.translatetable" +#define COPPER_COLOR_TAB "planet.copper.colortable" +#define COPPER_XLAT_TAB "planet.copper.translatetable" +#define CARBIDE_COLOR_TAB "planet.carbide.colortable" +#define CARBIDE_XLAT_TAB "planet.carbide.translatetable" +#define ULTRAMARINE_COLOR_TAB "planet.ultramarine.colortable" +#define ULTRAMARINE_XLAT_TAB "planet.ultramarine.translatetable" +#define NOBLE_COLOR_TAB "planet.noble.colortable" +#define NOBLE_XLAT_TAB "planet.noble.translatetable" +#define AZURE_COLOR_TAB "planet.azure.colortable" +#define AZURE_XLAT_TAB "planet.azure.translatetable" +#define CHONDRITE_COLOR_TAB "planet.chondrite.colortable" +#define CHONDRITE_XLAT_TAB "planet.chondrite.translatetable" +#define PURPLE_COLOR_TAB "planet.purple.colortable" +#define PURPLE_XLAT_TAB "planet.purple.translatetable" +#define SUPER_DENSE_COLOR_TAB "planet.superdense.colortable" +#define SUPER_DENSE_XLAT_TAB "planet.superdense.translatetable" +#define PELLUCID_COLOR_TAB "planet.pellucid.colortable" +#define PELLUCID_XLAT_TAB "planet.pellucid.translatetable" +#define DUST_COLOR_TAB "planet.dust.colortable" +#define DUST_XLAT_TAB "planet.dust.translatetable" +#define CRIMSON_COLOR_TAB "planet.crimson.colortable" +#define CRIMSON_XLAT_TAB "planet.crimson.translatetable" +#define CIMMERIAN_COLOR_TAB "planet.cimmerian.colortable" +#define CIMMERIAN_XLAT_TAB "planet.cimmerian.translatetable" +#define INFRARED_COLOR_TAB "planet.infrared.colortable" +#define INFRARED_XLAT_TAB "planet.infrared.translatetable" +#define SELENIC_COLOR_TAB "planet.selenic.colortable" +#define SELENIC_XLAT_TAB "planet.selenic.translatetable" +#define AURIC_COLOR_TAB "planet.auric.colortable" +#define AURIC_XLAT_TAB "planet.auric.translatetable" +#define FLUORESCENT_COLOR_TAB "planet.fluorescent.colortable" +#define FLUORESCENT_XLAT_TAB "planet.fluorescent.translatetable" +#define ULTRAVIOLET_COLOR_TAB "planet.ultraviolet.colortable" +#define ULTRAVIOLET_XLAT_TAB "planet.ultraviolet.translatetable" +#define PLUTONIC_COLOR_TAB "planet.plutonic.colortable" +#define PLUTONIC_XLAT_TAB "planet.plutonic.translatetable" +#define RAINBOW_COLOR_TAB "planet.rainbow.colortable" +#define RAINBOW_XLAT_TAB "planet.rainbow.translatetable" +#define SHATTERED_COLOR_TAB "planet.shattered.colortable" +#define SHATTERED_XLAT_TAB "planet.shattered.translatetable" +#define SAPPHIRE_COLOR_TAB "planet.sapphire.colortable" +#define SAPPHIRE_XLAT_TAB "planet.sapphire.translatetable" +#define ORGANIC_COLOR_TAB "planet.organic.colortable" +#define ORGANIC_XLAT_TAB "planet.organic.translatetable" +#define XENOLITHIC_COLOR_TAB "planet.xenolithic.colortable" +#define XENOLITHIC_XLAT_TAB "planet.xenolithic.translatetable" +#define REDUX_COLOR_TAB "planet.redux.colortable" +#define REDUX_XLAT_TAB "planet.redux.translatetable" +#define PRIMORDIAL_COLOR_TAB "planet.primordial.colortable" +#define PRIMORDIAL_XLAT_TAB "planet.primordial.translatetable" +#define EMERALD_COLOR_TAB "planet.emerald.colortable" +#define EMERALD_XLAT_TAB "planet.emerald.translatetable" +#define CHLORINE_COLOR_TAB "planet.chlorine.colortable" +#define CHLORINE_XLAT_TAB "planet.chlorine.translatetable" +#define MAGNETIC_COLOR_TAB "planet.magnetic.colortable" +#define MAGNETIC_XLAT_TAB "planet.magnetic.translatetable" +#define WATER_COLOR_TAB "planet.water.colortable" +#define WATER_XLAT_TAB "planet.water.translatetable" +#define TELLURIC_COLOR_TAB "planet.telluric.colortable" +#define TELLURIC_XLAT_TAB "planet.telluric.translatetable" +#define HYDROCARBON_COLOR_TAB "planet.hydrocarbon.colortable" +#define HYDROCARBON_XLAT_TAB "planet.hydrocarbon.translatetable" +#define IODINE_COLOR_TAB "planet.iodine.colortable" +#define IODINE_XLAT_TAB "planet.iodine.translatetable" +#define VINYLOGOUS_COLOR_TAB "planet.vinylogous.colortable" +#define VINYLOGOUS_XLAT_TAB "planet.vinylogous.translatetable" +#define RUBY_COLOR_TAB "planet.ruby.colortable" +#define RUBY_XLAT_TAB "planet.ruby.translatetable" +#define MAGMA_COLOR_TAB "planet.magma.colortable" +#define MAGMA_XLAT_TAB "planet.magma.translatetable" +#define MAROON_COLOR_TAB "planet.maroon.colortable" +#define MAROON_XLAT_TAB "planet.maroon.translatetable" +#define BLU_GAS_COLOR_TAB "planet.bluegas.colortable" +#define BLU_GAS_XLAT_TAB "planet.bluegas.translatetable" +#define CYA_GAS_COLOR_TAB "planet.cyangas.colortable" +#define CYA_GAS_XLAT_TAB "planet.cyangas.translatetable" +#define GRN_GAS_COLOR_TAB "planet.greengas.colortable" +#define GRN_GAS_XLAT_TAB "planet.greengas.translatetable" +#define GRY_GAS_COLOR_TAB "planet.greygas.colortable" +#define GRY_GAS_XLAT_TAB "planet.greygas.translatetable" +#define ORA_GAS_COLOR_TAB "planet.orangegas.colortable" +#define ORA_GAS_XLAT_TAB "planet.orangegas.translatetable" +#define PUR_GAS_COLOR_TAB "planet.purplegas.colortable" +#define PUR_GAS_XLAT_TAB "planet.purplegas.translatetable" +#define RED_GAS_COLOR_TAB "planet.redgas.colortable" +#define RED_GAS_XLAT_TAB "planet.redgas.translatetable" +#define VIO_GAS_COLOR_TAB "planet.violetgas.colortable" +#define VIO_GAS_XLAT_TAB "planet.violetgas.translatetable" +#define YEL_GAS_COLOR_TAB "planet.yellowgas.colortable" +#define YEL_GAS_XLAT_TAB "planet.yellowgas.translatetable" +#define MOONBASE_STRTAB "text.moonbase" +#define MAIDENS_STRTAB "text.maidens" +#define CHMMR_BASE_STRTAB "text.chmmrbas" +#define AQUA_STRTAB "text.aquhelix" +#define BURV_BCS_STRTAB "text.drutrans" +#define TAALO_DEVICE_STRTAB "text.taadevic" +#define SUN_DEVICE_STRTAB "text.sundevic" +#define VAULT_STRTAB "text.syrvault" +#define WRECK_STRTAB "text.urqwreck" +#define BOMB_STRTAB "text.utwbomb" +#define BEAST_STRTAB "text.vuxbeast" +#define EGG_CASE_STRTAB "text.eggcase" +#define SPAPLUTO_STRTAB "text.spapluto" +#define BURV_RUINS_STRTAB "text.burruins" +#define ANDROSYNTH_RUINS_STRTAB "text.andruins" +#define DRUUGE_RUINS_STRTAB "text.sphere" +#define PKUNK_RUINS_STRTAB "text.spindle" +#define RUINS_STRTAB "text.ruins" +#define UMGAH_BCS_STRTAB "text.umgtrans" +#define HANGAR_COLOR_TAB "colortable.dockpani" +#define SETUP_MENU_STRTAB "text.setupmenu" +#define INTROPRES_STRTAB "slides.intro" +#define FINALPRES_STRTAB "slides.ending" +#define CREDITS_STRTAB "credits.credits" +#define JOYSTICK_ALPHA_STRTAB "text.joyalpha" diff --git a/sc2/src/sc2code/libs/gfxlib.h b/sc2/src/sc2code/libs/gfxlib.h index 5186eb7d1..d261960e3 100644 --- a/sc2/src/sc2code/libs/gfxlib.h +++ b/sc2/src/sc2code/libs/gfxlib.h @@ -20,6 +20,7 @@ #define _GFXLIB_H #include "compiler.h" +#include "reslib.h" typedef struct context_desc CONTEXT_DESC; typedef struct frame_desc FRAME_DESC; @@ -203,7 +204,7 @@ extern HOT_SPOT GetFrameHot (FRAME Frame); extern BOOLEAN InstallGraphicResTypes (COUNT cel_type, COUNT font_type); extern DRAWABLE LoadGraphicFile (const char *pStr); extern FONT LoadFontFile (const char *pStr); -extern void *LoadGraphicInstance (DWORD res); +extern void *LoadGraphicInstance (RESOURCE res); extern DRAWABLE LoadDisplayPixmap (RECT *area, FRAME frame); extern FRAME SetContextFontEffect (FRAME EffectFrame); extern FONT SetContextFont (FONT Font); diff --git a/sc2/src/sc2code/libs/graphics/resgfx.c b/sc2/src/sc2code/libs/graphics/resgfx.c index 8348d6988..bc704baaf 100644 --- a/sc2/src/sc2code/libs/graphics/resgfx.c +++ b/sc2/src/sc2code/libs/graphics/resgfx.c @@ -29,7 +29,7 @@ InstallGraphicResTypes (COUNT cel_type, COUNT font_type) /* Needs to be void * because it could be either a DRAWABLE or a FONT. */ void * -LoadGraphicInstance (DWORD res) +LoadGraphicInstance (RESOURCE res) { void *hData; diff --git a/sc2/src/sc2code/libs/reslib.h b/sc2/src/sc2code/libs/reslib.h index 570ea175b..16e3eb7c3 100644 --- a/sc2/src/sc2code/libs/reslib.h +++ b/sc2/src/sc2code/libs/reslib.h @@ -23,11 +23,10 @@ #include "compiler.h" #include "port.h" #include "misc.h" -#include "libs/uio.h" - +#include "libs/uio.h" typedef struct resource_index *RESOURCE_INDEX; -typedef DWORD RESOURCE; +typedef const char *RESOURCE; typedef enum { @@ -42,28 +41,7 @@ typedef enum CODE } RES_TYPE; -typedef COUNT RES_INSTANCE; -typedef COUNT RES_PACKAGE; - -#define NULL_RESOURCE 0L - -#define TYPE_BITS 8 -#define INSTANCE_BITS 13 -#define PACKAGE_BITS 11 - -#define GET_TYPE(res) \ - ((RES_TYPE)(res) & (RES_TYPE)((1 << TYPE_BITS) - 1)) - -#define GET_INSTANCE(res) \ - ((RES_INSTANCE)((res) >> TYPE_BITS) & ((1 << INSTANCE_BITS) - 1)) -#define GET_PACKAGE(res) \ - ((RES_PACKAGE)((res) >> (TYPE_BITS + INSTANCE_BITS)) & \ - ((1 << PACKAGE_BITS) - 1)) -#define MAKE_RESOURCE(p,t,i) \ - (((RESOURCE)(p) << (TYPE_BITS + INSTANCE_BITS)) | \ - ((RESOURCE)(i) << TYPE_BITS) | \ - ((RESOURCE)(t))) - +#define NULL_RESOURCE NULL extern const char *_cur_resfile_name; @@ -84,8 +62,7 @@ extern long LengthResFile (uio_Stream *fp); extern BOOLEAN res_CloseResFile (uio_Stream *fp); extern BOOLEAN DeleteResFile (uio_DirHandle *dir, const char *filename); -extern RESOURCE_INDEX InitResourceSystem (const char *mapfile, const char *resfile, - RES_TYPE resType, BOOLEAN (*FileErrorFun) (const char *filename)); +extern RESOURCE_INDEX InitResourceSystem (); extern void UninitResourceSystem (void); extern BOOLEAN InstallResTypeVectors (RES_TYPE res_type, ResourceLoadFun *loadFun, ResourceFreeFun *freeFun); @@ -94,15 +71,12 @@ extern void *res_DetachResource (RESOURCE res); extern BOOLEAN FreeResource (RESOURCE res); extern COUNT CountResourceTypes (void); -extern RESOURCE_INDEX OpenResourceIndexFile (const char *resfile); -extern RESOURCE_INDEX OpenResourceIndexInstance (RESOURCE res); -extern RESOURCE_INDEX SetResourceIndex (RESOURCE_INDEX newIndexHandle); -extern BOOLEAN CloseResourceIndex (RESOURCE_INDEX newIndexHandle); +extern void LoadResourceIndex (uio_DirHandle *dir, const char *filename); extern void *GetResourceData (uio_Stream *fp, DWORD length); #define AllocResourceData HMalloc -#define FreeResourceData HFree +extern BOOLEAN FreeResourceData (void *); #include "strlib.h" @@ -149,4 +123,3 @@ void res_PutBoolean (const char *key, BOOLEAN value); BOOLEAN res_Remove (const char *key); #endif /* _RESLIB_H */ - diff --git a/sc2/src/sc2code/libs/resource/Makeinfo b/sc2/src/sc2code/libs/resource/Makeinfo index 55dff9746..40632db20 100644 --- a/sc2/src/sc2code/libs/resource/Makeinfo +++ b/sc2/src/sc2code/libs/resource/Makeinfo @@ -1,2 +1,2 @@ uqm_CFILES="direct.c filecntl.c getres.c loadres.c mapres.c - resdata.c resinit.c stringbank.c" + propfile.c resdata.c resinit.c stringbank.c" diff --git a/sc2/src/sc2code/libs/resource/getres.c b/sc2/src/sc2code/libs/resource/getres.c index c3a6eda9b..6214752ed 100644 --- a/sc2/src/sc2code/libs/resource/getres.c +++ b/sc2/src/sc2code/libs/resource/getres.c @@ -21,23 +21,7 @@ #include "resintrn.h" #include "libs/misc.h" #include "libs/log.h" - -#define TYPESIZ 32 -/* These MUST COME in the SAME ORDER as the enums in reslib.h!!! - They also must be no more than TYPESIZ-1 characters long, but that's - unlikely to be a problem. */ -static const char *res_type_strings[] = { - "UNKNOWNRES", - "KEY_CONFIG", - "GFXRES", - "FONTRES", - "STRTAB", - "SNDRES", - "MUSICRES", - "RES_INDEX", - "CODE", - NULL -}; +#include "libs/uio/charhashtable.h" const char *_cur_resfile_name; // When a file is being loaded, _cur_resfile_name is set to its name. @@ -45,104 +29,14 @@ const char *_cur_resfile_name; static ResourceDesc * lookupResourceDesc (ResourceIndex *idx, RESOURCE res) { - // Binary search through the resources. - COUNT l, h; - - if (idx->numRes == 0) - return NULL; - - l = 0; - h = idx->numRes; - - while (l + 1 != h) - { - COUNT m = (l + h) / 2; - if (idx->res[m]->res <= res) - l = m; - else - h = m; - } - - if (idx->res[l]->res == res) - return idx->res[l]; - return NULL; + return (ResourceDesc *) CharHashTable_find (idx->map, res); } void * loadResourceDesc (ResourceIndex *idx, ResourceDesc *desc) { - RES_TYPE resType, expectedType; - const char *resval; - char *path; - - expectedType = GET_TYPE (desc->res); - - resval = res_GetString (desc->res_id); - if (resval == NULL) - { - log_add (log_Warning, "Could not decode resource '%s'", desc->res_id); - return NULL; - } - - path = strchr (resval, ':'); - if (path == NULL) - { - log_add (log_Warning, "Could not find type information for resource '%s'", desc->res_id); - resType = GET_TYPE (desc->res); - path = (char *)resval; - } - else - { - char typestr[TYPESIZ]; - int n = path - resval; - - if (n >= TYPESIZ) - { - n = TYPESIZ - 1; - } - - strncpy (typestr, resval, n); - typestr[n] = '\0'; - - path++; - - resType = UNKNOWNRES; - while (res_type_strings[resType]) - { - if (!strcmp (typestr, res_type_strings[resType])) - { - break; - } - resType++; - } - if (!res_type_strings[resType]) - { - log_add (log_Warning, "Illegal type '%s' for resource '%s'", typestr, desc->res_id); - return NULL; - } - } - - if (resType >= idx->typeInfo.numTypes || - idx->typeInfo.handlers[resType].loadFun == NULL) - { - log_add (log_Warning, "Warning: Unable to load '%s'; no handler " - "for type %d defined.", desc->res_id, resType); - return NULL; - } - - if ((expectedType != UNKNOWNRES) && (resType != expectedType)) - { - log_add (log_Warning, "Warning: Expected type '%s' for" - "resource '%s', but got '%s'.", - res_type_strings[expectedType], - desc->res_id, - res_type_strings[resType]); - return NULL; - } - - desc->restype = resType; - desc->resdata = loadResource (path, - idx->typeInfo.handlers[resType].loadFun); + desc->resdata = loadResource (desc->fname, + idx->typeInfo.handlers[desc->restype].loadFun); return desc->resdata; } @@ -188,13 +82,19 @@ res_GetResource (RESOURCE res) ResourceIndex *resourceIndex; ResourceDesc *desc; + if (res == NULL_RESOURCE) + { + log_add (log_Warning, "Trying to get null resource"); + return NULL; + } + resourceIndex = _get_current_index_header (); desc = lookupResourceDesc (resourceIndex, res); if (desc == NULL) { - log_add (log_Warning, "Trying to get undefined resource %08x", - (DWORD) res); + log_add (log_Warning, "Trying to get undefined resource '%s'", + res); return NULL; } @@ -231,9 +131,8 @@ res_FreeResource (RESOURCE res) } idx = _get_current_index_header (); - freeFun = idx->typeInfo.handlers[GET_TYPE (res)].freeFun; + freeFun = idx->typeInfo.handlers[desc->restype].freeFun; (*freeFun) (desc->resdata); - desc->restype = UNKNOWNRES; desc->resdata = NULL; } @@ -268,4 +167,8 @@ res_DetachResource (RESOURCE res) return result; } - +BOOLEAN +FreeResourceData (void *data) { + HFree (data); + return TRUE; +} \ No newline at end of file diff --git a/sc2/src/sc2code/libs/resource/index.h b/sc2/src/sc2code/libs/resource/index.h index b655739de..10dfb1912 100644 --- a/sc2/src/sc2code/libs/resource/index.h +++ b/sc2/src/sc2code/libs/resource/index.h @@ -19,16 +19,16 @@ #ifndef _INDEX_H #define _INDEX_H -#include "reslib.h" #include +#include "reslib.h" +#include "libs/uio/charhashtable.h" typedef struct { - RESOURCE res; + RESOURCE res_id; + char *fname; RES_TYPE restype; - char *res_id; void *resdata; - //COUNT ref; } ResourceDesc; typedef struct @@ -48,7 +48,7 @@ typedef struct struct resource_index { - ResourceDesc **res; + CharHashTable_HashTable *map; ResourceTypeInfo typeInfo; size_t numRes; }; @@ -56,9 +56,5 @@ struct resource_index /* XXX: This should almost certainly be folded into RESOURCE_INDEX wherever possible */ typedef struct resource_index ResourceIndex; -void -forAllResourceIndices( - void (*callback) (ResourceIndex *idx, void *extra), void *extra); - #endif /* _INDEX_H */ diff --git a/sc2/src/sc2code/libs/resource/mapres.c b/sc2/src/sc2code/libs/resource/mapres.c index 109547887..043f4301e 100644 --- a/sc2/src/sc2code/libs/resource/mapres.c +++ b/sc2/src/sc2code/libs/resource/mapres.c @@ -1,4 +1,4 @@ -/* mapres.h, Copyright (c) 2005 Michael C. Martin */ +/* mapres.c, Copyright (c) 2005 Michael C. Martin */ /* * This program is free software; you can redistribute it and/or modify @@ -22,6 +22,7 @@ #include "libs/reslib.h" #include "libs/log.h" #include "libs/uio/charhashtable.h" +#include "propfile.h" #include "stringbank.h" /* The CharHashTable owns its keys, but not its values. We will keep the @@ -134,10 +135,10 @@ res_PutString (const char *key, const char *value) check_map_init (); value = StringBank_AddOrFindString (bank, value); - if (!CharHashTable_add (map, key, value)) + if (!CharHashTable_add (map, key, (void *)value)) { CharHashTable_remove (map, key); - CharHashTable_add (map, key, value); + CharHashTable_add (map, key, (void *)value); } } @@ -176,111 +177,17 @@ res_HasKey (const char *key) return (res_GetString (key) != NULL); } -static void -load_from_string (char *d) -{ - int len, i; - - check_map_init (); - if (!map) return; - - len = strlen(d); - i = 0; - while (i < len) { - int key_start, key_end, value_start, value_end; - /* Starting a line: search for non-whitespace */ - while ((i < len) && isspace (d[i])) i++; - if (i >= len) break; /* Done parsing! */ - /* If it was a comment, skip to end of comment/file */ - if (d[i] == '#') { - while ((i < len) && (d[i] != '\n')) i++; - if (i >= len) break; - continue; /* Back to keyword search */ - } - key_start = i; - /* Find the = on this line */ - while ((i < len) && (d[i] != '=') && - (d[i] != '\n') && (d[i] != '#')) i++; - if (i >= len) { /* Bare key at EOF */ - log_add (log_Warning, "Warning: Bare keyword at EOF"); - break; - } - /* Comments here mean incomplete line too */ - if (d[i] != '=') { - log_add (log_Warning, "Warning: Key without value"); - while ((i < len) && (d[i] != '\n')) i++; - if (i >= len) break; - continue; /* Back to keyword search */ - } - /* Key ends at first whitespace before = , or at key_start*/ - key_end = i; - while ((key_end > key_start) && isspace (d[key_end-1])) - key_end--; - - /* Consume the = */ - i++; - /* Value starts at first non-whitespace after = on line... */ - while ((i < len) && (d[i] != '#') && (d[i] != '\n') && - isspace (d[i])) - i++; - value_start = i; - /* Until first non-whitespace before terminator */ - while ((i < len) && (d[i] != '#') && (d[i] != '\n')) - i++; - value_end = i; - while ((value_end > value_start) && isspace (d[value_end-1])) - value_end--; - /* Skip past EOL or EOF */ - while ((i < len) && (d[i] != '\n')) - i++; - i++; - - /* We now have start and end values for key and value. - We terminate the strings for both by writing \0s, then - make a new map entry. */ - d[key_end] = '\0'; - d[value_end] = '\0'; - res_PutString (d+key_start, d+value_start); - } -} - -static void -load_from_file (uio_Stream *f) -{ - long flen; - char *data; - - flen = LengthResFile (f); - - data = malloc (flen + 1); - if (!data) { - return; - } - - flen = ReadResFile (data, 1, flen, f); - data[flen] = '\0'; - - load_from_string (data); - free (data); -} - -static void -load_from_filename (uio_DirHandle *path, const char *fname) -{ - uio_Stream *f = res_OpenResFile (path, fname, "rt"); - if (!f) { - return; - } - load_from_file (f); - res_CloseResFile(f); -} - void res_LoadFile (uio_Stream *s) { check_map_init (); - load_from_file (s); + if (!map) + { + return; + } + + PropFile_from_file (s, res_PutString); } void @@ -288,7 +195,12 @@ res_LoadFilename (uio_DirHandle *path, const char *fname) { check_map_init (); - load_from_filename (path, fname); + if (!map) + { + return; + } + + PropFile_from_filename (path, fname, res_PutString); } void diff --git a/sc2/src/sc2code/libs/resource/resinit.c b/sc2/src/sc2code/libs/resource/resinit.c index 9907b09f7..0b50683e0 100644 --- a/sc2/src/sc2code/libs/resource/resinit.c +++ b/sc2/src/sc2code/libs/resource/resinit.c @@ -19,369 +19,173 @@ #include "resintrn.h" #include "misc.h" #include "options.h" +#include "nameref.h" #include "types.h" -#include "libs/list.h" #include "libs/log.h" +#include "propfile.h" #include #include - -static bool copyResTypeHandlers (ResourceIndex *dest, - const ResourceIndex *src); -static bool setResTypeHandlers (ResourceIndex *idx, RES_TYPE resType, - const ResourceHandlers *handlers); -static RESOURCE_INDEX allocResourceIndex(void); -static void freeResourceIndex (RESOURCE_INDEX h); - - -static List_List *indexList; - - -static void -initIndexList (void) -{ - indexList = List_newList (); +static RESOURCE_INDEX +allocResourceIndex (void) { + RESOURCE_INDEX ndx = HMalloc (sizeof (struct resource_index)); + ndx->typeInfo.numTypes = 0; + ndx->typeInfo.handlers = NULL; + ndx->map = CharHashTable_newHashTable (NULL, NULL, NULL, NULL, 0, 0.85, 0.9); + return ndx; } static void -uninitIndexList (void) -{ - List_deleteList (indexList); - indexList = NULL; -} - -void -forAllResourceIndices( - void (*callback) (ResourceIndex *idx, void *extra), - void *extra) { - List_Link *link; - - for (link = indexList->first; link != NULL; link = link->next) +freeResourceIndex (RESOURCE_INDEX h) { + if (h != NULL) { - ResourceIndex *idx = (ResourceIndex *) link->entry; - (*callback) (idx, extra); + /* TODO: This leaks the contents of h->map */ + CharHashTable_deleteHashTable (h->map); + if (h->typeInfo.handlers != NULL) + HFree (h->typeInfo.handlers); + HFree (h); } } - -#if 0 -static ResourceDesc * -lookupResourceIndex (const char *path) -{ - List_Link *link; - - for (link = indexList->first; link != NULL; link = link->next) - { - ResourceDesc *desc = (ResourceDesc *) link->entry; - - if (strcmp (desc->path, path) == 0) - return link->entry; - } - - return NULL; -} -#endif +#define TYPESIZ 32 +/* These MUST COME in the SAME ORDER as the enums in reslib.h!!! + They also must be no more than TYPESIZ-1 characters long, but that's + unlikely to be a problem. */ +static const char *res_type_strings[] = { + "UNKNOWNRES", + "KEY_CONFIG", + "GFXRES", + "FONTRES", + "STRTAB", + "SNDRES", + "MUSICRES", + "RES_INDEX", + "CODE", + NULL +}; static ResourceDesc * -newResourceDesc (RESOURCE res, char *res_id) +newResourceDesc (const char *res_id, const char *resval) { + char *path; + int pathlen; + RES_TYPE resType; ResourceDesc *result; + ResourceIndex *idx = _get_current_index_header (); + + path = strchr (resval, ':'); + if (path == NULL) + { + log_add (log_Warning, "Could not find type information for resource '%s'", res_id); + return NULL; + } + else + { + char typestr[TYPESIZ]; + int n = path - resval; + + if (n >= TYPESIZ) + { + n = TYPESIZ - 1; + } + + strncpy (typestr, resval, n); + typestr[n] = '\0'; + + path++; + pathlen = strlen (path); + + resType = UNKNOWNRES; + while (res_type_strings[resType]) + { + if (!strcmp (typestr, res_type_strings[resType])) + { + break; + } + resType++; + } + if (!res_type_strings[resType]) + { + log_add (log_Warning, "Illegal type '%s' for resource '%s'", typestr, res_id); + return NULL; + } + } + + if (resType >= idx->typeInfo.numTypes) + { + log_add (log_Warning, "Warning: Unable to load '%s'; no handler " + "for type %d defined.", res_id, resType); + return NULL; + } + + if (idx->typeInfo.handlers[resType].loadFun == NULL) + { + log_add (log_Warning, "Warning: Unable to load '%s'; no handler " + "for type %s defined.", res_id, res_type_strings[resType]); + return NULL; + } result = HMalloc (sizeof (ResourceDesc)); if (result == NULL) return NULL; - // log_add (log_Info, " '%s' -> '%s'.", res_id, path); - - result->res = res; - result->res_id = res_id; + result->fname = HMalloc (pathlen + 1); + strncpy (result->fname, path, pathlen); + result->fname[pathlen] = '\0'; + result->restype = resType; result->resdata = NULL; - //result->ref = 0; return result; } -static RESOURCE_INDEX -loadResourceIndex (uio_Stream *stream, const char *fileName) { - size_t lineNum; - ResourceDesc **descs = NULL; - COUNT numRes; - int numDescsAlloced = 0; - RESOURCE_INDEX ndx = NULL; -#ifdef DEBUG - RESOURCE lastResource = 0x00000000; -#endif - - // This loop parses lines of the format " ". - // Resnum is in hex. '#' can be used to add comments. - lineNum = 0; - numRes = 0; - for (;;) +static void +process_resource_desc (const char *key, const char *value) +{ + CharHashTable_HashTable *map = _get_current_index_header ()->map; + ResourceDesc *newDesc = newResourceDesc (key, value); + if (newDesc != NULL) { - char lineBuf[PATH_MAX + 80]; - char *ptr; - char *endPtr; - char *path; - char *newPath; - RESOURCE res; - ResourceDesc *desc; - - if (uio_fgets (lineBuf, sizeof lineBuf, stream) == NULL) + if (!CharHashTable_add (map, key, newDesc)) { - if (uio_ferror (stream)) - goto err; - else - break; // EOF - } - - lineNum++; - - // Skip comments. - ptr = strchr (lineBuf, '#'); - if (ptr != NULL) - *ptr = '\0'; - - // Omit leading whitespace. - ptr = lineBuf; - while (isspace (*ptr)) - ptr++; - - // Omit trailing whitespace. - endPtr = ptr + strlen(ptr); - while (endPtr != ptr && isspace (endPtr[-1])) - { - endPtr--; - *endPtr = '\0'; - } - - // If the line is empty (apart from comments and whitespace) - // go to the next one. - if (*ptr == 0) - continue; - - { - unsigned int resPackage; - unsigned int resInstance; - unsigned int resType; - unsigned int numParsed; - - if (sscanf (ptr, "%i %i %i %n", - &resPackage, &resInstance, &resType, &numParsed) != 3) + ResourceDesc *oldDesc = (ResourceDesc *)CharHashTable_find (map, key); + if (oldDesc != NULL) { - log_add (log_Warning, "Resource index '%s': Invalid line %d.", - fileName, lineNum); - continue; + if (newDesc->resdata != NULL) + { + /* XXX: It might be nice to actually clean it up properly */ + log_add (log_Warning, "LEAK WARNING: Replaced '%s' while it was live", key); + } + HFree (oldDesc->fname); + HFree (oldDesc); } - path = ptr + numParsed; - - res = MAKE_RESOURCE (resPackage, resType, resInstance); + CharHashTable_remove (map, key); + CharHashTable_add (map, key, newDesc); } - - while (isspace (*path)) - path++; - if (*path == '\0') - { - // No path supplied. - log_add (log_Warning, "Resource index '%s': Invalid line %d.", - fileName, lineNum); - continue; - } - -#ifdef DEBUG - // We need the list to be sorted, as we binary search through it. - if (res <= lastResource) - { - log_add (log_Fatal, "Fatal: resource index '%s' is not sorted " - "on the resource number, or contains a double entry. " - "Problem encountered on line %d.", fileName, lineNum); - explode (); - } - lastResource = res; -#endif - -#define DESC_NUM_INCREMENT 80 - if (numDescsAlloced <= numRes) - { - // Need to enlarge the array of resource descs. - ResourceDesc **newDescs = HRealloc (descs, - sizeof (ResourceDesc *) * - (numDescsAlloced + DESC_NUM_INCREMENT)); - if (newDescs == NULL) - goto err; // Original descs is untouched. - descs = newDescs; - numDescsAlloced += DESC_NUM_INCREMENT; - } - - // Can't use strdup; it doesn't use HMalloc. - newPath = HMalloc (endPtr - path + 1); - if (newPath == NULL) - goto err; - strcpy (newPath, path); - - desc = newResourceDesc (res, newPath); - if (desc == NULL) - goto err; - - descs[numRes] = desc; - numRes++; } - - { - ResourceDesc **newDescs = HRealloc (descs, - sizeof (ResourceDesc *) * numRes); - if (newDescs == NULL && numRes != 0) - goto err; // Original descs is untouched. - descs = newDescs; - } - - if (numRes == 0) - log_add (log_Debug, "Warning: Resource index '%s' contains no valid " - "entries.", fileName); - - ndx = allocResourceIndex (); - if (ndx == NULL) - goto err; - - ndx->res = descs; - ndx->numRes = numRes; - ndx->typeInfo.numTypes = 0; - ndx->typeInfo.handlers = NULL; - List_add (indexList, (void *) ndx); - - return ndx; - -err: - if (ndx != NULL) - freeResourceIndex (ndx); - HFree (descs); - return NULL; -} - -// Get the data associated with a resource of type RES_INDEX -// (In other words, a ResourceIndex) -void * -_GetResFileData (uio_Stream *res_fp, DWORD fileLength) -{ - RESOURCE_INDEX ndx, parentNdx; - -#if 0 - ResourceDesc *desc; - - desc = lookupResourceIndex (_cur_resfile_name); - assert(desc != NULL); - - if (desc->handle != NULL_HANDLE) - return desc->handle; -#endif - - ndx = loadResourceIndex (res_fp, _cur_resfile_name); - parentNdx = _get_current_index_header (); - if (parentNdx != NULL) - copyResTypeHandlers (ndx, parentNdx); - - (void) fileLength; - return ndx; -} - -BOOLEAN -_ReleaseResFileData (RESOURCE_INDEX ndx) -{ - if (ndx->typeInfo.handlers != NULL) - HFree (ndx->typeInfo.handlers); - HFree (ndx); - return TRUE; } RESOURCE_INDEX -InitResourceSystem (const char *mapfile, const char *resfile, RES_TYPE resType, - BOOLEAN (*FileErrorFun) (const char *filename)) +InitResourceSystem (void) { - ResourceIndex *ndx; - ResourceHandlers handlers; - - initIndexList (); + ResourceIndex *ndx = allocResourceIndex (); - handlers.loadFun = _GetResFileData; - handlers.freeFun = _ReleaseResFileData; + _set_current_index_header (ndx); - res_LoadFilename (contentDir, mapfile); + INIT_INSTANCES (); - SetResourceIndex (NULL); - ndx = loadResource (resfile, handlers.loadFun); - if (ndx == NULL) - return NULL; - - setResTypeHandlers (ndx, resType, &handlers); - - SetResourceIndex (ndx); - - (void) FileErrorFun; - (void) mapfile; return ndx; } +void +LoadResourceIndex (uio_DirHandle *dir, const char *rmpfile) +{ + PropFile_from_filename (dir, rmpfile, process_resource_desc); +} + void UninitResourceSystem (void) { -#if 0 - List_Link *link; - - for (link = indexList->first; link != NULL; link = link->next) - { - ResourceIndex *ndx = (ResourceIndex *) link->entry; - - } -#endif - uninitIndexList (); - - SetResourceIndex (NULL); -} - -RESOURCE_INDEX -OpenResourceIndexInstance (RESOURCE res) -{ - RESOURCE_INDEX hRH; - - hRH = (RESOURCE_INDEX)res_GetResource (res); - if (hRH) - res_DetachResource (res); - - return (hRH); -} - -// Sets the current global resource index. -// This is the index res_GetResource() calls will use. -RESOURCE_INDEX -SetResourceIndex (RESOURCE_INDEX newIndex) -{ - static RESOURCE_INDEX currentIndex; - // NB: currentIndexHandle is locked. - RESOURCE_INDEX oldIndex; - - oldIndex = currentIndex; - currentIndex = newIndex; - - if (currentIndex != NULL) { - RESOURCE_INDEX ndx; - - ndx = currentIndex; - _set_current_index_header (ndx); - } else - _set_current_index_header (NULL); - - return oldIndex; -} - -BOOLEAN -CloseResourceIndex (RESOURCE_INDEX ndx) -{ - if (ndx == _get_current_index_header ()) - SetResourceIndex (NULL); - - List_remove ((void *) indexList, ndx); - - _ReleaseResFileData (ndx); - - return TRUE; + freeResourceIndex (_get_current_index_header ()); + _set_current_index_header (NULL); } BOOLEAN @@ -389,23 +193,16 @@ InstallResTypeVectors (RES_TYPE resType, ResourceLoadFun *loadFun, ResourceFreeFun *freeFun) { ResourceHandlers handlers; + ResourceIndex *idx = _get_current_index_header (); handlers.loadFun = loadFun; handlers.freeFun = freeFun; - setResTypeHandlers(_get_current_index_header (), resType, &handlers); - return TRUE; -} - -static bool -setResTypeHandlers (ResourceIndex *idx, RES_TYPE resType, - const ResourceHandlers *handlers) -{ if (resType >= idx->typeInfo.numTypes) { // Have to enlarge the handler array. ResourceHandlers *newHandlers = HRealloc (idx->typeInfo.handlers, (resType + 1) * sizeof (ResourceHandlers)); if (newHandlers == NULL) - return false; // idx->typeInfo.handlers is untouched + return FALSE; // idx->typeInfo.handlers is untouched // Clear the space for new entries. No need to init the last one; // it's going to be used immediately. @@ -417,39 +214,6 @@ setResTypeHandlers (ResourceIndex *idx, RES_TYPE resType, idx->typeInfo.numTypes = resType + 1; } - idx->typeInfo.handlers[resType] = *handlers; - return true; + idx->typeInfo.handlers[resType] = handlers; + return TRUE; } - -static bool -copyResTypeHandlers (ResourceIndex *dest, const ResourceIndex *src) -{ - assert (src != dest); - - if (dest->typeInfo.handlers != NULL) - HFree (dest->typeInfo.handlers); - - dest->typeInfo.handlers = HMalloc (src->typeInfo.numTypes * - sizeof (ResourceHandlers)); - if (dest->typeInfo.handlers == NULL) - return false; - - memcpy (dest->typeInfo.handlers, src->typeInfo.handlers, - src->typeInfo.numTypes * sizeof (ResourceHandlers)); - dest->typeInfo.numTypes = src->typeInfo.numTypes; - - return true; -} - - -static RESOURCE_INDEX -allocResourceIndex (void) { - return HMalloc (sizeof (struct resource_index)); -} - -static void -freeResourceIndex (RESOURCE_INDEX h) { - HFree (h); -} - - diff --git a/sc2/src/sc2code/libs/sndlib.h b/sc2/src/sc2code/libs/sndlib.h index 7a2e3e935..21686bb40 100644 --- a/sc2/src/sc2code/libs/sndlib.h +++ b/sc2/src/sc2code/libs/sndlib.h @@ -51,8 +51,8 @@ extern SOUND_REF LoadSoundFile (const char *pStr); extern MUSIC_REF LoadMusicFile (const char *pStr); extern BOOLEAN InstallAudioResTypes (COUNT sound_type, COUNT music_type); -extern SOUND_REF LoadSoundInstance (DWORD res); -extern MUSIC_REF LoadMusicInstance (DWORD res); +extern SOUND_REF LoadSoundInstance (RESOURCE res); +extern MUSIC_REF LoadMusicInstance (RESOURCE res); extern BOOLEAN DestroySound (SOUND_REF SoundRef); extern BOOLEAN DestroyMusic (MUSIC_REF MusicRef); diff --git a/sc2/src/sc2code/libs/strings/sresins.c b/sc2/src/sc2code/libs/strings/sresins.c index 6c1fe8d7b..3e50cf251 100644 --- a/sc2/src/sc2code/libs/strings/sresins.c +++ b/sc2/src/sc2code/libs/strings/sresins.c @@ -26,7 +26,7 @@ InstallStringTableResType (COUNT string_type) } STRING_TABLE -LoadStringTableInstance (DWORD res) +LoadStringTableInstance (RESOURCE res) { void *data; diff --git a/sc2/src/sc2code/libs/strlib.h b/sc2/src/sc2code/libs/strlib.h index 95fcdc09d..75b0187b4 100644 --- a/sc2/src/sc2code/libs/strlib.h +++ b/sc2/src/sc2code/libs/strlib.h @@ -32,8 +32,11 @@ typedef STRING_TABLE_DESC *STRING_TABLE; typedef STRING_TABLE_ENTRY_DESC *STRING; typedef BYTE *STRINGPTR; +/* This has to go here because reslib requires the above typedefs. */ +#include "reslib.h" + extern BOOLEAN InstallStringTableResType (COUNT string_type); -extern STRING_TABLE LoadStringTableInstance (DWORD res); +extern STRING_TABLE LoadStringTableInstance (RESOURCE res); extern STRING_TABLE LoadStringTableFile (uio_DirHandle *dir, const char *fileName); extern BOOLEAN DestroyStringTable (STRING_TABLE StringTable); diff --git a/sc2/src/sc2code/planets/lander.c b/sc2/src/sc2code/planets/lander.c index a5917d470..e5e7d248b 100644 --- a/sc2/src/sc2code/planets/lander.c +++ b/sc2/src/sc2code/planets/lander.c @@ -16,6 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#include "cons_res.h" #include "controls.h" #include "colors.h" #include "encount.h" diff --git a/sc2/src/sc2code/setup.c b/sc2/src/sc2code/setup.c index fbb622ead..a6c125947 100644 --- a/sc2/src/sc2code/setup.c +++ b/sc2/src/sc2code/setup.c @@ -105,9 +105,12 @@ LoadKernel (int argc, char *argv[]) SetContextFGFrame (Screen); SetFrameHot (Screen, MAKE_HOT_SPOT (0, 0)); - hResIndex = InitResourceSystem ("uqm.rmp", "starcon.ls2", RES_INDEX, NULL); + hResIndex = InitResourceSystem (); if (hResIndex == 0) return FALSE; + + /* Load base content. */ + loadIndices (contentDir); /* Load addons demanded by the current configuration. */ if (opt3doMusic) @@ -123,8 +126,6 @@ LoadKernel (int argc, char *argv[]) /* Now load the rest of the addons, in order. */ prepareAddons (optAddons); - INIT_INSTANCES (); - { COLORMAP ColorMapTab; diff --git a/sc2/src/sc2code/ships/androsyn/icode.h b/sc2/src/sc2code/ships/androsyn/icode.h index 701ff1a46..67f053a15 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 0x57800008L +#define ANDROSYNTH_CODE "ship.androsynth.code" diff --git a/sc2/src/sc2code/ships/androsyn/igfxres.h b/sc2/src/sc2code/ships/androsyn/igfxres.h index e0903b3f4..f669a124e 100644 --- a/sc2/src/sc2code/ships/androsyn/igfxres.h +++ b/sc2/src/sc2code/ships/androsyn/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ANDROSYNTH_ICON_MASK_PMAP_ANIM 0x57800302L -#define ANDROSYNTH_MICON_MASK_PMAP_ANIM 0x57800402L -#define ANDROSYNTH_BIG_MASK_PMAP_ANIM 0x57800502L -#define ANDROSYNTH_MED_MASK_PMAP_ANIM 0x57800602L -#define ANDROSYNTH_SML_MASK_PMAP_ANIM 0x57800702L -#define BUBBLE_BIG_MASK_PMAP_ANIM 0x57800802L -#define BUBBLE_MED_MASK_PMAP_ANIM 0x57800902L -#define BUBBLE_SML_MASK_PMAP_ANIM 0x57800a02L -#define BLAZER_BIG_MASK_PMAP_ANIM 0x57800b02L -#define BLAZER_MED_MASK_PMAP_ANIM 0x57800c02L -#define BLAZER_SML_MASK_PMAP_ANIM 0x57800d02L -#define ANDROSYNTH_CAPT_MASK_PMAP_ANIM 0x57800e02L +#define ANDROSYNTH_ICON_MASK_PMAP_ANIM "ship.androsynth.icons" +#define ANDROSYNTH_MICON_MASK_PMAP_ANIM "ship.androsynth.meleeicons" +#define ANDROSYNTH_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.androsyn.large" +#define ANDROSYNTH_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.androsyn.medium" +#define ANDROSYNTH_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.androsyn.small" +#define BUBBLE_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.large" +#define BUBBLE_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.medium" +#define BUBBLE_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.bubble.small" +#define BLAZER_BIG_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.large" +#define BLAZER_MED_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.medium" +#define BLAZER_SML_MASK_PMAP_ANIM "ship.androsynth.graphics.blazer.small" +#define ANDROSYNTH_CAPT_MASK_PMAP_ANIM "ship.androsynth.graphics.captain" diff --git a/sc2/src/sc2code/ships/androsyn/imusicre.h b/sc2/src/sc2code/ships/androsyn/imusicre.h index f081949dc..084d44530 100644 --- a/sc2/src/sc2code/ships/androsyn/imusicre.h +++ b/sc2/src/sc2code/ships/androsyn/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ANDROSYNTH_VICTORY_SONG 0x57800006L +#define ANDROSYNTH_VICTORY_SONG "ship.androsynth.ditty" diff --git a/sc2/src/sc2code/ships/androsyn/isndres.h b/sc2/src/sc2code/ships/androsyn/isndres.h index 2f85d50cb..9640b4864 100644 --- a/sc2/src/sc2code/ships/androsyn/isndres.h +++ b/sc2/src/sc2code/ships/androsyn/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ANDROSYNTH_SHIP_SOUNDS 0x57800205L +#define ANDROSYNTH_SHIP_SOUNDS "ship.androsynth.sounds" diff --git a/sc2/src/sc2code/ships/androsyn/istrtab.h b/sc2/src/sc2code/ships/androsyn/istrtab.h index cc22d1793..b6b75292c 100644 --- a/sc2/src/sc2code/ships/androsyn/istrtab.h +++ b/sc2/src/sc2code/ships/androsyn/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ANDROSYNTH_RACE_STRINGS 0x57800104L +#define ANDROSYNTH_RACE_STRINGS "ship.androsynth.text" diff --git a/sc2/src/sc2code/ships/arilou/icode.h b/sc2/src/sc2code/ships/arilou/icode.h index cce90a69f..81d4fff2c 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 0x57a00008L +#define ARILOU_CODE "ship.arilou.code" diff --git a/sc2/src/sc2code/ships/arilou/igfxres.h b/sc2/src/sc2code/ships/arilou/igfxres.h index 0c5f9bbe5..7e81e2708 100644 --- a/sc2/src/sc2code/ships/arilou/igfxres.h +++ b/sc2/src/sc2code/ships/arilou/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_ICON_MASK_PMAP_ANIM 0x57a00302L -#define ARILOU_MICON_MASK_PMAP_ANIM 0x57a00402L -#define ARILOU_BIG_MASK_PMAP_ANIM 0x57a00502L -#define ARILOU_MED_MASK_PMAP_ANIM 0x57a00602L -#define ARILOU_SML_MASK_PMAP_ANIM 0x57a00702L -#define WARP_BIG_MASK_PMAP_ANIM 0x57a00802L -#define WARP_MED_MASK_PMAP_ANIM 0x57a00902L -#define WARP_SML_MASK_PMAP_ANIM 0x57a00a02L -#define ARILOU_CAPTAIN_MASK_PMAP_ANIM 0x57a00b02L +#define ARILOU_ICON_MASK_PMAP_ANIM "ship.arilou.icons" +#define ARILOU_MICON_MASK_PMAP_ANIM "ship.arilou.meleeicons" +#define ARILOU_BIG_MASK_PMAP_ANIM "ship.arilou.graphics.arilou.large" +#define ARILOU_MED_MASK_PMAP_ANIM "ship.arilou.graphics.arilou.medium" +#define ARILOU_SML_MASK_PMAP_ANIM "ship.arilou.graphics.arilou.small" +#define WARP_BIG_MASK_PMAP_ANIM "ship.arilou.graphics.warp.large" +#define WARP_MED_MASK_PMAP_ANIM "ship.arilou.graphics.warp.medium" +#define WARP_SML_MASK_PMAP_ANIM "ship.arilou.graphics.warp.small" +#define ARILOU_CAPTAIN_MASK_PMAP_ANIM "ship.arilou.graphics.captain" diff --git a/sc2/src/sc2code/ships/arilou/imusicre.h b/sc2/src/sc2code/ships/arilou/imusicre.h index 04eba610c..af2eb0790 100644 --- a/sc2/src/sc2code/ships/arilou/imusicre.h +++ b/sc2/src/sc2code/ships/arilou/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_VICTORY_SONG 0x57a00006L +#define ARILOU_VICTORY_SONG "ship.arilou.ditty" diff --git a/sc2/src/sc2code/ships/arilou/isndres.h b/sc2/src/sc2code/ships/arilou/isndres.h index e0f9cfb48..3093976d3 100644 --- a/sc2/src/sc2code/ships/arilou/isndres.h +++ b/sc2/src/sc2code/ships/arilou/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_SHIP_SOUNDS 0x57a00205L +#define ARILOU_SHIP_SOUNDS "ship.arilou.sounds" diff --git a/sc2/src/sc2code/ships/arilou/istrtab.h b/sc2/src/sc2code/ships/arilou/istrtab.h index fe81dc041..4a10002f2 100644 --- a/sc2/src/sc2code/ships/arilou/istrtab.h +++ b/sc2/src/sc2code/ships/arilou/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ARILOU_RACE_STRINGS 0x57a00104L +#define ARILOU_RACE_STRINGS "ship.arilou.text" diff --git a/sc2/src/sc2code/ships/blackurq/icode.h b/sc2/src/sc2code/ships/blackurq/icode.h index 3aebae594..99c0ca227 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 0x57c00008L +#define KOHR_AH_CODE "ship.kohrah.code" diff --git a/sc2/src/sc2code/ships/blackurq/igfxres.h b/sc2/src/sc2code/ships/blackurq/igfxres.h index 13a531cf3..3b2da955b 100644 --- a/sc2/src/sc2code/ships/blackurq/igfxres.h +++ b/sc2/src/sc2code/ships/blackurq/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define KOHR_AH_ICON_MASK_PMAP_ANIM 0x57c00302L -#define KOHR_AH_MICON_MASK_PMAP_ANIM 0x57c00402L -#define KOHR_AH_BIG_MASK_PMAP_ANIM 0x57c00502L -#define KOHR_AH_MED_MASK_PMAP_ANIM 0x57c00602L -#define KOHR_AH_SML_MASK_PMAP_ANIM 0x57c00702L -#define BUZZSAW_BIG_MASK_PMAP_ANIM 0x57c00802L -#define BUZZSAW_MED_MASK_PMAP_ANIM 0x57c00902L -#define BUZZSAW_SML_MASK_PMAP_ANIM 0x57c00a02L -#define GAS_BIG_MASK_PMAP_ANIM 0x57c00b02L -#define GAS_MED_MASK_PMAP_ANIM 0x57c00c02L -#define GAS_SML_MASK_PMAP_ANIM 0x57c00d02L -#define KOHR_AH_CAPTAIN_MASK_PMAP_ANIM 0x57c00e02L +#define KOHR_AH_ICON_MASK_PMAP_ANIM "ship.kohrah.icons" +#define KOHR_AH_MICON_MASK_PMAP_ANIM "ship.kohrah.meleeicons" +#define KOHR_AH_BIG_MASK_PMAP_ANIM "ship.kohrah.graphics.blackurq.large" +#define KOHR_AH_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.blackurq.medium" +#define KOHR_AH_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.blackurq.small" +#define BUZZSAW_BIG_MASK_PMAP_ANIM "ship.kohrah.graphics.buz.large" +#define BUZZSAW_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.buz.medium" +#define BUZZSAW_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.buz.small" +#define GAS_BIG_MASK_PMAP_ANIM "ship.kohrah.graphics.gas.large" +#define GAS_MED_MASK_PMAP_ANIM "ship.kohrah.graphics.gas.medium" +#define GAS_SML_MASK_PMAP_ANIM "ship.kohrah.graphics.gas.small" +#define KOHR_AH_CAPTAIN_MASK_PMAP_ANIM "ship.kohrah.graphics.captain" diff --git a/sc2/src/sc2code/ships/blackurq/imusicre.h b/sc2/src/sc2code/ships/blackurq/imusicre.h index 4ef14d6bd..ff9d76efb 100644 --- a/sc2/src/sc2code/ships/blackurq/imusicre.h +++ b/sc2/src/sc2code/ships/blackurq/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define KOHR_AH_VICTORY_SONG 0x57c00006L +#define KOHR_AH_VICTORY_SONG "ship.kohrah.ditty" diff --git a/sc2/src/sc2code/ships/blackurq/isndres.h b/sc2/src/sc2code/ships/blackurq/isndres.h index abb690d2a..77b32bce8 100644 --- a/sc2/src/sc2code/ships/blackurq/isndres.h +++ b/sc2/src/sc2code/ships/blackurq/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define KOHR_AH_SHIP_SOUNDS 0x57c00205L +#define KOHR_AH_SHIP_SOUNDS "ship.kohrah.sounds" diff --git a/sc2/src/sc2code/ships/blackurq/istrtab.h b/sc2/src/sc2code/ships/blackurq/istrtab.h index dd47f2e36..5307dc2e5 100644 --- a/sc2/src/sc2code/ships/blackurq/istrtab.h +++ b/sc2/src/sc2code/ships/blackurq/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define KOHR_AH_RACE_STRINGS 0x57c00104L +#define KOHR_AH_RACE_STRINGS "ship.kohrah.text" diff --git a/sc2/src/sc2code/ships/chenjesu/icode.h b/sc2/src/sc2code/ships/chenjesu/icode.h index 0e947c4f8..1f4b693ef 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 0x57e00008L +#define CHENJESU_CODE "ship.chenjesu.code" diff --git a/sc2/src/sc2code/ships/chenjesu/igfxres.h b/sc2/src/sc2code/ships/chenjesu/igfxres.h index f745bbe55..546e59670 100644 --- a/sc2/src/sc2code/ships/chenjesu/igfxres.h +++ b/sc2/src/sc2code/ships/chenjesu/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHENJESU_ICON_MASK_PMAP_ANIM 0x57e00302L -#define CHENJESU_MICON_MASK_PMAP_ANIM 0x57e00402L -#define CHENJESU_BIG_MASK_PMAP_ANIM 0x57e00502L -#define CHENJESU_MED_MASK_PMAP_ANIM 0x57e00602L -#define CHENJESU_SML_MASK_PMAP_ANIM 0x57e00702L -#define SPARK_BIG_MASK_PMAP_ANIM 0x57e00802L -#define SPARK_MED_MASK_PMAP_ANIM 0x57e00902L -#define SPARK_SML_MASK_PMAP_ANIM 0x57e00a02L -#define DOGGY_BIG_MASK_PMAP_ANIM 0x57e00b02L -#define DOGGY_MED_MASK_PMAP_ANIM 0x57e00c02L -#define DOGGY_SML_MASK_PMAP_ANIM 0x57e00d02L -#define CHENJESU_CAPTAIN_MASK_PMAP_ANIM 0x57e00e02L +#define CHENJESU_ICON_MASK_PMAP_ANIM "ship.chenjesu.icons" +#define CHENJESU_MICON_MASK_PMAP_ANIM "ship.chenjesu.meleeicons" +#define CHENJESU_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.chenjesu.large" +#define CHENJESU_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.chenjesu.medium" +#define CHENJESU_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.chenjesu.small" +#define SPARK_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.large" +#define SPARK_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.medium" +#define SPARK_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.spark.small" +#define DOGGY_BIG_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.large" +#define DOGGY_MED_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.medium" +#define DOGGY_SML_MASK_PMAP_ANIM "ship.chenjesu.graphics.doggy.small" +#define CHENJESU_CAPTAIN_MASK_PMAP_ANIM "ship.chenjesu.graphics.captain" diff --git a/sc2/src/sc2code/ships/chenjesu/imusicre.h b/sc2/src/sc2code/ships/chenjesu/imusicre.h index 5b42e869c..a78e50130 100644 --- a/sc2/src/sc2code/ships/chenjesu/imusicre.h +++ b/sc2/src/sc2code/ships/chenjesu/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHENJESU_VICTORY_SONG 0x57e00006L +#define CHENJESU_VICTORY_SONG "ship.chenjesu.ditty" diff --git a/sc2/src/sc2code/ships/chenjesu/isndres.h b/sc2/src/sc2code/ships/chenjesu/isndres.h index 2103b4c1d..4267e36c4 100644 --- a/sc2/src/sc2code/ships/chenjesu/isndres.h +++ b/sc2/src/sc2code/ships/chenjesu/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHENJESU_SHIP_SOUNDS 0x57e00205L +#define CHENJESU_SHIP_SOUNDS "ship.chenjesu.sounds" diff --git a/sc2/src/sc2code/ships/chenjesu/istrtab.h b/sc2/src/sc2code/ships/chenjesu/istrtab.h index 874cd9d76..4e854b363 100644 --- a/sc2/src/sc2code/ships/chenjesu/istrtab.h +++ b/sc2/src/sc2code/ships/chenjesu/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHENJESU_RACE_STRINGS 0x57e00104L +#define CHENJESU_RACE_STRINGS "ship.chenjesu.text" diff --git a/sc2/src/sc2code/ships/chmmr/icode.h b/sc2/src/sc2code/ships/chmmr/icode.h index fe710baf6..0873a155d 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 0x58000008L +#define CHMMR_CODE "ship.chmmr.code" diff --git a/sc2/src/sc2code/ships/chmmr/igfxres.h b/sc2/src/sc2code/ships/chmmr/igfxres.h index be11fadfc..5dd157c4b 100644 --- a/sc2/src/sc2code/ships/chmmr/igfxres.h +++ b/sc2/src/sc2code/ships/chmmr/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_ICON_MASK_PMAP_ANIM 0x58000302L -#define CHMMR_MICON_MASK_PMAP_ANIM 0x58000402L -#define CHMMR_BIG_MASK_PMAP_ANIM 0x58000502L -#define CHMMR_MED_MASK_PMAP_ANIM 0x58000602L -#define CHMMR_SML_MASK_PMAP_ANIM 0x58000702L -#define MUZZLE_BIG_MASK_PMAP_ANIM 0x58000802L -#define MUZZLE_MED_MASK_PMAP_ANIM 0x58000902L -#define MUZZLE_SML_MASK_PMAP_ANIM 0x58000a02L -#define SATELLITE_BIG_MASK_PMAP_ANIM 0x58000b02L -#define SATELLITE_MED_MASK_PMAP_ANIM 0x58000c02L -#define SATELLITE_SML_MASK_PMAP_ANIM 0x58000d02L -#define CHMMR_CAPTAIN_MASK_PMAP_ANIM 0x58000e02L +#define CHMMR_ICON_MASK_PMAP_ANIM "ship.chmmr.icons" +#define CHMMR_MICON_MASK_PMAP_ANIM "ship.chmmr.meleeicons" +#define CHMMR_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.chmmr.large" +#define CHMMR_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.chmmr.medium" +#define CHMMR_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.chmmr.small" +#define MUZZLE_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.muz.large" +#define MUZZLE_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.muz.medium" +#define MUZZLE_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.muz.small" +#define SATELLITE_BIG_MASK_PMAP_ANIM "ship.chmmr.graphics.sat.large" +#define SATELLITE_MED_MASK_PMAP_ANIM "ship.chmmr.graphics.sat.medium" +#define SATELLITE_SML_MASK_PMAP_ANIM "ship.chmmr.graphics.sat.small" +#define CHMMR_CAPTAIN_MASK_PMAP_ANIM "ship.chmmr.graphics.captain" diff --git a/sc2/src/sc2code/ships/chmmr/imusicre.h b/sc2/src/sc2code/ships/chmmr/imusicre.h index 7c42ae65f..54437b4bf 100644 --- a/sc2/src/sc2code/ships/chmmr/imusicre.h +++ b/sc2/src/sc2code/ships/chmmr/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_VICTORY_SONG 0x58000006L +#define CHMMR_VICTORY_SONG "ship.chmmr.ditty" diff --git a/sc2/src/sc2code/ships/chmmr/isndres.h b/sc2/src/sc2code/ships/chmmr/isndres.h index fa591510b..7943871af 100644 --- a/sc2/src/sc2code/ships/chmmr/isndres.h +++ b/sc2/src/sc2code/ships/chmmr/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_SHIP_SOUNDS 0x58000205L +#define CHMMR_SHIP_SOUNDS "ship.chmmr.sounds" diff --git a/sc2/src/sc2code/ships/chmmr/istrtab.h b/sc2/src/sc2code/ships/chmmr/istrtab.h index c85575368..cf229a069 100644 --- a/sc2/src/sc2code/ships/chmmr/istrtab.h +++ b/sc2/src/sc2code/ships/chmmr/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define CHMMR_RACE_STRINGS 0x58000104L +#define CHMMR_RACE_STRINGS "ship.chmmr.text" diff --git a/sc2/src/sc2code/ships/druuge/icode.h b/sc2/src/sc2code/ships/druuge/icode.h index 029ba652c..859949011 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 0x58200008L +#define DRUUGE_CODE "ship.druuge.code" diff --git a/sc2/src/sc2code/ships/druuge/igfxres.h b/sc2/src/sc2code/ships/druuge/igfxres.h index 39f565a88..d84bd9d23 100644 --- a/sc2/src/sc2code/ships/druuge/igfxres.h +++ b/sc2/src/sc2code/ships/druuge/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_ICON_MASK_PMAP_ANIM 0x58200302L -#define DRUUGE_MICON_MASK_PMAP_ANIM 0x58200402L -#define DRUUGE_BIG_MASK_PMAP_ANIM 0x58200502L -#define DRUUGE_MED_MASK_PMAP_ANIM 0x58200602L -#define DRUUGE_SML_MASK_PMAP_ANIM 0x58200702L -#define DRUUGE_CANNON_BIG_MASK_PMAP_ANIM 0x58200802L -#define DRUUGE_CANNON_MED_MASK_PMAP_ANIM 0x58200902L -#define DRUUGE_CANNON_SML_MASK_PMAP_ANIM 0x58200a02L -#define DRUUGE_CAPT_MASK_PMAP_ANIM 0x58200b02L +#define DRUUGE_ICON_MASK_PMAP_ANIM "ship.druuge.icons" +#define DRUUGE_MICON_MASK_PMAP_ANIM "ship.druuge.meleeicons" +#define DRUUGE_BIG_MASK_PMAP_ANIM "ship.druuge.graphics.druuge.large" +#define DRUUGE_MED_MASK_PMAP_ANIM "ship.druuge.graphics.druuge.medium" +#define DRUUGE_SML_MASK_PMAP_ANIM "ship.druuge.graphics.druuge.small" +#define DRUUGE_CANNON_BIG_MASK_PMAP_ANIM "ship.druuge.graphics.can.large" +#define DRUUGE_CANNON_MED_MASK_PMAP_ANIM "ship.druuge.graphics.can.medium" +#define DRUUGE_CANNON_SML_MASK_PMAP_ANIM "ship.druuge.graphics.can.small" +#define DRUUGE_CAPT_MASK_PMAP_ANIM "ship.druuge.graphics.captain" diff --git a/sc2/src/sc2code/ships/druuge/imusicre.h b/sc2/src/sc2code/ships/druuge/imusicre.h index b18271d98..320a2c9e5 100644 --- a/sc2/src/sc2code/ships/druuge/imusicre.h +++ b/sc2/src/sc2code/ships/druuge/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_VICTORY_SONG 0x58200006L +#define DRUUGE_VICTORY_SONG "ship.druuge.ditty" diff --git a/sc2/src/sc2code/ships/druuge/isndres.h b/sc2/src/sc2code/ships/druuge/isndres.h index 4edd9629f..6236cc6b8 100644 --- a/sc2/src/sc2code/ships/druuge/isndres.h +++ b/sc2/src/sc2code/ships/druuge/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_SHIP_SOUNDS 0x58200205L +#define DRUUGE_SHIP_SOUNDS "ship.druuge.sounds" diff --git a/sc2/src/sc2code/ships/druuge/istrtab.h b/sc2/src/sc2code/ships/druuge/istrtab.h index 42799cb12..e6df7a9da 100644 --- a/sc2/src/sc2code/ships/druuge/istrtab.h +++ b/sc2/src/sc2code/ships/druuge/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define DRUUGE_RACE_STRINGS 0x58200104L +#define DRUUGE_RACE_STRINGS "ship.druuge.text" diff --git a/sc2/src/sc2code/ships/human/icode.h b/sc2/src/sc2code/ships/human/icode.h index 2366d09a2..acfd62ec3 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 0x58400008L +#define HUMAN_CODE "ship.earthling.code" diff --git a/sc2/src/sc2code/ships/human/igfxres.h b/sc2/src/sc2code/ships/human/igfxres.h index 5b066d4b1..e72b0a0e6 100644 --- a/sc2/src/sc2code/ships/human/igfxres.h +++ b/sc2/src/sc2code/ships/human/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define HUMAN_ICON_MASK_PMAP_ANIM 0x58400302L -#define HUMAN_MICON_MASK_PMAP_ANIM 0x58400402L -#define HUMAN_BIG_MASK_PMAP_ANIM 0x58400502L -#define HUMAN_MED_MASK_PMAP_ANIM 0x58400602L -#define HUMAN_SML_MASK_PMAP_ANIM 0x58400702L -#define SATURN_BIG_MASK_PMAP_ANIM 0x58400802L -#define SATURN_MED_MASK_PMAP_ANIM 0x58400902L -#define SATURN_SML_MASK_PMAP_ANIM 0x58400a02L -#define HUMAN_CAPTAIN_MASK_PMAP_ANIM 0x58400b02L +#define HUMAN_ICON_MASK_PMAP_ANIM "ship.earthling.icons" +#define HUMAN_MICON_MASK_PMAP_ANIM "ship.earthling.meleeicons" +#define HUMAN_BIG_MASK_PMAP_ANIM "ship.earthling.graphics.human.large" +#define HUMAN_MED_MASK_PMAP_ANIM "ship.earthling.graphics.human.medium" +#define HUMAN_SML_MASK_PMAP_ANIM "ship.earthling.graphics.human.small" +#define SATURN_BIG_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.large" +#define SATURN_MED_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.medium" +#define SATURN_SML_MASK_PMAP_ANIM "ship.earthling.graphics.saturn.small" +#define HUMAN_CAPTAIN_MASK_PMAP_ANIM "ship.earthling.graphics.captain" diff --git a/sc2/src/sc2code/ships/human/imusicre.h b/sc2/src/sc2code/ships/human/imusicre.h index 8ea4b5bf8..417f0db53 100644 --- a/sc2/src/sc2code/ships/human/imusicre.h +++ b/sc2/src/sc2code/ships/human/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define HUMAN_VICTORY_SONG 0x58400006L +#define HUMAN_VICTORY_SONG "ship.earthling.ditty" diff --git a/sc2/src/sc2code/ships/human/isndres.h b/sc2/src/sc2code/ships/human/isndres.h index 66dde175d..48dc5e99f 100644 --- a/sc2/src/sc2code/ships/human/isndres.h +++ b/sc2/src/sc2code/ships/human/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define HUMAN_SHIP_SOUNDS 0x58400205L +#define HUMAN_SHIP_SOUNDS "ship.earthling.sounds" diff --git a/sc2/src/sc2code/ships/human/istrtab.h b/sc2/src/sc2code/ships/human/istrtab.h index 700068582..2e586c889 100644 --- a/sc2/src/sc2code/ships/human/istrtab.h +++ b/sc2/src/sc2code/ships/human/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define HUMAN_RACE_STRINGS 0x58400104L +#define HUMAN_RACE_STRINGS "ship.earthling.text" diff --git a/sc2/src/sc2code/ships/ilwrath/icode.h b/sc2/src/sc2code/ships/ilwrath/icode.h index 43afcdc79..fa78adc05 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 0x58600008L +#define ILWRATH_CODE "ship.ilwrath.code" diff --git a/sc2/src/sc2code/ships/ilwrath/igfxres.h b/sc2/src/sc2code/ships/ilwrath/igfxres.h index 431d8e3b2..6b9effd2f 100644 --- a/sc2/src/sc2code/ships/ilwrath/igfxres.h +++ b/sc2/src/sc2code/ships/ilwrath/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_ICON_MASK_PMAP_ANIM 0x58600302L -#define ILWRATH_MICON_MASK_PMAP_ANIM 0x58600402L -#define ILWRATH_BIG_MASK_PMAP_ANIM 0x58600502L -#define ILWRATH_MED_MASK_PMAP_ANIM 0x58600602L -#define ILWRATH_SML_MASK_PMAP_ANIM 0x58600702L -#define FIRE_BIG_MASK_PMAP_ANIM 0x58600802L -#define FIRE_MED_MASK_PMAP_ANIM 0x58600902L -#define FIRE_SML_MASK_PMAP_ANIM 0x58600a02L -#define ILWRATH_CAPTAIN_MASK_PMAP_ANIM 0x58600b02L +#define ILWRATH_ICON_MASK_PMAP_ANIM "ship.ilwrath.icons" +#define ILWRATH_MICON_MASK_PMAP_ANIM "ship.ilwrath.meleeicons" +#define ILWRATH_BIG_MASK_PMAP_ANIM "ship.ilwrath.graphics.ilwrath.large" +#define ILWRATH_MED_MASK_PMAP_ANIM "ship.ilwrath.graphics.ilwrath.medium" +#define ILWRATH_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.ilwrath.small" +#define FIRE_BIG_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.large" +#define FIRE_MED_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.medium" +#define FIRE_SML_MASK_PMAP_ANIM "ship.ilwrath.graphics.fire.small" +#define ILWRATH_CAPTAIN_MASK_PMAP_ANIM "ship.ilwrath.graphics.captain" diff --git a/sc2/src/sc2code/ships/ilwrath/imusicre.h b/sc2/src/sc2code/ships/ilwrath/imusicre.h index d2f322de5..40daaf0ba 100644 --- a/sc2/src/sc2code/ships/ilwrath/imusicre.h +++ b/sc2/src/sc2code/ships/ilwrath/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_VICTORY_SONG 0x58600006L +#define ILWRATH_VICTORY_SONG "ship.ilwrath.ditty" diff --git a/sc2/src/sc2code/ships/ilwrath/isndres.h b/sc2/src/sc2code/ships/ilwrath/isndres.h index c325146c4..2107fbbd7 100644 --- a/sc2/src/sc2code/ships/ilwrath/isndres.h +++ b/sc2/src/sc2code/ships/ilwrath/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_SHIP_SOUNDS 0x58600205L +#define ILWRATH_SHIP_SOUNDS "ship.ilwrath.sounds" diff --git a/sc2/src/sc2code/ships/ilwrath/istrtab.h b/sc2/src/sc2code/ships/ilwrath/istrtab.h index 62c002d6c..a172f0070 100644 --- a/sc2/src/sc2code/ships/ilwrath/istrtab.h +++ b/sc2/src/sc2code/ships/ilwrath/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ILWRATH_RACE_STRINGS 0x58600104L +#define ILWRATH_RACE_STRINGS "ship.ilwrath.text" diff --git a/sc2/src/sc2code/ships/lastbat/icode.h b/sc2/src/sc2code/ships/lastbat/icode.h index 3185d244e..dfe9024c1 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 0x58800008L +#define SAMATRA_CODE "ship.lastbat.code" diff --git a/sc2/src/sc2code/ships/lastbat/igfxres.h b/sc2/src/sc2code/ships/lastbat/igfxres.h index 55a1e7758..1eb480a8f 100644 --- a/sc2/src/sc2code/ships/lastbat/igfxres.h +++ b/sc2/src/sc2code/ships/lastbat/igfxres.h @@ -2,13 +2,13 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SAMATRA_BIG_MASK_ANIM 0x58800202L -#define SAMATRA_MED_MASK_PMAP_ANIM 0x58800302L -#define SAMATRA_SML_MASK_PMAP_ANIM 0x58800402L -#define SENTINEL_BIG_MASK_ANIM 0x58800502L -#define SENTINEL_MED_MASK_PMAP_ANIM 0x58800602L -#define SENTINEL_SML_MASK_PMAP_ANIM 0x58800702L -#define GENERATOR_BIG_MASK_ANIM 0x58800802L -#define GENERATOR_MED_MASK_PMAP_ANIM 0x58800902L -#define GENERATOR_SML_MASK_PMAP_ANIM 0x58800a02L -#define SAMATRA_CAPTAIN_MASK_PMAP_ANIM 0x58800b02L +#define SAMATRA_BIG_MASK_ANIM "ship.lastbat.graphics.lastbat.large" +#define SAMATRA_MED_MASK_PMAP_ANIM "ship.lastbat.graphics.lastbat.medium" +#define SAMATRA_SML_MASK_PMAP_ANIM "ship.lastbat.graphics.lastbat.small" +#define SENTINEL_BIG_MASK_ANIM "ship.lastbat.graphics.sen.large" +#define SENTINEL_MED_MASK_PMAP_ANIM "ship.lastbat.graphics.sen.medium" +#define SENTINEL_SML_MASK_PMAP_ANIM "ship.lastbat.graphics.sen.small" +#define GENERATOR_BIG_MASK_ANIM "ship.lastbat.graphics.gen.large" +#define GENERATOR_MED_MASK_PMAP_ANIM "ship.lastbat.graphics.gen.medium" +#define GENERATOR_SML_MASK_PMAP_ANIM "ship.lastbat.graphics.gen.small" +#define SAMATRA_CAPTAIN_MASK_PMAP_ANIM "ship.lastbat.graphics.captain" diff --git a/sc2/src/sc2code/ships/lastbat/imusicre.h b/sc2/src/sc2code/ships/lastbat/imusicre.h index cf6187f62..870270d21 100644 --- a/sc2/src/sc2code/ships/lastbat/imusicre.h +++ b/sc2/src/sc2code/ships/lastbat/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SAMATRA_VICTORY_SONG 0x58800006L +#define SAMATRA_VICTORY_SONG "ship.lastbat.ditty" diff --git a/sc2/src/sc2code/ships/lastbat/isndres.h b/sc2/src/sc2code/ships/lastbat/isndres.h index 0b5bde8fd..9025e4744 100644 --- a/sc2/src/sc2code/ships/lastbat/isndres.h +++ b/sc2/src/sc2code/ships/lastbat/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SAMATRA_SHIP_SOUNDS 0x58800105L +#define SAMATRA_SHIP_SOUNDS "ship.lastbat.sounds" diff --git a/sc2/src/sc2code/ships/melnorme/icode.h b/sc2/src/sc2code/ships/melnorme/icode.h index 38ea87098..d9dd355f5 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 0x58a00008L +#define MELNORME_CODE "ship.melnorme.code" diff --git a/sc2/src/sc2code/ships/melnorme/igfxres.h b/sc2/src/sc2code/ships/melnorme/igfxres.h index c13418e01..12e5b2a8c 100644 --- a/sc2/src/sc2code/ships/melnorme/igfxres.h +++ b/sc2/src/sc2code/ships/melnorme/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_ICON_MASK_PMAP_ANIM 0x58a00302L -#define MELNORME_MICON_MASK_PMAP_ANIM 0x58a00402L -#define MELNORME_BIG_MASK_PMAP_ANIM 0x58a00502L -#define MELNORME_MED_MASK_PMAP_ANIM 0x58a00602L -#define MELNORME_SML_MASK_PMAP_ANIM 0x58a00702L -#define PUMPUP_BIG_MASK_PMAP_ANIM 0x58a00802L -#define PUMPUP_MED_MASK_PMAP_ANIM 0x58a00902L -#define PUMPUP_SML_MASK_PMAP_ANIM 0x58a00a02L -#define CONFUSE_BIG_MASK_PMAP_ANIM 0x58a00b02L -#define CONFUSE_MED_MASK_PMAP_ANIM 0x58a00c02L -#define CONFUSE_SML_MASK_PMAP_ANIM 0x58a00d02L -#define MELNORME_CAPTAIN_MASK_PMAP_ANIM 0x58a00e02L +#define MELNORME_ICON_MASK_PMAP_ANIM "ship.melnorme.icons" +#define MELNORME_MICON_MASK_PMAP_ANIM "ship.melnorme.meleeicons" +#define MELNORME_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.melnorme.large" +#define MELNORME_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.melnorme.medium" +#define MELNORME_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.melnorme.small" +#define PUMPUP_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.pump.large" +#define PUMPUP_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.pump.medium" +#define PUMPUP_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.pump.small" +#define CONFUSE_BIG_MASK_PMAP_ANIM "ship.melnorme.graphics.confu.large" +#define CONFUSE_MED_MASK_PMAP_ANIM "ship.melnorme.graphics.confu.medium" +#define CONFUSE_SML_MASK_PMAP_ANIM "ship.melnorme.graphics.confu.small" +#define MELNORME_CAPTAIN_MASK_PMAP_ANIM "ship.melnorme.graphics.captain" diff --git a/sc2/src/sc2code/ships/melnorme/imusicre.h b/sc2/src/sc2code/ships/melnorme/imusicre.h index 7ea173014..cfc05daca 100644 --- a/sc2/src/sc2code/ships/melnorme/imusicre.h +++ b/sc2/src/sc2code/ships/melnorme/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_VICTORY_SONG 0x58a00006L +#define MELNORME_VICTORY_SONG "ship.melnorme.ditty" diff --git a/sc2/src/sc2code/ships/melnorme/isndres.h b/sc2/src/sc2code/ships/melnorme/isndres.h index 3be9f1d0c..2322ade73 100644 --- a/sc2/src/sc2code/ships/melnorme/isndres.h +++ b/sc2/src/sc2code/ships/melnorme/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_SHIP_SOUNDS 0x58a00205L +#define MELNORME_SHIP_SOUNDS "ship.melnorme.sounds" diff --git a/sc2/src/sc2code/ships/melnorme/istrtab.h b/sc2/src/sc2code/ships/melnorme/istrtab.h index 545897252..e41cffbae 100644 --- a/sc2/src/sc2code/ships/melnorme/istrtab.h +++ b/sc2/src/sc2code/ships/melnorme/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MELNORME_RACE_STRINGS 0x58a00104L +#define MELNORME_RACE_STRINGS "ship.melnorme.text" diff --git a/sc2/src/sc2code/ships/mmrnmhrm/icode.h b/sc2/src/sc2code/ships/mmrnmhrm/icode.h index e9dce4353..ba3f593b5 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 0x58c00008L +#define MMRNMHRM_CODE "ship.mmrnmhrm.code" diff --git a/sc2/src/sc2code/ships/mmrnmhrm/igfxres.h b/sc2/src/sc2code/ships/mmrnmhrm/igfxres.h index ccccd1673..a9d3995f5 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/igfxres.h +++ b/sc2/src/sc2code/ships/mmrnmhrm/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MMRNMHRM_ICON_MASK_PMAP_ANIM 0x58c00302L -#define MMRNMHRM_MICON_MASK_PMAP_ANIM 0x58c00402L -#define MMRNMHRM_BIG_MASK_PMAP_ANIM 0x58c00502L -#define MMRNMHRM_MED_MASK_PMAP_ANIM 0x58c00602L -#define MMRNMHRM_SML_MASK_PMAP_ANIM 0x58c00702L -#define TORP_BIG_MASK_PMAP_ANIM 0x58c00802L -#define TORP_MED_MASK_PMAP_ANIM 0x58c00902L -#define TORP_SML_MASK_PMAP_ANIM 0x58c00a02L -#define YWING_BIG_MASK_PMAP_ANIM 0x58c00b02L -#define YWING_MED_MASK_PMAP_ANIM 0x58c00c02L -#define YWING_SML_MASK_PMAP_ANIM 0x58c00d02L -#define MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM 0x58c00e02L +#define MMRNMHRM_ICON_MASK_PMAP_ANIM "ship.mmrnmhrm.icons" +#define MMRNMHRM_MICON_MASK_PMAP_ANIM "ship.mmrnmhrm.meleeicons" +#define MMRNMHRM_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.mmrnmhrm.large" +#define MMRNMHRM_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.mmrnmhrm.medium" +#define MMRNMHRM_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.mmrnmhrm.small" +#define TORP_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torp.large" +#define TORP_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torp.medium" +#define TORP_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.torp.small" +#define YWING_BIG_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.large" +#define YWING_MED_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.medium" +#define YWING_SML_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.ywing.small" +#define MMRNMHRM_CAPTAIN_MASK_PMAP_ANIM "ship.mmrnmhrm.graphics.captain" diff --git a/sc2/src/sc2code/ships/mmrnmhrm/imusicre.h b/sc2/src/sc2code/ships/mmrnmhrm/imusicre.h index 020dbf8fa..4ee389463 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/imusicre.h +++ b/sc2/src/sc2code/ships/mmrnmhrm/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MMRNMHRM_VICTORY_SONG 0x58c00006L +#define MMRNMHRM_VICTORY_SONG "ship.mmrnmhrm.ditty" diff --git a/sc2/src/sc2code/ships/mmrnmhrm/isndres.h b/sc2/src/sc2code/ships/mmrnmhrm/isndres.h index f92029a2c..c9cbcd621 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/isndres.h +++ b/sc2/src/sc2code/ships/mmrnmhrm/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MMRNMHRM_SHIP_SOUNDS 0x58c00205L +#define MMRNMHRM_SHIP_SOUNDS "ship.mmrnmhrm.sounds" diff --git a/sc2/src/sc2code/ships/mmrnmhrm/istrtab.h b/sc2/src/sc2code/ships/mmrnmhrm/istrtab.h index 6b8f8884d..e597180c6 100644 --- a/sc2/src/sc2code/ships/mmrnmhrm/istrtab.h +++ b/sc2/src/sc2code/ships/mmrnmhrm/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MMRNMHRM_RACE_STRINGS 0x58c00104L +#define MMRNMHRM_RACE_STRINGS "ship.mmrnmhrm.text" diff --git a/sc2/src/sc2code/ships/mycon/icode.h b/sc2/src/sc2code/ships/mycon/icode.h index b36a69b8b..b3caa5819 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 0x58e00008L +#define MYCON_CODE "ship.mycon.code" diff --git a/sc2/src/sc2code/ships/mycon/igfxres.h b/sc2/src/sc2code/ships/mycon/igfxres.h index e46d8709a..eb2379381 100644 --- a/sc2/src/sc2code/ships/mycon/igfxres.h +++ b/sc2/src/sc2code/ships/mycon/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_ICON_MASK_PMAP_ANIM 0x58e00302L -#define MYCON_MICON_MASK_PMAP_ANIM 0x58e00402L -#define MYCON_BIG_MASK_PMAP_ANIM 0x58e00502L -#define MYCON_MED_MASK_PMAP_ANIM 0x58e00602L -#define MYCON_SML_MASK_PMAP_ANIM 0x58e00702L -#define PLASMA_BIG_MASK_PMAP_ANIM 0x58e00802L -#define PLASMA_MED_MASK_PMAP_ANIM 0x58e00902L -#define PLASMA_SML_MASK_PMAP_ANIM 0x58e00a02L -#define MYCON_CAPTAIN_MASK_PMAP_ANIM 0x58e00b02L +#define MYCON_ICON_MASK_PMAP_ANIM "ship.mycon.icons" +#define MYCON_MICON_MASK_PMAP_ANIM "ship.mycon.meleeicons" +#define MYCON_BIG_MASK_PMAP_ANIM "ship.mycon.graphics.mycon.large" +#define MYCON_MED_MASK_PMAP_ANIM "ship.mycon.graphics.mycon.medium" +#define MYCON_SML_MASK_PMAP_ANIM "ship.mycon.graphics.mycon.small" +#define PLASMA_BIG_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.large" +#define PLASMA_MED_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.medium" +#define PLASMA_SML_MASK_PMAP_ANIM "ship.mycon.graphics.plasma.small" +#define MYCON_CAPTAIN_MASK_PMAP_ANIM "ship.mycon.graphics.captain" diff --git a/sc2/src/sc2code/ships/mycon/imusicre.h b/sc2/src/sc2code/ships/mycon/imusicre.h index 5850c627f..e191b40b4 100644 --- a/sc2/src/sc2code/ships/mycon/imusicre.h +++ b/sc2/src/sc2code/ships/mycon/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_VICTORY_SONG 0x58e00006L +#define MYCON_VICTORY_SONG "ship.mycon.ditty" diff --git a/sc2/src/sc2code/ships/mycon/isndres.h b/sc2/src/sc2code/ships/mycon/isndres.h index 2d87c126b..4868fd132 100644 --- a/sc2/src/sc2code/ships/mycon/isndres.h +++ b/sc2/src/sc2code/ships/mycon/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_SHIP_SOUNDS 0x58e00205L +#define MYCON_SHIP_SOUNDS "ship.mycon.sounds" diff --git a/sc2/src/sc2code/ships/mycon/istrtab.h b/sc2/src/sc2code/ships/mycon/istrtab.h index ecb1c5988..26f98e5df 100644 --- a/sc2/src/sc2code/ships/mycon/istrtab.h +++ b/sc2/src/sc2code/ships/mycon/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define MYCON_RACE_STRINGS 0x58e00104L +#define MYCON_RACE_STRINGS "ship.mycon.text" diff --git a/sc2/src/sc2code/ships/orz/icode.h b/sc2/src/sc2code/ships/orz/icode.h index 9b1553c7a..bb45c4e35 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 0x59000008L +#define ORZ_CODE "ship.orz.code" diff --git a/sc2/src/sc2code/ships/orz/igfxres.h b/sc2/src/sc2code/ships/orz/igfxres.h index b71ac3906..718ad381d 100644 --- a/sc2/src/sc2code/ships/orz/igfxres.h +++ b/sc2/src/sc2code/ships/orz/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_ICON_MASK_PMAP_ANIM 0x59000302L -#define ORZ_MICON_MASK_PMAP_ANIM 0x59000402L -#define ORZ_BIG_MASK_PMAP_ANIM 0x59000502L -#define ORZ_MED_MASK_PMAP_ANIM 0x59000602L -#define ORZ_SML_MASK_PMAP_ANIM 0x59000702L -#define HOWITZER_BIG_MASK_PMAP_ANIM 0x59000802L -#define HOWITZER_MED_MASK_PMAP_ANIM 0x59000902L -#define HOWITZER_SML_MASK_PMAP_ANIM 0x59000a02L -#define TURRET_BIG_MASK_PMAP_ANIM 0x59000b02L -#define TURRET_MED_MASK_PMAP_ANIM 0x59000c02L -#define TURRET_SML_MASK_PMAP_ANIM 0x59000d02L -#define ORZ_CAPTAIN_MASK_PMAP_ANIM 0x59000e02L +#define ORZ_ICON_MASK_PMAP_ANIM "ship.orz.icons" +#define ORZ_MICON_MASK_PMAP_ANIM "ship.orz.meleeicons" +#define ORZ_BIG_MASK_PMAP_ANIM "ship.orz.graphics.orz.large" +#define ORZ_MED_MASK_PMAP_ANIM "ship.orz.graphics.orz.medium" +#define ORZ_SML_MASK_PMAP_ANIM "ship.orz.graphics.orz.small" +#define HOWITZER_BIG_MASK_PMAP_ANIM "ship.orz.graphics.how.large" +#define HOWITZER_MED_MASK_PMAP_ANIM "ship.orz.graphics.how.medium" +#define HOWITZER_SML_MASK_PMAP_ANIM "ship.orz.graphics.how.small" +#define TURRET_BIG_MASK_PMAP_ANIM "ship.orz.graphics.tur.large" +#define TURRET_MED_MASK_PMAP_ANIM "ship.orz.graphics.tur.medium" +#define TURRET_SML_MASK_PMAP_ANIM "ship.orz.graphics.tur.small" +#define ORZ_CAPTAIN_MASK_PMAP_ANIM "ship.orz.graphics.captain" diff --git a/sc2/src/sc2code/ships/orz/imusicre.h b/sc2/src/sc2code/ships/orz/imusicre.h index f4d803213..69e2f84f3 100644 --- a/sc2/src/sc2code/ships/orz/imusicre.h +++ b/sc2/src/sc2code/ships/orz/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_VICTORY_SONG 0x59000006L +#define ORZ_VICTORY_SONG "ship.orz.ditty" diff --git a/sc2/src/sc2code/ships/orz/isndres.h b/sc2/src/sc2code/ships/orz/isndres.h index 6b5ff5ea5..caf0f070b 100644 --- a/sc2/src/sc2code/ships/orz/isndres.h +++ b/sc2/src/sc2code/ships/orz/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_SHIP_SOUNDS 0x59000205L +#define ORZ_SHIP_SOUNDS "ship.orz.sounds" diff --git a/sc2/src/sc2code/ships/orz/istrtab.h b/sc2/src/sc2code/ships/orz/istrtab.h index decd97f50..bec77edc1 100644 --- a/sc2/src/sc2code/ships/orz/istrtab.h +++ b/sc2/src/sc2code/ships/orz/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ORZ_RACE_STRINGS 0x59000104L +#define ORZ_RACE_STRINGS "ship.orz.text" diff --git a/sc2/src/sc2code/ships/pkunk/icode.h b/sc2/src/sc2code/ships/pkunk/icode.h index fa91d1d3d..4d0d4e51f 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 0x59200008L +#define PKUNK_CODE "ship.pkunk.code" diff --git a/sc2/src/sc2code/ships/pkunk/igfxres.h b/sc2/src/sc2code/ships/pkunk/igfxres.h index c36534487..a337899e8 100644 --- a/sc2/src/sc2code/ships/pkunk/igfxres.h +++ b/sc2/src/sc2code/ships/pkunk/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_ICON_MASK_PMAP_ANIM 0x59200302L -#define PKUNK_MICON_MASK_PMAP_ANIM 0x59200402L -#define PKUNK_BIG_MASK_PMAP_ANIM 0x59200502L -#define PKUNK_MED_MASK_PMAP_ANIM 0x59200602L -#define PKUNK_SML_MASK_PMAP_ANIM 0x59200702L -#define BUG_BIG_MASK_PMAP_ANIM 0x59200802L -#define BUG_MED_MASK_PMAP_ANIM 0x59200902L -#define BUG_SML_MASK_PMAP_ANIM 0x59200a02L -#define PKUNK_CAPTAIN_MASK_PMAP_ANIM 0x59200b02L +#define PKUNK_ICON_MASK_PMAP_ANIM "ship.pkunk.icons" +#define PKUNK_MICON_MASK_PMAP_ANIM "ship.pkunk.meleeicons" +#define PKUNK_BIG_MASK_PMAP_ANIM "ship.pkunk.graphics.pkunk.large" +#define PKUNK_MED_MASK_PMAP_ANIM "ship.pkunk.graphics.pkunk.medium" +#define PKUNK_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.pkunk.small" +#define BUG_BIG_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.large" +#define BUG_MED_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.medium" +#define BUG_SML_MASK_PMAP_ANIM "ship.pkunk.graphics.bug.small" +#define PKUNK_CAPTAIN_MASK_PMAP_ANIM "ship.pkunk.graphics.captain" diff --git a/sc2/src/sc2code/ships/pkunk/imusicre.h b/sc2/src/sc2code/ships/pkunk/imusicre.h index ea95a4d13..cb37ddd04 100644 --- a/sc2/src/sc2code/ships/pkunk/imusicre.h +++ b/sc2/src/sc2code/ships/pkunk/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_VICTORY_SONG 0x59200006L +#define PKUNK_VICTORY_SONG "ship.pkunk.ditty" diff --git a/sc2/src/sc2code/ships/pkunk/isndres.h b/sc2/src/sc2code/ships/pkunk/isndres.h index 7d669df57..d6c739231 100644 --- a/sc2/src/sc2code/ships/pkunk/isndres.h +++ b/sc2/src/sc2code/ships/pkunk/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_SHIP_SOUNDS 0x59200205L +#define PKUNK_SHIP_SOUNDS "ship.pkunk.sounds" diff --git a/sc2/src/sc2code/ships/pkunk/istrtab.h b/sc2/src/sc2code/ships/pkunk/istrtab.h index 43f406724..0a79377e5 100644 --- a/sc2/src/sc2code/ships/pkunk/istrtab.h +++ b/sc2/src/sc2code/ships/pkunk/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PKUNK_RACE_STRINGS 0x59200104L +#define PKUNK_RACE_STRINGS "ship.pkunk.text" diff --git a/sc2/src/sc2code/ships/probe/icode.h b/sc2/src/sc2code/ships/probe/icode.h index 9690b144a..bb8aa0832 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 0x59400008L +#define PROBE_CODE "ship.probe.code" diff --git a/sc2/src/sc2code/ships/probe/igfxres.h b/sc2/src/sc2code/ships/probe/igfxres.h index 6449c6db2..f8dfac5dd 100644 --- a/sc2/src/sc2code/ships/probe/igfxres.h +++ b/sc2/src/sc2code/ships/probe/igfxres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define PROBE_MICON_MASK_PMAP_ANIM 0x59400002L +#define PROBE_MICON_MASK_PMAP_ANIM "ship.probe.meleeicons" diff --git a/sc2/src/sc2code/ships/shofixti/icode.h b/sc2/src/sc2code/ships/shofixti/icode.h index f296a3e1a..4afe8d350 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 0x59600008L +#define SHOFIXTI_CODE "ship.shofixti.code" diff --git a/sc2/src/sc2code/ships/shofixti/igfxres.h b/sc2/src/sc2code/ships/shofixti/igfxres.h index 126467eed..1890f1df0 100644 --- a/sc2/src/sc2code/ships/shofixti/igfxres.h +++ b/sc2/src/sc2code/ships/shofixti/igfxres.h @@ -2,19 +2,19 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_ICON_MASK_PMAP_ANIM 0x59600302L -#define SHOFIXTI_MICON_MASK_PMAP_ANIM 0x59600402L -#define SHOFIXTI_BIG_MASK_PMAP_ANIM 0x59600502L -#define SHOFIXTI_MED_MASK_PMAP_ANIM 0x59600602L -#define SHOFIXTI_SML_MASK_PMAP_ANIM 0x59600702L -#define DESTRUCT_BIG_MASK_ANIM 0x59600802L -#define DESTRUCT_MED_MASK_ANIM 0x59600902L -#define DESTRUCT_SML_MASK_ANIM 0x59600a02L -#define SHOFIXTI_CAPTAIN_MASK_PMAP_ANIM 0x59600b02L -#define OLDSHOF_BIG_MASK_PMAP_ANIM 0x59600c02L -#define OLDSHOF_MED_MASK_PMAP_ANIM 0x59600d02L -#define OLDSHOF_SML_MASK_PMAP_ANIM 0x59600e02L -#define OLDSHOF_CAPTAIN_MASK_PMAP_ANIM 0x59600f02L -#define DART_BIG_MASK_PMAP_ANIM 0x59601002L -#define DART_MED_MASK_PMAP_ANIM 0x59601102L -#define DART_SML_MASK_PMAP_ANIM 0x59601202L +#define SHOFIXTI_ICON_MASK_PMAP_ANIM "ship.shofixti.icons" +#define SHOFIXTI_MICON_MASK_PMAP_ANIM "ship.shofixti.meleeicons" +#define SHOFIXTI_BIG_MASK_PMAP_ANIM "ship.shofixti.graphics.shofixti.large" +#define SHOFIXTI_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.shofixti.medium" +#define SHOFIXTI_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.shofixti.small" +#define DESTRUCT_BIG_MASK_ANIM "ship.shofixti.graphics.destruct.large" +#define DESTRUCT_MED_MASK_ANIM "ship.shofixti.graphics.destruct.medium" +#define DESTRUCT_SML_MASK_ANIM "ship.shofixti.graphics.destruct.small" +#define SHOFIXTI_CAPTAIN_MASK_PMAP_ANIM "ship.shofixti.graphics.captain" +#define OLDSHOF_BIG_MASK_PMAP_ANIM "ship.shofixti.graphics.oldshof.large" +#define OLDSHOF_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.oldshof.medium" +#define OLDSHOF_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.oldshof.small" +#define OLDSHOF_CAPTAIN_MASK_PMAP_ANIM "ship.shofixti.graphics.oldcaptain" +#define DART_BIG_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.large" +#define DART_MED_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.medium" +#define DART_SML_MASK_PMAP_ANIM "ship.shofixti.graphics.missile.small" diff --git a/sc2/src/sc2code/ships/shofixti/imusicre.h b/sc2/src/sc2code/ships/shofixti/imusicre.h index daa73a29c..9ae62ad7b 100644 --- a/sc2/src/sc2code/ships/shofixti/imusicre.h +++ b/sc2/src/sc2code/ships/shofixti/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_VICTORY_SONG 0x59600006L +#define SHOFIXTI_VICTORY_SONG "ship.shofixti.ditty" diff --git a/sc2/src/sc2code/ships/shofixti/isndres.h b/sc2/src/sc2code/ships/shofixti/isndres.h index 77250a873..359b294c7 100644 --- a/sc2/src/sc2code/ships/shofixti/isndres.h +++ b/sc2/src/sc2code/ships/shofixti/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_SHIP_SOUNDS 0x59600205L +#define SHOFIXTI_SHIP_SOUNDS "ship.shofixti.sounds" diff --git a/sc2/src/sc2code/ships/shofixti/istrtab.h b/sc2/src/sc2code/ships/shofixti/istrtab.h index 041c51ade..0a573975c 100644 --- a/sc2/src/sc2code/ships/shofixti/istrtab.h +++ b/sc2/src/sc2code/ships/shofixti/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SHOFIXTI_RACE_STRINGS 0x59600104L +#define SHOFIXTI_RACE_STRINGS "ship.shofixti.text" diff --git a/sc2/src/sc2code/ships/sis_ship/icode.h b/sc2/src/sc2code/ships/sis_ship/icode.h index e78268b74..5d84706de 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 0x59800008L +#define SIS_CODE "ship.sis_ship.code" diff --git a/sc2/src/sc2code/ships/sis_ship/igfxres.h b/sc2/src/sc2code/ships/sis_ship/igfxres.h index fc2a63fa9..9b31f435c 100644 --- a/sc2/src/sc2code/ships/sis_ship/igfxres.h +++ b/sc2/src/sc2code/ships/sis_ship/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SIS_ICON_MASK_PMAP_ANIM 0x59800202L -#define SIS_BIG_MASK_PMAP_ANIM 0x59800302L -#define SIS_MED_MASK_PMAP_ANIM 0x59800402L -#define SIS_SML_MASK_PMAP_ANIM 0x59800502L -#define BLASTER_BIG_MASK_PMAP_ANIM 0x59800602L -#define BLASTER_MED_MASK_PMAP_ANIM 0x59800702L -#define BLASTER_SML_MASK_PMAP_ANIM 0x59800802L -#define SIS_CAPTAIN_MASK_PMAP_ANIM 0x59800902L -#define SIS_HYPER_MASK_PMAP_ANIM 0x59800a02L +#define SIS_ICON_MASK_PMAP_ANIM "ship.sis_ship.icons" +#define SIS_BIG_MASK_PMAP_ANIM "ship.sis_ship.graphics.sis.large" +#define SIS_MED_MASK_PMAP_ANIM "ship.sis_ship.graphics.sis.medium" +#define SIS_SML_MASK_PMAP_ANIM "ship.sis_ship.graphics.sis.small" +#define BLASTER_BIG_MASK_PMAP_ANIM "ship.sis_ship.graphics.blas.large" +#define BLASTER_MED_MASK_PMAP_ANIM "ship.sis_ship.graphics.blas.medium" +#define BLASTER_SML_MASK_PMAP_ANIM "ship.sis_ship.graphics.blas.small" +#define SIS_CAPTAIN_MASK_PMAP_ANIM "ship.sis_ship.graphics.captain" +#define SIS_HYPER_MASK_PMAP_ANIM "ship.sis_ship.graphics.sishyper" diff --git a/sc2/src/sc2code/ships/sis_ship/imusicre.h b/sc2/src/sc2code/ships/sis_ship/imusicre.h index 4f025f501..0e30cdd40 100644 --- a/sc2/src/sc2code/ships/sis_ship/imusicre.h +++ b/sc2/src/sc2code/ships/sis_ship/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SIS_VICTORY_SONG 0x59800006L +#define SIS_VICTORY_SONG "ship.sis_ship.ditty" diff --git a/sc2/src/sc2code/ships/sis_ship/isndres.h b/sc2/src/sc2code/ships/sis_ship/isndres.h index 7066e8b7a..ce19380b4 100644 --- a/sc2/src/sc2code/ships/sis_ship/isndres.h +++ b/sc2/src/sc2code/ships/sis_ship/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SIS_SHIP_SOUNDS 0x59800105L +#define SIS_SHIP_SOUNDS "ship.sis_ship.sounds" diff --git a/sc2/src/sc2code/ships/slylandr/icode.h b/sc2/src/sc2code/ships/slylandr/icode.h index a6ae4afe0..9897234b5 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 0x59a00008L +#define SLYLANDRO_CODE "ship.slylandro.code" diff --git a/sc2/src/sc2code/ships/slylandr/igfxres.h b/sc2/src/sc2code/ships/slylandr/igfxres.h index be6d7c022..1809014c1 100644 --- a/sc2/src/sc2code/ships/slylandr/igfxres.h +++ b/sc2/src/sc2code/ships/slylandr/igfxres.h @@ -2,9 +2,9 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_ICON_MASK_PMAP_ANIM 0x59a00302L -#define SLYLANDRO_MICON_MASK_PMAP_ANIM 0x59a00402L -#define SLYLANDRO_BIG_MASK_PMAP_ANIM 0x59a00502L -#define SLYLANDRO_MED_MASK_PMAP_ANIM 0x59a00602L -#define SLYLANDRO_SML_MASK_PMAP_ANIM 0x59a00702L -#define SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM 0x59a00802L +#define SLYLANDRO_ICON_MASK_PMAP_ANIM "ship.slylandro.icons" +#define SLYLANDRO_MICON_MASK_PMAP_ANIM "ship.slylandro.meleeicons" +#define SLYLANDRO_BIG_MASK_PMAP_ANIM "ship.slylandro.graphics.slylandr.large" +#define SLYLANDRO_MED_MASK_PMAP_ANIM "ship.slylandro.graphics.slylandr.medium" +#define SLYLANDRO_SML_MASK_PMAP_ANIM "ship.slylandro.graphics.slylandr.small" +#define SLYLANDRO_CAPTAIN_MASK_PMAP_ANIM "ship.slylandro.graphics.captain" diff --git a/sc2/src/sc2code/ships/slylandr/imusicre.h b/sc2/src/sc2code/ships/slylandr/imusicre.h index ebdc20136..3982dd857 100644 --- a/sc2/src/sc2code/ships/slylandr/imusicre.h +++ b/sc2/src/sc2code/ships/slylandr/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_VICTORY_SONG 0x59a00006L +#define SLYLANDRO_VICTORY_SONG "ship.slylandro.ditty" diff --git a/sc2/src/sc2code/ships/slylandr/isndres.h b/sc2/src/sc2code/ships/slylandr/isndres.h index 11b2f0f64..886f3235a 100644 --- a/sc2/src/sc2code/ships/slylandr/isndres.h +++ b/sc2/src/sc2code/ships/slylandr/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_SHIP_SOUNDS 0x59a00205L +#define SLYLANDRO_SHIP_SOUNDS "ship.slylandro.sounds" diff --git a/sc2/src/sc2code/ships/slylandr/istrtab.h b/sc2/src/sc2code/ships/slylandr/istrtab.h index f8b03d157..76556dec6 100644 --- a/sc2/src/sc2code/ships/slylandr/istrtab.h +++ b/sc2/src/sc2code/ships/slylandr/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SLYLANDRO_RACE_STRINGS 0x59a00104L +#define SLYLANDRO_RACE_STRINGS "ship.slylandro.text" diff --git a/sc2/src/sc2code/ships/spathi/icode.h b/sc2/src/sc2code/ships/spathi/icode.h index 8e3049b82..aa5f6ef27 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 0x59c00008L +#define SPATHI_CODE "ship.spathi.code" diff --git a/sc2/src/sc2code/ships/spathi/igfxres.h b/sc2/src/sc2code/ships/spathi/igfxres.h index 7a13de436..83ee481d0 100644 --- a/sc2/src/sc2code/ships/spathi/igfxres.h +++ b/sc2/src/sc2code/ships/spathi/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_ICON_MASK_PMAP_ANIM 0x59c00302L -#define SPATHI_MICON_MASK_PMAP_ANIM 0x59c00402L -#define SPATHI_BIG_MASK_PMAP_ANIM 0x59c00502L -#define SPATHI_MED_MASK_PMAP_ANIM 0x59c00602L -#define SPATHI_SML_MASK_PMAP_ANIM 0x59c00702L -#define MISSILE_BIG_MASK_PMAP_ANIM 0x59c00802L -#define MISSILE_MED_MASK_PMAP_ANIM 0x59c00902L -#define MISSILE_SML_MASK_PMAP_ANIM 0x59c00a02L -#define DISCRIM_BIG_MASK_PMAP_ANIM 0x59c00b02L -#define DISCRIM_MED_MASK_PMAP_ANIM 0x59c00c02L -#define DISCRIM_SML_MASK_PMAP_ANIM 0x59c00d02L -#define SPATHI_CAPTAIN_MASK_PMAP_ANIM 0x59c00e02L +#define SPATHI_ICON_MASK_PMAP_ANIM "ship.spathi.icons" +#define SPATHI_MICON_MASK_PMAP_ANIM "ship.spathi.meleeicons" +#define SPATHI_BIG_MASK_PMAP_ANIM "ship.spathi.graphics.spathi.large" +#define SPATHI_MED_MASK_PMAP_ANIM "ship.spathi.graphics.spathi.medium" +#define SPATHI_SML_MASK_PMAP_ANIM "ship.spathi.graphics.spathi.small" +#define MISSILE_BIG_MASK_PMAP_ANIM "ship.spathi.graphics.missile.large" +#define MISSILE_MED_MASK_PMAP_ANIM "ship.spathi.graphics.missile.medium" +#define MISSILE_SML_MASK_PMAP_ANIM "ship.spathi.graphics.missile.small" +#define DISCRIM_BIG_MASK_PMAP_ANIM "ship.spathi.graphics.discrim.large" +#define DISCRIM_MED_MASK_PMAP_ANIM "ship.spathi.graphics.discrim.medium" +#define DISCRIM_SML_MASK_PMAP_ANIM "ship.spathi.graphics.discrim.small" +#define SPATHI_CAPTAIN_MASK_PMAP_ANIM "ship.spathi.graphics.captain" diff --git a/sc2/src/sc2code/ships/spathi/imusicre.h b/sc2/src/sc2code/ships/spathi/imusicre.h index 32c7b59e3..c0397a76b 100644 --- a/sc2/src/sc2code/ships/spathi/imusicre.h +++ b/sc2/src/sc2code/ships/spathi/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_VICTORY_SONG 0x59c00006L +#define SPATHI_VICTORY_SONG "ship.spathi.ditty" diff --git a/sc2/src/sc2code/ships/spathi/isndres.h b/sc2/src/sc2code/ships/spathi/isndres.h index f1f937416..eb2de64a6 100644 --- a/sc2/src/sc2code/ships/spathi/isndres.h +++ b/sc2/src/sc2code/ships/spathi/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_SHIP_SOUNDS 0x59c00205L +#define SPATHI_SHIP_SOUNDS "ship.spathi.sounds" diff --git a/sc2/src/sc2code/ships/spathi/istrtab.h b/sc2/src/sc2code/ships/spathi/istrtab.h index 76b53f513..ab20d61a3 100644 --- a/sc2/src/sc2code/ships/spathi/istrtab.h +++ b/sc2/src/sc2code/ships/spathi/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SPATHI_RACE_STRINGS 0x59c00104L +#define SPATHI_RACE_STRINGS "ship.spathi.text" diff --git a/sc2/src/sc2code/ships/supox/icode.h b/sc2/src/sc2code/ships/supox/icode.h index ed3bf187c..d2f82f95f 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 0x59e00008L +#define SUPOX_CODE "ship.supox.code" diff --git a/sc2/src/sc2code/ships/supox/igfxres.h b/sc2/src/sc2code/ships/supox/igfxres.h index 1509e4116..8a9a2d2be 100644 --- a/sc2/src/sc2code/ships/supox/igfxres.h +++ b/sc2/src/sc2code/ships/supox/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_ICON_MASK_PMAP_ANIM 0x59e00302L -#define SUPOX_MICON_MASK_PMAP_ANIM 0x59e00402L -#define SUPOX_BIG_MASK_PMAP_ANIM 0x59e00502L -#define SUPOX_MED_MASK_PMAP_ANIM 0x59e00602L -#define SUPOX_SML_MASK_PMAP_ANIM 0x59e00702L -#define GOB_BIG_MASK_PMAP_ANIM 0x59e00802L -#define GOB_MED_MASK_PMAP_ANIM 0x59e00902L -#define GOB_SML_MASK_PMAP_ANIM 0x59e00a02L -#define SUPOX_CAPTAIN_MASK_PMAP_ANIM 0x59e00b02L +#define SUPOX_ICON_MASK_PMAP_ANIM "ship.supox.icons" +#define SUPOX_MICON_MASK_PMAP_ANIM "ship.supox.meleeicons" +#define SUPOX_BIG_MASK_PMAP_ANIM "ship.supox.graphics.supox.large" +#define SUPOX_MED_MASK_PMAP_ANIM "ship.supox.graphics.supox.medium" +#define SUPOX_SML_MASK_PMAP_ANIM "ship.supox.graphics.supox.small" +#define GOB_BIG_MASK_PMAP_ANIM "ship.supox.graphics.gob.large" +#define GOB_MED_MASK_PMAP_ANIM "ship.supox.graphics.gob.medium" +#define GOB_SML_MASK_PMAP_ANIM "ship.supox.graphics.gob.small" +#define SUPOX_CAPTAIN_MASK_PMAP_ANIM "ship.supox.graphics.captain" diff --git a/sc2/src/sc2code/ships/supox/imusicre.h b/sc2/src/sc2code/ships/supox/imusicre.h index 6397ffbf6..1f2d74994 100644 --- a/sc2/src/sc2code/ships/supox/imusicre.h +++ b/sc2/src/sc2code/ships/supox/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_VICTORY_SONG 0x59e00006L +#define SUPOX_VICTORY_SONG "ship.supox.ditty" diff --git a/sc2/src/sc2code/ships/supox/isndres.h b/sc2/src/sc2code/ships/supox/isndres.h index a7539542c..1872ab045 100644 --- a/sc2/src/sc2code/ships/supox/isndres.h +++ b/sc2/src/sc2code/ships/supox/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_SHIP_SOUNDS 0x59e00205L +#define SUPOX_SHIP_SOUNDS "ship.supox.sounds" diff --git a/sc2/src/sc2code/ships/supox/istrtab.h b/sc2/src/sc2code/ships/supox/istrtab.h index f6fc96ffe..20b88b2cc 100644 --- a/sc2/src/sc2code/ships/supox/istrtab.h +++ b/sc2/src/sc2code/ships/supox/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SUPOX_RACE_STRINGS 0x59e00104L +#define SUPOX_RACE_STRINGS "ship.supox.text" diff --git a/sc2/src/sc2code/ships/syreen/icode.h b/sc2/src/sc2code/ships/syreen/icode.h index 62e06d10d..66f3ca4c8 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 0x5a000008L +#define SYREEN_CODE "ship.syreen.code" diff --git a/sc2/src/sc2code/ships/syreen/igfxres.h b/sc2/src/sc2code/ships/syreen/igfxres.h index 27884d16b..5c122a9af 100644 --- a/sc2/src/sc2code/ships/syreen/igfxres.h +++ b/sc2/src/sc2code/ships/syreen/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_ICON_MASK_PMAP_ANIM 0x5a000302L -#define SYREEN_MICON_MASK_PMAP_ANIM 0x5a000402L -#define SYREEN_BIG_MASK_PMAP_ANIM 0x5a000502L -#define SYREEN_MED_MASK_PMAP_ANIM 0x5a000602L -#define SYREEN_SML_MASK_PMAP_ANIM 0x5a000702L -#define DAGGER_BIG_MASK_PMAP_ANIM 0x5a000802L -#define DAGGER_MED_MASK_PMAP_ANIM 0x5a000902L -#define DAGGER_SML_MASK_PMAP_ANIM 0x5a000a02L -#define SYREEN_CAPTAIN_MASK_PMAP_ANIM 0x5a000b02L +#define SYREEN_ICON_MASK_PMAP_ANIM "ship.syreen.icons" +#define SYREEN_MICON_MASK_PMAP_ANIM "ship.syreen.meleeicons" +#define SYREEN_BIG_MASK_PMAP_ANIM "ship.syreen.graphics.syreen.large" +#define SYREEN_MED_MASK_PMAP_ANIM "ship.syreen.graphics.syreen.medium" +#define SYREEN_SML_MASK_PMAP_ANIM "ship.syreen.graphics.syreen.small" +#define DAGGER_BIG_MASK_PMAP_ANIM "ship.syreen.graphics.dagger.large" +#define DAGGER_MED_MASK_PMAP_ANIM "ship.syreen.graphics.dagger.medium" +#define DAGGER_SML_MASK_PMAP_ANIM "ship.syreen.graphics.dagger.small" +#define SYREEN_CAPTAIN_MASK_PMAP_ANIM "ship.syreen.graphics.captain" diff --git a/sc2/src/sc2code/ships/syreen/imusicre.h b/sc2/src/sc2code/ships/syreen/imusicre.h index 2c6c3c8c6..c81df28f5 100644 --- a/sc2/src/sc2code/ships/syreen/imusicre.h +++ b/sc2/src/sc2code/ships/syreen/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_VICTORY_SONG 0x5a000006L +#define SYREEN_VICTORY_SONG "ship.syreen.ditty" diff --git a/sc2/src/sc2code/ships/syreen/isndres.h b/sc2/src/sc2code/ships/syreen/isndres.h index 821373f36..b9a0d20ca 100644 --- a/sc2/src/sc2code/ships/syreen/isndres.h +++ b/sc2/src/sc2code/ships/syreen/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_SHIP_SOUNDS 0x5a000205L +#define SYREEN_SHIP_SOUNDS "ship.syreen.sounds" diff --git a/sc2/src/sc2code/ships/syreen/istrtab.h b/sc2/src/sc2code/ships/syreen/istrtab.h index f7269afc6..1683713a6 100644 --- a/sc2/src/sc2code/ships/syreen/istrtab.h +++ b/sc2/src/sc2code/ships/syreen/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define SYREEN_RACE_STRINGS 0x5a000104L +#define SYREEN_RACE_STRINGS "ship.syreen.text" diff --git a/sc2/src/sc2code/ships/thradd/icode.h b/sc2/src/sc2code/ships/thradd/icode.h index e9f2c52ea..070353a48 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 0x5a200008L +#define THRADDASH_CODE "ship.thraddash.code" diff --git a/sc2/src/sc2code/ships/thradd/igfxres.h b/sc2/src/sc2code/ships/thradd/igfxres.h index aabf2965d..b67f42e66 100644 --- a/sc2/src/sc2code/ships/thradd/igfxres.h +++ b/sc2/src/sc2code/ships/thradd/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADDASH_ICON_MASK_PMAP_ANIM 0x5a200302L -#define THRADDASH_MICON_MASK_PMAP_ANIM 0x5a200402L -#define THRADDASH_BIG_MASK_PMAP_ANIM 0x5a200502L -#define THRADDASH_MED_MASK_PMAP_ANIM 0x5a200602L -#define THRADDASH_SML_MASK_PMAP_ANIM 0x5a200702L -#define HORN_BIG_MASK_PMAP_ANIM 0x5a200802L -#define HORN_MED_MASK_PMAP_ANIM 0x5a200902L -#define HORN_SML_MASK_PMAP_ANIM 0x5a200a02L -#define NAPALM_BIG_MASK_PMAP_ANIM 0x5a200b02L -#define NAPALM_MED_MASK_PMAP_ANIM 0x5a200c02L -#define NAPALM_SML_MASK_PMAP_ANIM 0x5a200d02L -#define THRADDASH_CAPTAIN_MASK_PMAP_ANIM 0x5a200e02L +#define THRADDASH_ICON_MASK_PMAP_ANIM "ship.thraddash.icons" +#define THRADDASH_MICON_MASK_PMAP_ANIM "ship.thraddash.meleeicons" +#define THRADDASH_BIG_MASK_PMAP_ANIM "ship.thraddash.graphics.thradd.large" +#define THRADDASH_MED_MASK_PMAP_ANIM "ship.thraddash.graphics.thradd.medium" +#define THRADDASH_SML_MASK_PMAP_ANIM "ship.thraddash.graphics.thradd.small" +#define HORN_BIG_MASK_PMAP_ANIM "ship.thraddash.graphics.hor.large" +#define HORN_MED_MASK_PMAP_ANIM "ship.thraddash.graphics.hor.medium" +#define HORN_SML_MASK_PMAP_ANIM "ship.thraddash.graphics.hor.small" +#define NAPALM_BIG_MASK_PMAP_ANIM "ship.thraddash.graphics.nap.large" +#define NAPALM_MED_MASK_PMAP_ANIM "ship.thraddash.graphics.nap.medium" +#define NAPALM_SML_MASK_PMAP_ANIM "ship.thraddash.graphics.nap.small" +#define THRADDASH_CAPTAIN_MASK_PMAP_ANIM "ship.thraddash.graphics.captain" diff --git a/sc2/src/sc2code/ships/thradd/imusicre.h b/sc2/src/sc2code/ships/thradd/imusicre.h index 5c64406fb..16c156c43 100644 --- a/sc2/src/sc2code/ships/thradd/imusicre.h +++ b/sc2/src/sc2code/ships/thradd/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADDASH_VICTORY_SONG 0x5a200006L +#define THRADDASH_VICTORY_SONG "ship.thraddash.ditty" diff --git a/sc2/src/sc2code/ships/thradd/isndres.h b/sc2/src/sc2code/ships/thradd/isndres.h index 3f56df00f..05a7bc93a 100644 --- a/sc2/src/sc2code/ships/thradd/isndres.h +++ b/sc2/src/sc2code/ships/thradd/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADDASH_SHIP_SOUNDS 0x5a200205L +#define THRADDASH_SHIP_SOUNDS "ship.thraddash.sounds" diff --git a/sc2/src/sc2code/ships/thradd/istrtab.h b/sc2/src/sc2code/ships/thradd/istrtab.h index e10f72600..9dea1b4bb 100644 --- a/sc2/src/sc2code/ships/thradd/istrtab.h +++ b/sc2/src/sc2code/ships/thradd/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define THRADDASH_RACE_STRINGS 0x5a200104L +#define THRADDASH_RACE_STRINGS "ship.thraddash.text" diff --git a/sc2/src/sc2code/ships/umgah/icode.h b/sc2/src/sc2code/ships/umgah/icode.h index 4893f32ea..103f5d28f 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 0x5a400008L +#define UMGAH_CODE "ship.umgah.code" diff --git a/sc2/src/sc2code/ships/umgah/igfxres.h b/sc2/src/sc2code/ships/umgah/igfxres.h index 16ec4c283..1eacafe2e 100644 --- a/sc2/src/sc2code/ships/umgah/igfxres.h +++ b/sc2/src/sc2code/ships/umgah/igfxres.h @@ -2,13 +2,13 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_ICON_MASK_PMAP_ANIM 0x5a400302L -#define UMGAH_MICON_MASK_PMAP_ANIM 0x5a400402L -#define UMGAH_BIG_MASK_PMAP_ANIM 0x5a400502L -#define UMGAH_MED_MASK_PMAP_ANIM 0x5a400602L -#define UMGAH_SML_MASK_PMAP_ANIM 0x5a400702L -#define SPRITZ_MASK_PMAP_ANIM 0x5a400802L -#define CONE_BIG_MASK_ANIM 0x5a400902L -#define CONE_MED_MASK_ANIM 0x5a400a02L -#define CONE_SML_MASK_ANIM 0x5a400b02L -#define UMGAH_CAPTAIN_MASK_PMAP_ANIM 0x5a400c02L +#define UMGAH_ICON_MASK_PMAP_ANIM "ship.umgah.icons" +#define UMGAH_MICON_MASK_PMAP_ANIM "ship.umgah.meleeicons" +#define UMGAH_BIG_MASK_PMAP_ANIM "ship.umgah.graphics.umgah.large" +#define UMGAH_MED_MASK_PMAP_ANIM "ship.umgah.graphics.umgah.medium" +#define UMGAH_SML_MASK_PMAP_ANIM "ship.umgah.graphics.umgah.small" +#define SPRITZ_MASK_PMAP_ANIM "ship.umgah.graphics.spritz" +#define CONE_BIG_MASK_ANIM "ship.umgah.graphics.cone.large" +#define CONE_MED_MASK_ANIM "ship.umgah.graphics.cone.medium" +#define CONE_SML_MASK_ANIM "ship.umgah.graphics.cone.small" +#define UMGAH_CAPTAIN_MASK_PMAP_ANIM "ship.umgah.graphics.captain" diff --git a/sc2/src/sc2code/ships/umgah/imusicre.h b/sc2/src/sc2code/ships/umgah/imusicre.h index 666cdd957..a06c7cae7 100644 --- a/sc2/src/sc2code/ships/umgah/imusicre.h +++ b/sc2/src/sc2code/ships/umgah/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_VICTORY_SONG 0x5a400006L +#define UMGAH_VICTORY_SONG "ship.umgah.ditty" diff --git a/sc2/src/sc2code/ships/umgah/isndres.h b/sc2/src/sc2code/ships/umgah/isndres.h index c2f8f92d5..164f6cc6d 100644 --- a/sc2/src/sc2code/ships/umgah/isndres.h +++ b/sc2/src/sc2code/ships/umgah/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_SHIP_SOUNDS 0x5a400205L +#define UMGAH_SHIP_SOUNDS "ship.umgah.sounds" diff --git a/sc2/src/sc2code/ships/umgah/istrtab.h b/sc2/src/sc2code/ships/umgah/istrtab.h index ffa82cc92..7bb2b6625 100644 --- a/sc2/src/sc2code/ships/umgah/istrtab.h +++ b/sc2/src/sc2code/ships/umgah/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UMGAH_RACE_STRINGS 0x5a400104L +#define UMGAH_RACE_STRINGS "ship.umgah.text" diff --git a/sc2/src/sc2code/ships/urquan/icode.h b/sc2/src/sc2code/ships/urquan/icode.h index 7cc38ffdc..b26e84a09 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 0x5a600008L +#define URQUAN_CODE "ship.urquan.code" diff --git a/sc2/src/sc2code/ships/urquan/igfxres.h b/sc2/src/sc2code/ships/urquan/igfxres.h index 47b9e5bec..f55401dcd 100644 --- a/sc2/src/sc2code/ships/urquan/igfxres.h +++ b/sc2/src/sc2code/ships/urquan/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_ICON_MASK_PMAP_ANIM 0x5a600302L -#define URQUAN_MICON_MASK_PMAP_ANIM 0x5a600402L -#define URQUAN_BIG_MASK_PMAP_ANIM 0x5a600502L -#define URQUAN_MED_MASK_PMAP_ANIM 0x5a600602L -#define URQUAN_SML_MASK_PMAP_ANIM 0x5a600702L -#define FUSION_BIG_MASK_PMAP_ANIM 0x5a600802L -#define FUSION_MED_MASK_PMAP_ANIM 0x5a600902L -#define FUSION_SML_MASK_PMAP_ANIM 0x5a600a02L -#define FIGHTER_BIG_MASK_PMAP_ANIM 0x5a600b02L -#define FIGHTER_MED_MASK_PMAP_ANIM 0x5a600c02L -#define FIGHTER_SML_MASK_PMAP_ANIM 0x5a600d02L -#define URQUAN_CAPTAIN_MASK_PMAP_ANIM 0x5a600e02L +#define URQUAN_ICON_MASK_PMAP_ANIM "ship.urquan.icons" +#define URQUAN_MICON_MASK_PMAP_ANIM "ship.urquan.meleeicons" +#define URQUAN_BIG_MASK_PMAP_ANIM "ship.urquan.graphics.urquan.large" +#define URQUAN_MED_MASK_PMAP_ANIM "ship.urquan.graphics.urquan.medium" +#define URQUAN_SML_MASK_PMAP_ANIM "ship.urquan.graphics.urquan.small" +#define FUSION_BIG_MASK_PMAP_ANIM "ship.urquan.graphics.fusion.large" +#define FUSION_MED_MASK_PMAP_ANIM "ship.urquan.graphics.fusion.medium" +#define FUSION_SML_MASK_PMAP_ANIM "ship.urquan.graphics.fusion.small" +#define FIGHTER_BIG_MASK_PMAP_ANIM "ship.urquan.graphics.fight.large" +#define FIGHTER_MED_MASK_PMAP_ANIM "ship.urquan.graphics.fight.medium" +#define FIGHTER_SML_MASK_PMAP_ANIM "ship.urquan.graphics.fight.small" +#define URQUAN_CAPTAIN_MASK_PMAP_ANIM "ship.urquan.graphics.captain" diff --git a/sc2/src/sc2code/ships/urquan/imusicre.h b/sc2/src/sc2code/ships/urquan/imusicre.h index fad06a3c7..254ccf06c 100644 --- a/sc2/src/sc2code/ships/urquan/imusicre.h +++ b/sc2/src/sc2code/ships/urquan/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_VICTORY_SONG 0x5a600006L +#define URQUAN_VICTORY_SONG "ship.urquan.ditty" diff --git a/sc2/src/sc2code/ships/urquan/isndres.h b/sc2/src/sc2code/ships/urquan/isndres.h index 6eb3826c7..6610fce1f 100644 --- a/sc2/src/sc2code/ships/urquan/isndres.h +++ b/sc2/src/sc2code/ships/urquan/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_SHIP_SOUNDS 0x5a600205L +#define URQUAN_SHIP_SOUNDS "ship.urquan.sounds" diff --git a/sc2/src/sc2code/ships/urquan/istrtab.h b/sc2/src/sc2code/ships/urquan/istrtab.h index 1c1cbc6e0..20473a1bc 100644 --- a/sc2/src/sc2code/ships/urquan/istrtab.h +++ b/sc2/src/sc2code/ships/urquan/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define URQUAN_RACE_STRINGS 0x5a600104L +#define URQUAN_RACE_STRINGS "ship.urquan.text" diff --git a/sc2/src/sc2code/ships/utwig/icode.h b/sc2/src/sc2code/ships/utwig/icode.h index 2b9df65f7..4762b8905 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 0x5a800008L +#define UTWIG_CODE "ship.utwig.code" diff --git a/sc2/src/sc2code/ships/utwig/igfxres.h b/sc2/src/sc2code/ships/utwig/igfxres.h index 1890e6a6b..8eca3e2cd 100644 --- a/sc2/src/sc2code/ships/utwig/igfxres.h +++ b/sc2/src/sc2code/ships/utwig/igfxres.h @@ -2,12 +2,12 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_ICON_MASK_PMAP_ANIM 0x5a800302L -#define UTWIG_MICON_MASK_PMAP_ANIM 0x5a800402L -#define UTWIG_BIG_MASK_PMAP_ANIM 0x5a800502L -#define UTWIG_MED_MASK_PMAP_ANIM 0x5a800602L -#define UTWIG_SML_MASK_PMAP_ANIM 0x5a800702L -#define LANCE_BIG_MASK_PMAP_ANIM 0x5a800802L -#define LANCE_MED_MASK_PMAP_ANIM 0x5a800902L -#define LANCE_SML_MASK_PMAP_ANIM 0x5a800a02L -#define UTWIG_CAPTAIN_MASK_PMAP_ANIM 0x5a800b02L +#define UTWIG_ICON_MASK_PMAP_ANIM "ship.utwig.icons" +#define UTWIG_MICON_MASK_PMAP_ANIM "ship.utwig.meleeicons" +#define UTWIG_BIG_MASK_PMAP_ANIM "ship.utwig.graphics.utwig.large" +#define UTWIG_MED_MASK_PMAP_ANIM "ship.utwig.graphics.utwig.medium" +#define UTWIG_SML_MASK_PMAP_ANIM "ship.utwig.graphics.utwig.small" +#define LANCE_BIG_MASK_PMAP_ANIM "ship.utwig.graphics.lan.large" +#define LANCE_MED_MASK_PMAP_ANIM "ship.utwig.graphics.lan.medium" +#define LANCE_SML_MASK_PMAP_ANIM "ship.utwig.graphics.lan.small" +#define UTWIG_CAPTAIN_MASK_PMAP_ANIM "ship.utwig.graphics.captain" diff --git a/sc2/src/sc2code/ships/utwig/imusicre.h b/sc2/src/sc2code/ships/utwig/imusicre.h index 148a70ae4..d5df6a45a 100644 --- a/sc2/src/sc2code/ships/utwig/imusicre.h +++ b/sc2/src/sc2code/ships/utwig/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_VICTORY_SONG 0x5a800006L +#define UTWIG_VICTORY_SONG "ship.utwig.ditty" diff --git a/sc2/src/sc2code/ships/utwig/isndres.h b/sc2/src/sc2code/ships/utwig/isndres.h index b4ad13e00..649a31e67 100644 --- a/sc2/src/sc2code/ships/utwig/isndres.h +++ b/sc2/src/sc2code/ships/utwig/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_SHIP_SOUNDS 0x5a800205L +#define UTWIG_SHIP_SOUNDS "ship.utwig.sounds" diff --git a/sc2/src/sc2code/ships/utwig/istrtab.h b/sc2/src/sc2code/ships/utwig/istrtab.h index 81361c307..c2b6fbb1c 100644 --- a/sc2/src/sc2code/ships/utwig/istrtab.h +++ b/sc2/src/sc2code/ships/utwig/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define UTWIG_RACE_STRINGS 0x5a800104L +#define UTWIG_RACE_STRINGS "ship.utwig.text" diff --git a/sc2/src/sc2code/ships/vux/icode.h b/sc2/src/sc2code/ships/vux/icode.h index 7dc158bd9..0bd37d7d8 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 0x5aa00008L +#define VUX_CODE "ship.vux.code" diff --git a/sc2/src/sc2code/ships/vux/igfxres.h b/sc2/src/sc2code/ships/vux/igfxres.h index f0e9ad9cb..96d123575 100644 --- a/sc2/src/sc2code/ships/vux/igfxres.h +++ b/sc2/src/sc2code/ships/vux/igfxres.h @@ -2,13 +2,13 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_ICON_MASK_PMAP_ANIM 0x5aa00302L -#define VUX_MICON_MASK_PMAP_ANIM 0x5aa00402L -#define VUX_BIG_MASK_PMAP_ANIM 0x5aa00502L -#define VUX_MED_MASK_PMAP_ANIM 0x5aa00602L -#define VUX_SML_MASK_PMAP_ANIM 0x5aa00702L -#define LIMPETS_BIG_MASK_PMAP_ANIM 0x5aa00802L -#define LIMPETS_MED_MASK_PMAP_ANIM 0x5aa00902L -#define LIMPETS_SML_MASK_PMAP_ANIM 0x5aa00a02L -#define SLIME_MASK_PMAP_ANIM 0x5aa00b02L -#define VUX_CAPTAIN_MASK_PMAP_ANIM 0x5aa00c02L +#define VUX_ICON_MASK_PMAP_ANIM "ship.vux.icons" +#define VUX_MICON_MASK_PMAP_ANIM "ship.vux.meleeicons" +#define VUX_BIG_MASK_PMAP_ANIM "ship.vux.graphics.vux.large" +#define VUX_MED_MASK_PMAP_ANIM "ship.vux.graphics.vux.medium" +#define VUX_SML_MASK_PMAP_ANIM "ship.vux.graphics.vux.small" +#define LIMPETS_BIG_MASK_PMAP_ANIM "ship.vux.graphics.limpets.large" +#define LIMPETS_MED_MASK_PMAP_ANIM "ship.vux.graphics.limpets.medium" +#define LIMPETS_SML_MASK_PMAP_ANIM "ship.vux.graphics.limpets.small" +#define SLIME_MASK_PMAP_ANIM "ship.vux.graphics.slime" +#define VUX_CAPTAIN_MASK_PMAP_ANIM "ship.vux.graphics.captain" diff --git a/sc2/src/sc2code/ships/vux/imusicre.h b/sc2/src/sc2code/ships/vux/imusicre.h index 23b099d5c..9b7e7fe3d 100644 --- a/sc2/src/sc2code/ships/vux/imusicre.h +++ b/sc2/src/sc2code/ships/vux/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_VICTORY_SONG 0x5aa00006L +#define VUX_VICTORY_SONG "ship.vux.ditty" diff --git a/sc2/src/sc2code/ships/vux/isndres.h b/sc2/src/sc2code/ships/vux/isndres.h index c46ee11b9..5101cac69 100644 --- a/sc2/src/sc2code/ships/vux/isndres.h +++ b/sc2/src/sc2code/ships/vux/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_SHIP_SOUNDS 0x5aa00205L +#define VUX_SHIP_SOUNDS "ship.vux.sounds" diff --git a/sc2/src/sc2code/ships/vux/istrtab.h b/sc2/src/sc2code/ships/vux/istrtab.h index 8c7e3fb5d..a181b0bb5 100644 --- a/sc2/src/sc2code/ships/vux/istrtab.h +++ b/sc2/src/sc2code/ships/vux/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define VUX_RACE_STRINGS 0x5aa00104L +#define VUX_RACE_STRINGS "ship.vux.text" diff --git a/sc2/src/sc2code/ships/yehat/icode.h b/sc2/src/sc2code/ships/yehat/icode.h index 033c2e827..81cac0eb5 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 0x5ac00008L +#define YEHAT_CODE "ship.yehat.code" diff --git a/sc2/src/sc2code/ships/yehat/igfxres.h b/sc2/src/sc2code/ships/yehat/igfxres.h index ad7afc685..c6bd00a5a 100644 --- a/sc2/src/sc2code/ships/yehat/igfxres.h +++ b/sc2/src/sc2code/ships/yehat/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_ICON_MASK_PMAP_ANIM 0x5ac00302L -#define YEHAT_MICON_MASK_PMAP_ANIM 0x5ac00402L -#define YEHAT_BIG_MASK_PMAP_ANIM 0x5ac00502L -#define YEHAT_MED_MASK_PMAP_ANIM 0x5ac00602L -#define YEHAT_SML_MASK_PMAP_ANIM 0x5ac00702L -#define YEHAT_CANNON_BIG_MASK_PMAP_ANIM 0x5ac00802L -#define YEHAT_CANNON_MED_MASK_PMAP_ANIM 0x5ac00902L -#define YEHAT_CANNON_SML_MASK_PMAP_ANIM 0x5ac00a02L -#define SHIELD_BIG_MASK_ANIM 0x5ac00b02L -#define SHIELD_MED_MASK_ANIM 0x5ac00c02L -#define SHIELD_SML_MASK_ANIM 0x5ac00d02L -#define YEHAT_CAPTAIN_MASK_PMAP_ANIM 0x5ac00e02L +#define YEHAT_ICON_MASK_PMAP_ANIM "ship.yehat.icons" +#define YEHAT_MICON_MASK_PMAP_ANIM "ship.yehat.meleeicons" +#define YEHAT_BIG_MASK_PMAP_ANIM "ship.yehat.graphics.yehat.large" +#define YEHAT_MED_MASK_PMAP_ANIM "ship.yehat.graphics.yehat.medium" +#define YEHAT_SML_MASK_PMAP_ANIM "ship.yehat.graphics.yehat.small" +#define YEHAT_CANNON_BIG_MASK_PMAP_ANIM "ship.yehat.graphics.missile.large" +#define YEHAT_CANNON_MED_MASK_PMAP_ANIM "ship.yehat.graphics.missile.medium" +#define YEHAT_CANNON_SML_MASK_PMAP_ANIM "ship.yehat.graphics.missile.small" +#define SHIELD_BIG_MASK_ANIM "ship.yehat.graphics.shield.large" +#define SHIELD_MED_MASK_ANIM "ship.yehat.graphics.shield.medium" +#define SHIELD_SML_MASK_ANIM "ship.yehat.graphics.shield.small" +#define YEHAT_CAPTAIN_MASK_PMAP_ANIM "ship.yehat.graphics.captain" diff --git a/sc2/src/sc2code/ships/yehat/imusicre.h b/sc2/src/sc2code/ships/yehat/imusicre.h index 676a8bdc9..d92086cdc 100644 --- a/sc2/src/sc2code/ships/yehat/imusicre.h +++ b/sc2/src/sc2code/ships/yehat/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_VICTORY_SONG 0x5ac00006L +#define YEHAT_VICTORY_SONG "ship.yehat.ditty" diff --git a/sc2/src/sc2code/ships/yehat/isndres.h b/sc2/src/sc2code/ships/yehat/isndres.h index 2a8067c4c..54ad5a896 100644 --- a/sc2/src/sc2code/ships/yehat/isndres.h +++ b/sc2/src/sc2code/ships/yehat/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_SHIP_SOUNDS 0x5ac00205L +#define YEHAT_SHIP_SOUNDS "ship.yehat.sounds" diff --git a/sc2/src/sc2code/ships/yehat/istrtab.h b/sc2/src/sc2code/ships/yehat/istrtab.h index 05db02bd3..076362915 100644 --- a/sc2/src/sc2code/ships/yehat/istrtab.h +++ b/sc2/src/sc2code/ships/yehat/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define YEHAT_RACE_STRINGS 0x5ac00104L +#define YEHAT_RACE_STRINGS "ship.yehat.text" diff --git a/sc2/src/sc2code/ships/zoqfot/icode.h b/sc2/src/sc2code/ships/zoqfot/icode.h index 60128df65..0fe635fe0 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 0x5ae00008L +#define ZOQFOTPIK_CODE "ship.zoqfotpik.code" diff --git a/sc2/src/sc2code/ships/zoqfot/igfxres.h b/sc2/src/sc2code/ships/zoqfot/igfxres.h index 2d1829b9e..3dd111aed 100644 --- a/sc2/src/sc2code/ships/zoqfot/igfxres.h +++ b/sc2/src/sc2code/ships/zoqfot/igfxres.h @@ -2,15 +2,15 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_ICON_MASK_PMAP_ANIM 0x5ae00302L -#define ZOQFOTPIK_MICON_MASK_PMAP_ANIM 0x5ae00402L -#define ZOQFOTPIK_BIG_MASK_PMAP_ANIM 0x5ae00502L -#define ZOQFOTPIK_MED_MASK_PMAP_ANIM 0x5ae00602L -#define ZOQFOTPIK_SML_MASK_PMAP_ANIM 0x5ae00702L -#define SPIT_BIG_MASK_PMAP_ANIM 0x5ae00802L -#define SPIT_MED_MASK_PMAP_ANIM 0x5ae00902L -#define SPIT_SML_MASK_PMAP_ANIM 0x5ae00a02L -#define STINGER_BIG_MASK_PMAP_ANIM 0x5ae00b02L -#define STINGER_MED_MASK_PMAP_ANIM 0x5ae00c02L -#define STINGER_SML_MASK_PMAP_ANIM 0x5ae00d02L -#define ZOQFOTPIK_CAPTAIN_MASK_PMAP_ANIM 0x5ae00e02L +#define ZOQFOTPIK_ICON_MASK_PMAP_ANIM "ship.zoqfotpik.icons" +#define ZOQFOTPIK_MICON_MASK_PMAP_ANIM "ship.zoqfotpik.meleeicons" +#define ZOQFOTPIK_BIG_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.zoqfot.large" +#define ZOQFOTPIK_MED_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.zoqfot.medium" +#define ZOQFOTPIK_SML_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.zoqfot.small" +#define SPIT_BIG_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.spit.large" +#define SPIT_MED_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.spit.medium" +#define SPIT_SML_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.spit.small" +#define STINGER_BIG_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.sti.large" +#define STINGER_MED_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.sti.medium" +#define STINGER_SML_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.sti.small" +#define ZOQFOTPIK_CAPTAIN_MASK_PMAP_ANIM "ship.zoqfotpik.graphics.captain" diff --git a/sc2/src/sc2code/ships/zoqfot/imusicre.h b/sc2/src/sc2code/ships/zoqfot/imusicre.h index 3669eaea5..3471f205b 100644 --- a/sc2/src/sc2code/ships/zoqfot/imusicre.h +++ b/sc2/src/sc2code/ships/zoqfot/imusicre.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_VICTORY_SONG 0x5ae00006L +#define ZOQFOTPIK_VICTORY_SONG "ship.zoqfotpik.ditty" diff --git a/sc2/src/sc2code/ships/zoqfot/isndres.h b/sc2/src/sc2code/ships/zoqfot/isndres.h index a1cfc731a..86fd29f39 100644 --- a/sc2/src/sc2code/ships/zoqfot/isndres.h +++ b/sc2/src/sc2code/ships/zoqfot/isndres.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_SHIP_SOUNDS 0x5ae00205L +#define ZOQFOTPIK_SHIP_SOUNDS "ship.zoqfotpik.sounds" diff --git a/sc2/src/sc2code/ships/zoqfot/istrtab.h b/sc2/src/sc2code/ships/zoqfot/istrtab.h index d97b886df..76dd89fd3 100644 --- a/sc2/src/sc2code/ships/zoqfot/istrtab.h +++ b/sc2/src/sc2code/ships/zoqfot/istrtab.h @@ -2,4 +2,4 @@ should not be edited directly. Modify the master resource list instead and regenerate. */ -#define ZOQFOTPIK_RACE_STRINGS 0x5ae00104L +#define ZOQFOTPIK_RACE_STRINGS "ship.zoqfotpik.text" diff --git a/tools/resmap/gen_resfiles.py b/tools/resmap/gen_resfiles.py index 148a28484..50d859374 100644 --- a/tools/resmap/gen_resfiles.py +++ b/tools/resmap/gen_resfiles.py @@ -91,7 +91,7 @@ def rmp_text(vals): result.append("%s = UNKNOWNRES:%s" % (entry.res_id, entry.res_file)) return result -def h_text(header, vals): +def h_integer_text(header, vals): result = ["/* This file was auto-generated by the gen_resfiles utility and", " should not be edited directly. Modify the master resource list", " instead and regenerate. */", @@ -102,6 +102,17 @@ def h_text(header, vals): result.append("#define %s %s" % (entry.constant, res_encode_str(entry.package, entry.instance, entry.int_type))) return result +def h_string_text(header, vals): + result = ["/* This file was auto-generated by the gen_resfiles utility and", + " should not be edited directly. Modify the master resource list", + " instead and regenerate. */", + ""] + in_index = [x for x in vals if x.hfile == header] + in_index.sort(lambda x,y: x.res_number() - y.res_number()) + for entry in in_index: + result.append("#define %s \"%s\"" % (entry.constant, entry.res_id)) + return result + def dump_values(data): keys = data.keys() keys.sort() @@ -112,17 +123,25 @@ def dump_values(data): print>>outfile, l outfile.close() -def collate_data(data): +def collate_integer_data(data): result = {} headers = get_headers(data) indices = get_resfiles(data) for index in indices: result[os.path.join(contentdir, *(index.split('/')))] = ls2_text(index, data) for header in headers: - result[os.path.join(srcdir, *(header.split('/')))] = h_text(header, data) + result[os.path.join(srcdir, *(header.split('/')))] = h_integer_text(header, data) result[os.path.join(contentdir, 'uqm.rmp')] = rmp_text(data) return result - + +def collate_string_data(data): + result = {} + headers = get_headers(data) + for header in headers: + result[os.path.join(srcdir, *(header.split('/')))] = h_string_text(header, data) + result[os.path.join(contentdir, 'uqm.rmp')] = rmp_text(data) + return result + if __name__=="__main__": - data = collate_data(read_csv()) + data = collate_string_data(read_csv()) dump_values(data)