- reshuffling stuff.

source/games/duke/CMakeLists.txt

@@ -1,7 +1,9 @@
 
 set( PCH_SOURCES
 	src/actors.cpp
-	src/actors_e.cpp
+	src/actors_r.cpp
+	src/actors_d.cpp
+	src/e_actors.cpp
 	src/anim.cpp
 	src/cheats.cpp
 	src/cmdline.cpp

source/games/duke/src/names.h

@@ -775,436 +775,6 @@ enum
 	DEVELOPERCOMMENTARY = 5294,
 	BOSS5 = 5310,
 	BOSS5STAYPUT = 5311,
-
-	// Redneck Rampage
-
-	RR_GRID = 0,
-	RR_JAILDOOR = 11,
-	RR_LNRDTAG = 15,
-	RR_SIGN1 = 16,
-	RR_SIGN2 = 17,
-	RR_TORCH = 18,
-	//FIRSTGUNSPRITE = 21,
-	RR_RIFLESPRITE = 22,
-	RR_CROSSBOWSPRITE = 23,
-	RR_TEATGUN = 24,
-	RR_BUZSAWSPRITE = 25,
-	RR_DYNAMITE = 26,
-	RR_POWDERKEGSPRITE = 27,
-	//SHOTGUNSPRITE = 28,
-	RR_ALIENARMGUN = 29,
-	//HEALTHBOX = 30,
-	//AMMOBOX = 31,
-	RR_TEATAMMO = 32,
-	//INVENTORYBOX = 33,
-	RR_DOORKEYS = 34,
-	RR_LIGHTNIN = 35,
-	RR_DESTRUCTO = 36,
-	RR_JAILSOUND = 38,
-	//AMMO = 40,
-	RR_RIFLEAMMO = 41,
-	RR_ALIENBLASTERAMMO = 42,
-	RR_BLADEAMMO = 43,
-	//HBOMBAMMO = 47,
-	//SHOTGUNAMMO = 49,
-	RR_BEER = 51,
-	RR_PORKBALLS = 52,
-	RR_WHISKEY = 53,
-	RR_MOONSHINE = 55,
-	RR_SNORKLE = 56,
-	RR_COWPIE = 57,
-	RR_DOORKEY = 60,
-	//BOOTS = 61,
-	RR_MINECARTKILLER = 67,
-	RR_SHADESECTOR = 68,
-	RR_SOUNDFX = 71,
-	RR_MULTISWITCH = 98,
-	RR_DOORSHOCK = 120,
-	RR_FLOORSLIME = 132,
-	RR_BIGFORCE = 135,
-	RR_SCREENBREAK6 = 164,
-	RR_SCREENBREAK7 = 165,
-	RR_SCREENBREAK8 = 166,
-	RR_FANSPRITEWORK = 210,
-	RR_FANSPRITE = 211,
-	RR_FANSPRITEBROKE = 215,
-	RR_GRATE1 = 234,
-	RR_BGRATE1 = 235,
-	RR_WATERDRIP = 239,
-	RR_WATERBUBBLE = 240,
-	RR_WATERBUBBLEMAKER = 241,
-	RR_W_FORCEFIELD = 242,
-	RR_LIGHTSWITCH2 = 250,
-	RR_UFOBEAM = 252,
-	RR_BOULDER = 256,
-	RR_BOULDER1 = 264,
-	RR_BOWLLINE = 280,
-	RR_CHICKENA = 285,
-	RR_CHICKENC = 286,
-	RR_HEADCHK = 287,
-	RR_FEATHERCHK = 288,
-	RR_LOAF = 289,
-	RR_NUGGETS = 290,
-	RR_PACKEDCHK = 291,
-	RR_BONELESSCHK = 292,
-	RR_JIBSCHK = 293,
-	RR_BIGFNTCURSOR = 512,
-	RR_SMALLFNTCURSOR = 513,
-	RR_STARTALPHANUM = 514,
-	RR_ENDALPHANUM = 607,
-	RR_BIGALPHANUM = 632,
-	RR_BIGPERIOD = 694,
-	RR_BIGCOMMA = 695,
-	RR_BIGX = 696,
-	RR_BIGQ = 697,
-	RR_BIGSEMI = 698,
-	RR_BIGCOLIN = 699,
-	RR_THREEBYFIVE = 702,
-	RR_BIGAPPOS = 714,
-	RR_MINIFONT = 718,
-	RR_RESPAWNMARKERRED = 866,
-
-	RR_MOONSKY1 = 1022,
-	RR_MOONSKY2 = 1023,
-	RR_MOONSKY3 = 1024,
-	RR_MOONSKY4 = 1025,
-	RR_BIGORBIT1 = 1026,
-	RR_BIGORBIT2 = 1027,
-	RR_BIGORBIT3 = 1028,
-	RR_BIGORBIT4 = 1029,
-	RR_BIGORBIT5 =1030,
-	RR_WATERTILE2 = 1045,
-	RR_GLASS = 1056,
-	RR_GLASS2 = 1057,
-	RR_CRACK1 = 1075,
-	RR_CRACK2 = 1076,
-	RR_CRACK3 = 1077,
-	RR_CRACK4 = 1078,
-	RR_FOOTPRINTS = 1079,
-	RR_MIRROR = 1089,
-	RR_WATERFOUNTAIN = 1092,
-	RR_REACTOR = 1107,
-	RR_REACTORBURNT = 1108,
-	RR_REACTORSPARK = 1109,
-	RR_BOLT1 = 1127,
-	
-	
-	RR_CAMERA1 = 1134,
-	RR_FOOTPRINTS2 = 1144,
-	RR_FOOTPRINTS3 = 1145,
-	RR_FOOTPRINTS4 = 1146,
-	RR_SLIME = 1161,
-	RR_QUEBALL = 1184,
-	RR_STRIPEBALL = 1185,
-	RR_POCKET = 1186,
-	RR_AFLAM1191 = 1191,
-	RR_AFLAM1193 = 1193,
-	RR_NEON1 = 1200,
-	RR_NEON2 = 1201,
-	RR_BOUNCEMINE = 1204,
-	RR_BULLETHOLE = 1212,
-	RR_TIRE = 1230,
-	RR_NEON3 = 1241,
-	RR_NEON4 = 1242,
-	RR_NEON5 = 1243,
-	RR_GLASSPIECES = 1256,
-	RR_NEON6 = 1264,
-	RR_OOZFILTER = 1273,
-	RR_FLOORPLASMA = 1276,
-	RR_BOTTLE12 = 1282,
-	RR_BOTTLE13 = 1283,
-	RR_BOTTLE14 = 1284,
-	RR_BOTTLE15 = 1285,
-	RR_BOTTLE16 = 1286,
-	RR_BOTTLE17 = 1287,
-	RR_BOTTLE18 = 1288,
-	RR_VENDMACHINE = 1291,
-	RR_VENDMACHINEBROKE = 1293,
-	RR_COLAMACHINE = 1294,
-	RR_COLAMACHINEBROKE = 1296,
-	RR_CRANE = 1299,
-	RR_BLOODPOOL = 1303,
-	RR_CANWITHSOMETHING = 1309,
-	RR_FEATHERS = 1310,
-	RR_BANNER = 1313,
-	RR_SEENINE = 1324,
-	RR_SEENINEDEAD = 1325,
-	RR_STEAM = 1327,
-	RR_CEILINGSTEAM = 1332,
-	RR_TRANSPORTERBEAM = 1338,
-	RR_RAT = 1344,
-	RR_TRASH = 1346,
-	RR_WATERSPLASH2 = 1383,
-	RR_BLOOD = 1391,
-	RR_TRANSPORTERSTAR = 1398,
-	RR_ALIENBLAST = 1409,
-	RR_TONGUE = 1414,
-	RR_MORTER = 1416,
-	RR_MUD = 1420,
-	RR_RADIUSEXPLOSION = 1426,
-	RR_FORCERIPPLE = 1427,
-	RR_INNERJAW = 1439,
-	RR_EXPLOSION2 = 1441,
-	RR_EXPLOSION3 = 1442,
-	RR_JIBS1 = 1463,
-	RR_JIBS2 = 1468,
-	RR_JIBS3 = 1473,
-	RR_JIBS4 = 1478,
-	RR_JIBS5 = 1483,
-	RR_BURNING = 1494,
-	RR_FIRE = 1495,
-	RR_JIBS6 = 1515,
-	RR_BLOODSPLAT1 = 1525,
-	RR_BLOODSPLAT3 = 1526,
-	RR_BLOODSPLAT2 = 1527,
-	RR_BLOODSPLAT4 = 1528,
-	RR_OOZ = 1529,
-	RR_WALLBLOOD1 = 1530,
-	RR_WALLBLOOD2 = 1531,
-	RR_WALLBLOOD3 = 1532,
-	RR_WALLBLOOD4 = 1533,
-	RR_WALLBLOOD5 = 1534,
-	RR_WALLBLOOD6 = 1535,
-	RR_WALLBLOOD7 = 1536,
-	RR_WALLBLOOD8 = 1537,
-	RR_OOZ2 = 1538,
-	RR_BURNING2 = 1539,
-	RR_FIRE2 = 1540,
-	RR_SMALLSMOKE = 1554,
-	RR_SMALLSMOKEMAKER = 1555,
-	RR_SCRAP6 = 1595,
-	RR_SCRAP1 = 1605,
-	RR_SCRAP2 = 1609,
-	RR_SCRAP3 = 1613,
-	RR_SCRAP4 = 1617,
-	RR_SCRAP5 = 1621,
-	RR_F1HELP = 1633,
-	RR_MENUSCREEN = 1641,
-	RR_MENUBAR = 1642,
-	RR_KILLSICON = 1643,
-	RR_WHISHKEY_ICON = 1645,
-	RR_EMPTY_ICON = 1646,
-	RR_BOTTOMSTATUSBAR = 1647,
-	RR_BOOT_ICON = 1648,
-	RR_FRAGBAR = 1650,
-	RR_COWPIE_ICON = 1652,
-	RR_SNORKLE_ICON = 1653,
-	RR_MOONSHINE_ICON = 1654,
-	RR_BEER_ICON = 1655,
-	RR_ACCESS_ICON = 1656,
-	RR_DIGITALNUM = 1657,
-	RR_SLIDEBAR = 1674,
-	RR_WINDOWBORDER1 = 1679,
-	RR_TEXTBOX = 1680,
-	RR_WINDOWBORDER2 = 1681,
-	RR_INGAMELNRDTHREEDEE = 1684,
-	RR_TENSCREEN = 1685,
-	RR_NEWCROSSHAIR = 1689,
-	RR_CROSSHAIR = 1692,
-	RR_SHELL = 1702,
-	RR_SHOTGUNSHELL = 1704,
-	RR_FORCESPHERE = 1759,
-	RR_SHOTSPARK1 = 1764,
-	RR_CROSSBOW = 1774,
-	RR_TORNADO = 1930,
-	RR_TIKILAMP = 1990,
-	RR_POPCORN = 2021,
-	RR_TESLACON = 2056,
-	RR_TESLABALL = 2094,
-	RR_DILDO = 2095,
-	RR_TESLA = 2097,
-	RR_HURTRAIL = 2221,
-	RR_LOCKSWITCH1 = 2224,
-	RR_STATUEFLASH = 2231,
-	RR_REACTOR2 = 2239,
-	RR_REACTOR2SPARK = 2243,
-	RR_REACTOR2BURNT = 2247,
-	RR_EXPLOSION2BOT = 2272,
-	RR_SELECTDIR = 2444,
-	RR_VIEWBORDER = 2520,
-	RR_ORDERING = 2531,
-	RR_TEXTSTORY = 2541,
-	RR_LOADSCREEN = 2542,
-	RR_STARSKY2 = 2577,
-	RR_SPINNINGNUKEICON = 896,
-	RR_TOILETPAPER = 2864,
-	RR_BUSTAWIN5A = 2878,
-	RR_BUSTAWIN5B = 2879,
-	RR_BUSTAWIN4A = 2898,
-	RR_BUSTAWIN4B = 2899,
-	RR_FRAMEEFFECT1 = 2999,
-
-	RR_AFLAM3062 = 3062,
-	
-	RR_LOAFTILE = 3120,
-	RR_NUGGETTILE = 3122,
-	RR_BROASTEDTILE = 3123,
-	RR_BONELESSTILE = 3124,
-	RR_HEAD1TILE = 3132,
-	RR_HEAD2TILE = 3133,
-	RR_CHICKENATILE = 3190,
-	RR_CHICKENBTILE = 3191,
-	RR_CHICKENCTILE = 3192,
-	
-	RR_NEWPISTOL = 3328,
-	RR_NEWPISTOLCOCK = 3336,
-	RR_NEWCROWBAR = 3340,
-	RR_CROWBAR = RR_NEWCROWBAR,
-	RR_NEWSHOTGUN = 3350,
-	RR_SHOTGUN = RR_NEWSHOTGUN,
-	RR_NEWDYNAMITE = 3360,
-	RR_RIFLE = 3380,
-	RR_CIRCLESTUCK = 3388,
-	RR_SHITBALL = 3390,
-	RR_BUZSAW = 3395,
-	RR_CIRCLESAW = 3400,
-	RR_LUMBERBLADE = 3411,
-	RR_FIRELASER = 3420,
-	RR_BOWLINGBALL = 3430,
-	RR_BOWLINGBALLSPRITE = 3437,
-	RR_CHEERBOMB = -3464,
-	RR_OWHIP = 3471,
-	RR_UWHIP = 3475,
-	RR_BACKGROUND = 3822,
-	RR_APLAYERTOP = 3840,
-	RR_APLAYER = 3845,
-	RR_PLAYERONWATER = 3860,
-	RR_LNYDLADDER = 3975,
-	RR_LNRDLYINGDEAD = 3998,
-	RR_LNRDGUN = 4041,
-	RR_LNRDTORSO = 4046,
-	RR_LNRLEG = 4055,
-	RR_DOGATTACK = 4060,
-	RR_BILLYWALK = 4096,
-	RR_BILLYDIE = 4137,
-	RR_BILLYCOCK = 4147,
-	RR_BILLYRAY = 4162,
-	RR_BILLYSHOOT = 4162,
-	RR_BILLYRAYSTAYPUT = 4163,
-	RR_BILLYBUT = 4188,
-	RR_BILLYSCRATCH = 4191,
-	RR_BILLYSNIFF = 4195,
-	RR_BILLYWOUND = 4202,
-	RR_BILLYGORE = 4228,
-	RR_BILLYJIBA = 4235,
-	RR_BILLYJIBB = 4244,
-	RR_DOGRUN = 4260,
-	RR_DOGDIE = 4295,
-	RR_DOGDEAD = 4303,
-	RR_DOGBARK = 4305,
-	RR_LTH = 4352,
-	RR_LTHSTRAFE = 4395,
-	RR_LTHLOAD = 4430,
-	RR_LTHDIE = 4456,
-	RR_BUBBASCRATCH = 4464,
-	RR_BUBBANOSE = 4476,
-	RR_BUBBAPISS = 4487,
-	RR_BUBBASTAND = 4504,
-	RR_BUBBAOUCH = 4506,
-	RR_BUBBADIE = 4513,
-	RR_BUBBADEAD = 4523,
-	RR_BOSS2 = 4557,
-	RR_HULK = 4649,
-	RR_HULKSTAYPUT = 4650,
-	RR_HULKA = 4651,
-	RR_HULKB = 4652,
-	RR_HULKC = 4653,
-	RR_HULKJIBA = 4748,
-	RR_HULKJIBB = 4753,
-	RR_HULKJIBC = 4758,
-	RR_SBSWIPE = 4770,
-	RR_SBPAIN = 4810,
-	RR_SBDIE = 4820,
-	RR_HEN = 4861,
-	RR_HENSTAYPUT = 4862,
-	RR_HENSTAND = 4897,
-	RR_MOSQUITO = 4916,
-	RR_PIG = 4945,
-	RR_PIGSTAYPUT = 4946,
-	RR_PIGEAT = 4983,
-	RR_SBMOVE = 5015,
-	RR_SBSPIT = 5050,
-	RR_SBDIP = 5085,
-	RR_MINION = 5120,
-	RR_MINIONSTAYPUT = 5121,
-	RR_UFO1 = 5270,
-	RR_UFO2 = 5274,
-	RR_UFO3 = 5278,
-	RR_UFO4 = 5282,
-	RR_UFO5 = 5286,
-	RR_MINJIBA = 5290,
-	RR_MINJIBB = 5295,
-	RR_MINJIBC = 5300,
-	RR_COW = 5317,
-	RR_COOT = 5376,
-	RR_COOTSTAYPUT = 5377,
-	RR_COOTSHOOT = 5411,
-	RR_COOTDIE = 5437,
-	RR_COOTDUCK = 5481,
-	RR_COOTPAIN = 5548,
-	RR_COOTTRANS = 5568,
-	RR_COOTGETUP = 5579,
-	RR_ECLAIRHEALTH = 5595,
-	RR_COOTJIBA = 5602,
-	RR_COOTJIBB = 5607,
-	RR_COOTJIBC = 5616,
-	RR_VIXEN = 5635,
-	RR_VIXENPAIN = 5675,
-	RR_VIXENDIE = 5710,
-	RR_VIXENSHOOT = 5720,
-	RR_VIXENWDN = 5740,
-	RR_VIXENWUP = 5775,
-	RR_VIXENKICK = 5805,
-	RR_VIXENTELE = 5845,
-	RR_VIXENTEAT = 5851,
-	RR_BIKERBV = 5891,
-	RR_MAKEOUT = 6225,
-	RR_CHEER = 6658,
-	RR_CHEERSTAYPUT = 6659,
-	//RA
-	RR_AIRPLANE = 8450,
-	RR_SWAMPBUGGY = 7233,
-	RR_MOTORCYCLE = 7220,
-	RR_CHIKENCROSSBOW = 1781,
-	RR_BIKERSTAND = 5995,
-	RR_BIKERRIDE = 5890,
-	RR_BIKERRIDEDAISY = 6401,
-	RR_MINIONAIRBOAT = 7192,
-	RR_HULKAIRBOAT = 7199,
-	RR_DAISYMAE = 6658,
-	RR_DAISYMAESTAYPUT = 6659,
-	RR_DAISYAIRBOAT = 7206,
-	RR_MINIONUFO = 5260,
-	RR_JACKOLOPE = 7280,
-	RR_BANJOCOOTER = 7030,
-	RR_GUITARBILLY = 7035,
-	RR_MAMACLOUD = 8663,
-	RR_MAMAJACKOLOPE = 8705,
-	RR_RABBITJIBA = 7387,
-	RR_RABBITJIBB = 7392,
-	RR_RABBITJIBC = 7397,
-
-	// Stuff that gets referenced but has no name. RR Reconstruction only has Duke names for these items which should be avoided.
-	RR_1196 = 1196,
-	RR_1251 = 1251,
-	RR_1268 = 1268,
-	RR_1187 = 1187,
-	RR_1304 = 1304,
-	RR_1305 = 1305,
-	RR_1306 = 1306,
-	RR_1309 = 1309,
-	RR_1310 = 1310,
-	RR_1315 = 1315,
-	RR_1317 = 1317,
-	RR_1388 = 1388,
-	RR_3440 = 3440,
-	RR_1228 = 1228,
-	RR_1273 = 1273,
-	RR_4989 = 4989,
-	RR_1790 = 1790,
-	RR_3643 = 3643,
-
-
 };
 
 extern int APLAYER;