diff --git a/source/core/actorlist.cpp b/source/core/actorlist.cpp index 539564fd2..464424c78 100644 --- a/source/core/actorlist.cpp +++ b/source/core/actorlist.cpp @@ -547,7 +547,7 @@ DEFINE_FIELD_NAMED(DCoreActor, sprext.mdanimcur, mdanimcur) DEFINE_FIELD_NAMED(DCoreActor, sprext.renderflags, renderflags) DEFINE_FIELD_NAMED(DCoreActor, sprext.alpha, alpha) DEFINE_FIELD_NAMED(DCoreActor, time, spawnindex) -DEFINE_FIELD_NAMED(DCoreActor, spritesetindex, spritesetpic) +DEFINE_FIELD(DCoreActor, spritesetindex) DEFINE_FIELD_NAMED(DCoreActor, spr.angle, angle) DEFINE_FIELD(DCoreActor, vel) diff --git a/source/games/duke/src/vmexports.cpp b/source/games/duke/src/vmexports.cpp index 539f073a3..18fa3ca0b 100644 --- a/source/games/duke/src/vmexports.cpp +++ b/source/games/duke/src/vmexports.cpp @@ -73,7 +73,7 @@ player_struct* duke_checkcursectnums(sectortype* sector) { if (!sector) return nullptr; int pp = checkcursectnums(sector); - return pp ? &ps[pp] : nullptr; + return pp >= 0 ? &ps[pp] : nullptr; } DEFINE_ACTION_FUNCTION_NATIVE(_Duke, checkcursectnums, duke_checkcursectnums) diff --git a/wadsrc/static/zscript/coreactor.zs b/wadsrc/static/zscript/coreactor.zs index 9d2bdd4db..dd56af012 100644 --- a/wadsrc/static/zscript/coreactor.zs +++ b/wadsrc/static/zscript/coreactor.zs @@ -40,7 +40,7 @@ class CoreActor native native double angle; native Vector3 vel; - native readonly int16 spritesetpic; + native readonly int16 spritesetindex; native readonly int spawnindex; native void setpos(Vector3 newpos, bool relink = true); diff --git a/wadsrc/static/zscript/games/duke/dukeactor.zs b/wadsrc/static/zscript/games/duke/dukeactor.zs index ffa37516c..bc0420c23 100644 --- a/wadsrc/static/zscript/games/duke/dukeactor.zs +++ b/wadsrc/static/zscript/games/duke/dukeactor.zs @@ -36,7 +36,6 @@ class DukeActor : CoreActor native native int palvals; native int temp_data[6]; native private int flags1, flags2; - native readonly int16 spritesetindex; native walltype temp_walls[2]; native sectortype temp_sect, actorstayput;