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

Remove some unused gamevars pertaining to the original multiplayer code. DONT_BUILD.

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@5832 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2016-08-27 01:41:41 +00:00
parent e3a7c98a25
commit 0520994a8f
4 changed files with 2 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
polymer/eduke32/source/gamevars.c
View file

@ -1657,30 +1657,6 @@ static void Gv_AddSystemVars(void)
Gv_NewVar("cameradist",(intptr_t)&g_cameraDistance, GAMEVAR_SYSTEM | GAMEVAR_INTPTR); Gv_NewVar("cameradist",(intptr_t)&g_cameraDistance, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("cameraclock",(intptr_t)&g_cameraClock, GAMEVAR_SYSTEM | GAMEVAR_INTPTR); Gv_NewVar("cameraclock",(intptr_t)&g_cameraClock, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myx",(intptr_t)&my.x, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myy",(intptr_t)&my.y, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myz",(intptr_t)&my.z, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("omyx",(intptr_t)&omy.x, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("omyy",(intptr_t)&omy.y, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("omyz",(intptr_t)&omy.z, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myvelx",(intptr_t)&myvel.x, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myvely",(intptr_t)&myvel.y, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myvelz",(intptr_t)&myvel.z, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
Gv_NewVar("myhoriz",(intptr_t)&myhoriz, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("myhorizoff",(intptr_t)&myhorizoff, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("omyhoriz",(intptr_t)&omyhoriz, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("omyhorizoff",(intptr_t)&omyhorizoff, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("myang",(intptr_t)&myang, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("omyang",(intptr_t)&omyang, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("mycursectnum",(intptr_t)&mycursectnum, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("myjumpingcounter",(intptr_t)&myjumpingcounter, GAMEVAR_SYSTEM | GAMEVAR_SHORTPTR);
Gv_NewVar("myjumpingtoggle",(intptr_t)&myjumpingtoggle, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR);
Gv_NewVar("myonground",(intptr_t)&myonground, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR);
Gv_NewVar("myhardlanding",(intptr_t)&myhardlanding, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR);
Gv_NewVar("myreturntocenter",(intptr_t)&myreturntocenter, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR);
Gv_NewVar("display_mirror",(intptr_t)&display_mirror, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR); Gv_NewVar("display_mirror",(intptr_t)&display_mirror, GAMEVAR_SYSTEM | GAMEVAR_CHARPTR);
Gv_NewVar("randomseed",(intptr_t)&randomseed, GAMEVAR_SYSTEM | GAMEVAR_INTPTR); Gv_NewVar("randomseed",(intptr_t)&randomseed, GAMEVAR_SYSTEM | GAMEVAR_INTPTR);
@ -1835,30 +1811,6 @@ void Gv_RefreshPointers(void)
aGameVars[Gv_GetVarIndex("cameradist")].global = (intptr_t)&g_cameraDistance; aGameVars[Gv_GetVarIndex("cameradist")].global = (intptr_t)&g_cameraDistance;
aGameVars[Gv_GetVarIndex("cameraclock")].global = (intptr_t)&g_cameraClock; aGameVars[Gv_GetVarIndex("cameraclock")].global = (intptr_t)&g_cameraClock;
aGameVars[Gv_GetVarIndex("myx")].global = (intptr_t)&my.x;
aGameVars[Gv_GetVarIndex("myy")].global = (intptr_t)&my.y;
aGameVars[Gv_GetVarIndex("myz")].global = (intptr_t)&my.z;
aGameVars[Gv_GetVarIndex("omyx")].global = (intptr_t)&omy.x;
aGameVars[Gv_GetVarIndex("omyy")].global = (intptr_t)&omy.y;
aGameVars[Gv_GetVarIndex("omyz")].global = (intptr_t)&omy.z;
aGameVars[Gv_GetVarIndex("myvelx")].global = (intptr_t)&myvel.x;
aGameVars[Gv_GetVarIndex("myvely")].global = (intptr_t)&myvel.y;
aGameVars[Gv_GetVarIndex("myvelz")].global = (intptr_t)&myvel.z;
aGameVars[Gv_GetVarIndex("myhoriz")].global = (intptr_t)&myhoriz;
aGameVars[Gv_GetVarIndex("myhorizoff")].global = (intptr_t)&myhorizoff;
aGameVars[Gv_GetVarIndex("omyhoriz")].global = (intptr_t)&omyhoriz;
aGameVars[Gv_GetVarIndex("omyhorizoff")].global = (intptr_t)&omyhorizoff;
aGameVars[Gv_GetVarIndex("myang")].global = (intptr_t)&myang;
aGameVars[Gv_GetVarIndex("omyang")].global = (intptr_t)&omyang;
aGameVars[Gv_GetVarIndex("mycursectnum")].global = (intptr_t)&mycursectnum;
aGameVars[Gv_GetVarIndex("myjumpingcounter")].global = (intptr_t)&myjumpingcounter;
aGameVars[Gv_GetVarIndex("myjumpingtoggle")].global = (intptr_t)&myjumpingtoggle;
aGameVars[Gv_GetVarIndex("myonground")].global = (intptr_t)&myonground;
aGameVars[Gv_GetVarIndex("myhardlanding")].global = (intptr_t)&myhardlanding;
aGameVars[Gv_GetVarIndex("myreturntocenter")].global = (intptr_t)&myreturntocenter;
aGameVars[Gv_GetVarIndex("display_mirror")].global = (intptr_t)&display_mirror; aGameVars[Gv_GetVarIndex("display_mirror")].global = (intptr_t)&display_mirror;
aGameVars[Gv_GetVarIndex("randomseed")].global = (intptr_t)&randomseed; aGameVars[Gv_GetVarIndex("randomseed")].global = (intptr_t)&randomseed;

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

@ -74,7 +74,6 @@ G_EXTERN char *label;
G_EXTERN int32_t g_musicIndex; G_EXTERN int32_t g_musicIndex;
G_EXTERN char g_loadFromGroupOnly; G_EXTERN char g_loadFromGroupOnly;
G_EXTERN char g_numSkills; G_EXTERN char g_numSkills;
G_EXTERN char myjumpingtoggle,myonground,myhardlanding,myreturntocenter;
G_EXTERN char pus,pub; G_EXTERN char pus,pub;
G_EXTERN char ready2send; G_EXTERN char ready2send;
#define MAXPLAYERNAME 32 #define MAXPLAYERNAME 32
@ -95,8 +94,6 @@ G_EXTERN int16_t g_globalRandom;
G_EXTERN int16_t g_mirrorWall[64],g_mirrorSector[64],g_mirrorCount; G_EXTERN int16_t g_mirrorWall[64],g_mirrorSector[64],g_mirrorCount;
G_EXTERN int16_t g_numAnimWalls; G_EXTERN int16_t g_numAnimWalls;
G_EXTERN int16_t g_numClouds,clouds[256],cloudx,cloudy; G_EXTERN int16_t g_numClouds,clouds[256],cloudx,cloudy;
G_EXTERN int16_t myang,omyang,mycursectnum,myjumpingcounter;
G_EXTERN int16_t myhoriz,omyhoriz,myhorizoff,omyhorizoff;
G_EXTERN int32_t *animateptr[MAXANIMATES]; G_EXTERN int32_t *animateptr[MAXANIMATES];
G_EXTERN int32_t animategoal[MAXANIMATES],animatevel[MAXANIMATES],g_animateCount; G_EXTERN int32_t animategoal[MAXANIMATES],animatevel[MAXANIMATES],g_animateCount;
G_EXTERN int32_t cloudtotalclock; G_EXTERN int32_t cloudtotalclock;
@ -141,7 +138,6 @@ G_EXTERN projectile_t SpriteProjectile[MAXSPRITES];
G_EXTERN sound_t g_sounds[MAXSOUNDS]; G_EXTERN sound_t g_sounds[MAXSOUNDS];
G_EXTERN uint32_t everyothertime; G_EXTERN uint32_t everyothertime;
G_EXTERN uint32_t g_moveThingsCount; G_EXTERN uint32_t g_moveThingsCount;
G_EXTERN vec3_t my,omy,myvel;
G_EXTERN char g_soundlocks[MAXSOUNDS]; G_EXTERN char g_soundlocks[MAXSOUNDS];
G_EXTERN int32_t g_restorePalette; G_EXTERN int32_t g_restorePalette;
G_EXTERN int32_t g_screenCapture; G_EXTERN int32_t g_screenCapture;

13
polymer/eduke32/source/net.c
View file

@ -241,19 +241,6 @@ void Net_WaitForServer(void)
void Net_ResetPrediction(void) void Net_ResetPrediction(void)
{ {
Bmemcpy(&my, &g_player[myconnectindex].ps, sizeof(vec3_t));
Bmemcpy(&omy, &g_player[myconnectindex].ps, sizeof(vec3_t));
Bmemset(&myvel, 0, sizeof(vec3_t));
myang = omyang = g_player[myconnectindex].ps->ang;
myhoriz = omyhoriz = g_player[myconnectindex].ps->horiz;
myhorizoff = omyhorizoff = g_player[myconnectindex].ps->horizoff;
mycursectnum = g_player[myconnectindex].ps->cursectnum;
myjumpingcounter = g_player[myconnectindex].ps->jumping_counter;
myjumpingtoggle = g_player[myconnectindex].ps->jumping_toggle;
myonground = g_player[myconnectindex].ps->on_ground;
myhardlanding = g_player[myconnectindex].ps->hard_landing;
myreturntocenter = g_player[myconnectindex].ps->return_to_center;
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

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

@ -302,11 +302,13 @@ void G_DoSectorAnimations(void)
{ {
g_player[p].ps->pos.z += v; g_player[p].ps->pos.z += v;
g_player[p].ps->vel.z = 0; g_player[p].ps->vel.z = 0;
/*
if (p == myconnectindex) if (p == myconnectindex)
{ {
my.z += v; my.z += v;
myvel.z = 0; myvel.z = 0;
} }
*/
} }
for (j=headspritesect[dasect]; j>=0; j=nextspritesect[j]) for (j=headspritesect[dasect]; j>=0; j=nextspritesect[j])