mirror of
https://github.com/ZDoom/Raze.git
synced 2025-02-16 16:51:08 +00:00
- SW: game.h cleanup
Turned almost all #defines into enums or inline functions, removed unused declarations and all leftover MONO_PRINT fragments elsewhere.
This commit is contained in:
Christoph Oelckers
parent
96396385e7
commit
c24aafd3d6
10 changed files with 90 additions and 144 deletions
|
|
@ -823,13 +823,10 @@ int DoActorCantMoveCloser(DSWActor* actor)
|
|||
|
||||
actor->user.ActorActionFunc = DoActorDecide;
|
||||
NewStateGroup(actor, actor->user.ActorActionSet->Run);
|
||||
//MONO_PRINT("Trying to get to the track point\n");
|
||||
}
|
||||
else
|
||||
{
|
||||
// Try to move closer
|
||||
//MONO_PRINT("Move Closer - Trying to move around\n");
|
||||
|
||||
InitActorReposition(actor);
|
||||
}
|
||||
return 0;
|
||||
|
|
@ -1024,8 +1021,6 @@ int FindWanderTrack(DSWActor* actor)
|
|||
BIT(TT_OPERATE)
|
||||
};
|
||||
|
||||
//MONO_PRINT("FindWanderTrack\n");
|
||||
|
||||
for (i = 0; i < SIZ(WanderTracks); i++)
|
||||
{
|
||||
track = ActorFindTrack(actor, -1, WanderTracks[i], &point, &track_dir);
|
||||
|
|
|
|||
|
|
@ -102,7 +102,7 @@ DAMAGE_ENTRY(DMG_VOMIT, nullptr, 5, 15, 0, -1, -1
|
|||
|
||||
// inanimate objects
|
||||
DAMAGE_ENTRY(DMG_BLADE, nullptr, 10, 20, 0, -1, -1, -1)
|
||||
DAMAGE_ENTRY(MAX_WEAPONS, nullptr, 10, 20, 0, -1, -1, -1)
|
||||
DAMAGE_ENTRY(MAX_WEAPONDEF, nullptr, 10, 20, 0, -1, -1, -1)
|
||||
|
||||
#undef DAMAGE_ENTRY
|
||||
#undef DAMAGE_ENTRY_WPN
|
||||
|
|
|
|||
|
|
@ -1093,8 +1093,6 @@ void PrintSpriteInfo(PLAYERp pp)
|
|||
|
||||
void DrawCrosshair(PLAYERp pp)
|
||||
{
|
||||
extern bool CameraTestMode;
|
||||
|
||||
if (!(CameraTestMode))
|
||||
{
|
||||
::DrawCrosshair(2326, pp->actor->user.Health, -pp->angle.look_anghalf(smoothratio), TEST(pp->Flags, PF_VIEW_FROM_OUTSIDE) ? 5 : 0, 2, shadeToLight(10));
|
||||
|
|
@ -1167,9 +1165,6 @@ void CameraView(PLAYERp pp, int *tx, int *ty, int *tz, sectortype** tsect, binan
|
|||
// new horiz to player
|
||||
*thoriz = q16horiz(clamp(-(zvect << 8), gi->playerHorizMin(), gi->playerHorizMax()));
|
||||
|
||||
//DSPRINTF(ds,"xvect %d,yvect %d,zvect %d,thoriz %d",xvect,yvect,zvect,*thoriz.asbuild());
|
||||
MONO_PRINT(ds);
|
||||
|
||||
*tang = ang;
|
||||
*tx = actor->spr.pos.X;
|
||||
*ty = actor->spr.pos.Y;
|
||||
|
|
|
|||
|
|
@ -28,10 +28,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms
|
|||
|
||||
#define GAME_H
|
||||
|
||||
#ifndef DEBUG
|
||||
#define DEBUG 0
|
||||
#endif
|
||||
|
||||
#ifdef _MSC_VER
|
||||
#pragma warning(disable:4101) // there's too many of these... :(
|
||||
#endif
|
||||
|
|
@ -108,22 +104,13 @@ enum
|
|||
|
||||
#define ASSERT assert
|
||||
|
||||
#define MONO_PRINT(str)
|
||||
|
||||
|
||||
#define HEAP_CHECK()
|
||||
#define RANDOM_DEBUG 0
|
||||
|
||||
|
||||
int RandomRange(int);
|
||||
inline int RANDOM(void)
|
||||
{
|
||||
randomseed = ((randomseed * 21 + 1) & 65535);
|
||||
return randomseed;
|
||||
}
|
||||
|
||||
#define MOD_P2(number,modby) ((number) & ((modby)-1))
|
||||
#define RANDOM_P2(pwr_of_2) (MOD_P2(RANDOM(),(pwr_of_2)))
|
||||
int RANDOM_P2(int pwr_of_2) { return (RANDOM() & (pwr_of_2 - 1)); }
|
||||
|
||||
//
|
||||
// Map directions/degrees
|
||||
|
|
@ -250,16 +237,16 @@ inline int GetSpriteSizeToBottom(const spritetypebase* sp)
|
|||
// actual Z for TOS and BOS - handles both WYSIWYG and old style
|
||||
inline int GetSpriteZOfTop(const spritetypebase* sp)
|
||||
{
|
||||
return (TEST(sp->cstat, CSTAT_SPRITE_YCENTER) ?
|
||||
return (sp->cstat & CSTAT_SPRITE_YCENTER) ?
|
||||
sp->pos.Z - GetSpriteSizeToTop(sp) :
|
||||
sp->pos.Z - GetSpriteSizeZ(sp));
|
||||
sp->pos.Z - GetSpriteSizeZ(sp);
|
||||
}
|
||||
|
||||
inline int GetSpriteZOfBottom(const spritetypebase* sp)
|
||||
{
|
||||
return (TEST(sp->cstat, CSTAT_SPRITE_YCENTER) ?
|
||||
return (sp->cstat & CSTAT_SPRITE_YCENTER) ?
|
||||
sp->pos.Z + GetSpriteSizeToBottom(sp) :
|
||||
sp->pos.Z);
|
||||
sp->pos.Z;
|
||||
}
|
||||
|
||||
// mid and upper/lower sprite calculations
|
||||
|
|
@ -452,17 +439,18 @@ void QueueLoWangs(DSWActor*); // Weapon.c
|
|||
int SpawnShell(DSWActor* actor, int ShellNum); // JWeapon.c
|
||||
void UnlockKeyLock(short key_num, DSWActor* actor); // JSector.c
|
||||
|
||||
#define MAX_PAIN 5
|
||||
enum
|
||||
{
|
||||
MAX_PAIN = 5,
|
||||
MAX_TAUNTAI = 33,
|
||||
MAX_GETSOUNDS = 5,
|
||||
MAX_YELLSOUNDS = 3,
|
||||
};
|
||||
|
||||
extern int PlayerPainVocs[MAX_PAIN];
|
||||
extern int PlayerLowHealthPainVocs[MAX_PAIN];
|
||||
|
||||
#define MAX_TAUNTAI 33
|
||||
extern int TauntAIVocs[MAX_TAUNTAI];
|
||||
|
||||
#define MAX_GETSOUNDS 5
|
||||
extern int PlayerGetItemVocs[MAX_GETSOUNDS];
|
||||
|
||||
#define MAX_YELLSOUNDS 3
|
||||
extern int PlayerYellVocs[MAX_YELLSOUNDS];
|
||||
|
||||
void BossHealthMeter(void);
|
||||
|
|
@ -481,14 +469,16 @@ void BossHealthMeter(void);
|
|||
//
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define MAX_WEAPONS_KEYS 10
|
||||
#define MAX_WEAPONS_EXTRA 4 // extra weapons like the two extra head attacks
|
||||
#define MAX_WEAPONS (MAX_WEAPONS_KEYS + MAX_WEAPONS_EXTRA)
|
||||
|
||||
// weapons that not missile type sprites
|
||||
#define WPN_NM_LAVA (-8)
|
||||
#define WPN_NM_SECTOR_SQUISH (-9)
|
||||
enum
|
||||
{
|
||||
MAX_WEAPONS_KEYS = 10,
|
||||
MAX_WEAPONS_EXTRA = 4, // extra weapons like the two extra head attacks
|
||||
MAX_WEAPONS = (MAX_WEAPONS_KEYS + MAX_WEAPONS_EXTRA),
|
||||
|
||||
// weapons that not missile type sprites
|
||||
WPN_NM_LAVA = (-8),
|
||||
WPN_NM_SECTOR_SQUISH = (-9),
|
||||
};
|
||||
//#define WEAP_ENTRY(id, init_func, damage_lo, damage_hi, radius)
|
||||
|
||||
typedef struct
|
||||
|
|
@ -535,16 +525,16 @@ extern void (*InitWeapon[MAX_WEAPONS]) (PLAYERp);
|
|||
//
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define MAX_SW_PLAYERS_SW (4)
|
||||
#define MAX_SW_PLAYERS_REG (8)
|
||||
enum
|
||||
{
|
||||
MAX_SW_PLAYERS_SW = (4),
|
||||
MAX_SW_PLAYERS_REG = (8)
|
||||
};
|
||||
#define MAX_SW_PLAYERS (SW_SHAREWARE ? MAX_SW_PLAYERS_SW : MAX_SW_PLAYERS_REG)
|
||||
|
||||
extern int ThemeTrack[6]; // w
|
||||
extern FString ThemeSongs[6]; //
|
||||
|
||||
#define MAX_EPISODE_NAME_LEN 24
|
||||
extern char EpisodeNames[3][MAX_EPISODE_NAME_LEN+2];
|
||||
|
||||
enum
|
||||
{
|
||||
MAX_KEYS = 8,
|
||||
|
|
@ -586,8 +576,6 @@ enum
|
|||
|
||||
};
|
||||
|
||||
#define PACK 1
|
||||
|
||||
extern bool CameraTestMode;
|
||||
|
||||
enum PlayerDeathTypes
|
||||
|
|
@ -843,29 +831,34 @@ enum
|
|||
// Hit Points
|
||||
//
|
||||
|
||||
#define HEALTH_RIPPER 70
|
||||
#define HEALTH_RIPPER2 200
|
||||
#define HEALTH_MOMMA_RIPPER 500
|
||||
#define HEALTH_NINJA 40
|
||||
#define HEALTH_RED_NINJA 160
|
||||
#define HEALTH_COOLIE 120
|
||||
#define HEALTH_COOLIE_GHOST 65
|
||||
#define HEALTH_SKEL_PRIEST 90
|
||||
#define HEALTH_GORO 200
|
||||
#define HEALTH_HORNET 4
|
||||
#define HEALTH_SKULL 4
|
||||
#define HEALTH_EEL 100
|
||||
|
||||
#define HEALTH_SERP_GOD 3800
|
||||
enum
|
||||
{
|
||||
HEALTH_RIPPER = 70 ,
|
||||
HEALTH_RIPPER2 = 200 ,
|
||||
HEALTH_MOMMA_RIPPER = 500 ,
|
||||
HEALTH_NINJA = 40 ,
|
||||
HEALTH_RED_NINJA = 160 ,
|
||||
HEALTH_COOLIE = 120 ,
|
||||
HEALTH_COOLIE_GHOST = 65 ,
|
||||
HEALTH_SKEL_PRIEST = 90 ,
|
||||
HEALTH_GORO = 200 ,
|
||||
HEALTH_HORNET = 4 ,
|
||||
HEALTH_SKULL = 4 ,
|
||||
HEALTH_EEL = 100 ,
|
||||
HEALTH_SERP_GOD = 3800,
|
||||
};
|
||||
|
||||
//
|
||||
// Action Set Structure
|
||||
//
|
||||
|
||||
enum
|
||||
{
|
||||
MAX_ACTOR_CLOSE_ATTACK = 2,
|
||||
MAX_ACTOR_ATTACK = 6,
|
||||
};
|
||||
typedef struct
|
||||
{
|
||||
#define MAX_ACTOR_CLOSE_ATTACK 2
|
||||
#define MAX_ACTOR_ATTACK 6
|
||||
STATEp *Stand;
|
||||
STATEp *Run;
|
||||
STATEp *Jump;
|
||||
|
|
@ -931,12 +924,6 @@ using ROTATORp = ROTATOR*;
|
|||
|
||||
struct USER
|
||||
{
|
||||
// C++'s default init rules suck, so we have to help it out a bit to do what we need (i.e. setting all POD members to 0.
|
||||
USER()
|
||||
{
|
||||
memset(&WallP, 0, sizeof(USER) - myoffsetof(USER, WallP));
|
||||
}
|
||||
|
||||
void Clear()
|
||||
{
|
||||
rotator.Clear();
|
||||
|
|
@ -1337,8 +1324,6 @@ typedef struct
|
|||
int16_t TimeOut;
|
||||
} DOOR_AUTO_CLOSE, *DOOR_AUTO_CLOSEp;
|
||||
|
||||
#define MAX_DOOR_AUTO_CLOSE 16
|
||||
|
||||
typedef struct
|
||||
{
|
||||
int origx[17], origy[17];
|
||||
|
|
@ -1381,9 +1366,15 @@ struct SPRING_BOARD
|
|||
extern SPRING_BOARD SpringBoard[20];
|
||||
extern SWING Rotate[17];
|
||||
|
||||
enum
|
||||
{
|
||||
MAX_DOOR_AUTO_CLOSE = 16,
|
||||
MAXANIM = 256
|
||||
};
|
||||
|
||||
|
||||
extern DOOR_AUTO_CLOSE DoorAutoClose[MAX_DOOR_AUTO_CLOSE];
|
||||
|
||||
#define MAXANIM 256
|
||||
typedef void ANIM_CALLBACK (ANIMp, void *);
|
||||
typedef ANIM_CALLBACK *ANIM_CALLBACKp;
|
||||
typedef void *ANIM_DATAp;
|
||||
|
|
@ -1433,23 +1424,26 @@ typedef struct TRACK
|
|||
// Most track type flags are in tags.h
|
||||
|
||||
// Regular track flags
|
||||
#define TF_TRACK_OCCUPIED BIT(0)
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint8_t FromRange,ToRange,FromColor,ToColor;
|
||||
} COLOR_MAP, *COLOR_MAPp;
|
||||
|
||||
#define MAX_TRACKS 100
|
||||
enum
|
||||
{
|
||||
TF_TRACK_OCCUPIED = BIT(0),
|
||||
MAX_TRACKS = 100,
|
||||
MAX_SO_SECTOR = 40,
|
||||
MAX_SO_POINTS = (MAX_SO_SECTOR*15),
|
||||
MAX_SO_SPRITE = 60,
|
||||
MAX_CLIPBOX = 32
|
||||
};
|
||||
|
||||
extern TRACK Track[MAX_TRACKS];
|
||||
|
||||
struct SECTOR_OBJECTstruct
|
||||
{
|
||||
#define MAX_SO_SECTOR 40
|
||||
#define MAX_SO_POINTS (MAX_SO_SECTOR*15)
|
||||
#define MAX_SO_SPRITE 60
|
||||
#define MAX_CLIPBOX 32
|
||||
|
||||
soANIMATORp PreMoveAnimator;
|
||||
soANIMATORp PostMoveAnimator;
|
||||
|
|
@ -1720,8 +1714,11 @@ void CollectPortals();
|
|||
|
||||
int SpawnBlood(DSWActor* actor, DSWActor* weapActor, short hit_ang, int hit_x, int hit_y, int hit_z);
|
||||
|
||||
#define FAF_PLACE_MIRROR_PIC 341
|
||||
#define FAF_MIRROR_PIC 2356
|
||||
enum
|
||||
{
|
||||
FAF_PLACE_MIRROR_PIC = 341,
|
||||
FAF_MIRROR_PIC = 2356
|
||||
};
|
||||
|
||||
inline bool FAF_ConnectCeiling(sectortype* sect)
|
||||
{
|
||||
|
|
@ -1767,7 +1764,6 @@ enum SoundType
|
|||
|
||||
void DoSoundSpotMatch(short match, short sound_num, short sound_type);
|
||||
|
||||
#define ACTOR_GRAVITY 8
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
|
|
@ -1787,22 +1783,28 @@ extern bool ReloadPrompt;
|
|||
|
||||
extern int lockspeed;
|
||||
|
||||
// Various scattered constants
|
||||
enum
|
||||
{
|
||||
synctics = 3,
|
||||
ACTORMOVETICS = (synctics << 1),
|
||||
TICSPERMOVEMENT = synctics,
|
||||
ACTOR_GRAVITY = 8,
|
||||
// subtract value from clipdist on getzrange calls
|
||||
GETZRANGE_CLIP_ADJ = 8,
|
||||
STAT_DAMAGE_LIST_SIZE = 20,
|
||||
COLOR_PAIN = 128, // Light red range
|
||||
|
||||
NTAG_SEARCH_LO = 1,
|
||||
NTAG_SEARCH_HI = 2,
|
||||
NTAG_SEARCH_LO_HI = 3,
|
||||
|
||||
ANIM_SERP = 1,
|
||||
ANIM_SUMO =2,
|
||||
ANIM_ZILLA =3
|
||||
|
||||
};
|
||||
|
||||
// subtract value from clipdist on getzrange calls
|
||||
#define GETZRANGE_CLIP_ADJ 8
|
||||
|
||||
// MULTIPLAYER
|
||||
// VARIABLES: (You should extern these in your game.c)
|
||||
/*
|
||||
extern short numplayers, myconnectindex;
|
||||
extern short connecthead, connectpoint2[MAXPLAYERS];
|
||||
*/
|
||||
extern int *lastpacket2clock;
|
||||
|
||||
|
||||
|
|
@ -1817,7 +1819,6 @@ extern int MoveSkip4, MoveSkip2, MoveSkip8;
|
|||
extern int MinEnemySkill;
|
||||
extern short screenpeek;
|
||||
|
||||
#define STAT_DAMAGE_LIST_SIZE 20
|
||||
extern int16_t StatDamageList[STAT_DAMAGE_LIST_SIZE];
|
||||
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
|
@ -1826,7 +1827,6 @@ extern int16_t StatDamageList[STAT_DAMAGE_LIST_SIZE];
|
|||
//
|
||||
///////////////////////////////////////////////////////////////
|
||||
|
||||
#define COLOR_PAIN 128 // Light red range
|
||||
extern void SetFadeAmt(PLAYERp pp, short damage, uint8_t startcolor);
|
||||
extern void DoPaletteFlash(PLAYERp pp);
|
||||
extern bool NightVision;
|
||||
|
|
@ -1905,10 +1905,6 @@ bool CanSeeWallMove(DSWActor* wp,int match); // wallmove.c
|
|||
void DoSpikeOperate(sectortype* sect); // spike.c
|
||||
void SetSpikeActive(DSWActor*); // spike.c
|
||||
|
||||
#define NTAG_SEARCH_LO 1
|
||||
#define NTAG_SEARCH_HI 2
|
||||
#define NTAG_SEARCH_LO_HI 3
|
||||
|
||||
DSWActor* insertActor(sectortype* sect, int statnum);
|
||||
|
||||
void AudioUpdate(void); // stupid
|
||||
|
|
@ -1935,10 +1931,6 @@ extern int ChopTics;
|
|||
extern int Bunny_Count;
|
||||
|
||||
|
||||
#define ANIM_SERP 1
|
||||
#define ANIM_SUMO 2
|
||||
#define ANIM_ZILLA 3
|
||||
|
||||
struct GameInterface : public ::GameInterface
|
||||
{
|
||||
const char* Name() override { return "ShadowWarrior"; }
|
||||
|
|
@ -1998,13 +1990,13 @@ BEGIN_SW_NS
|
|||
// OVER and UNDER water macros
|
||||
inline bool SectorIsDiveArea(sectortype* sect)
|
||||
{
|
||||
return (TEST(sect->extra, SECTFX_DIVE_AREA) ? true : false);
|
||||
return (sect->extra & SECTFX_DIVE_AREA) ? true : false;
|
||||
}
|
||||
|
||||
inline bool SectorIsUnderwaterArea(sectortype* sect)
|
||||
{
|
||||
if (!sect) return false;
|
||||
return (TEST(sect->extra, SECTFX_UNDERWATER | SECTFX_UNDERWATER2) ? true : false);
|
||||
return (sect->extra & (SECTFX_UNDERWATER | SECTFX_UNDERWATER2)) ? true : false;
|
||||
}
|
||||
|
||||
inline int PlayerFacingRange(PLAYERp pp, DSWActor* a, int range)
|
||||
|
|
@ -2133,12 +2125,12 @@ inline int GetRepeatFromHeight(DSWActor* sp, int zh)
|
|||
|
||||
inline bool SpriteInDiveArea(DSWActor* a)
|
||||
{
|
||||
return (TEST(a->spr.sector()->extra, SECTFX_DIVE_AREA) ? true : false);
|
||||
return (a->spr.sector()->extra & SECTFX_DIVE_AREA) ? true : false;
|
||||
}
|
||||
|
||||
inline bool SpriteInUnderwaterArea(DSWActor* a)
|
||||
{
|
||||
return (TEST(a->spr.sector()->extra, SECTFX_UNDERWATER | SECTFX_UNDERWATER2) ? true : false);
|
||||
return (a->spr.sector()->extra & (SECTFX_UNDERWATER | SECTFX_UNDERWATER2)) ? true : false;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -248,9 +248,6 @@ void PlayerUpdateHealth(PLAYERp pp, short value)
|
|||
}
|
||||
else if (value <= -1000)
|
||||
{
|
||||
//DSPRINTF(ds,"value = %d\n",value);
|
||||
MONO_PRINT(ds);
|
||||
|
||||
value += 1000;
|
||||
IsChem = true;
|
||||
}
|
||||
|
|
@ -1466,9 +1463,6 @@ void pStarRest(PANEL_SPRITEp psp)
|
|||
if (!WeaponOK(psp->PlayerP))
|
||||
return;
|
||||
|
||||
// //DSPRINTF(ds,"StarFire");
|
||||
// MONO_PRINT(ds);
|
||||
|
||||
DoPlayerChooseYell(psp->PlayerP);
|
||||
|
||||
pSetState(psp, psp->ActionState);
|
||||
|
|
|
|||
|
|
@ -6504,8 +6504,6 @@ void PlayerGlobal(PLAYERp pp)
|
|||
{
|
||||
if (!(pp->Flags & PF_DEAD))
|
||||
{
|
||||
////DSPRINTF(ds,"Squish diff %d, min %d, cz %d, fz %d, lo %d, hi %d",labs(pp->loz - pp->hiz)>>8,min_height>>8, pp->ceiling_dist>>8, pp->floor_dist>>8,pp->lo_sectp-sector,pp->hi_sectp-sector);
|
||||
//MONO_PRINT(ds);
|
||||
PlayerUpdateHealth(pp, -pp->actor->user.Health); // Make sure he dies!
|
||||
PlayerCheckDeath(pp, nullptr);
|
||||
|
||||
|
|
|
|||
|
|
@ -142,9 +142,6 @@ void CorrectPrediction(int actualfifoplc)
|
|||
return;
|
||||
}
|
||||
|
||||
// //DSPRINTF(ds,"PREDICT ERROR: %ld %ld %ld %ld %ld %ld %ld %ld %ld %ld", predict->angle.ang.asbuild(), Player[myconnectindex].angle.ang.asbuild(), predict->x, Player[myconnectindex].posx, predict->y, Player[myconnectindex].posy, predict->z, Player[myconnectindex].posz, predict->horiz.asbuild(), Player[myconnectindex].horizon.horiz.asbuild()));
|
||||
// MONO_PRINT(ds);
|
||||
|
||||
InitPrediction(&Player[myconnectindex]);
|
||||
// puts the predicted pos back to actual pos
|
||||
predictmovefifoplc = movefifoplc;
|
||||
|
|
|
|||
|
|
@ -2520,10 +2520,6 @@ void AnimDelete(int animtype, int animindex, DSWActor* animactor)
|
|||
|
||||
// move the last entry to the current one to free the last entry up
|
||||
Anim[j] = Anim[AnimCnt];
|
||||
|
||||
//DSPRINTF(ds, "Deleted a Anim");
|
||||
MONO_PRINT(ds);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -141,8 +141,6 @@ short ActorFindTrack(DSWActor* actor, int8_t player_dir, int track_type, int* tr
|
|||
// Skip if already someone on this track
|
||||
if (TEST(t->flags, TF_TRACK_OCCUPIED))
|
||||
{
|
||||
//DSPRINTF(ds,"occupied!");
|
||||
MONO_PRINT(ds);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -848,8 +846,6 @@ void SectorObjectSetupBounds(SECTOR_OBJECTp sop)
|
|||
switch (itActor->spr.statnum)
|
||||
{
|
||||
case STAT_WALL_MOVE:
|
||||
////DSPRINTF(ds,"Damage Wall attached ");
|
||||
//MONO_PRINT(ds);
|
||||
break;
|
||||
case STAT_DEFAULT:
|
||||
switch (itActor->spr.hitag)
|
||||
|
|
@ -2390,9 +2386,6 @@ void DoTrack(SECTOR_OBJECTp sop, short locktics, int *nx, int *ny)
|
|||
sop->bob_sine_ndx = 0;
|
||||
sop->bob_amt = 0;
|
||||
|
||||
//DSPRINTF(ds,"dest sector %d",dest_sector);
|
||||
MONO_PRINT(ds);
|
||||
|
||||
for (i = 0, sectp = &sop->sectp[0]; *sectp; sectp++, i++)
|
||||
{
|
||||
if (sop->sectp[i]->hasU() && TEST(sop->sectp[i]->flags, SECTFU_SO_DONT_SINK))
|
||||
|
|
@ -3363,7 +3356,7 @@ bool ActorTrackDecide(TRACK_POINTp tpoint, DSWActor* actor)
|
|||
}
|
||||
auto wal = near.hitWall;
|
||||
|
||||
#if DEBUG
|
||||
#if 0
|
||||
if (!wal->twoSided())
|
||||
{
|
||||
I_Error("Take out white wall ladder x = %d, y = %d",wal->x, wal->y);
|
||||
|
|
|
|||
|
|
@ -5212,9 +5212,6 @@ int ActorDamageSlide(DSWActor* actor, int damage, int ang)
|
|||
{
|
||||
slide_vel = (damage * 6) - (actor->user.MaxHealth);
|
||||
|
||||
//DSPRINTF(ds,"slide_vel = %ld",slide_vel);
|
||||
MONO_PRINT(ds);
|
||||
|
||||
if (slide_vel < -1000) slide_vel = -1000;
|
||||
slide_dec = 5;
|
||||
|
||||
|
|
@ -5890,7 +5887,6 @@ int DoDamage(DSWActor* actor, DSWActor* weapActor)
|
|||
}
|
||||
else if (actor->user.PlayerP)
|
||||
{
|
||||
MONO_PRINT("Stat Hit Actor");
|
||||
// Is the player blocking?
|
||||
if (actor->user.PlayerP->WpnKungFuMove == 3)
|
||||
damage /= 3;
|
||||
|
|
@ -5905,7 +5901,6 @@ int DoDamage(DSWActor* actor, DSWActor* weapActor)
|
|||
}
|
||||
else
|
||||
{
|
||||
MONO_PRINT("Star Hit Actor");
|
||||
ActorHealth(actor, damage);
|
||||
ActorPain(actor);
|
||||
ActorStdMissile(actor, weapActor);
|
||||
|
|
@ -6335,8 +6330,6 @@ int DoDamage(DSWActor* actor, DSWActor* weapActor)
|
|||
|
||||
case BOLT_EXP:
|
||||
damage = GetDamage(actor, weapActor, DMG_BOLT_EXP);
|
||||
// //DSPRINTF(ds,"Damage Bolt: %d\n",damage);
|
||||
// MONO_PRINT(ds);
|
||||
if (actor->user.sop_parent)
|
||||
{
|
||||
if (actor->user.sop_parent->flags & (SOBJ_DIE_HARD))
|
||||
|
|
@ -6472,9 +6465,6 @@ int DoDamage(DSWActor* actor, DSWActor* weapActor)
|
|||
|
||||
damage = GetDamage(actor, weapActor, DMG_MINE_EXP);
|
||||
|
||||
// //DSPRINTF(ds,"Damage Micro: %d\n",damage);
|
||||
// MONO_PRINT(ds);
|
||||
|
||||
if (actor->user.sop_parent)
|
||||
{
|
||||
if (actor->user.sop_parent->flags & (SOBJ_DIE_HARD))
|
||||
|
|
@ -18288,10 +18278,6 @@ int ShrapKillSprite(DSWActor* actor)
|
|||
|
||||
bool CheckBreakToughness(BREAK_INFOp break_info, int ID)
|
||||
{
|
||||
////DSPRINTF(ds,"CheckBreakToughness called with %d",ID);
|
||||
//CON_Message(ds);
|
||||
//MONO_PRINT(ds);
|
||||
|
||||
if (TEST(break_info->flags, BF_TOUGH))
|
||||
{
|
||||
switch (ID)
|
||||
|
|
|
|||
Loading…
Reference in a new issue