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

ULTIMA8: Put back ARG_NULL8 macro with fix

Browse Source 
Removed this macro in dc17170 because it had one usage and was wrong anyway,
but it's nice to avoid the unused variable warning.
This commit is contained in:
Matthew Duggan 2021-09-23 07:39:25 +09:00
parent ec02b4e7b1
commit dbce998d04
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/ultima/ultima8/usecode/intrinsics.h
View File

@ -90,6 +90,8 @@ typedef uint32(*Intrinsic)(const uint8 *args, unsigned int argsize);
WorldPoint x; \
UCMachine::get_instance()->dereferencePointer(ucptr_##x, x._buf, 5);
// See comment on ARG_UINT8 for why +2 on NULL8
#define ARG_NULL8() args+=2;
#define ARG_NULL16() args+=2;
#define ARG_NULL32() args+=4;

2
engines/ultima/ultima8/world/item.cpp
View File

@ -3881,7 +3881,7 @@ uint32 Item::I_explode(const uint8 *args, unsigned int argsize) {
uint32 Item::I_igniteChaos(const uint8 *args, unsigned int /*argsize*/) {
ARG_UINT16(x);
ARG_UINT16(y);
ARG_UINT8(z); // unused
ARG_NULL8(); // z, unused
assert(GAME_IS_U8);