zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-12-14 22:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity
raze/source/blood/src/aicaleb.cpp

425 lines
16 KiB
C++
Raw Normal View History

- added NBlood source.
2019-09-19 22:42:45 +00:00
//-------------------------------------------------------------------------
/*
Copyright (C) 2010-2019 EDuke32 developers and contributors
Copyright (C) 2019 Nuke.YKT
This file is part of NBlood.
NBlood is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 2
as published by the Free Software Foundation.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
//-------------------------------------------------------------------------
- include namespace file in all sources as the very first include.
2019-09-21 18:59:54 +00:00
#include "ns.h" // Must come before everything else!
- added NBlood source.
2019-09-19 22:42:45 +00:00
#include "compat.h"
#include "build.h"
#include "pragmas.h"
#include "mmulti.h"
#include "common_game.h"
#include "actor.h"
#include "ai.h"
#include "blood.h"
#include "db.h"
#include "dude.h"
#include "levels.h"
#include "player.h"
#include "seq.h"
- merged the 3 sound related headers in Blood.
2020-07-25 16:53:44 +00:00
#include "sound.h"
- added NBlood source.
2019-09-19 22:42:45 +00:00
- put all Blood game code into a namespace.
2019-09-22 06:39:22 +00:00
BEGIN_BLD_NS
- added NBlood source.
2019-09-19 22:42:45 +00:00
static void SeqAttackCallback(int, int);
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
static void calebThinkSearch(spritetype *, XSPRITE *);
static void calebThinkGoto(spritetype *, XSPRITE *);
static void calebThinkChase(spritetype *, XSPRITE *);
static void calebThinkSwimGoto(spritetype *, XSPRITE *);
static void calebThinkSwimChase(spritetype *, XSPRITE *);
- added NBlood source.
2019-09-19 22:42:45 +00:00
static void sub_65D04(spritetype *, XSPRITE *);
static void sub_65F44(spritetype *, XSPRITE *);
static void sub_661E0(spritetype *, XSPRITE *);
static int nAttackClient = seqRegisterClient(SeqAttackCallback);
AISTATE tinycalebIdle = { kAiStateIdle, 0, -1, 0, NULL, NULL, aiThinkTarget, NULL };
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
AISTATE tinycalebChase = { kAiStateChase, 6, -1, 0, NULL, aiMoveForward, calebThinkChase, NULL };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE tinycalebDodge = { kAiStateMove, 6, -1, 90, NULL, aiMoveDodge, NULL, &tinycalebChase };
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
AISTATE tinycalebGoto = { kAiStateMove, 6, -1, 600, NULL, aiMoveForward, calebThinkGoto, &tinycalebIdle };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE tinycalebAttack = { kAiStateChase, 0, nAttackClient, 120, NULL, NULL, NULL, &tinycalebChase };
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
AISTATE tinycalebSearch = { kAiStateSearch, 6, -1, 120, NULL, aiMoveForward, calebThinkSearch, &tinycalebIdle };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE tinycalebRecoil = { kAiStateRecoil, 5, -1, 0, NULL, NULL, NULL, &tinycalebDodge };
AISTATE tinycalebTeslaRecoil = { kAiStateRecoil, 4, -1, 0, NULL, NULL, NULL, &tinycalebDodge };
AISTATE tinycalebSwimIdle = { kAiStateIdle, 10, -1, 0, NULL, NULL, aiThinkTarget, NULL };
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
AISTATE tinycalebSwimChase = { kAiStateChase, 8, -1, 0, NULL, sub_65D04, calebThinkSwimChase, NULL };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE tinycalebSwimDodge = { kAiStateMove, 8, -1, 90, NULL, aiMoveDodge, NULL, &tinycalebSwimChase };
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
AISTATE tinycalebSwimGoto = { kAiStateMove, 8, -1, 600, NULL, aiMoveForward, calebThinkSwimGoto, &tinycalebSwimIdle };
AISTATE tinycalebSwimSearch = { kAiStateSearch, 8, -1, 120, NULL, aiMoveForward, calebThinkSearch, &tinycalebSwimIdle };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE tinycalebSwimAttack = { kAiStateChase, 10, nAttackClient, 0, NULL, NULL, NULL, &tinycalebSwimChase };
AISTATE tinycalebSwimRecoil = { kAiStateRecoil, 5, -1, 0, NULL, NULL, NULL, &tinycalebSwimDodge };
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
AISTATE tinycaleb139660 = { kAiStateOther, 8, -1, 120, NULL, sub_65F44, calebThinkSwimChase, &tinycalebSwimChase };
AISTATE tinycaleb13967C = { kAiStateOther, 8, -1, 0, NULL, sub_661E0, calebThinkSwimChase, &tinycalebSwimChase };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE tinycaleb139698 = { kAiStateOther, 8, -1, 120, NULL, aiMoveTurn, NULL, &tinycalebSwimChase };
static void SeqAttackCallback(int, int nXSprite)
{
int nSprite = xsprite[nXSprite].reference;
spritetype *pSprite = &sprite[nSprite];
- Major cleanup of Q16.16 utilisation within games and engine. * Remove fix16.h/cpp and utilise library from m_fixed.h. * Extend m_fixed.h with two inline functions for int to/from float operations. * Replace fix16_floor operations with those from xs_Float.h * Replace multiple Q16.16 conversions from 0 to just be 0. * Replaced all found in-game bit-shifts and multiplications/divisions with inline functions from m_fixed.h * Replaced many casts of FRACUNIT as double in SW's panel.cpp as it is converted to double by way of type promotion. * Fixed missed precision fixes in SW's panel.cpp where some types weren't declared correctly. * Replaced 100+ `Cos()/Sin() >> 16` operations for Blood with inline functions `CosScale16()/SinScale16()`.
2020-09-01 13:00:35 +00:00
int dx = CosScale16(pSprite->ang);
int dy = SinScale16(pSprite->ang);
- added NBlood source.
2019-09-19 22:42:45 +00:00
int dz = gDudeSlope[nXSprite];
dx += Random2(1500);
dy += Random2(1500);
dz += Random2(1500);
for (int i = 0; i < 2; i++)
{
int r1 = Random3(500);
int r2 = Random3(1000);
int r3 = Random3(1000);
actFireVector(pSprite, 0, 0, dx+r3, dy+r2, dz+r1, VECTOR_TYPE_1);
}
if (Chance(0x8000))
sfxPlay3DSound(pSprite, 10000+Random(5), -1, 0);
if (Chance(0x8000))
sfxPlay3DSound(pSprite, 1001, -1, 0);
else
sfxPlay3DSound(pSprite, 1002, -1, 0);
}
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
static void calebThinkSearch(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
aiChooseDirection(pSprite, pXSprite, pXSprite->goalAng);
aiThinkTarget(pSprite, pXSprite);
}
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
static void calebThinkGoto(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- added NBlood source.
2019-09-19 22:42:45 +00:00
XSECTOR *pXSector;
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0)
pXSector = &xsector[nXSector];
else
pXSector = NULL;
int dx = pXSprite->targetX-pSprite->x;
int dy = pXSprite->targetY-pSprite->y;
int nAngle = getangle(dx, dy);
int nDist = approxDist(dx, dy);
aiChooseDirection(pSprite, pXSprite, nAngle);
if (nDist < 512 && klabs(pSprite->ang - nAngle) < pDudeInfo->periphery)
{
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
else
aiNewState(pSprite, pXSprite, &tinycalebSearch);
}
aiThinkTarget(pSprite, pXSprite);
}
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
static void calebThinkChase(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
if (pXSprite->target == -1)
{
XSECTOR *pXSector;
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0)
pXSector = &xsector[nXSector];
else
pXSector = NULL;
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
else
aiNewState(pSprite, pXSprite, &tinycalebSearch);
return;
}
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pXSprite->target >= 0 && pXSprite->target < kMaxSprites);
- added NBlood source.
2019-09-19 22:42:45 +00:00
spritetype *pTarget = &sprite[pXSprite->target];
XSPRITE *pXTarget = &xsprite[pTarget->extra];
int dx = pTarget->x-pSprite->x;
int dy = pTarget->y-pSprite->y;
aiChooseDirection(pSprite, pXSprite, getangle(dx, dy));
if (pXTarget->health == 0)
{
XSECTOR *pXSector;
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0)
pXSector = &xsector[nXSector];
else
pXSector = NULL;
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
else
{
aiPlay3DSound(pSprite, 11000+Random(4), AI_SFX_PRIORITY_1, -1);
aiNewState(pSprite, pXSprite, &tinycalebSearch);
}
return;
}
- Refactor: added names for powerups and updated some old. - AI: there is printing error message in conosole added (instead of dassert) - Updates for Player Control modern type # Conflicts: # source/blood/src/actor.cpp # source/blood/src/actor.h # source/blood/src/globals.cpp # source/blood/src/globals.h # source/blood/src/player.h # source/blood/src/sound.cpp # source/blood/src/triggers.cpp # source/blood/src/triggers.h # source/blood/src/view.cpp # source/blood/src/weapon.cpp # source/blood/src/weapon.h
2019-10-19 19:11:39 +00:00
if (IsPlayerSprite(pTarget) && powerupCheck(&gPlayer[pTarget->type-kDudePlayer1], kPwUpShadowCloak) > 0)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
XSECTOR *pXSector;
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0)
pXSector = &xsector[nXSector];
else
pXSector = NULL;
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
else
aiNewState(pSprite, pXSprite, &tinycalebSearch);
return;
}
int nDist = approxDist(dx, dy);
if (nDist <= pDudeInfo->seeDist)
{
int nDeltaAngle = ((getangle(dx,dy)+1024-pSprite->ang)&2047)-1024;
int height = (pDudeInfo->eyeHeight*pSprite->yrepeat)<<2;
if (cansee(pTarget->x, pTarget->y, pTarget->z, pTarget->sectnum, pSprite->x, pSprite->y, pSprite->z - height, pSprite->sectnum))
{
if (nDist < pDudeInfo->seeDist && klabs(nDeltaAngle) <= pDudeInfo->periphery)
{
aiSetTarget(pXSprite, pXSprite->target);
int nXSprite = sprite[pXSprite->reference].extra;
gDudeSlope[nXSprite] = divscale(pTarget->z-pSprite->z, nDist, 10);
if (nDist < 0x599 && klabs(nDeltaAngle) < 28)
{
XSECTOR *pXSector;
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0)
pXSector = &xsector[nXSector];
else
pXSector = NULL;
int hit = HitScan(pSprite, pSprite->z, dx, dy, 0, CLIPMASK1, 0);
switch (hit)
{
case -1:
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimAttack);
else
aiNewState(pSprite, pXSprite, &tinycalebAttack);
break;
case 3:
if (pSprite->type != sprite[gHitInfo.hitsprite].type)
{
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimAttack);
else
aiNewState(pSprite, pXSprite, &tinycalebAttack);
}
else
{
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimDodge);
else
aiNewState(pSprite, pXSprite, &tinycalebDodge);
}
break;
default:
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimAttack);
else
aiNewState(pSprite, pXSprite, &tinycalebAttack);
break;
}
}
}
return;
}
}
XSECTOR *pXSector;
int nXSector = sector[pSprite->sectnum].extra;
if (nXSector > 0)
pXSector = &xsector[nXSector];
else
pXSector = NULL;
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &tinycalebSwimGoto);
else
aiNewState(pSprite, pXSprite, &tinycalebGoto);
if (Chance(0x2000))
sfxPlay3DSound(pSprite, 10000 + Random(5), -1, 0);
pXSprite->target = -1;
}
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
static void calebThinkSwimGoto(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- added NBlood source.
2019-09-19 22:42:45 +00:00
int dx = pXSprite->targetX-pSprite->x;
int dy = pXSprite->targetY-pSprite->y;
int nAngle = getangle(dx, dy);
int nDist = approxDist(dx, dy);
aiChooseDirection(pSprite, pXSprite, nAngle);
if (nDist < 512 && klabs(pSprite->ang - nAngle) < pDudeInfo->periphery)
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
aiThinkTarget(pSprite, pXSprite);
}
- use distinct names for monster AI variables and functions. I was just toying around with compiling all of these as a single unit and that uniform naming made it impossible.
2020-10-11 09:56:27 +00:00
static void calebThinkSwimChase(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
if (pXSprite->target == -1)
{
aiNewState(pSprite, pXSprite, &tinycalebSwimGoto);
return;
}
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pXSprite->target >= 0 && pXSprite->target < kMaxSprites);
- added NBlood source.
2019-09-19 22:42:45 +00:00
spritetype *pTarget = &sprite[pXSprite->target];
XSPRITE *pXTarget = &xsprite[pTarget->extra];
int dx = pTarget->x-pSprite->x;
int dy = pTarget->y-pSprite->y;
aiChooseDirection(pSprite, pXSprite, getangle(dx, dy));
if (pXTarget->health == 0)
{
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
return;
}
- Refactor: added names for powerups and updated some old. - AI: there is printing error message in conosole added (instead of dassert) - Updates for Player Control modern type # Conflicts: # source/blood/src/actor.cpp # source/blood/src/actor.h # source/blood/src/globals.cpp # source/blood/src/globals.h # source/blood/src/player.h # source/blood/src/sound.cpp # source/blood/src/triggers.cpp # source/blood/src/triggers.h # source/blood/src/view.cpp # source/blood/src/weapon.cpp # source/blood/src/weapon.h
2019-10-19 19:11:39 +00:00
if (IsPlayerSprite(pTarget) && powerupCheck(&gPlayer[pTarget->type-kDudePlayer1], kPwUpShadowCloak) > 0)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
aiNewState(pSprite, pXSprite, &tinycalebSwimSearch);
return;
}
int nDist = approxDist(dx, dy);
if (nDist <= pDudeInfo->seeDist)
{
int nDeltaAngle = ((getangle(dx,dy)+1024-pSprite->ang)&2047)-1024;
int height = pDudeInfo->eyeHeight+pSprite->z;
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
if (cansee(pTarget->x, pTarget->y, pTarget->z, pTarget->sectnum, pSprite->x, pSprite->y, pSprite->z - height, pSprite->sectnum))
{
if (nDist < pDudeInfo->seeDist && klabs(nDeltaAngle) <= pDudeInfo->periphery)
{
aiSetTarget(pXSprite, pXSprite->target);
if (nDist < 0x400 && klabs(nDeltaAngle) < 85)
aiNewState(pSprite, pXSprite, &tinycalebSwimAttack);
else
aiNewState(pSprite, pXSprite, &tinycaleb13967C);
}
}
return;
}
aiNewState(pSprite, pXSprite, &tinycalebSwimGoto);
pXSprite->target = -1;
}
static void sub_65D04(spritetype *pSprite, XSPRITE *pXSprite)
{
int nSprite = pSprite->index;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- added NBlood source.
2019-09-19 22:42:45 +00:00
int nAng = ((pXSprite->goalAng+1024-pSprite->ang)&2047)-1024;
int nTurnRange = (pDudeInfo->angSpeed<<2)>>4;
pSprite->ang = (pSprite->ang+ClipRange(nAng, -nTurnRange, nTurnRange))&2047;
int nAccel = pDudeInfo->frontSpeed<<2;
if (klabs(nAng) > 341)
return;
if (pXSprite->target == -1)
pSprite->ang = (pSprite->ang+256)&2047;
int dx = pXSprite->targetX-pSprite->x;
int dy = pXSprite->targetY-pSprite->y;
int nDist = approxDist(dx, dy);
if (Random(64) < 32 && nDist <= 0x400)
return;
int nCos = Cos(pSprite->ang);
int nSin = Sin(pSprite->ang);
int vx = xvel[nSprite];
int vy = yvel[nSprite];
int t1 = dmulscale30(vx, nCos, vy, nSin);
int t2 = dmulscale30(vx, nSin, -vy, nCos);
if (pXSprite->target == -1)
t1 += nAccel;
else
t1 += nAccel>>2;
xvel[nSprite] = dmulscale30(t1, nCos, t2, nSin);
yvel[nSprite] = dmulscale30(t1, nSin, -t2, nCos);
}
static void sub_65F44(spritetype *pSprite, XSPRITE *pXSprite)
{
int nSprite = pSprite->index;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- added NBlood source.
2019-09-19 22:42:45 +00:00
spritetype *pTarget = &sprite[pXSprite->target];
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
int z = pSprite->z + getDudeInfo(pSprite->type)->eyeHeight;
int z2 = pTarget->z + getDudeInfo(pTarget->type)->eyeHeight;
- added NBlood source.
2019-09-19 22:42:45 +00:00
int nAng = ((pXSprite->goalAng+1024-pSprite->ang)&2047)-1024;
int nTurnRange = (pDudeInfo->angSpeed<<2)>>4;
pSprite->ang = (pSprite->ang+ClipRange(nAng, -nTurnRange, nTurnRange))&2047;
int nAccel = pDudeInfo->frontSpeed<<2;
if (klabs(nAng) > 341)
{
pXSprite->goalAng = (pSprite->ang+512)&2047;
return;
}
int dx = pXSprite->targetX-pSprite->x;
int dy = pXSprite->targetY-pSprite->y;
int dz = z2 - z;
int nDist = approxDist(dx, dy);
if (Chance(0x600) && nDist <= 0x400)
return;
int nCos = Cos(pSprite->ang);
int nSin = Sin(pSprite->ang);
int vx = xvel[nSprite];
int vy = yvel[nSprite];
int t1 = dmulscale30(vx, nCos, vy, nSin);
int t2 = dmulscale30(vx, nSin, -vy, nCos);
t1 += nAccel;
xvel[nSprite] = dmulscale30(t1, nCos, t2, nSin);
yvel[nSprite] = dmulscale30(t1, nSin, -t2, nCos);
zvel[nSprite] = -dz;
}
static void sub_661E0(spritetype *pSprite, XSPRITE *pXSprite)
{
int nSprite = pSprite->index;
- cleanup of the remaining homegrown Blood wrappers. consoleSysMsg and dassert are gone now, all places now call the system implementation directly.
2020-10-11 10:38:17 +00:00
assert(pSprite->type >= kDudeBase && pSprite->type < kDudeMax);
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
DUDEINFO *pDudeInfo = getDudeInfo(pSprite->type);
- added NBlood source.
2019-09-19 22:42:45 +00:00
spritetype *pTarget = &sprite[pXSprite->target];
Blood: workaround dudeInfo OOB issue # Conflicts: # source/blood/src/actor.cpp # source/blood/src/demo.cpp # source/blood/src/dude.cpp # source/blood/src/dude.h
2020-02-05 21:17:05 +00:00
int z = pSprite->z + getDudeInfo(pSprite->type)->eyeHeight;
int z2 = pTarget->z + getDudeInfo(pTarget->type)->eyeHeight;
- added NBlood source.
2019-09-19 22:42:45 +00:00
int nAng = ((pXSprite->goalAng+1024-pSprite->ang)&2047)-1024;
int nTurnRange = (pDudeInfo->angSpeed<<2)>>4;
pSprite->ang = (pSprite->ang+ClipRange(nAng, -nTurnRange, nTurnRange))&2047;
int nAccel = pDudeInfo->frontSpeed<<2;
if (klabs(nAng) > 341)
{
pSprite->ang = (pSprite->ang+512)&2047;
return;
}
int dx = pXSprite->targetX-pSprite->x;
int dy = pXSprite->targetY-pSprite->y;
int dz = (z2 - z)<<3;
int nDist = approxDist(dx, dy);
if (Chance(0x4000) && nDist <= 0x400)
return;
int nCos = Cos(pSprite->ang);
int nSin = Sin(pSprite->ang);
int vx = xvel[nSprite];
int vy = yvel[nSprite];
int t1 = dmulscale30(vx, nCos, vy, nSin);
int t2 = dmulscale30(vx, nSin, -vy, nCos);
t1 += nAccel>>1;
xvel[nSprite] = dmulscale30(t1, nCos, t2, nSin);
yvel[nSprite] = dmulscale30(t1, nSin, -t2, nCos);
zvel[nSprite] = dz;
}
- put all Blood game code into a namespace.
2019-09-22 06:39:22 +00:00
END_BLD_NS
Reference in a new issue Copy permalink