diff --git a/polymer/eduke32/source/duke3d.h b/polymer/eduke32/source/duke3d.h index 11e97af02..0593b3c87 100644 --- a/polymer/eduke32/source/duke3d.h +++ b/polymer/eduke32/source/duke3d.h @@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define VOLUMEONE (g_Shareware == 1) // increase by 3, because atomic GRP adds 1, and Shareware adds 2 -#define BYTEVERSION_JF 273 +#define BYTEVERSION_JF 276 #define BYTEVERSION_13 27 #define BYTEVERSION_14 116 diff --git a/polymer/eduke32/source/gameexec.c b/polymer/eduke32/source/gameexec.c index 69ae5e975..b50dc2159 100644 --- a/polymer/eduke32/source/gameexec.c +++ b/polymer/eduke32/source/gameexec.c @@ -3112,7 +3112,7 @@ nullquote: case CON_QUAKE: insptr++; - g_earthquakeTime = (uint8_t)Gv_GetVarX(*insptr++); + g_earthquakeTime = Gv_GetVarX(*insptr++); A_PlaySound(EARTHQUAKE,g_player[screenpeek].ps->i); continue; diff --git a/polymer/eduke32/source/global.h b/polymer/eduke32/source/global.h index 506155627..8605e009d 100644 --- a/polymer/eduke32/source/global.h +++ b/polymer/eduke32/source/global.h @@ -91,7 +91,7 @@ G_EXTERN int32_t g_currentFrameRate; G_EXTERN int32_t g_currentMenu; G_EXTERN int32_t g_damageCameras,g_freezerSelfDamage; G_EXTERN int32_t g_doQuickSave; -G_EXTERN char g_earthquakeTime; +G_EXTERN uint16_t g_earthquakeTime; G_EXTERN int32_t g_gameQuit; G_EXTERN int32_t g_groupFileHandle; G_EXTERN int32_t g_impactDamage,g_maxPlayerHealth; diff --git a/polymer/eduke32/source/lunatic/defs.ilua b/polymer/eduke32/source/lunatic/defs.ilua index a9648dc88..5da1ee454 100644 --- a/polymer/eduke32/source/lunatic/defs.ilua +++ b/polymer/eduke32/source/lunatic/defs.ilua @@ -245,8 +245,6 @@ __attribute__((packed)) struct { uint8_t palette; palette_t _pals; - const char name[32]; - // NOTE: In C, the struct type has no name. We only have it here to define // a metatype later. const weaponaccess_t weapon; diff --git a/polymer/eduke32/source/player.h b/polymer/eduke32/source/player.h index 74e3dda89..9f639bf04 100644 --- a/polymer/eduke32/source/player.h +++ b/polymer/eduke32/source/player.h @@ -227,9 +227,6 @@ typedef struct { uint8_t palette; palette_t pals; - // UNUSED - char name[32]; - #ifdef LUNATIC // The player index. Always valid since we have no loose DukePlayer_t's // anywhere (like with spritetype_t): g_player[i].ps->wa.idx == i. diff --git a/polymer/eduke32/source/sector.h b/polymer/eduke32/source/sector.h index af009f3cf..01020a770 100644 --- a/polymer/eduke32/source/sector.h +++ b/polymer/eduke32/source/sector.h @@ -65,7 +65,7 @@ typedef struct { int16_t prevspritestat[MAXSPRITES]; int16_t pskyoff[MAXPSKYTILES], pskybits; - uint8_t g_earthquakeTime; + uint16_t g_earthquakeTime; int8_t g_numPlayerSprites; uint8_t show2dsector[(MAXSECTORS+7)>>3];