- SW: converted 1/3 of the #defines in names2.h into enums.

This commit is contained in:
Christoph Oelckers 2021-12-23 19:47:42 +01:00
parent 92f2182e6e
commit 394f06baa0
2 changed files with 280 additions and 265 deletions

View file

@ -249,11 +249,6 @@ inline int SPRITEp_SIZE_Z(const spritetypebase* sp)
return (tileHeight(sp->picnum) * sp->yrepeat) << 2;
}
inline int SPRITEp_SIZE_Z(DSWActor* sp)
{
return (tileHeight(sp->spr.picnum) * sp->spr.yrepeat) << 2;
}
// Given a z height and sprite return the correct y repeat value
inline int SPRITEp_SIZE_Z_2_YREPEAT(const spritetype* sp, int zh)
@ -2144,6 +2139,11 @@ inline int ActorMid(DSWActor* actor)
return SPRITEp_MID(&actor->s());
}
inline int SPRITEp_SIZE_Z(DSWActor* sp)
{
return (tileHeight(sp->spr.picnum) * sp->spr.yrepeat) << 2;
}
inline int Facing(DSWActor* actor1, DSWActor* actor2)
{
auto sp1 = &actor1->s();

View file

@ -29,6 +29,7 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
#include "names.h"
BEGIN_SW_NS
// Rotation info
@ -44,23 +45,23 @@ enum STAT_ENUMS
STAT_DEFAULT= 0,
STAT_MISC= 1,
#define STAT_SKIP2_START 2
STAT_SKIP2_START = 2,
STAT_ENEMY= 2,
STAT_DEAD_ACTOR= 3, //misc actor stuff - dead guys etc
STAT_MISSILE= 4,
STAT_SHRAP= 5,
#define STAT_SKIP2_END 5
#define STAT_SKIP2_INTERP_END 5
STAT_SKIP2_END = 5,
STAT_SKIP2_INTERP_END = 5,
#define STAT_SKIP4_START 6
STAT_SKIP4_START = 6,
STAT_SKIP4= 6,
STAT_MISSILE_SKIP4= 7,
STAT_MINE_STUCK= 8, //solely for mines
STAT_ENEMY_SKIP4= 9,
#define STAT_SKIP4_INTERP_END 9
STAT_SKIP4_INTERP_END = 9,
STAT_ITEM= 10,
#define STAT_SKIP4_END 10
STAT_SKIP4_END = 10,
STAT_FAF_COPY,
STAT_MAX=20, // everything below here can move
@ -159,60 +160,90 @@ enum STAT_ENUMS
STAT_QUICK_LADDER,
STAT_QUICK_OPERATE,
STAT_QUICK_DUCK,
STAT_QUICK_DEFEND
STAT_QUICK_DEFEND,
STAT_MULTI_START = 600,
STAT_MULTI_START1 = 601,
STAT_MULTI_START2 = 602,
STAT_MULTI_START3 = 603,
STAT_MULTI_START4 = 604,
STAT_MULTI_START5 = 605,
STAT_MULTI_START6 = 606,
STAT_MULTI_START7 = 607,
STAT_CO_OP_START = 610,
STAT_CO_OP_START1 = 611,
STAT_CO_OP_START2 = 612,
STAT_CO_OP_START3 = 613,
STAT_CO_OP_START4 = 614,
STAT_CO_OP_START5 = 615,
STAT_CO_OP_START6 = 616,
STAT_CO_OP_START7 = 617,
};
// multi player start
#define STAT_MULTI_START 600
#define STAT_MULTI_START1 601
#define STAT_MULTI_START2 602
#define STAT_MULTI_START3 603
#define STAT_MULTI_START4 604
#define STAT_MULTI_START5 605
#define STAT_MULTI_START6 606
#define STAT_MULTI_START7 607
#define STAT_CO_OP_START 610
#define STAT_CO_OP_START1 611
#define STAT_CO_OP_START2 612
#define STAT_CO_OP_START3 613
#define STAT_CO_OP_START4 614
#define STAT_CO_OP_START5 615
#define STAT_CO_OP_START6 616
#define STAT_CO_OP_START7 617
//******************************************************************************
#define SWITCH_ON 562
#define SWITCH_OFF 561
#define TRACK_SPRITE 1900 //start of track sprites
#define ST1 2307
#define ST2 2308
#define ST_QUICK_JUMP 2309
#define ST_QUICK_JUMP_DOWN 2310
#define ST_QUICK_SUPER_JUMP 2311
#define ST_QUICK_SCAN 2312
#define ST_QUICK_EXIT 2313
#define ST_QUICK_OPERATE 2314
#define ST_QUICK_DUCK 2315
#define ST_QUICK_DEFEND 2316
//////////////////////
//
// TIMERS
//
//////////////////////
enum ETimers
{
TICS_PER_SEC = 120,
#define TICS_PER_SEC 120
FLY_INVENTORY_TIME = 30,
CLOAK_INVENTORY_TIME = 30,
ENVIRON_SUIT_INVENTORY_TIME = 30,
#define FLY_INVENTORY_TIME 30
#define CLOAK_INVENTORY_TIME 30
#define ENVIRON_SUIT_INVENTORY_TIME 30
DAMAGE_TIME = (1 * TICS_PER_SEC),
};
#define DAMAGE_TIME (1 * TICS_PER_SEC)
// multi player start
//******************************************************************************
enum ECounters
{
BOLT_THINMAN_FRAMES = 1,
SPEAR_FRAMES = 1,
COOLIE_CHARGE_FRAMES = 4,
COOLIE_RUN_FRAMES = 4,
COOLIE_PAIN_FRAMES = 1,
COOLG_RUN_FRAMES = 4,
COOLG_CLUB_FRAMES = 2,
COOLG_FIRE_FRAMES = 3,
COOLG_PAIN_FRAMES = 1,
PLAYER_NINJA_SHOOT_FRAMES = 1,
PLAYER_NINJA_RUN_FRAMES = 4,
PLAYER_NINJA_STAND_FRAMES = 1,
PLAYER_NINJA_JUMP_FRAMES = 4,
PLAYER_NINJA_CLIMB_FRAMES = 4,
PLAYER_NINJA_CRAWL_FRAMES = 4,
PLAYER_NINJA_SWIM_FRAMES = 4,
PLAYER_NINJA_SWORD_FRAMES = 3,
PLAYER_NINJA_PUNCH_FRAMES = 2,
PLAYER_NINJA_KICK_FRAMES = 2,
};
enum EPicnums
{
SWITCH_ON = 562,
SWITCH_OFF = 561,
TRACK_SPRITE = 1900, //start of track sprites
ST1 = 2307,
ST2 = 2308,
ST_QUICK_JUMP = 2309,
ST_QUICK_JUMP_DOWN = 2310,
ST_QUICK_SUPER_JUMP = 2311,
ST_QUICK_SCAN = 2312,
ST_QUICK_EXIT = 2313,
ST_QUICK_OPERATE = 2314,
ST_QUICK_DUCK = 2315,
ST_QUICK_DEFEND = 2316,
//////////////////////
//
@ -220,9 +251,9 @@ enum STAT_ENUMS
//
//////////////////////
#define BLADE1 360
#define BLADE2 361
#define BLADE3 362
BLADE1 = 360,
BLADE2 = 361,
BLADE3 = 362,
//////////////////////
//
@ -230,237 +261,219 @@ enum STAT_ENUMS
//
//////////////////////
#define STAR 2039
#define ELECTRO 2025
STAR = 2039,
ELECTRO = 2025,
#define UZI_SMOKE 2146
#define UZI_SPARK 2140
#define SPIKES 2092
#define GRENADE 2019
#define BLANK 2200
UZI_SMOKE = 2146,
UZI_SPARK = 2140,
SPIKES = 2092,
GRENADE = 2019,
BLANK = 2200,
#define BODY 1002
#define BODY_BURN 1003
#define BODY_SIZZLE 1011
BODY = 1002,
BODY_BURN = 1003,
BODY_SIZZLE = 1011,
#define DART_R0 2130
#define DART_R1 2131
#define DART_R2 2132
#define DART_R3 2133
#define DART_R4 2134
#define DART_R5 2135
#define DART_R6 2136
#define DART_R7 2137
DART_R0 = 2130,
DART_R1 = 2131,
DART_R2 = 2132,
DART_R3 = 2133,
DART_R4 = 2134,
DART_R5 = 2135,
DART_R6 = 2136,
DART_R7 = 2137,
#define BOLT_THINMAN_FRAMES 1
#define BOLT_THINMAN_R0 2018
#define BOLT_THINMAN_R1 BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 1)
#define BOLT_THINMAN_R2 BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 2)
#define BOLT_THINMAN_R3 BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 3)
#define BOLT_THINMAN_R4 BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 4)
BOLT_THINMAN_R0 = 2018,
BOLT_THINMAN_R1 = BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 1),
BOLT_THINMAN_R2 = BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 2),
BOLT_THINMAN_R3 = BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 3),
BOLT_THINMAN_R4 = BOLT_THINMAN_R0 - (BOLT_THINMAN_FRAMES * 4),
#define SPEAR_FRAMES 1
#define SPEAR_R0 2030
#define SPEAR_R1 SPEAR_R0 + (SPEAR_FRAMES * 1)
#define SPEAR_R2 SPEAR_R0 + (SPEAR_FRAMES * 2)
#define SPEAR_R3 SPEAR_R0 + (SPEAR_FRAMES * 3)
#define SPEAR_R4 SPEAR_R0 + (SPEAR_FRAMES * 4)
SPEAR_R0 = 2030,
SPEAR_R1 = SPEAR_R0 + (SPEAR_FRAMES * 1),
SPEAR_R2 = SPEAR_R0 + (SPEAR_FRAMES * 2),
SPEAR_R3 = SPEAR_R0 + (SPEAR_FRAMES * 3),
SPEAR_R4 = SPEAR_R0 + (SPEAR_FRAMES * 4),
#define STAR1 2049
#define EXP 3100 // Use new digitized explosion for big stuff
#define EXP2 2160 // My old explosion is still used for goro head
#define FIREBALL 2035
#define FIREBALL_FLAMES 3212
STAR1 = 2049,
EXP = 3100, // Use new digitized explosion for big stuff
EXP2 = 2160, // My old explosion is still used for goro head
FIREBALL = 2035,
FIREBALL_FLAMES = 3212,
//////////////////////
//
// MISC
//
//////////////////////
//////////////////////
//
// MISC
//
//////////////////////
#define BLUE_KEY_STATUE BLUE_KEY+2
#define RED_KEY_STATUE RED_KEY+2
#define GREEN_KEY_STATUE GREEN_KEY+2
#define YELLOW_KEY_STATUE YELLOW_KEY+2
#define SKEL_LOCKED 1846
#define SKEL_UNLOCKED 1847
#define RAMCARD_LOCKED 1850
#define RAMCARD_UNLOCKED 1851
#define CARD_LOCKED 1852
#define CARD_UNLOCKED 1853
BLUE_KEY_STATUE = BLUE_KEY+2,
RED_KEY_STATUE = RED_KEY+2,
GREEN_KEY_STATUE = GREEN_KEY+2,
YELLOW_KEY_STATUE = YELLOW_KEY+2,
SKEL_LOCKED = 1846,
SKEL_UNLOCKED = 1847,
RAMCARD_LOCKED = 1850,
RAMCARD_UNLOCKED = 1851,
CARD_LOCKED = 1852,
CARD_UNLOCKED = 1853,
#define WATER_BEGIN 320
#define WATER_END 320+8
WATER_BEGIN = 320,
WATER_END = 320+8,
#define WATER_BOIL 2305
WATER_BOIL = 2305,
#define FIRE_FLY0 630
#define FIRE_FLY1 631
#define FIRE_FLY2 632
#define FIRE_FLY3 633
#define FIRE_FLY4 634
FIRE_FLY0 = 630,
FIRE_FLY1 = 631,
FIRE_FLY2 = 632,
FIRE_FLY3 = 633,
FIRE_FLY4 = 634,
#define FIRE_FLY_RATE 50
FIRE_FLY_RATE = 50,
#define BREAK_LIGHT 443
#define BREAK_LIGHT_ANIM 447
#define BREAK_BARREL 453
#define BREAK_PEDISTAL 463
#define BREAK_BOTTLE1 468
#define BREAK_BOTTLE2 475
#define BREAK_MUSHROOM 666
BREAK_LIGHT = 443,
BREAK_LIGHT_ANIM = 447,
BREAK_BARREL = 453,
BREAK_PEDISTAL = 463,
BREAK_BOTTLE1 = 468,
BREAK_BOTTLE2 = 475,
BREAK_MUSHROOM = 666,
//////////////////////
//
// COOLIE
//
//////////////////////
//////////////////////
//
// COOLIE
//
//////////////////////
#define COOLIE_CHARGE_FRAMES 4
#define COOLIE_CHARGE_R0 1420
#define COOLIE_CHARGE_R1 COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 1)
#define COOLIE_CHARGE_R2 COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 2)
#define COOLIE_CHARGE_R3 COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 3)
#define COOLIE_CHARGE_R4 COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 4)
COOLIE_CHARGE_R0 = 1420,
COOLIE_CHARGE_R1 = COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 1),
COOLIE_CHARGE_R2 = COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 2),
COOLIE_CHARGE_R3 = COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 3),
COOLIE_CHARGE_R4 = COOLIE_CHARGE_R0 + (COOLIE_CHARGE_FRAMES * 4),
COOLIE_RUN_R0 = 1400,
COOLIE_RUN_R1 = COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 1),
COOLIE_RUN_R2 = COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 2),
COOLIE_RUN_R3 = COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 3),
COOLIE_RUN_R4 = COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 4),
COOLIE_PAIN_R0 = 1420,
COOLIE_PAIN_R1 = COOLIE_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 1)
COOLIE_PAIN_R2 = COOLIE_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 2)
COOLIE_PAIN_R3 = COOLIE_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 3)
COOLIE_PAIN_R4 = COOLIE_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 4)
COOLG_RUN_R0 = 4277,
COOLG_RUN_R1 = COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 1),
COOLG_RUN_R2 = COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 2),
COOLG_RUN_R3 = COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 3),
COOLG_RUN_R4 = COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 4),
COOLG_CLUB_R0 = 1451,
COOLG_CLUB_R1 = COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 1),
COOLG_CLUB_R2 = COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 2),
COOLG_CLUB_R3 = COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 3),
COOLG_CLUB_R4 = COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 4),
COOLG_FIRE_R0 = 4297,
COOLG_FIRE_R1 = COOLG_FIRE_R0 + (COOLG_FIRE_FRAMES * 1),
COOLG_FIRE_R2 = COOLG_FIRE_R0 + (COOLG_FIRE_FRAMES * 2),
COOLG_PAIN_R0 = 4306,
COOLG_PAIN_R1 = COOLG_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 1)
COOLG_PAIN_R2 = COOLG_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 2)
COOLG_PAIN_R3 = COOLG_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 3)
COOLG_PAIN_R4 = COOLG_PAIN_R0, //+ (COOLIE_PAIN_FRAMES * 4)
COOLIE_DEAD_NOHEAD = 1440,
COOLIE_DEAD_HEAD = 4267,
COOLIE_DIE = 4260,
COOLIE_DEAD = 4268,
#define COOLIE_RUN_FRAMES 4
#define COOLIE_RUN_R0 1400
#define COOLIE_RUN_R1 COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 1)
#define COOLIE_RUN_R2 COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 2)
#define COOLIE_RUN_R3 COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 3)
#define COOLIE_RUN_R4 COOLIE_RUN_R0 + (COOLIE_RUN_FRAMES * 4)
//////////////////////
//
// PLAYER NINJA
//
//////////////////////
#define COOLIE_PAIN_FRAMES 1
#define COOLIE_PAIN_R0 1420
#define COOLIE_PAIN_R1 COOLIE_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 1)
#define COOLIE_PAIN_R2 COOLIE_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 2)
#define COOLIE_PAIN_R3 COOLIE_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 3)
#define COOLIE_PAIN_R4 COOLIE_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 4)
#define COOLG_RUN_FRAMES 4
#define COOLG_RUN_R0 4277
#define COOLG_RUN_R1 COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 1)
#define COOLG_RUN_R2 COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 2)
#define COOLG_RUN_R3 COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 3)
#define COOLG_RUN_R4 COOLG_RUN_R0 + (COOLG_RUN_FRAMES * 4)
#define COOLG_CLUB_FRAMES 2
#define COOLG_CLUB_R0 1451
#define COOLG_CLUB_R1 COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 1)
#define COOLG_CLUB_R2 COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 2)
#define COOLG_CLUB_R3 COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 3)
#define COOLG_CLUB_R4 COOLG_CLUB_R0 + (COOLG_CLUB_FRAMES * 4)
#define COOLG_FIRE_FRAMES 3
#define COOLG_FIRE_R0 4297
#define COOLG_FIRE_R1 COOLG_FIRE_R0 + (COOLG_FIRE_FRAMES * 1)
#define COOLG_FIRE_R2 COOLG_FIRE_R0 + (COOLG_FIRE_FRAMES * 2)
//#define COOLG_FIRE_R3 COOLG_FIRE_R0 + (COOLG_FIRE_FRAMES * 3)
//#define COOLG_FIRE_R4 COOLG_FIRE_R0 + (COOLG_FIRE_FRAMES * 4)
#define COOLG_PAIN_FRAMES 1
#define COOLG_PAIN_R0 4306
#define COOLG_PAIN_R1 COOLG_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 1)
#define COOLG_PAIN_R2 COOLG_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 2)
#define COOLG_PAIN_R3 COOLG_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 3)
#define COOLG_PAIN_R4 COOLG_PAIN_R0 //+ (COOLIE_PAIN_FRAMES * 4)
#define COOLIE_DEAD_NOHEAD 1440
#define COOLIE_DEAD_HEAD 4267
#define COOLIE_DIE 4260
#define COOLIE_DEAD 4268
//////////////////////
//
// PLAYER NINJA
//
//////////////////////
PLAYER_NINJA_SHOOT_R0 = 1069,
PLAYER_NINJA_SHOOT_R1 = PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 2),
PLAYER_NINJA_SHOOT_R2 = PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 3),
PLAYER_NINJA_SHOOT_R3 = PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 4),
PLAYER_NINJA_SHOOT_R4 = PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 1),
PLAYER_NINJA_RUN_R0 = 1094,
PLAYER_NINJA_RUN_R1 = PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 1),
PLAYER_NINJA_RUN_R2 = PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 2),
PLAYER_NINJA_RUN_R3 = PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 3),
PLAYER_NINJA_RUN_R4 = PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 4),
ZOMBIE_RUN_R0 = PLAYER_NINJA_RUN_R0+1,
PLAYER_NINJA_STAND_R0 = PLAYER_NINJA_RUN_R0,
PLAYER_NINJA_STAND_R1 = PLAYER_NINJA_RUN_R1,
PLAYER_NINJA_STAND_R2 = PLAYER_NINJA_RUN_R2,
PLAYER_NINJA_STAND_R3 = PLAYER_NINJA_RUN_R3,
PLAYER_NINJA_STAND_R4 = PLAYER_NINJA_RUN_R4,
PLAYER_NINJA_JUMP_R0 = 1074,
PLAYER_NINJA_JUMP_R1 = PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 1),
PLAYER_NINJA_JUMP_R2 = PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 2),
PLAYER_NINJA_JUMP_R3 = PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 3),
PLAYER_NINJA_JUMP_R4 = PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 4),
PLAYER_NINJA_FALL_R0 = PLAYER_NINJA_JUMP_R0+2,
PLAYER_NINJA_FALL_R1 = PLAYER_NINJA_JUMP_R1+2,
PLAYER_NINJA_FALL_R2 = PLAYER_NINJA_JUMP_R2+2,
PLAYER_NINJA_FALL_R3 = PLAYER_NINJA_JUMP_R3+2,
PLAYER_NINJA_FALL_R4 = PLAYER_NINJA_JUMP_R4+2,
PLAYER_NINJA_CLIMB_R0 = 1024,
PLAYER_NINJA_CLIMB_R1 = PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 1),
PLAYER_NINJA_CLIMB_R2 = PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 2),
PLAYER_NINJA_CLIMB_R3 = PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 3),
PLAYER_NINJA_CLIMB_R4 = PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 4),
PLAYER_NINJA_CRAWL_R0 = 1044,
PLAYER_NINJA_CRAWL_R1 = PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 1),
PLAYER_NINJA_CRAWL_R2 = PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 2),
PLAYER_NINJA_CRAWL_R3 = PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 3),
PLAYER_NINJA_CRAWL_R4 = PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 4),
PLAYER_NINJA_SWIM_R0 = 1114,
PLAYER_NINJA_SWIM_R1 = PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 1),
PLAYER_NINJA_SWIM_R2 = PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 2),
PLAYER_NINJA_SWIM_R3 = PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 3),
PLAYER_NINJA_SWIM_R4 = PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 4),
PLAYER_NINJA_SWORD_R0 = 1161,
PLAYER_NINJA_SWORD_R1 = PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 1),
PLAYER_NINJA_SWORD_R2 = PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 2),
PLAYER_NINJA_SWORD_R3 = PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 3),
PLAYER_NINJA_SWORD_R4 = PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 4),
PLAYER_NINJA_PUNCH_R0 = 1176,
PLAYER_NINJA_PUNCH_R1 = PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 1),
PLAYER_NINJA_PUNCH_R2 = PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 2),
PLAYER_NINJA_PUNCH_R3 = PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 3),
PLAYER_NINJA_PUNCH_R4 = PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 4),
PLAYER_NINJA_KICK_R0 = 1186,
PLAYER_NINJA_KICK_R1 = PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 1),
PLAYER_NINJA_KICK_R2 = PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 2),
PLAYER_NINJA_KICK_R3 = PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 3),
PLAYER_NINJA_KICK_R4 = PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 4),
PLAYER_NINJA_DIE = 1152,
PLAYER_NINJA_FLY = 1069,
};
#define PLAYER_NINJA_SHOOT_FRAMES 1
#define PLAYER_NINJA_SHOOT_R0 1069
#define PLAYER_NINJA_SHOOT_R1 PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 2)
#define PLAYER_NINJA_SHOOT_R2 PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 3)
#define PLAYER_NINJA_SHOOT_R3 PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 4)
#define PLAYER_NINJA_SHOOT_R4 PLAYER_NINJA_SHOOT_R0 + (PLAYER_NINJA_SHOOT_FRAMES * 1)
#define PLAYER_NINJA_RUN_FRAMES 4
#define PLAYER_NINJA_RUN_R0 1094
#define PLAYER_NINJA_RUN_R1 PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 1)
#define PLAYER_NINJA_RUN_R2 PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 2)
#define PLAYER_NINJA_RUN_R3 PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 3)
#define PLAYER_NINJA_RUN_R4 PLAYER_NINJA_RUN_R0 + (PLAYER_NINJA_RUN_FRAMES * 4)
#define ZOMBIE_RUN_R0 PLAYER_NINJA_RUN_R0+1
#define PLAYER_NINJA_STAND_FRAMES 1
#define PLAYER_NINJA_STAND_R0 PLAYER_NINJA_RUN_R0
#define PLAYER_NINJA_STAND_R1 PLAYER_NINJA_RUN_R1
#define PLAYER_NINJA_STAND_R2 PLAYER_NINJA_RUN_R2
#define PLAYER_NINJA_STAND_R3 PLAYER_NINJA_RUN_R3
#define PLAYER_NINJA_STAND_R4 PLAYER_NINJA_RUN_R4
#define PLAYER_NINJA_JUMP_FRAMES 4
#define PLAYER_NINJA_JUMP_R0 1074
#define PLAYER_NINJA_JUMP_R1 PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 1)
#define PLAYER_NINJA_JUMP_R2 PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 2)
#define PLAYER_NINJA_JUMP_R3 PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 3)
#define PLAYER_NINJA_JUMP_R4 PLAYER_NINJA_JUMP_R0 + (PLAYER_NINJA_JUMP_FRAMES * 4)
#define PLAYER_NINJA_FALL_R0 PLAYER_NINJA_JUMP_R0+2
#define PLAYER_NINJA_FALL_R1 PLAYER_NINJA_JUMP_R1+2
#define PLAYER_NINJA_FALL_R2 PLAYER_NINJA_JUMP_R2+2
#define PLAYER_NINJA_FALL_R3 PLAYER_NINJA_JUMP_R3+2
#define PLAYER_NINJA_FALL_R4 PLAYER_NINJA_JUMP_R4+2
#define PLAYER_NINJA_CLIMB_FRAMES 4
#define PLAYER_NINJA_CLIMB_R0 1024
#define PLAYER_NINJA_CLIMB_R1 PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 1)
#define PLAYER_NINJA_CLIMB_R2 PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 2)
#define PLAYER_NINJA_CLIMB_R3 PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 3)
#define PLAYER_NINJA_CLIMB_R4 PLAYER_NINJA_CLIMB_R0 + (PLAYER_NINJA_CLIMB_FRAMES * 4)
#define PLAYER_NINJA_CRAWL_FRAMES 4
#define PLAYER_NINJA_CRAWL_R0 1044
#define PLAYER_NINJA_CRAWL_R1 PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 1)
#define PLAYER_NINJA_CRAWL_R2 PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 2)
#define PLAYER_NINJA_CRAWL_R3 PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 3)
#define PLAYER_NINJA_CRAWL_R4 PLAYER_NINJA_CRAWL_R0 + (PLAYER_NINJA_CRAWL_FRAMES * 4)
#define PLAYER_NINJA_SWIM_FRAMES 4
#define PLAYER_NINJA_SWIM_R0 1114
#define PLAYER_NINJA_SWIM_R1 PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 1)
#define PLAYER_NINJA_SWIM_R2 PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 2)
#define PLAYER_NINJA_SWIM_R3 PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 3)
#define PLAYER_NINJA_SWIM_R4 PLAYER_NINJA_SWIM_R0 + (PLAYER_NINJA_SWIM_FRAMES * 4)
#define PLAYER_NINJA_SWORD_FRAMES 3
#define PLAYER_NINJA_SWORD_R0 1161
#define PLAYER_NINJA_SWORD_R1 PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 1)
#define PLAYER_NINJA_SWORD_R2 PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 2)
#define PLAYER_NINJA_SWORD_R3 PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 3)
#define PLAYER_NINJA_SWORD_R4 PLAYER_NINJA_SWORD_R0 + (PLAYER_NINJA_SWORD_FRAMES * 4)
#define PLAYER_NINJA_PUNCH_FRAMES 2
#define PLAYER_NINJA_PUNCH_R0 1176
#define PLAYER_NINJA_PUNCH_R1 PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 1)
#define PLAYER_NINJA_PUNCH_R2 PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 2)
#define PLAYER_NINJA_PUNCH_R3 PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 3)
#define PLAYER_NINJA_PUNCH_R4 PLAYER_NINJA_PUNCH_R0 + (PLAYER_NINJA_PUNCH_FRAMES * 4)
#define PLAYER_NINJA_KICK_FRAMES 2
#define PLAYER_NINJA_KICK_R0 1186
#define PLAYER_NINJA_KICK_R1 PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 1)
#define PLAYER_NINJA_KICK_R2 PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 2)
#define PLAYER_NINJA_KICK_R3 PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 3)
#define PLAYER_NINJA_KICK_R4 PLAYER_NINJA_KICK_R0 + (PLAYER_NINJA_KICK_FRAMES * 4)
#define PLAYER_NINJA_DIE 1152
#define PLAYER_NINJA_FLY 1069
//////////////////////
//
@ -1163,4 +1176,6 @@ enum STAT_ENUMS
#define FLOORBLOOD1 389
END_SW_NS
#endif