Merge remote-tracking branch 'origin/Saturn-Next' into lugstuff
This commit is contained in:
commit
cb2be726f6
2 files changed
+5
-5
No files matched your search
+1
-1
@@ -1146,7 +1146,7 @@ void M_DoScreenShot(void)
|
||||
char pathname[MAX_WADPATH];
|
||||
boolean ret = false;
|
||||
UINT8 *linear = NULL;
|
||||
UINT8 *palette;
|
||||
UINT8 *palette = NULL;
|
||||
|
||||
// Don't take multiple screenshots, obviously
|
||||
takescreenshot = false;
|
||||
|
||||
+4
-4
@@ -291,15 +291,15 @@ typedef struct mobj_s
|
||||
// List: thinker links.
|
||||
thinker_t thinker;
|
||||
|
||||
// More list: links in sector (if needed)
|
||||
struct mobj_s *bnext;
|
||||
struct mobj_s **bprev; // killough 8/11/98: change to ptr-to-ptr
|
||||
|
||||
// Info for drawing: position.
|
||||
fixed_t x, y, z;
|
||||
fixed_t old_x, old_y, old_z; // position interpolation
|
||||
fixed_t old_x2, old_y2, old_z2;
|
||||
|
||||
// More list: links in sector (if needed)
|
||||
struct mobj_s *bnext;
|
||||
struct mobj_s **bprev; // killough 8/11/98: change to ptr-to-ptr
|
||||
|
||||
mobjtype_t type;
|
||||
const mobjinfo_t *info; // &mobjinfo[mobj->type]
|
||||
|
||||
|
||||
Reference in new issue
Block a user