From e80888523ea62df60c69b098236f6af1f994177a Mon Sep 17 00:00:00 2001 From: NY00123 Date: Tue, 14 Apr 2020 00:15:03 +0300 Subject: [PATCH] Another change modifying saved game format in SW: Increase MAXINTERPOLATIONS from 1024 to MAXSPRITES. # Conflicts: # source/sw/src/interp.cpp # source/sw/src/interp.h --- source/sw/src/interp.cpp | 1 - source/sw/src/interp.h | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/source/sw/src/interp.cpp b/source/sw/src/interp.cpp index 923db284b..917d6f270 100644 --- a/source/sw/src/interp.cpp +++ b/source/sw/src/interp.cpp @@ -33,7 +33,6 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms BEGIN_SW_NS -#define MAXINTERPOLATIONS 1024 int numinterpolations = 0, startofdynamicinterpolations = 0; int oldipos[MAXINTERPOLATIONS]; int bakipos[MAXINTERPOLATIONS]; diff --git a/source/sw/src/interp.h b/source/sw/src/interp.h index 9b8704a9f..def0248d8 100644 --- a/source/sw/src/interp.h +++ b/source/sw/src/interp.h @@ -25,13 +25,19 @@ Prepared for public release: 03/28/2005 - Charlie Wiederhold, 3D Realms //------------------------------------------------------------------------- BEGIN_SW_NS +#ifndef INTERP_H + +#define INTERP_H + +#include "build.h" + #define SHORT_MAXINTERPOLATIONS 256 extern short short_numinterpolations, short_startofdynamicinterpolations; extern short short_oldipos[SHORT_MAXINTERPOLATIONS]; extern short short_bakipos[SHORT_MAXINTERPOLATIONS]; extern short *short_curipos[SHORT_MAXINTERPOLATIONS]; -#define MAXINTERPOLATIONS 1024 +#define MAXINTERPOLATIONS MAXSPRITES extern int numinterpolations, startofdynamicinterpolations; extern int oldipos[MAXINTERPOLATIONS]; extern int bakipos[MAXINTERPOLATIONS]; @@ -42,4 +48,6 @@ void stopinterpolation(int *posptr); void updateinterpolations(void); void dointerpolations(int smoothratio); void restoreinterpolations(void); + +#endif END_SW_NS