libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-19 02:38:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ULTIMA8: Renaming more world folder class fields

Browse Source
This commit is contained in:
Paul Gilbert 2020-02-16 22:13:53 -08:00
parent 3c320a414a
commit 2b934e06ab
8 changed files with 516 additions and 517 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
View File

@ -98,9 +98,9 @@ void WpnOvlayDat::load(RawArchive *overlaydat) {
unsigned int offset = type * 8 * animlength
+ dir * animlength + frame;
ds->seek(4 * offset);
f.xoff = ds->readXS(1);
f.yoff = ds->readXS(1);
f.frame = ds->read2();
f._xOff = ds->readXS(1);
f._yOff = ds->readXS(1);
f._frame = ds->read2();
awo->_overlay[type]._frames[dir][frame] = f;
}

6
engines/ultima/ultima8/world/actors/weapon_overlay.h
View File

@ -29,9 +29,9 @@ namespace Ultima {
namespace Ultima8 {
struct WeaponOverlayFrame {
int32 xoff;
int32 yoff;
uint32 frame;
int32 _xOff;
int32 _yOff;
uint32 _frame;
};
struct WeaponOverlay {

14
engines/ultima/ultima8/world/egg_hatcher_process.cpp
View File

@ -46,12 +46,12 @@ EggHatcherProcess::~EggHatcherProcess() {
}
void EggHatcherProcess::addEgg(uint16 egg) {
eggs.push_back(egg);
_eggs.push_back(egg);
}
void EggHatcherProcess::addEgg(Egg *egg) {
assert(egg);
eggs.push_back(egg->getObjId());
_eggs.push_back(egg->getObjId());
}
void EggHatcherProcess::run() {
@ -59,8 +59,8 @@ void EggHatcherProcess::run() {
MainActor *av = getMainActor();
assert(av);
for (unsigned int i = 0; i < eggs.size(); i++) {
uint16 eggid = eggs[i];
for (unsigned int i = 0; i < _eggs.size(); i++) {
uint16 eggid = _eggs[i];
Egg *egg = p_dynamic_cast<Egg *>(getObject(eggid));
if (!egg) continue; // egg gone
@ -81,8 +81,8 @@ void EggHatcherProcess::run() {
// 'justTeleported':
// if the avatar teleports, set the 'justTeleported' flag.
// if this is set, don't hatch any teleport eggs
// unset it when you're out of range of any teleport eggs
// if this is set, don't hatch any teleport _eggs
// unset it when you're out of range of any teleport _eggs
TeleportEgg *tegg = p_dynamic_cast<TeleportEgg *>(egg);
if (x1 <= ax && ax - axs < x2 && y1 <= ay && ay - ays < y2 &&
@ -106,7 +106,7 @@ void EggHatcherProcess::saveData(ODataSource *ods) {
bool EggHatcherProcess::loadData(IDataSource *ids, uint32 version) {
if (!Process::loadData(ids, version)) return false;
// the eggs will be re-added to the EggHatcherProcess when they're
// the _eggs will be re-added to the EggHatcherProcess when they're
// re-added to the CurrentMap
return true;

2
engines/ultima/ultima8/world/egg_hatcher_process.h
View File

@ -48,7 +48,7 @@ public:
private:
void saveData(ODataSource *ods) override;
Std::vector<uint16> eggs;
Std::vector<uint16> _eggs;
};
} // End of namespace Ultima8

96
engines/ultima/ultima8/world/fireball_process.cpp
View File

@ -46,24 +46,24 @@ FireballProcess::FireballProcess()
}
FireballProcess::FireballProcess(Item *item, Item *target_)
: xspeed(0), yspeed(0), age(0) {
FireballProcess::FireballProcess(Item *item, Item *target)
: _xSpeed(0), _ySpeed(0), _age(0) {
assert(item);
assert(target_);
assert(target);
tail[0] = 0;
tail[1] = 0;
tail[2] = 0;
_tail[0] = 0;
_tail[1] = 0;
_tail[2] = 0;
_itemNum = item->getObjId();
target = target_->getObjId();
_target = target->getObjId();
_type = 0x218; // CONSTANT!
}
void FireballProcess::run() {
age++;
_age++;
Item *item = getItem(_itemNum);
if (!item) {
@ -71,23 +71,23 @@ void FireballProcess::run() {
return;
}
Item *t = getItem(target);
Item *t = getItem(_target);
if (!t) {
terminate();
return;
}
if (age > 300 && (getRandom() % 20 == 0)) {
if (_age > 300 && (getRandom() % 20 == 0)) {
// chance of 5% to disappear every frame after 10 seconds
terminate();
return;
}
// * accelerate a bit towards target
// * accelerate a bit towards _target
// * try to move
// * if succesful:
// * move
// * shift tail, enlarging if smaller than 3 flames
// * shift _tail, enlarging if smaller than 3 flames
// * if failed
// * deal damage if hit Actor
// * turn around if hit non-Actor
@ -103,41 +103,41 @@ void FireballProcess::run() {
int targetdir = item->getDirToItemCentre(*t);
if (xspeed == 0 && yspeed == 0 && dx / 64 == 0 && dy / 64 == 0) {
xspeed += 2 * x_fact[targetdir];
yspeed += 2 * y_fact[targetdir];
if (_xSpeed == 0 && _ySpeed == 0 && dx / 64 == 0 && dy / 64 == 0) {
_xSpeed += 2 * x_fact[targetdir];
_ySpeed += 2 * y_fact[targetdir];
} else {
xspeed += (dx / 64);
yspeed += (dy / 64);
_xSpeed += (dx / 64);
_ySpeed += (dy / 64);
}
// limit speed
int speed = static_cast<int>(sqrt(static_cast<float>(xspeed * xspeed + yspeed * yspeed)));
int speed = static_cast<int>(sqrt(static_cast<float>(_xSpeed * _xSpeed + _ySpeed * _ySpeed)));
if (speed > 32) {
xspeed = (xspeed * 32) / speed;
yspeed = (yspeed * 32) / speed;
_xSpeed = (_xSpeed * 32) / speed;
_ySpeed = (_ySpeed * 32) / speed;
}
ObjId hititem = 0;
item->collideMove(x + xspeed, y + yspeed, z, false, false, &hititem);
item->collideMove(x + _xSpeed, y + _ySpeed, z, false, false, &hititem);
// handle tail
// tail is shape 261, frame 0-7 (0 = to top-right, 7 = to top)
if (tail[2] == 0) {
// enlarge tail
// handle _tail
// _tail is shape 261, frame 0-7 (0 = to top-right, 7 = to top)
if (_tail[2] == 0) {
// enlarge _tail
Item *newtail = ItemFactory::createItem(261, 0, 0,
Item::FLG_DISPOSABLE, 0, 0,
Item::EXT_SPRITE, true);
tail[2] = newtail->getObjId();
_tail[2] = newtail->getObjId();
}
Item *tailitem = getItem(tail[2]);
tailitem->setFrame(Get_WorldDirection(yspeed, xspeed));
Item *tailitem = getItem(_tail[2]);
tailitem->setFrame(Get_WorldDirection(_ySpeed, _xSpeed));
tailitem->move(x, y, z);
tail[2] = tail[1];
tail[1] = tail[0];
tail[0] = tailitem->getObjId();
_tail[2] = _tail[1];
_tail[1] = _tail[0];
_tail[0] = tailitem->getObjId();
if (hititem) {
Actor *hit = getActor(hititem);
@ -151,8 +151,8 @@ void FireballProcess::run() {
} else {
// hit an object: invert direction
xspeed = -xspeed;
yspeed = -yspeed;
_xSpeed = -_xSpeed;
_ySpeed = -_ySpeed;
}
}
}
@ -169,7 +169,7 @@ void FireballProcess::explode() {
if (item) item->destroy();
for (unsigned int i = 0; i < 3; ++i) {
item = getItem(tail[i]);
item = getItem(_tail[i]);
if (item) item->destroy();
}
}
@ -206,25 +206,25 @@ uint32 FireballProcess::I_TonysBalls(const uint8 *args,
void FireballProcess::saveData(ODataSource *ods) {
Process::saveData(ods);
ods->write4(static_cast<uint32>(xspeed));
ods->write4(static_cast<uint32>(yspeed));
ods->write2(target);
ods->write2(tail[0]);
ods->write2(tail[1]);
ods->write2(tail[2]);
ods->write2(age);
ods->write4(static_cast<uint32>(_xSpeed));
ods->write4(static_cast<uint32>(_ySpeed));
ods->write2(_target);
ods->write2(_tail[0]);
ods->write2(_tail[1]);
ods->write2(_tail[2]);
ods->write2(_age);
}
bool FireballProcess::loadData(IDataSource *ids, uint32 version) {
if (!Process::loadData(ids, version)) return false;
xspeed = static_cast<int>(ids->read4());
yspeed = static_cast<int>(ids->read4());
target = ids->read2();
tail[0] = ids->read2();
tail[1] = ids->read2();
tail[2] = ids->read2();
age = ids->read2();
_xSpeed = static_cast<int>(ids->read4());
_ySpeed = static_cast<int>(ids->read4());
_target = ids->read2();
_tail[0] = ids->read2();
_tail[1] = ids->read2();
_tail[2] = ids->read2();
_age = ids->read2();
return true;
}

8
engines/ultima/ultima8/world/fireball_process.h
View File

@ -51,10 +51,10 @@ protected:
void explode();
int xspeed, yspeed;
ObjId tail[3];
ObjId target;
uint16 age;
int _xSpeed, _ySpeed;
ObjId _tail[3];
ObjId _target;
uint16 _age;
};
} // End of namespace Ultima8

881
engines/ultima/ultima8/world/item_sorter.cpp
View File

File diff suppressed because it is too large Load Diff

20
engines/ultima/ultima8/world/item_sorter.h
View File

@ -32,17 +32,17 @@ class RenderSurface;
struct SortItem;
class ItemSorter {
MainShapeArchive *shapes;
RenderSurface *surf;
MainShapeArchive *_shapes;
RenderSurface *_surf;
SortItem *items;
SortItem *items_tail;
SortItem *items_unused;
int32 sort_limit;
SortItem *_items;
SortItem *_itemsTail;
SortItem *_itemsUnused;
int32 _sortLimit;
int32 order_counter;
int32 _orderCounter;
int32 cam_sx, cam_sy;
int32 _camSx, _camSy;
public:
ItemSorter();
@ -66,10 +66,10 @@ public:
uint16 Trace(int32 x, int32 y, HitFace *face = 0, bool item_highlight = false);
void IncSortLimit() {
sort_limit++;
_sortLimit++;
}
void DecSortLimit() {
if (sort_limit > 0) sort_limit--;
if (_sortLimit > 0) _sortLimit--;
}
private: