- added a few texture names for picnum literals.

source/games/sw/src/cache.cpp

@@ -406,7 +406,7 @@ void PreCacheActor(void)
 			PreCacheNinjaGirl(pal);
 			break;
 
-		case 623:   // Pachinko win light
+		case PACHINKOWINLIGHT:   // Pachinko win light
 		case PACHINKO1:
 		case PACHINKO2:
 		case PACHINKO3:

source/games/sw/src/coolie.cpp

@@ -369,7 +369,7 @@ void EnemyDefaults(DSWActor* actor, ACTOR_ACTION_SET* action, PERSONALITY* perso
     case PACHINKO2:
     case PACHINKO3:
     case PACHINKO4:
-    case 623:
+    case PACHINKOWINLIGHT:
     case TOILETGIRL_R0:
     case WASHGIRL_R0:
     case CARGIRL_R0:

source/games/sw/src/namelist.h

@@ -735,3 +735,76 @@ x(NINJA_DEAD, 4226)
 x(NINJA_HARAKIRI_DEAD, 4218)
 x(NINJA_DEAD1, 4226)
 x(PLAYER_NINJA_DEAD, 1160)
+
+x(UZI_COPEN, 2040)
+x(UZI_CCLOSED, 2041)
+x(UZI_CLIT, 2042)
+x(UZI_CRELOAD, 2043)
+x(SHOTGUN_AUTO, 2078)
+x(HEAD_MODE1, 2055)
+x(HEAD_MODE2, 2056)
+x(HEAD_MODE3, 2057)
+x(MICRO_SIGHT, 2075)
+x(MICRO_SHOT_20, 2076)
+x(MICRO_SHOT_1, 2077)
+x(MICRO_HEAT0, 2084)
+x(MICRO_HEAT1, 2085)
+x(MICRO_HEAT2, 2086)
+x(MICRO_HEAT3, 2087)
+x(MICRO_HEAT4, 2088)
+x(MICRO_HEAT5, 2089)
+x(SWITCH_ON, 562)
+x(BLADE1, 360)
+x(BLADE2, 361)
+x(BLADE3, 362)
+x(SKEL_LOCKED, 1846)
+x(SKEL_UNLOCKED, 1847)
+x(RAMCARD_LOCKED, 1850)
+x(RAMCARD_UNLOCKED, 1851)
+x(CARD_LOCKED, 1852)
+x(CARD_UNLOCKED, 1853)
+x(BREAK_LIGHT, 443)
+x(BREAK_MUSHROOM, 666)
+x(STAR1, 2049)
+x(CRACK, 80)
+x(MPLOCK1, 1846)
+x(MPLOCK2, 1850)
+x(MPLOCK3, 1852)
+x(MPLOCK4, 2470)
+x(BLADE4, 5011)
+x(FFIRE1, 3143)
+x(FFIRE2, 3157)
+x(SWITCH_LEVER, 581)
+x(SWITCH_FUSE, 558)
+x(SWITCH_FLIP, 561)
+x(SWITCH_RED_CHAIN, 563)
+x(SWITCH_GREEN_CHAIN, 565)
+x(SWITCH_TOUCH, 567)
+x(SWITCH_DRAGON, 569)
+x(SWITCH_LIGHT, 551)
+x(SWITCH_1, 575)
+x(SWITCH_3, 579)
+x(SWITCH_SHOOTABLE_1, 577)
+x(SWITCH_4, 571)
+x(SWITCH_5, 573)
+x(SWITCH_6, 583)
+x(EXIT_SWITCH, 2470)
+x(SWITCH_SKULL, 553)
+x(SWITCH_LEVER_ON, 582)
+x(SWITCH_FUSE_ANI, 559)
+x(SWITCH_FUSE_ON, 560)
+x(SWITCH_FLIP_ON, 562)
+x(SWITCH_RED_CHAIN_ON, 564)
+x(SWITCH_GREEN_CHAIN_ON, 566)
+x(SWITCH_TOUCH_ON, 568)
+x(SWITCH_DRAGON_ON, 570)
+x(SWITCH_LIGHT_ON, 552)
+x(SWITCH_1_ON, 576)
+x(SWITCH_3_ON, 580)
+x(SWITCH_SHOOTABLE_1_ON, 578)
+x(SWITCH_4_ON, 572)
+x(SWITCH_5_ON, 574)
+x(SWITCH_6_ON, 584)
+x(EXIT_SWITCH_ON, 2471)
+x(SWITCH_SKULL_ON, 554)
+x(PACHINKOWINLIGHT, 623)

source/games/sw/src/names2.h

@@ -230,7 +230,6 @@ enum ECounters
 
 enum EPicnums
 {
-    SWITCH_ON = 562,
     SWITCH_OFF = 561,
 
     TRACK_SPRITE = 1900, //start of track sprites
@@ -245,16 +244,6 @@ enum EPicnums
     ST_QUICK_DUCK = 2315,
     ST_QUICK_DEFEND = 2316,
 
-//////////////////////
-//
-// BLADES
-//
-//////////////////////
-
-    BLADE1 = 360,
-    BLADE2 = 361,
-    BLADE3 = 362,
-
 //////////////////////
 //
 // WEAPON RELATED
@@ -297,7 +286,6 @@ enum EPicnums
     SPEAR_R3 = SPEAR_R0 + (SPEAR_FRAMES * 3),
     SPEAR_R4 = SPEAR_R0 + (SPEAR_FRAMES * 4),
 
-    STAR1 = 2049,
     EXP = 3100, // Use new digitized explosion for big stuff
     EXP2 = 2160, // My old explosion is still used for goro head
     FIREBALL = 2035,
@@ -309,13 +297,6 @@ enum EPicnums
     //
     //////////////////////
 
-     SKEL_LOCKED = 1846,
-     SKEL_UNLOCKED = 1847,
-     RAMCARD_LOCKED = 1850,
-     RAMCARD_UNLOCKED = 1851,
-     CARD_LOCKED = 1852,
-     CARD_UNLOCKED = 1853,
-
      WATER_BEGIN = 320,
      WATER_END = 320+8,
 
@@ -329,13 +310,11 @@ enum EPicnums
 
      FIRE_FLY_RATE = 50,
 
-     BREAK_LIGHT = 443,
      BREAK_LIGHT_ANIM = 447,
      BREAK_BARREL = 453,
      BREAK_PEDISTAL = 463,
      BREAK_BOTTLE1 = 468,
      BREAK_BOTTLE2 = 475,
-     BREAK_MUSHROOM = 666,
 
     //////////////////////
     //

source/games/sw/src/panel.h

@@ -167,26 +167,13 @@ enum BorderTypes
 enum
 {
 	MICRO_SIGHT_NUM = 0,
-	MICRO_SIGHT = 2075,
 
 	MICRO_SHOT_NUM = 2,
-	MICRO_SHOT_20 = 2076,
-	MICRO_SHOT_1 = 2077,
 
 	MICRO_HEAT_NUM = 1,
 	MICRO_HEAT = 2084,
 
-	UZI_COPEN   = 2040,
-	UZI_CCLOSED = 2041,
-	UZI_CLIT    = 2042,
-	UZI_CRELOAD = 2043,
-
-	HEAD_MODE1 = 2055,
-	HEAD_MODE2 = 2056,
-	HEAD_MODE3 = 2057,
-
 	SHOTGUN_AUTO_NUM = 0,
-	SHOTGUN_AUTO = 2078,
 };
 
 

source/games/sw/src/sector.cpp

@@ -792,28 +792,6 @@ int OperateSector(sectortype* sect, short player_is_operating)
     return false;
 }
 
-enum
-{
-    SWITCH_LEVER = 581,
-    SWITCH_FUSE = 558,
-    SWITCH_FLIP = 561,
-    SWITCH_RED_CHAIN = 563,
-    SWITCH_GREEN_CHAIN = 565,
-    SWITCH_TOUCH = 567,
-    SWITCH_DRAGON = 569,
-
-    SWITCH_LIGHT = 551,
-    SWITCH_1 = 575,
-    SWITCH_3 = 579,
-
-    SWITCH_SHOOTABLE_1 = 577,
-    SWITCH_4 = 571,
-    SWITCH_5 = 573,
-    SWITCH_6 = 583,
-    EXIT_SWITCH = 2470,
-
-    SWITCH_SKULL = 553,
-};
 
 //---------------------------------------------------------------------------
 //
@@ -862,21 +840,21 @@ int AnimateSwitch(DSWActor* actor, int tgt_value)
         return true;
 
     // set to true
-    case SWITCH_SKULL + 1:
-    case SWITCH_LEVER + 1:
-    case SWITCH_LIGHT + 1:
-    case SWITCH_1 + 1:
-    case SWITCH_3 + 1:
-    case SWITCH_FLIP + 1:
-    case SWITCH_RED_CHAIN + 1:
-    case SWITCH_GREEN_CHAIN + 1:
-    case SWITCH_TOUCH + 1:
-    case SWITCH_DRAGON + 1:
-    case SWITCH_SHOOTABLE_1 + 1:
-    case SWITCH_4+1:
-    case SWITCH_5+1:
-    case SWITCH_6+1:
-    case EXIT_SWITCH+1:
+    case SWITCH_SKULL_ON:
+    case SWITCH_LEVER_ON:
+    case SWITCH_LIGHT_ON:
+    case SWITCH_1_ON:
+    case SWITCH_3_ON:
+    case SWITCH_FLIP_ON:
+    case SWITCH_RED_CHAIN_ON:
+    case SWITCH_GREEN_CHAIN_ON:
+    case SWITCH_TOUCH_ON:
+    case SWITCH_DRAGON_ON:
+    case SWITCH_SHOOTABLE_1_ON:
+    case SWITCH_4_ON:
+    case SWITCH_5_ON:
+    case SWITCH_6_ON:
+    case EXIT_SWITCH_ON:
 
         // dont toggle - return the current state
         if (tgt_value == 999)
@@ -1294,13 +1272,13 @@ void ShootableSwitch(DSWActor* actor)
     case SWITCH_SHOOTABLE_1:
         //actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
         OperateSprite(actor, false);
-        actor->spr.picnum = SWITCH_SHOOTABLE_1 + 1;
+        actor->spr.picnum = SWITCH_SHOOTABLE_1_ON;
         break;
     case SWITCH_FUSE:
-    case SWITCH_FUSE + 1:
+    case SWITCH_FUSE_ANI:
         actor->spr.cstat &= ~(CSTAT_SPRITE_BLOCK | CSTAT_SPRITE_BLOCK_HITSCAN);
         OperateSprite(actor, false);
-        actor->spr.picnum = SWITCH_FUSE + 2;
+        actor->spr.picnum = SWITCH_FUSE_ON;
         break;
     }
 }