Skip to content

[Modding] Add objcursmod #8410

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kphoenix137 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[Modding] Add objcursmod #8410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 41 additions & 11 deletions Source/cursor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
#include <SDL3/SDL_rect.h>
#include <SDL3/SDL_surface.h>
#else
#include <SDL.h>

Check warning on line 18 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:18:1 [misc-include-cleaner] 

included header SDL.h is not used directly
#endif

#include <fmt/format.h>

Check warning on line 21 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:21:1 [misc-include-cleaner] 

included header format.h is not used directly

#include "DiabloUI/diabloui.h"
#include "control/control.hpp"
Expand All @@ -30,7 +30,7 @@
#include "engine/point.hpp"
#include "engine/points_in_rectangle_range.hpp"
#include "engine/render/clx_render.hpp"
#include "engine/render/primitive_render.hpp"

Check warning on line 33 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:33:1 [misc-include-cleaner] 

included header primitive_render.hpp is not used directly
#include "engine/trn.hpp"
#include "headless_mode.hpp"
#include "hwcursor.hpp"
Expand All @@ -42,43 +42,44 @@
#include "qol/stash.h"
#include "towners.h"
#include "track.h"
#include "utils/attributes.h"

Check warning on line 45 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:45:1 [misc-include-cleaner] 

included header attributes.h is not used directly
#include "utils/is_of.hpp"
#include "utils/language.h"
#include "utils/palette_blending.hpp"
#include "utils/sdl_bilinear_scale.hpp"
#include "utils/surface_to_clx.hpp"
#include "utils/utf8.hpp"

Check warning on line 51 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:51:1 [misc-include-cleaner] 

included header utf8.hpp is not used directly

#ifdef UNPACKED_MPQS
#include "engine/load_clx.hpp"
#else
#include "engine/load_cel.hpp"
#include "engine/load_file.hpp"

Check warning on line 57 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:57:1 [misc-include-cleaner] 

included header load_file.hpp is not used directly
#include "utils/parse_int.hpp"
#endif

namespace devilution {
namespace {
/** Cursor images CEL */
OptionalOwnedClxSpriteList pCursCels;

Check warning on line 64 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:64:1 [misc-include-cleaner] 

no header providing "devilution::OptionalOwnedClxSpriteList" is directly included
OptionalOwnedClxSpriteList pCursCels2;
OptionalOwnedClxSpriteList pCursCelsMod;

OptionalOwnedClxSpriteList *HalfSizeItemSprites;
OptionalOwnedClxSpriteList *HalfSizeItemSpritesRed;

bool IsValidMonsterForSelection(const Monster &monster)

Check warning on line 71 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:71:39 [misc-include-cleaner] 

no header providing "devilution::Monster" is directly included
{
if (monster.hasNoLife())
return false;
if ((monster.flags & MFLAG_HIDDEN) != 0)

Check warning on line 75 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:75:23 [misc-include-cleaner] 

no header providing "devilution::MFLAG_HIDDEN" is directly included
return false;
if (monster.isPlayerMinion())
return false;
return true;
}

bool TrySelectMonster(bool flipflag, Point tile, tl::function_ref<bool(const Monster &)> isValidMonster)

Check warning on line 82 in Source/cursor.cpp

View workflow job for this annotation

GitHub Actions / tidy-check

Source/cursor.cpp:82:54 [misc-include-cleaner] 

no header providing "tl::function_ref" is directly included
{
auto checkPosition = [&](SelectionRegion selectionRegion, Displacement displacement) {
const Point posToCheck = tile + displacement;
Expand Down Expand Up @@ -441,12 +442,17 @@
#ifdef UNPACKED_MPQS
pCursCels = LoadClx("data\\inv\\objcurs.clx");
pCursCels2 = LoadOptionalClx("data\\inv\\objcurs2.clx");
pCursCelsMod = LoadOptionalClx("data\\inv\\objcursmod.clx");
#else
pCursCels = LoadCel("data\\inv\\objcurs", ReadWidths(FindAsset("data\\inv\\objcurs-widths.txt")).data());
AssetRef ref = FindAsset("data\\inv\\objcurs2-widths.txt");
if (ref.ok()) {
pCursCels2 = LoadOptionalCel("data\\inv\\objcurs2", ReadWidths(std::move(ref)).data());
}
ref = FindAsset("data\\inv\\objcursmod-widths.txt");
if (ref.ok()) {
pCursCelsMod = LoadOptionalCel("data\\inv\\objcursmod", ReadWidths(std::move(ref)).data());
}
#endif
ClearCursor();
}
Expand All @@ -455,19 +461,31 @@
{
pCursCels = std::nullopt;
pCursCels2 = std::nullopt;
pCursCelsMod = std::nullopt;
ClearCursor();
}

ClxSprite GetInvItemSprite(int cursId)
{
assert(cursId > 0);
const size_t numSprites = pCursCels->numSprites();
if (static_cast<size_t>(cursId) <= numSprites) {
return (*pCursCels)[cursId - 1];

const size_t n1 = pCursCels->numSprites();
size_t idx = static_cast<size_t>(cursId);
if (idx <= n1)
return (*pCursCels)[idx - 1];
idx -= n1;

if (pCursCels2.has_value()) {
const size_t n2 = pCursCels2->numSprites();
if (idx <= n2)
return (*pCursCels2)[idx - 1];
idx -= n2;
}
assert(pCursCels2.has_value());
assert(cursId - numSprites <= pCursCels2->numSprites());
return (*pCursCels2)[cursId - numSprites - 1];

assert(pCursCelsMod.has_value());
const size_t n3 = pCursCelsMod->numSprites();
assert(idx <= n3);
return (*pCursCelsMod)[idx - 1];
}

Size GetInvItemSize(int cursId)
Expand All @@ -490,8 +508,12 @@
{
if (HalfSizeItemSprites != nullptr)
return;
const uint32_t numInvItems = pCursCels->numSprites() - (static_cast<uint32_t>(CURSOR_FIRSTITEM) - 1)
+ (pCursCels2.has_value() ? pCursCels2->numSprites() : 0);

const uint32_t baseItemCount = pCursCels->numSprites() - (static_cast<uint32_t>(CURSOR_FIRSTITEM) - 1);
const uint32_t hfItemCount = pCursCels2.has_value() ? static_cast<uint32_t>(pCursCels2->numSprites()) : 0;
const uint32_t modItemCount = pCursCelsMod.has_value() ? static_cast<uint32_t>(pCursCelsMod->numSprites()) : 0;
const uint32_t numInvItems = baseItemCount + hfItemCount + modItemCount;

HalfSizeItemSprites = new OptionalOwnedClxSpriteList[numInvItems];
HalfSizeItemSpritesRed = new OptionalOwnedClxSpriteList[numInvItems];
const uint8_t *redTrn = GetInfravisionTRN();
Expand Down Expand Up @@ -526,14 +548,22 @@
};

size_t outputIndex = 0;
for (size_t i = static_cast<int>(CURSOR_FIRSTITEM) - 1, n = pCursCels->numSprites(); i < n; ++i, ++outputIndex) {

for (size_t i = static_cast<size_t>(static_cast<int>(CURSOR_FIRSTITEM) - 1), n = pCursCels->numSprites(); i < n; ++i, ++outputIndex) {
createHalfSize((*pCursCels)[i], outputIndex);
}

if (pCursCels2.has_value()) {
for (size_t i = 0, n = pCursCels2->numSprites(); i < n; ++i, ++outputIndex) {
for (size_t i = 0, n = pCursCels2->numSprites(); i < n; ++i, ++outputIndex)
createHalfSize((*pCursCels2)[i], outputIndex);
}
}

if (pCursCelsMod.has_value()) {
for (size_t i = 0, n = pCursCelsMod->numSprites(); i < n; ++i, ++outputIndex)
createHalfSize((*pCursCelsMod)[i], outputIndex);
}

assert(outputIndex == numInvItems);
}

void FreeHalfSizeItemSprites()
Expand Down
Loading