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

578 lines
23 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 MorphToBeast(spritetype *, XSPRITE *);
- 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 beastThinkSearch(spritetype *, XSPRITE *);
static void beastThinkGoto(spritetype *, XSPRITE *);
static void beastThinkChase(spritetype *, XSPRITE *);
static void beastThinkSwimGoto(spritetype *, XSPRITE *);
static void beastThinkSwimChase(spritetype *, XSPRITE *);
static void beastMoveForward(spritetype *, XSPRITE *);
- added NBlood source.
2019-09-19 22:42:45 +00:00
static void sub_628A0(spritetype *, XSPRITE *);
static void sub_62AE0(spritetype *, XSPRITE *);
static void sub_62D7C(spritetype *, XSPRITE *);
AISTATE beastIdle = {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 beastChase = {kAiStateChase, 8, -1, 0, NULL, beastMoveForward, beastThinkChase, NULL };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE beastDodge = { kAiStateMove, 8, -1, 60, NULL, aiMoveDodge, NULL, &beastChase };
- 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 beastGoto = { kAiStateMove, 8, -1, 600, NULL, beastMoveForward, beastThinkGoto, &beastIdle };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE beastSlash = { kAiStateChase, 6, nSlashClient, 120, NULL, NULL, NULL, &beastChase };
AISTATE beastStomp = { kAiStateChase, 7, nStompClient, 120, NULL, NULL, NULL, &beastChase };
- 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 beastSearch = { kAiStateSearch, 8, -1, 120, NULL, beastMoveForward, beastThinkSearch, &beastIdle };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE beastRecoil = { kAiStateRecoil, 5, -1, 0, NULL, NULL, NULL, &beastDodge };
AISTATE beastTeslaRecoil = { kAiStateRecoil, 4, -1, 0, NULL, NULL, NULL, &beastDodge };
AISTATE beastSwimIdle = {kAiStateIdle, 9, -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 beastSwimChase = { kAiStateChase, 9, -1, 0, NULL, sub_628A0, beastThinkSwimChase, NULL };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE beastSwimDodge = { kAiStateMove, 9, -1, 90, NULL, aiMoveDodge, NULL, &beastSwimChase };
- 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 beastSwimGoto = { kAiStateMove, 9, -1, 600, NULL, beastMoveForward, beastThinkSwimGoto, &beastSwimIdle };
AISTATE beastSwimSearch = { kAiStateSearch, 9, -1, 120, NULL, beastMoveForward, beastThinkSearch, &beastSwimIdle };
AISTATE beastSwimSlash = { kAiStateChase, 9, nSlashClient, 0, NULL, NULL, beastThinkSwimChase, &beastSwimChase };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE beastSwimRecoil = { kAiStateRecoil, 5, -1, 0, NULL, NULL, NULL, &beastSwimDodge };
AISTATE beastMorphToBeast = { kAiStateOther, -1, -1, 0, MorphToBeast, NULL, NULL, &beastIdle };
AISTATE beastMorphFromCultist = { kAiStateOther, 2576, -1, 0, NULL, NULL, NULL, &beastMorphToBeast };
- 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 beast138FB4 = { kAiStateOther, 9, -1, 120, NULL, sub_62AE0, beastThinkSwimChase, &beastSwimChase };
AISTATE beast138FD0 = { kAiStateOther, 9, -1, 0, NULL, sub_62D7C, beastThinkSwimChase, &beastSwimChase };
- added NBlood source.
2019-09-19 22:42:45 +00:00
AISTATE beast138FEC = { kAiStateOther, 9, -1, 120, NULL, aiMoveTurn, NULL, &beastSwimChase };
- use a static table for SEQ callbacks. This ensures that callback indices are consistent. Runtime registration as performed by NBlood has undefined order and will make savegames non-transferrable.
2020-11-21 15:34:32 +00:00
void SlashSeqCallback(int, int nXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
XSPRITE *pXSprite = &xsprite[nXSprite];
int nSprite = pXSprite->reference;
spritetype *pSprite = &sprite[nSprite];
spritetype *pTarget = &sprite[pXSprite->target];
- 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
// Correct ?
int dz = pSprite->z-pTarget->z;
dx += Random3(4000-700*gGameOptions.nDifficulty);
dy += Random3(4000-700*gGameOptions.nDifficulty);
actFireVector(pSprite, 0, 0, dx, dy, dz, VECTOR_TYPE_13);
actFireVector(pSprite, 0, 0, dx, dy, dz, VECTOR_TYPE_13);
actFireVector(pSprite, 0, 0, dx, dy, dz, VECTOR_TYPE_13);
sfxPlay3DSound(pSprite, 9012+Random(2), -1, 0);
}
- use a static table for SEQ callbacks. This ensures that callback indices are consistent. Runtime registration as performed by NBlood has undefined order and will make savegames non-transferrable.
2020-11-21 15:34:32 +00:00
void StompSeqCallback(int, int nXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
- use iterator class for all stat loops in Blood's actor.cpp.
2020-10-15 15:08:21 +00:00
uint8_t vb8[(kMaxSectors+7)>>3];
- added NBlood source.
2019-09-19 22:42:45 +00:00
XSPRITE *pXSprite = &xsprite[nXSprite];
int nSprite = pXSprite->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 x = pSprite->x;
int y = pSprite->y;
int z = pSprite->z;
int vc = 400;
int nSector = pSprite->sectnum;
int v1c = 5+2*gGameOptions.nDifficulty;
int v10 = 25+30*gGameOptions.nDifficulty;
- JSON serializer for actor. Also cleaned up use of gAffectedSectors and gAffectedXWalls. These are merely needed as local worker variables, not as global persistent status.
2020-11-21 20:31:50 +00:00
GetClosestSpriteSectors(nSector, x, y, vc, vb8);
- added NBlood source.
2019-09-19 22:42:45 +00:00
char v4 = 0;
int v34 = -1;
int hit = HitScan(pSprite, pSprite->z, dx, dy, 0, CLIPMASK1, 0);
actHitcodeToData(hit, &gHitInfo, &v34, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
if (hit == 3 && v34 >= 0)
{
- Added names for statnums - Added names for system RX/TX channels - Detect if map requires new features to work properly via special TX and command - Effect Gen update # Conflicts: # source/blood/src/actor.cpp # source/blood/src/eventq.h # source/blood/src/triggers.cpp # source/blood/src/triggers.h
2019-10-07 19:29:52 +00:00
if (sprite[v34].statnum == kStatDude)
- added NBlood source.
2019-09-19 22:42:45 +00:00
v4 = 0;
}
vc <<= 4;
- all Blood stat iterators ported.
2020-10-15 15:15:45 +00:00
int nSprite2;
StatIterator it1(kStatDude);
while ((nSprite2 = it1.NextIndex()) >= 0)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
if (nSprite != nSprite2 || v4)
{
spritetype *pSprite2 = &sprite[nSprite2];
if (pSprite2->extra > 0 && pSprite2->extra < kMaxXSprites)
{
- Added names for callbacks - Added names for sprite, wall and sector types - Added gModernMap protection for using new features only on different version of map # Conflicts: # source/blood/src/actor.cpp # source/blood/src/callback.cpp # source/blood/src/callback.h # source/blood/src/triggers.h
2019-10-11 21:59:39 +00:00
if (pSprite2->type == kDudeBeast)
- added NBlood source.
2019-09-19 22:42:45 +00:00
continue;
More meaningful names for build object struct members
2019-09-30 07:18:01 +00:00
if (pSprite2->flags&32)
- added NBlood source.
2019-09-19 22:42:45 +00:00
continue;
if (TestBitString(vb8, pSprite2->sectnum) && CheckProximity(pSprite2, x, y, z, nSector, vc))
{
int top, bottom;
GetSpriteExtents(pSprite, &top, &bottom);
if (klabs(bottom-sector[nSector].floorz) == 0)
{
int dx = klabs(pSprite->x-pSprite2->x);
int dy = klabs(pSprite->y-pSprite2->y);
int nDist2 = ksqrt(dx*dx + dy*dy);
if (nDist2 <= vc)
{
int nDamage;
if (!nDist2)
nDamage = v1c + v10;
else
nDamage = v1c + ((vc-nDist2)*v10)/vc;
if (IsPlayerSprite(pSprite2))
Refactor: - PLAYER.H structs - ACTOR.H structs # Conflicts: # source/blood/src/db.h # source/blood/src/player.h
2019-10-21 19:46:41 +00:00
gPlayer[pSprite2->type-kDudePlayer1].quakeEffect += nDamage*4;
- added NBlood source.
2019-09-19 22:42:45 +00:00
actDamageSprite(nSprite, pSprite2, DAMAGE_TYPE_0, nDamage<<4);
}
}
}
}
}
}
- all Blood stat iterators ported.
2020-10-15 15:15:45 +00:00
it1.Reset(kStatThing);
while ((nSprite2 = it1.NextIndex()) >= 0)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
spritetype *pSprite2 = &sprite[nSprite2];
More meaningful names for build object struct members
2019-09-30 07:18:01 +00:00
if (pSprite2->flags&32)
- added NBlood source.
2019-09-19 22:42:45 +00:00
continue;
if (TestBitString(vb8, pSprite2->sectnum) && CheckProximity(pSprite2, x, y, z, nSector, vc))
{
XSPRITE *pXSprite = &xsprite[pSprite2->extra];
if (pXSprite->locked)
continue;
int dx = klabs(pSprite->x-pSprite2->x);
int dy = klabs(pSprite->y-pSprite2->y);
int nDist2 = ksqrt(dx*dx + dy*dy);
if (nDist2 <= vc)
{
int nDamage;
if (!nDist2)
nDamage = v1c + v10;
else
nDamage = v1c + ((vc-nDist2)*v10)/vc;
if (IsPlayerSprite(pSprite2))
Refactor: - PLAYER.H structs - ACTOR.H structs # Conflicts: # source/blood/src/db.h # source/blood/src/player.h
2019-10-21 19:46:41 +00:00
gPlayer[pSprite2->type-kDudePlayer1].quakeEffect += nDamage*4;
- added NBlood source.
2019-09-19 22:42:45 +00:00
actDamageSprite(nSprite, pSprite2, DAMAGE_TYPE_0, nDamage<<4);
}
}
}
sfxPlay3DSound(pSprite, 9015+Random(2), -1, 0);
}
static void MorphToBeast(spritetype *pSprite, XSPRITE *pXSprite)
{
actHealDude(pXSprite, dudeInfo[51].startHealth, dudeInfo[51].startHealth);
- Added names for callbacks - Added names for sprite, wall and sector types - Added gModernMap protection for using new features only on different version of map # Conflicts: # source/blood/src/actor.cpp # source/blood/src/callback.cpp # source/blood/src/callback.h # source/blood/src/triggers.h
2019-10-11 21:59:39 +00:00
pSprite->type = kDudeBeast;
- added NBlood source.
2019-09-19 22:42:45 +00:00
}
- 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 beastThinkSearch(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 beastThinkGoto(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, &beastSwimSearch);
else
aiNewState(pSprite, pXSprite, &beastSearch);
}
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 beastThinkChase(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, &beastSwimSearch);
else
aiNewState(pSprite, pXSprite, &beastSearch);
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, &beastSwimSearch);
else
aiNewState(pSprite, pXSprite, &beastSearch);
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, &beastSwimSearch);
else
aiNewState(pSprite, pXSprite, &beastSearch);
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);
More meaningful names for build object struct members
2019-09-30 07:18:01 +00:00
if (nDist < 0x1400 && nDist > 0xa00 && klabs(nDeltaAngle) < 85 && (pTarget->flags&2)
- added NBlood source.
2019-09-19 22:42:45 +00:00
&& IsPlayerSprite(pTarget) && Chance(0x8000))
{
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);
if (pXTarget->health > gPlayerTemplate[0].startHealth/2)
{
switch (hit)
{
case -1:
if (!pXSector || !pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastStomp);
break;
case 3:
if (pSprite->type != sprite[gHitInfo.hitsprite].type)
{
if (!pXSector || !pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastStomp);
}
else
{
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastSwimDodge);
else
aiNewState(pSprite, pXSprite, &beastDodge);
}
break;
default:
if (!pXSector || !pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastStomp);
break;
}
}
}
if (nDist < 921 && 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, &beastSwimSlash);
else
aiNewState(pSprite, pXSprite, &beastSlash);
break;
case 3:
if (pSprite->type != sprite[gHitInfo.hitsprite].type)
{
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastSwimSlash);
else
aiNewState(pSprite, pXSprite, &beastSlash);
}
else
{
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastSwimDodge);
else
aiNewState(pSprite, pXSprite, &beastDodge);
}
break;
default:
if (pXSector && pXSector->Underwater)
aiNewState(pSprite, pXSprite, &beastSwimSlash);
else
aiNewState(pSprite, pXSprite, &beastSlash);
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, &beastSwimGoto);
else
aiNewState(pSprite, pXSprite, &beastGoto);
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 beastThinkSwimGoto(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, &beastSwimSearch);
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 beastThinkSwimChase(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
if (pXSprite->target == -1)
{
aiNewState(pSprite, pXSprite, &beastSwimGoto);
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, &beastSwimSearch);
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, &beastSwimSearch);
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, &beastSwimSlash);
else
{
aiPlay3DSound(pSprite, 9009+Random(2), AI_SFX_PRIORITY_1, -1);
aiNewState(pSprite, pXSprite, &beast138FD0);
}
}
}
else
aiNewState(pSprite, pXSprite, &beast138FD0);
return;
}
aiNewState(pSprite, pXSprite, &beastSwimGoto);
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 beastMoveForward(spritetype *pSprite, XSPRITE *pXSprite)
- added NBlood source.
2019-09-19 22:42:45 +00:00
{
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;
if (klabs(nAng) > 341)
return;
int dx = pXSprite->targetX-pSprite->x;
int dy = pXSprite->targetY-pSprite->y;
int nDist = approxDist(dx, dy);
if (nDist <= 0x400 && Random(64) < 32)
return;
xvel[nSprite] += mulscale30(pDudeInfo->frontSpeed, Cos(pSprite->ang));
yvel[nSprite] += mulscale30(pDudeInfo->frontSpeed, Sin(pSprite->ang));
}
static void sub_628A0(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_62AE0(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_62D7C(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