mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Clean up private function names

pull/2368/head
Anders Jenbo 5 years ago
parent
4bf4e42230
commit
ef6275caac
21 changed files with 478 additions and 480 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Source/DiabloUI/diabloui.h
  2. 6
      Source/DiabloUI/dialogs.h
  3. 2
      Source/capture.cpp
  4. 2
      Source/codec.cpp
  5. 2
      Source/dead.cpp
  6. 2
      Source/debug.cpp
  7. 2
      Source/lighting.cpp
  8. 2
      Source/lighting.h
  9. 46
      Source/loadsave.cpp
  10. 26
      Source/mainmenu.cpp
  11. 90
      Source/missiles.cpp
  12. 2
      Source/monstdat.cpp
  13. 2
      Source/monstdat.h
  14. 731
      Source/monster.cpp
  15. 6
      Source/monster.h
  16. 2
      Source/msg.cpp
  17. 1
      Source/objects.h
  18. 4
      Source/player.cpp
  19. 4
      Source/quests.cpp
  20. 6
      Source/scrollrt.cpp
  21. 18
      Source/setmaps.cpp

2
Source/DiabloUI/diabloui.h
Unescape View File

@ -113,7 +113,7 @@ Sint16 GetCenterOffset(Sint16 w, Sint16 bw = 0);
void LoadPalInMem(const SDL_Color *pPal);
void DrawMouse();
void LoadBackgroundArt(const char *pszFile, int frames = 1);
void UiAddBackground(std::vector<std::unique_ptr<UiItemBase> > *vecDialog);
void UiAddBackground(std::vector<std::unique_ptr<UiItemBase>> *vecDialog);
void UiAddLogo(std::vector<std::unique_ptr<UiItemBase>> *vecDialog, int size = LOGO_MED, int y = 0);
void UiFocusNavigationSelect();
void UiFocusNavigationEsc();

6
Source/DiabloUI/dialogs.h
Unescape View File

@ -6,8 +6,8 @@
namespace devilution {
void UiErrorOkDialog(const char *text, const std::vector<std::unique_ptr<UiItemBase> > &renderBehind);
void UiErrorOkDialog(const char *text, const char *caption, const std::vector<std::unique_ptr<UiItemBase> > &renderBehind);
void UiOkDialog(const char *text, const char *caption, bool error, const std::vector<std::unique_ptr<UiItemBase> > &renderBehind);
void UiErrorOkDialog(const char *text, const std::vector<std::unique_ptr<UiItemBase>> &renderBehind);
void UiErrorOkDialog(const char *text, const char *caption, const std::vector<std::unique_ptr<UiItemBase>> &renderBehind);
void UiOkDialog(const char *text, const char *caption, bool error, const std::vector<std::unique_ptr<UiItemBase>> &renderBehind);
} // namespace devilution

2
Source/capture.cpp
Unescape View File

@ -16,7 +16,7 @@
#include "utils/ui_fwd.h"
namespace devilution {
namespace {
namespace {
/**
* @brief Write the PCX-file header

2
Source/codec.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "utils/stdcompat/cstddef.hpp"
namespace devilution {
namespace {
namespace {
struct CodecSignature {
uint32_t checksum;

2
Source/dead.cpp
Unescape View File

@ -19,7 +19,7 @@ namespace {
void InitDeadAnimationFromMonster(DeadStruct &dead, const CMonster &mon)
{
int i = 0;
auto &animData = mon.GetAnimData(MonsterGraphic::Death);
const auto &animData = mon.GetAnimData(MonsterGraphic::Death);
for (const auto &celSprite : animData.CelSpritesForDirections)
dead.data[i++] = celSprite->Data();
dead.frame = animData.Frames;

2
Source/debug.cpp
Unescape View File

@ -18,7 +18,7 @@ std::optional<CelSprite> pSquareCel;
#ifdef _DEBUG
namespace {
namespace {
char dMonsDbg[NUMLEVELS][MAXDUNX][MAXDUNY];
char dFlagDbg[NUMLEVELS][MAXDUNX][MAXDUNY];

2
Source/lighting.cpp
Unescape View File

@ -1023,7 +1023,7 @@ void ChangeLightXY(int i, Point position)
UpdateLighting = true;
}
void ChangeLightOff(int i, Point position)
void ChangeLightOffset(int i, Point position)
{
if (DisableLighting || i == NO_LIGHT) {
return;

2
Source/lighting.h
Unescape View File

@ -60,7 +60,7 @@ int AddLight(Point position, int r);
void AddUnLight(int i);
void ChangeLightRadius(int i, int r);
void ChangeLightXY(int i, Point position);
void ChangeLightOff(int i, Point position);
void ChangeLightOffset(int i, Point position);
void ChangeLight(int i, Point position, int r);
void ProcessLightList();
void SavePreLighting();

46
Source/loadsave.cpp
Unescape View File

@ -207,7 +207,7 @@ public:
}
};
static void LoadItemData(LoadHelper *file, ItemStruct *pItem)
void LoadItemData(LoadHelper *file, ItemStruct *pItem)
{
pItem->_iSeed = file->NextLE<int32_t>();
pItem->_iCreateInfo = file->NextLE<uint16_t>();
@ -297,14 +297,14 @@ static void LoadItemData(LoadHelper *file, ItemStruct *pItem)
RemoveInvalidItem(pItem);
}
static void LoadItems(LoadHelper *file, const int n, ItemStruct *pItem)
void LoadItems(LoadHelper *file, const int n, ItemStruct *pItem)
{
for (int i = 0; i < n; i++) {
LoadItemData(file, &pItem[i]);
}
}
static void LoadPlayer(LoadHelper *file, int p)
void LoadPlayer(LoadHelper *file, int p)
{
auto &player = Players[p];
@ -532,7 +532,7 @@ static void LoadPlayer(LoadHelper *file, int p)
bool gbSkipSync = false;
static void LoadMonster(LoadHelper *file, int i)
void LoadMonster(LoadHelper *file, int i)
{
MonsterStruct *pMonster = &Monsters[i];
@ -637,7 +637,7 @@ static void LoadMonster(LoadHelper *file, int i)
SyncMonsterAnim(i);
}
static void LoadMissile(LoadHelper *file, int i)
void LoadMissile(LoadHelper *file, int i)
{
MissileStruct *pMissile = &Missiles[i];
@ -688,7 +688,7 @@ static void LoadMissile(LoadHelper *file, int i)
pMissile->limitReached = file->NextBool32();
}
static void LoadObject(LoadHelper *file, int i)
void LoadObject(LoadHelper *file, int i)
{
ObjectStruct *pObject = &Objects[i];
@ -727,18 +727,18 @@ static void LoadObject(LoadHelper *file, int i)
pObject->_oVar8 = file->NextLE<int32_t>();
}
static void LoadItem(LoadHelper *file, int i)
void LoadItem(LoadHelper *file, int i)
{
LoadItemData(file, &Items[i]);
GetItemFrm(i);
}
static void LoadPremium(LoadHelper *file, int i)
void LoadPremium(LoadHelper *file, int i)
{
LoadItemData(file, &premiumitems[i]);
}
static void LoadQuest(LoadHelper *file, int i)
void LoadQuest(LoadHelper *file, int i)
{
QuestStruct *pQuest = &Quests[i];
@ -770,7 +770,7 @@ static void LoadQuest(LoadHelper *file, int i)
file->Skip(sizeof(int32_t)); // Skip DoomQuestState
}
static void LoadLighting(LoadHelper *file, LightStruct *pLight)
void LoadLighting(LoadHelper *file, LightStruct *pLight)
{
pLight->position.tile.x = file->NextLE<int32_t>();
pLight->position.tile.y = file->NextLE<int32_t>();
@ -787,7 +787,7 @@ static void LoadLighting(LoadHelper *file, LightStruct *pLight)
pLight->_lflags = file->NextBool32();
}
static void LoadPortal(LoadHelper *file, int i)
void LoadPortal(LoadHelper *file, int i)
{
PortalStruct *pPortal = &Portals[i];
@ -799,7 +799,7 @@ static void LoadPortal(LoadHelper *file, int i)
pPortal->setlvl = file->NextBool32();
}
static void ConvertLevels()
void ConvertLevels()
{
// Backup current level state
bool tmpSetlevel = setlevel;
@ -849,7 +849,7 @@ static void ConvertLevels()
leveltype = tmpLeveltype;
}
static void LoadMatchingItems(LoadHelper *file, const int n, ItemStruct *pItem)
void LoadMatchingItems(LoadHelper *file, const int n, ItemStruct *pItem)
{
ItemStruct tempItem;
@ -874,7 +874,7 @@ void RemoveEmptyLevelItems()
}
}
static void SaveItem(SaveHelper *file, ItemStruct *pItem)
void SaveItem(SaveHelper *file, ItemStruct *pItem)
{
auto idx = pItem->IDidx;
if (!gbIsHellfire)
@ -967,14 +967,14 @@ static void SaveItem(SaveHelper *file, ItemStruct *pItem)
file->WriteLE<uint32_t>(pItem->_iDamAcFlags);
}
static void SaveItems(SaveHelper *file, ItemStruct *pItem, const int n)
void SaveItems(SaveHelper *file, ItemStruct *pItem, const int n)
{
for (int i = 0; i < n; i++) {
SaveItem(file, &pItem[i]);
}
}
static void SavePlayer(SaveHelper *file, int p)
void SavePlayer(SaveHelper *file, int p)
{
auto &player = Players[p];
@ -1196,7 +1196,7 @@ static void SavePlayer(SaveHelper *file, int p)
// Omit pointer pReserved
}
static void SaveMonster(SaveHelper *file, int i)
void SaveMonster(SaveHelper *file, int i)
{
MonsterStruct *pMonster = &Monsters[i];
@ -1288,7 +1288,7 @@ static void SaveMonster(SaveHelper *file, int i)
// Omit pointer MData;
}
static void SaveMissile(SaveHelper *file, int i)
void SaveMissile(SaveHelper *file, int i)
{
MissileStruct *pMissile = &Missiles[i];
@ -1339,7 +1339,7 @@ static void SaveMissile(SaveHelper *file, int i)
file->WriteLE<uint32_t>(pMissile->limitReached ? 1 : 0);
}
static void SaveObject(SaveHelper *file, int i)
void SaveObject(SaveHelper *file, int i)
{
ObjectStruct *pObject = &Objects[i];
@ -1378,12 +1378,12 @@ static void SaveObject(SaveHelper *file, int i)
file->WriteLE<int32_t>(pObject->_oVar8);
}
static void SavePremium(SaveHelper *file, int i)
void SavePremium(SaveHelper *file, int i)
{
SaveItem(file, &premiumitems[i]);
}
static void SaveQuest(SaveHelper *file, int i)
void SaveQuest(SaveHelper *file, int i)
{
QuestStruct *pQuest = &Quests[i];
@ -1415,7 +1415,7 @@ static void SaveQuest(SaveHelper *file, int i)
file->Skip(sizeof(int32_t)); // Skip DoomQuestState
}
static void SaveLighting(SaveHelper *file, LightStruct *pLight)
void SaveLighting(SaveHelper *file, LightStruct *pLight)
{
file->WriteLE<int32_t>(pLight->position.tile.x);
file->WriteLE<int32_t>(pLight->position.tile.y);
@ -1432,7 +1432,7 @@ static void SaveLighting(SaveHelper *file, LightStruct *pLight)
file->WriteLE<uint32_t>(pLight->_lflags ? 1 : 0);
}
static void SavePortal(SaveHelper *file, int i)
void SavePortal(SaveHelper *file, int i)
{
PortalStruct *pPortal = &Portals[i];

26
Source/mainmenu.cpp
Unescape View File

@ -21,7 +21,7 @@ namespace {
/** The active music track id for the main menu. */
uint8_t menu_music_track_id = TMUSIC_INTRO;
void mainmenu_refresh_music()
void RefreshMusic()
{
music_start(menu_music_track_id);
@ -38,7 +38,7 @@ void mainmenu_refresh_music()
} while (menu_music_track_id == TMUSIC_TOWN || menu_music_track_id == TMUSIC_L1);
}
static bool MainmenuInitMenu(_selhero_selections type)
bool InitMenu(_selhero_selections type)
{
bool success;
@ -49,31 +49,31 @@ static bool MainmenuInitMenu(_selhero_selections type)
success = StartGame(type != SELHERO_CONTINUE, type != SELHERO_CONNECT);
if (success)
mainmenu_refresh_music();
RefreshMusic();
return success;
}
static bool MainmenuSinglePlayer()
bool InitSinglePlayerMenu()
{
gbIsMultiplayer = false;
return MainmenuInitMenu(SELHERO_NEW_DUNGEON);
return InitMenu(SELHERO_NEW_DUNGEON);
}
static bool MainmenuMultiPlayer()
bool InitMultiPlayerMenu()
{
gbIsMultiplayer = true;
return MainmenuInitMenu(SELHERO_CONNECT);
return InitMenu(SELHERO_CONNECT);
}
static void MainmenuPlayIntro()
void PlayIntro()
{
music_stop();
if (gbIsHellfire)
play_movie("gendata\\Hellfire.smk", true);
else
play_movie("gendata\\diablo1.smk", true);
mainmenu_refresh_music();
RefreshMusic();
}
} // namespace
@ -116,7 +116,7 @@ void mainmenu_loop()
bool done;
_mainmenu_selections menu;
mainmenu_refresh_music();
RefreshMusic();
done = false;
do {
@ -128,11 +128,11 @@ void mainmenu_loop()
case MAINMENU_NONE:
break;
case MAINMENU_SINGLE_PLAYER:
if (!MainmenuSinglePlayer())
if (!InitSinglePlayerMenu())
done = true;
break;
case MAINMENU_MULTIPLAYER:
if (!MainmenuMultiPlayer())
if (!InitMultiPlayerMenu())
done = true;
break;
case MAINMENU_ATTRACT_MODE:
@ -140,7 +140,7 @@ void mainmenu_loop()
if (gbIsSpawn && !gbIsHellfire)
done = false;
else if (gbActive)
MainmenuPlayIntro();
PlayIntro();
break;
case MAINMENU_SHOW_CREDITS:
UiCreditsDialog();

90
Source/missiles.cpp
Unescape View File

@ -68,7 +68,7 @@ int GenerateRndSum(int range, int iterations)
return value;
}
static bool CheckBlock(Point from, Point to)
bool CheckBlock(Point from, Point to)
{
while (from != to) {
from += GetDirection(from, to);
@ -79,12 +79,12 @@ static bool CheckBlock(Point from, Point to)
return false;
}
static inline bool InDungeonBounds(Point position)
inline bool InDungeonBounds(Point position)
{
return position.x > 0 && position.x < MAXDUNX && position.y > 0 && position.y < MAXDUNY;
}
static int FindClosest(Point source, int rad)
int FindClosest(Point source, int rad)
{
if (rad > 19)
rad = 19;
@ -112,7 +112,7 @@ constexpr Direction16 Direction16Flip(Direction16 x, Direction16 pivot)
return static_cast<Direction16>(ret);
}
static void UpdateMissileVel(int i, Point source, Point destination, int v)
void UpdateMissileVelocity(int i, Point source, Point destination, int v)
{
Missiles[i].position.velocity = { 0, 0 };
@ -126,7 +126,7 @@ static void UpdateMissileVel(int i, Point source, Point destination, int v)
Missiles[i].position.velocity.deltaY = static_cast<int>((dyp * (v << 15)) / dr);
}
static void PutMissile(int8_t i)
void PutMissile(int8_t i)
{
int x = Missiles[i].position.tile.x;
int y = Missiles[i].position.tile.y;
@ -143,7 +143,7 @@ static void PutMissile(int8_t i)
}
}
static void UpdateMissilePos(int i)
void UpdateMissilePos(int i)
{
int mx = Missiles[i].position.traveled.deltaX >> 16;
int my = Missiles[i].position.traveled.deltaY >> 16;
@ -156,7 +156,7 @@ static void UpdateMissilePos(int i)
Missiles[i].position.tile = Missiles[i].position.start + Displacement { dx, dy };
Missiles[i].position.offset.deltaX = mx + (dy * 32) - (dx * 32);
Missiles[i].position.offset.deltaY = my - (dx * 16) - (dy * 16);
ChangeLightOff(Missiles[i]._mlid, { lx - (dx * 8), ly - (dy * 8) });
ChangeLightOffset(Missiles[i]._mlid, { lx - (dx * 8), ly - (dy * 8) });
}
void MoveMissilePos(int i)
@ -649,7 +649,7 @@ void FreeMissileGFX(int mi)
}
}
static bool MissilesFoundTarget(int mi, Point *position, int rad)
bool MissilesFoundTarget(int mi, Point *position, int rad)
{
rad = std::min(rad, 19);
@ -683,7 +683,7 @@ bool CheckIfTrig(Point position)
return false;
}
static int Sentfire(int i, Point src)
int GuardianTryFireAt(int i, Point src)
{
int ex = 0;
if (LineClearMissile(Missiles[i].position.tile, src)) {
@ -702,7 +702,7 @@ static int Sentfire(int i, Point src)
return ex;
}
static void FireballUpdate(int i, Displacement offset, bool alwaysDelete)
void FireballUpdate(int i, Displacement offset, bool alwaysDelete)
{
Missiles[i]._mirange--;
@ -761,7 +761,7 @@ static void FireballUpdate(int i, Displacement offset, bool alwaysDelete)
PutMissile(i);
}
static void MissileRing(int i, int type)
void MissileRing(int i, int type)
{
Missiles[i]._miDelFlag = true;
int8_t src = Missiles[i]._micaster;
@ -1498,7 +1498,7 @@ void AddBerserk(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*mienem
void AddHorkSpawn(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
{
UpdateMissileVel(mi, src, dst, 8);
UpdateMissileVelocity(mi, src, dst, 8);
Missiles[mi]._mirange = 9;
Missiles[mi]._miVar1 = midir;
PutMissile(mi);
@ -1707,7 +1707,7 @@ void AddWarp(int mi, Point src, Point /*dst*/, int /*midir*/, int8_t mienemy, in
void AddLightningWall(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int dam)
{
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
Missiles[mi]._midam = dam;
Missiles[mi]._miAnimFrame = GenerateRnd(8) + 1;
Missiles[mi]._mirange = 255 * (Missiles[mi]._mispllvl + 1);
@ -1752,7 +1752,7 @@ void AddImmolation(int mi, Point src, Point dst, int midir, int8_t mienemy, int
UseMana(id, SPL_FIREBALL);
}
UpdateMissileVel(mi, src, dst, sp);
UpdateMissileVelocity(mi, src, dst, sp);
SetMissDir(mi, GetDirection16(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -1774,7 +1774,7 @@ void AddFireNova(int mi, Point src, Point dst, int midir, int8_t mienemy, int /*
if (mienemy == TARGET_MONSTERS) {
sp += std::min(Missiles[mi]._mispllvl, 34);
}
UpdateMissileVel(mi, src, dst, sp);
UpdateMissileVelocity(mi, src, dst, sp);
SetMissDir(mi, GetDirection16(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -1790,7 +1790,7 @@ void AddLightningArrow(int mi, Point src, Point dst, int midir, int8_t /*mienemy
if (src == dst) {
dst += static_cast<Direction>(midir);
}
UpdateMissileVel(mi, src, dst, 32);
UpdateMissileVelocity(mi, src, dst, 32);
Missiles[mi]._miAnimFrame = GenerateRnd(8) + 1;
Missiles[mi]._mirange = 255;
if (id < 0) {
@ -1904,7 +1904,7 @@ void AddCboltArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int
}
Missiles[mi]._miAnimFrame = GenerateRnd(8) + 1;
Missiles[mi]._mlid = AddLight(src, 5);
UpdateMissileVel(mi, src, dst, 8);
UpdateMissileVelocity(mi, src, dst, 8);
Missiles[mi]._miVar1 = 5;
Missiles[mi]._miVar2 = midir;
Missiles[mi]._miVar3 = 0;
@ -1938,7 +1938,7 @@ void AddLArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
av -= 1;
}
}
UpdateMissileVel(mi, src, dst, av);
UpdateMissileVelocity(mi, src, dst, av);
SetMissDir(mi, GetDirection16(src, dst));
Missiles[mi]._mirange = 256;
@ -1975,7 +1975,7 @@ void AddArrow(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
av += 8;
}
}
UpdateMissileVel(mi, src, dst, av);
UpdateMissileVelocity(mi, src, dst, av);
Missiles[mi]._miAnimFrame = GetDirection16(src, dst) + 1;
Missiles[mi]._mirange = 256;
}
@ -2063,7 +2063,7 @@ void AddFirebolt(int mi, Point src, Point dst, int midir, int8_t micaster, int i
if (i == ActiveMissileCount)
UseMana(id, SPL_FIREBOLT);
}
UpdateMissileVel(mi, src, dst, sp);
UpdateMissileVelocity(mi, src, dst, sp);
SetMissDir(mi, GetDirection16(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -2073,7 +2073,7 @@ void AddFirebolt(int mi, Point src, Point dst, int midir, int8_t micaster, int i
void AddMagmaball(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
{
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
Missiles[mi].position.traveled.deltaX += 3 * Missiles[mi].position.velocity.deltaX;
Missiles[mi].position.traveled.deltaY += 3 * Missiles[mi].position.velocity.deltaY;
UpdateMissilePos(mi);
@ -2088,7 +2088,7 @@ void AddMagmaball(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*
void AddKrull(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int /*id*/, int /*dam*/)
{
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
Missiles[mi]._miVar2 = src.y;
@ -2124,7 +2124,7 @@ void AddTeleport(int mi, Point /*src*/, Point dst, int /*midir*/, int8_t /*miene
void AddLightball(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int dam)
{
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
Missiles[mi]._midam = dam;
Missiles[mi]._miAnimFrame = GenerateRnd(8) + 1;
Missiles[mi]._mirange = 255;
@ -2142,7 +2142,7 @@ void AddFirewall(int mi, Point src, Point dst, int /*midir*/, int8_t mienemy, in
Missiles[mi]._midam = GenerateRndSum(10, 2) + 2;
Missiles[mi]._midam += id >= 0 ? Players[id]._pLevel : currlevel; // BUGFIX: missing parenthesis around ternary (fixed)
Missiles[mi]._midam <<= 3;
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
int i = Missiles[mi]._mispllvl;
Missiles[mi]._mirange = 10;
if (i > 0)
@ -2170,7 +2170,7 @@ void AddFireball(int mi, Point src, Point dst, int midir, int8_t mienemy, int id
UseMana(id, SPL_FIREBALL);
}
UpdateMissileVel(mi, src, dst, sp);
UpdateMissileVelocity(mi, src, dst, sp);
SetMissDir(mi, GetDirection16(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -2187,7 +2187,7 @@ void AddLightctrl(int mi, Point src, Point dst, int /*midir*/, int8_t mienemy, i
UseMana(id, SPL_LIGHTNING);
Missiles[mi]._miVar1 = src.x;
Missiles[mi]._miVar2 = src.y;
UpdateMissileVel(mi, src, dst, 32);
UpdateMissileVelocity(mi, src, dst, 32);
Missiles[mi]._miAnimFrame = GenerateRnd(8) + 1;
Missiles[mi]._mirange = 256;
}
@ -2354,7 +2354,7 @@ void AddManashield(int mi, Point /*src*/, Point /*dst*/, int /*midir*/, int8_t m
void AddFiremove(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
{
Missiles[mi]._midam = GenerateRnd(10) + Players[id]._pLevel + 1;
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
Missiles[mi]._mirange = 255;
Missiles[mi]._miVar1 = 0;
Missiles[mi]._miVar2 = 0;
@ -2475,7 +2475,7 @@ void AddRhino(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int i
graphic = MonsterGraphic::Attack;
}
}
UpdateMissileVel(mi, src, dst, 18);
UpdateMissileVelocity(mi, src, dst, 18);
InitMissileAnimationFromMonster(Missiles[mi], midir, Monsters[id], graphic);
if (Monsters[id].MType->mtype >= MT_NSNAKE && Monsters[id].MType->mtype <= MT_GSNAKE)
Missiles[mi]._miAnimFrame = 7;
@ -2488,7 +2488,7 @@ void AddRhino(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int i
void AddFireman(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int id, int /*dam*/)
{
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
auto &mon = Monsters[id];
InitMissileAnimationFromMonster(Missiles[mi], midir, mon, MonsterGraphic::Walk);
if (mon._uniqtype != 0)
@ -2502,7 +2502,7 @@ void AddFlare(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
if (src == dst) {
dst += static_cast<Direction>(midir);
}
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
Missiles[mi]._miVar2 = src.y;
@ -2530,7 +2530,7 @@ void AddFlare(int mi, Point src, Point dst, int midir, int8_t mienemy, int id, i
void AddAcid(int mi, Point src, Point dst, int /*midir*/, int8_t /*mienemy*/, int id, int /*dam*/)
{
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
SetMissDir(mi, GetDirection16(src, dst));
if ((!gbIsHellfire && (Missiles[mi].position.velocity.deltaX & 0xFFFF0000) != 0) || (Missiles[mi].position.velocity.deltaY & 0xFFFF0000) != 0)
Missiles[mi]._mirange = 5 * (Monsters[id]._mint + 4);
@ -2717,7 +2717,7 @@ void AddElement(int mi, Point src, Point dst, int midir, int8_t /*mienemy*/, int
int dmg = 2 * (Players[id]._pLevel + GenerateRndSum(10, 2)) + 4;
Missiles[mi]._midam = ScaleSpellEffect(dmg, Missiles[mi]._mispllvl) / 2;
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
SetMissDir(mi, GetDirection(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -2933,7 +2933,7 @@ void AddFlamec(int mi, Point src, Point dst, int midir, int8_t mienemy, int id,
if (src == dst) {
dst += static_cast<Direction>(midir);
}
UpdateMissileVel(mi, src, dst, 32);
UpdateMissileVelocity(mi, src, dst, 32);
if (mienemy == TARGET_MONSTERS) {
UseMana(id, SPL_FLAME);
}
@ -2956,7 +2956,7 @@ void AddCbolt(int mi, Point src, Point dst, int midir, int8_t micaster, int id,
Missiles[mi]._miAnimFrame = GenerateRnd(8) + 1;
Missiles[mi]._mlid = AddLight(src, 5);
UpdateMissileVel(mi, src, dst, 8);
UpdateMissileVelocity(mi, src, dst, 8);
Missiles[mi]._miVar1 = 5;
Missiles[mi]._miVar2 = midir;
Missiles[mi]._miVar3 = 0;
@ -2974,7 +2974,7 @@ void AddHbolt(int mi, Point src, Point dst, int midir, int8_t /*micaster*/, int
sp += std::min(Missiles[mi]._mispllvl * 2, 47);
}
UpdateMissileVel(mi, src, dst, sp);
UpdateMissileVelocity(mi, src, dst, sp);
SetMissDir(mi, GetDirection16(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -3017,7 +3017,7 @@ void AddBoneSpirit(int mi, Point src, Point dst, int midir, int8_t mienemy, int
dst += static_cast<Direction>(midir);
}
Missiles[mi]._midam = 0;
UpdateMissileVel(mi, src, dst, 16);
UpdateMissileVelocity(mi, src, dst, 16);
SetMissDir(mi, GetDirection(src, dst));
Missiles[mi]._mirange = 256;
Missiles[mi]._miVar1 = src.x;
@ -4034,19 +4034,19 @@ void MI_Guardian(int i)
if (previous == offset) {
continue;
}
ex = Sentfire(i, { position.x + offset.deltaX, position.y + offset.deltaY });
ex = GuardianTryFireAt(i, { position.x + offset.deltaX, position.y + offset.deltaY });
if (ex == -1) {
break;
}
ex = Sentfire(i, { position.x - offset.deltaX, position.y - offset.deltaY });
ex = GuardianTryFireAt(i, { position.x - offset.deltaX, position.y - offset.deltaY });
if (ex == -1) {
break;
}
ex = Sentfire(i, { position.x + offset.deltaX, position.y - offset.deltaY });
ex = GuardianTryFireAt(i, { position.x + offset.deltaX, position.y - offset.deltaY });
if (ex == -1) {
break;
}
ex = Sentfire(i, { position.x - offset.deltaX, position.y + offset.deltaY });
ex = GuardianTryFireAt(i, { position.x - offset.deltaX, position.y + offset.deltaY });
if (ex == -1) {
break;
}
@ -4566,7 +4566,7 @@ void MI_Cbolt(int i)
}
Missiles[i]._mirnd = (Missiles[i]._mirnd + 1) & 0xF;
UpdateMissileVel(i, Missiles[i].position.tile, Missiles[i].position.tile + md, 8);
UpdateMissileVelocity(i, Missiles[i].position.tile, Missiles[i].position.tile + md, 8);
Missiles[i]._miVar3 = 16;
} else {
Missiles[i]._miVar3--;
@ -4660,11 +4660,11 @@ void MI_Element(int i)
if (mid > 0) {
Direction sd = GetDirection(c, Monsters[mid].position.tile);
SetMissDir(i, sd);
UpdateMissileVel(i, c, Monsters[mid].position.tile, 16);
UpdateMissileVelocity(i, c, Monsters[mid].position.tile, 16);
} else {
Direction sd = Players[id]._pdir;
SetMissDir(i, sd);
UpdateMissileVel(i, c, c + sd, 16);
UpdateMissileVelocity(i, c, c + sd, 16);
}
}
if (c != Point { Missiles[i]._miVar1, Missiles[i]._miVar2 }) {
@ -4707,11 +4707,11 @@ void MI_Bonespirit(int i)
if (mid > 0) {
Missiles[i]._midam = Monsters[mid]._mhitpoints >> 7;
SetMissDir(i, GetDirection(c, Monsters[mid].position.tile));
UpdateMissileVel(i, c, Monsters[mid].position.tile, 16);
UpdateMissileVelocity(i, c, Monsters[mid].position.tile, 16);
} else {
Direction sd = Players[id]._pdir;
SetMissDir(i, sd);
UpdateMissileVel(i, c, c + sd, 16);
UpdateMissileVelocity(i, c, c + sd, 16);
}
}
if (c != Point { Missiles[i]._miVar1, Missiles[i]._miVar2 }) {

2
Source/monstdat.cpp
Unescape View File

@ -473,7 +473,7 @@ const UniqMonstStruct UniqMonst[] = {
{ MT_SKING, N_("Skeleton King"), "GENRL", 0, 240, AI_SKELKING, 3, 6, 16, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40, 1, 0, 0, TEXT_NONE },
{ MT_COUNSLR, N_("Zhar the Mad"), "GENERAL", 8, 360, AI_ZHAR, 3, 16, 40, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING , 0, 0, 0, TEXT_ZHAR1 },
{ MT_BFALLSP, N_("Snotspill"), "BNG", 4, 220, AI_SNOTSPIL, 3, 10, 18, RESIST_LIGHTNING , 0, 0, 0, TEXT_BANNER10 },
{ MT_ADVOCATE, N_("Arch-Bishop Lazarus"), "GENERAL", 0, 600, AI_LAZURUS, 3, 30, 50, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40, 0, 0, 0, TEXT_VILE13 },
{ MT_ADVOCATE, N_("Arch-Bishop Lazarus"), "GENERAL", 0, 600, AI_LAZARUS, 3, 30, 50, IMMUNE_MAGIC | RESIST_FIRE | RESIST_LIGHTNING | IMMUNE_NULL_40, 0, 0, 0, TEXT_VILE13 },
{ MT_HLSPWN, N_("Red Vex"), "REDV", 0, 400, AI_LAZHELP, 3, 30, 50, IMMUNE_MAGIC | RESIST_FIRE | IMMUNE_NULL_40, 0, 0, 0, TEXT_VILE13 },
{ MT_HLSPWN, N_("Black Jade"), "BLKJD", 0, 400, AI_LAZHELP, 3, 30, 50, IMMUNE_MAGIC | RESIST_LIGHTNING | IMMUNE_NULL_40, 0, 0, 0, TEXT_VILE13 },
{ MT_RBLACK, "Lachdanan", "BHKA", 14, 500, AI_LACHDAN, 3, 0, 0, 0 , 0, 0, 0, TEXT_VEIL9 },

2
Source/monstdat.h
Unescape View File

@ -40,7 +40,7 @@ enum _mai_id : int8_t {
AI_COUNSLR,
AI_MEGA,
AI_DIABLO,
AI_LAZURUS,
AI_LAZARUS,
AI_LAZHELP,
AI_LACHDAN,
AI_WARLORD,

731
Source/monster.cpp
View File

File diff suppressed because it is too large Load Diff

6
Source/monster.h
Unescape View File

@ -52,7 +52,7 @@ enum : uint8_t {
UMT_SKELKING,
UMT_ZHAR,
UMT_SNOTSPIL,
UMT_LAZURUS,
UMT_LAZARUS,
UMT_RED_VEX,
UMT_BLACKJADE,
UMT_LACHDAN,
@ -130,7 +130,7 @@ struct CMonster {
/**
* @brief Returns AnimStruct for specified graphic
*/
const AnimStruct& GetAnimData(MonsterGraphic graphic) const
const AnimStruct &GetAnimData(MonsterGraphic graphic) const
{
return Anims[static_cast<int>(graphic)];
}
@ -244,7 +244,7 @@ void M_UpdateLeader(int i);
void DoEnding();
void PrepDoEnding();
void M_WalkDir(int i, Direction md);
void MAI_Golum(int i);
void GolumAi(int i);
void DeleteMonsterList();
void ProcessMonsters();
void FreeMonsters();

2
Source/msg.cpp
Unescape View File

@ -2031,7 +2031,7 @@ void DeltaLoadLevel()
if (Monsters[i].position.tile != Point { 0, 0 } && Monsters[i].position.tile != Point { 1, 0 })
dMonster[Monsters[i].position.tile.x][Monsters[i].position.tile.y] = i + 1;
if (i < MAX_PLRS) {
MAI_Golum(i);
GolumAi(i);
Monsters[i]._mFlags |= (MFLAG_TARGETS_MONSTER | MFLAG_GOLEM);
} else {
M_StartStand(i, Monsters[i]._mdir);

1
Source/objects.h
Unescape View File

@ -120,7 +120,6 @@ struct ObjectStruct {
SetMapRange(mapRange);
_oVar8 = leverID;
}
};
extern ObjectStruct Objects[MAXOBJECTS];

4
Source/player.cpp
Unescape View File

@ -60,7 +60,7 @@ void PmChangeLightOff(PlayerStruct &player)
if (abs(lx - offx) < 3 && abs(ly - offy) < 3)
return;
ChangeLightOff(player._plid, { x, y });
ChangeLightOffset(player._plid, { x, y });
}
void WalkUpwards(int pnum, const DirectionSettings &walkParams)
@ -2140,7 +2140,7 @@ bool PM_DoWalk(int pnum, int variant)
//Reset the "sub-tile" position of the player's light entry to 0
if (leveltype != DTYPE_TOWN) {
ChangeLightOff(player._plid, { 0, 0 });
ChangeLightOffset(player._plid, { 0, 0 });
}
AutoGoldPickup(pnum);

4
Source/quests.cpp
Unescape View File

@ -323,7 +323,7 @@ void CheckQuestKill(int m, bool sendmsg)
} else if (Monsters[m]._uniqtype - 1 == UMT_ZHAR) { //"Zhar the Mad"
Quests[Q_ZHAR]._qactive = QUEST_DONE;
Players[MyPlayerId].Say(HeroSpeech::ImSorryDidIBreakYourConcentration, 30);
} else if (Monsters[m]._uniqtype - 1 == UMT_LAZURUS && gbIsMultiplayer) { //"Arch-Bishop Lazarus"
} else if (Monsters[m]._uniqtype - 1 == UMT_LAZARUS && gbIsMultiplayer) { //"Arch-Bishop Lazarus"
Quests[Q_BETRAYER]._qactive = QUEST_DONE;
Quests[Q_BETRAYER]._qvar1 = 7;
Quests[Q_DIABLO]._qactive = QUEST_ACTIVE;
@ -342,7 +342,7 @@ void CheckQuestKill(int m, bool sendmsg)
NetSendCmdQuest(true, Q_BETRAYER);
NetSendCmdQuest(true, Q_DIABLO);
}
} else if (Monsters[m]._uniqtype - 1 == UMT_LAZURUS && !gbIsMultiplayer) { //"Arch-Bishop Lazarus"
} else if (Monsters[m]._uniqtype - 1 == UMT_LAZARUS && !gbIsMultiplayer) { //"Arch-Bishop Lazarus"
Quests[Q_BETRAYER]._qactive = QUEST_DONE;
InitVPTriggers();
Quests[Q_BETRAYER]._qvar1 = 7;

6
Source/scrollrt.cpp
Unescape View File

@ -443,7 +443,7 @@ static void DrawMonster(const Surface &out, int x, int y, int mx, int my, int m)
return;
}
auto &cel = *Monsters[m].AnimInfo.pCelSprite;
const auto &cel = *Monsters[m].AnimInfo.pCelSprite;
if ((dFlags[x][y] & BFLAG_LIT) == 0) {
Cl2DrawLightTbl(out, mx, my, cel, nCel, 1);
@ -523,7 +523,7 @@ static void DrawPlayer(const Surface &out, int pnum, int x, int y, int px, int p
auto &player = Players[pnum];
auto *pCelSprite = player.AnimInfo.pCelSprite;
const auto *pCelSprite = player.AnimInfo.pCelSprite;
int nCel = player.AnimInfo.GetFrameToUseForRendering();
if (pCelSprite == nullptr) {
@ -732,7 +732,7 @@ static void DrawItem(const Surface &out, int x, int y, int sx, int sy, bool pre)
if (pItem->_iPostDraw == pre)
return;
auto *cel = pItem->AnimInfo.pCelSprite;
const auto *cel = pItem->AnimInfo.pCelSprite;
if (cel == nullptr) {
Log("Draw Item \"{}\" 1: NULL CelSprite", pItem->_iIName);
return;

18
Source/setmaps.cpp
Unescape View File

@ -94,17 +94,17 @@ ObjectStruct &ObjectAtPosition(Point position)
void AddSKingObjs()
{
constexpr Rectangle smallSecretRoom { { 20, 7 }, { 3, 3 } };
ObjectAtPosition({ 64, 34 }).InitializeLoadedObject(smallSecretRoom, 1);
constexpr Rectangle SmallSecretRoom { { 20, 7 }, { 3, 3 } };
ObjectAtPosition({ 64, 34 }).InitializeLoadedObject(SmallSecretRoom, 1);
constexpr Rectangle gate { { 20, 14 }, { 1, 2 } };
ObjectAtPosition({ 64, 59 }).InitializeLoadedObject(gate, 2);
constexpr Rectangle Gate { { 20, 14 }, { 1, 2 } };
ObjectAtPosition({ 64, 59 }).InitializeLoadedObject(Gate, 2);
constexpr Rectangle largeSecretRoom { { 8, 1 }, { 7, 10 } };
ObjectAtPosition({ 27, 37 }).InitializeLoadedObject(largeSecretRoom, 3);
ObjectAtPosition({ 46, 35 }).InitializeLoadedObject(largeSecretRoom, 3);
ObjectAtPosition({ 49, 53 }).InitializeLoadedObject(largeSecretRoom, 3);
ObjectAtPosition({ 27, 53 }).InitializeLoadedObject(largeSecretRoom, 3);
constexpr Rectangle LargeSecretRoom { { 8, 1 }, { 7, 10 } };
ObjectAtPosition({ 27, 37 }).InitializeLoadedObject(LargeSecretRoom, 3);
ObjectAtPosition({ 46, 35 }).InitializeLoadedObject(LargeSecretRoom, 3);
ObjectAtPosition({ 49, 53 }).InitializeLoadedObject(LargeSecretRoom, 3);
ObjectAtPosition({ 27, 53 }).InitializeLoadedObject(LargeSecretRoom, 3);
}
void AddSChamObjs()

Write Preview
Loading…
Cancel
Save