zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-25 11:10:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Make g_earthquakeTime into a uint16_t, remove DukePlayer_t's name[] member.

Browse source 
Bump BYTEVERSION.

git-svn-id: https://svn.eduke32.com/eduke32@3478 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
helixhorned 2013-02-11 17:16:50 +00:00
parent 605de9f6d1
commit 200cd75275
6 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
polymer/eduke32/source/duke3d.h
View file

@ -57,7 +57,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define VOLUMEONE (g_Shareware == 1) #define VOLUMEONE (g_Shareware == 1)
// increase by 3, because atomic GRP adds 1, and Shareware adds 2 // 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_13 27
#define BYTEVERSION_14 116 #define BYTEVERSION_14 116

2
polymer/eduke32/source/gameexec.c
View file

@ -3112,7 +3112,7 @@ nullquote:
case CON_QUAKE: case CON_QUAKE:
insptr++; insptr++;
g_earthquakeTime = (uint8_t)Gv_GetVarX(*insptr++); g_earthquakeTime = Gv_GetVarX(*insptr++);
A_PlaySound(EARTHQUAKE,g_player[screenpeek].ps->i); A_PlaySound(EARTHQUAKE,g_player[screenpeek].ps->i);
continue; continue;

2
polymer/eduke32/source/global.h
View file

@ -91,7 +91,7 @@ G_EXTERN int32_t g_currentFrameRate;
G_EXTERN int32_t g_currentMenu; G_EXTERN int32_t g_currentMenu;
G_EXTERN int32_t g_damageCameras,g_freezerSelfDamage; G_EXTERN int32_t g_damageCameras,g_freezerSelfDamage;
G_EXTERN int32_t g_doQuickSave; 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_gameQuit;
G_EXTERN int32_t g_groupFileHandle; G_EXTERN int32_t g_groupFileHandle;
G_EXTERN int32_t g_impactDamage,g_maxPlayerHealth; G_EXTERN int32_t g_impactDamage,g_maxPlayerHealth;

2
polymer/eduke32/source/lunatic/defs.ilua
View file

@ -245,8 +245,6 @@ __attribute__((packed)) struct {
uint8_t palette; uint8_t palette;
palette_t _pals; palette_t _pals;
const char name[32];
// NOTE: In C, the struct type has no name. We only have it here to define // NOTE: In C, the struct type has no name. We only have it here to define
// a metatype later. // a metatype later.
const weaponaccess_t weapon; const weaponaccess_t weapon;

3
polymer/eduke32/source/player.h
View file

@ -227,9 +227,6 @@ typedef struct {
uint8_t palette; uint8_t palette;
palette_t pals; palette_t pals;
// UNUSED
char name[32];
#ifdef LUNATIC #ifdef LUNATIC
// The player index. Always valid since we have no loose DukePlayer_t's // 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. // anywhere (like with spritetype_t): g_player[i].ps->wa.idx == i.

2
polymer/eduke32/source/sector.h
View file

@ -65,7 +65,7 @@ typedef struct {
int16_t prevspritestat[MAXSPRITES]; int16_t prevspritestat[MAXSPRITES];
int16_t pskyoff[MAXPSKYTILES], pskybits; int16_t pskyoff[MAXPSKYTILES], pskybits;
uint8_t g_earthquakeTime; uint16_t g_earthquakeTime;
int8_t g_numPlayerSprites; int8_t g_numPlayerSprites;
uint8_t show2dsector[(MAXSECTORS+7)>>3]; uint8_t show2dsector[(MAXSECTORS+7)>>3];