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

git-svn-id: https://svn.eduke32.com/eduke32@630 1a8010ca-5511-0410-912e-c29ae57300e0

Browse source
This commit is contained in:
terminx 2008-02-29 04:37:37 +00:00
parent 72d2bc1b81
commit f13385cf86
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -347,6 +347,20 @@ typedef struct {
int MouseFilter,MouseBias; int MouseFilter,MouseBias;
int SmoothInput; int SmoothInput;
// JBF 20031211: Store the input settings because
// (currently) jmact can't regurgitate them
int MouseFunctions[MAXMOUSEBUTTONS][2];
int MouseDigitalFunctions[MAXMOUSEAXES][2];
int MouseAnalogueAxes[MAXMOUSEAXES];
int MouseAnalogueScale[MAXMOUSEAXES];
int JoystickFunctions[MAXJOYBUTTONS][2];
int JoystickDigitalFunctions[MAXJOYAXES][2];
int JoystickAnalogueAxes[MAXJOYAXES];
int JoystickAnalogueScale[MAXJOYAXES];
int JoystickAnalogueDead[MAXJOYAXES];
int JoystickAnalogueSaturate[MAXJOYAXES];
byte KeyboardKeys[NUMGAMEFUNCTIONS][2];
// //
// Sound variables // Sound variables
// //
@ -384,20 +398,6 @@ typedef struct {
int CheckForUpdates; int CheckForUpdates;
int LastUpdateCheck; int LastUpdateCheck;
int useprecache; int useprecache;
// JBF 20031211: Store the input settings because
// (currently) jmact can't regurgitate them
int MouseFunctions[MAXMOUSEBUTTONS][2];
int MouseDigitalFunctions[MAXMOUSEAXES][2];
int MouseAnalogueAxes[MAXMOUSEAXES];
int MouseAnalogueScale[MAXMOUSEAXES];
int JoystickFunctions[MAXJOYBUTTONS][2];
int JoystickDigitalFunctions[MAXJOYAXES][2];
int JoystickAnalogueAxes[MAXJOYAXES];
int JoystickAnalogueScale[MAXJOYAXES];
int JoystickAnalogueDead[MAXJOYAXES];
int JoystickAnalogueSaturate[MAXJOYAXES];
byte KeyboardKeys[NUMGAMEFUNCTIONS][2];
} config_t; } config_t;
typedef struct { typedef struct {
@ -561,7 +561,6 @@ typedef struct {
spriteinterpolate sprpos[MAXSPRITES]; spriteinterpolate sprpos[MAXSPRITES];
typedef struct { typedef struct {
int floorz,ceilingz,lastvx,lastvy,bposx,bposy,bposz; int floorz,ceilingz,lastvx,lastvy,bposx,bposy,bposz;
int flags; int flags;
@ -592,7 +591,7 @@ extern char display_mirror,loadfromgrouponly,rtsplaying;
extern int groupfile; extern int groupfile;
extern int ototalclock; extern int ototalclock;
extern int *animateptr[MAXANIMATES]; extern intptr_t *animateptr[MAXANIMATES];
extern int animategoal[MAXANIMATES]; extern int animategoal[MAXANIMATES];
extern int animatevel[MAXANIMATES]; extern int animatevel[MAXANIMATES];
// extern int oanimateval[MAXANIMATES]; // extern int oanimateval[MAXANIMATES];

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

@ -150,7 +150,7 @@ extern void lotsofglass(int i,int wallnum,int n);
extern void spriteglass(int i,int n); extern void spriteglass(int i,int n);
extern void ceilingglass(int i,int sectnum,int n); extern void ceilingglass(int i,int sectnum,int n);
extern void lotsofcolourglass(int i,int wallnum,int n); extern void lotsofcolourglass(int i,int wallnum,int n);
extern int GetTime(void); extern inline int GetTime(void);
extern void CONFIG_GetSetupFilename(void); extern void CONFIG_GetSetupFilename(void);
extern int32 CONFIG_FunctionNameToNum(char *func); extern int32 CONFIG_FunctionNameToNum(char *func);
extern char *CONFIG_FunctionNumToName(int32 func); extern char *CONFIG_FunctionNumToName(int32 func);

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

@ -12696,7 +12696,7 @@ static void SetupGameButtons(void)
=================== ===================
*/ */
int GetTime(void) inline int GetTime(void)
{ {
return totalclock; return totalclock;
} }

3
polymer/eduke32/source/global.c
View file

@ -38,7 +38,8 @@ actordata_t hittype[MAXSPRITES];
short spriteq[1024],spriteqloc,spriteqamount=64; short spriteq[1024],spriteqloc,spriteqamount=64;
animwalltype animwall[MAXANIMWALLS]; animwalltype animwall[MAXANIMWALLS];
short numanimwalls; short numanimwalls;
int *animateptr[MAXANIMATES], animategoal[MAXANIMATES], animatevel[MAXANIMATES], animatecnt; intptr_t *animateptr[MAXANIMATES];
int animategoal[MAXANIMATES], animatevel[MAXANIMATES], animatecnt;
// int oanimateval[MAXANIMATES]; // int oanimateval[MAXANIMATES];
short animatesect[MAXANIMATES]; short animatesect[MAXANIMATES];
int msx[2048],msy[2048]; int msx[2048],msy[2048];

8
polymer/eduke32/source/savegame.c
View file

@ -314,8 +314,8 @@ int loadplayer(int spot)
if (kdfread(&animatecnt,sizeof(animatecnt),1,fil) != 1) goto corrupt; if (kdfread(&animatecnt,sizeof(animatecnt),1,fil) != 1) goto corrupt;
if (kdfread(&animatesect[0],2,MAXANIMATES,fil) != MAXANIMATES) goto corrupt; if (kdfread(&animatesect[0],2,MAXANIMATES,fil) != MAXANIMATES) goto corrupt;
if (kdfread(&animateptr[0],4,MAXANIMATES,fil) != MAXANIMATES) goto corrupt; if (kdfread(&animateptr[0],sizeof(intptr_t),MAXANIMATES,fil) != MAXANIMATES) goto corrupt;
for (i = animatecnt-1;i>=0;i--) animateptr[i] = (int *)((int)animateptr[i]+(int)(&sector[0])); for (i = animatecnt-1;i>=0;i--) animateptr[i] = (intptr_t *)((intptr_t)animateptr[i]+(intptr_t)(&sector[0]));
if (kdfread(&animategoal[0],4,MAXANIMATES,fil) != MAXANIMATES) goto corrupt; if (kdfread(&animategoal[0],4,MAXANIMATES,fil) != MAXANIMATES) goto corrupt;
if (kdfread(&animatevel[0],4,MAXANIMATES,fil) != MAXANIMATES) goto corrupt; if (kdfread(&animatevel[0],4,MAXANIMATES,fil) != MAXANIMATES) goto corrupt;
@ -729,9 +729,9 @@ int saveplayer(int spot)
dfwrite(&pskyoff[0],sizeof(pskyoff[0]),MAXPSKYTILES,fil); dfwrite(&pskyoff[0],sizeof(pskyoff[0]),MAXPSKYTILES,fil);
dfwrite(&animatecnt,sizeof(animatecnt),1,fil); dfwrite(&animatecnt,sizeof(animatecnt),1,fil);
dfwrite(&animatesect[0],2,MAXANIMATES,fil); dfwrite(&animatesect[0],2,MAXANIMATES,fil);
for (i = animatecnt-1;i>=0;i--) animateptr[i] = (int *)((int)animateptr[i]-(int)(&sector[0])); for (i = animatecnt-1;i>=0;i--) animateptr[i] = (intptr_t *)((intptr_t)animateptr[i]-(intptr_t)(&sector[0]));
dfwrite(&animateptr[0],4,MAXANIMATES,fil); dfwrite(&animateptr[0],4,MAXANIMATES,fil);
for (i = animatecnt-1;i>=0;i--) animateptr[i] = (int *)((int)animateptr[i]+(int)(&sector[0])); for (i = animatecnt-1;i>=0;i--) animateptr[i] = (intptr_t *)((intptr_t)animateptr[i]+(intptr_t)(&sector[0]));
dfwrite(&animategoal[0],4,MAXANIMATES,fil); dfwrite(&animategoal[0],4,MAXANIMATES,fil);
dfwrite(&animatevel[0],4,MAXANIMATES,fil); dfwrite(&animatevel[0],4,MAXANIMATES,fil);