Maksytka/Vangers
1
1
Fork 0
mirror of https://github.com/KranX/Vangers.git synced 2025-12-01 07:25:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

Surmap: change storage type of global variable profils

Browse Source 
Global variable `profils` points to an array of 6 pointers to `pure` functions
that known at compile time. However the variable inits in runtime with allocate
memory in heap by calling `sTrack::load(0)`.

To block potentially dangerous using the exportable variable (trying access
before calling `sTrack::load(0)` this commit changed behavior to initialize
`profils` global variable at compile time instead of runtime.
This commit is contained in:
Vitaliy Busko
2021-02-06 00:06:00 +07:00
parent f9194322c2
commit 606d00b6cb
2 changed files with 8 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
surmap/track.cpp
View File

@@ -39,8 +39,6 @@ int Track_show_all;
static int delta = 20;
int n_function = 6;
int NoiseLevel,NoiseAmp,ShapeNumber,ShapeAmp;
int DeltamH = 0;
@@ -53,13 +51,6 @@ int cNode = 0;
//int UcutLeft,UcutRight,VcutUp,VcutDown;
PF* profils;
eBranch* delBranch = 0;
eNode* delNode = 0;
void drawpoly(int* x, int* y, int n, int, int, double, int, int, int, int, int, int, double, int, int);
void calc_normal_vector( eSection* data, int pos, int& xv, int& yv );
void set_one_section(int,eBranch*&,int,int ,int,int,int,int,int,int);
double f0( double t, double );
double f1( double t, double );
double f2( double t, double );
@@ -67,6 +58,13 @@ double f3( double t, double );
double f4( double t, double );
double f5( double t, double );
PF profils[] = {f0, f1, f2, f3, f4, f5};
eBranch* delBranch = 0;
eNode* delNode = 0;
void drawpoly(int* x, int* y, int n, int, int, double, int, int, int, int, int, int, double, int, int);
void calc_normal_vector( eSection* data, int pos, int& xv, int& yv );
void set_one_section(int,eBranch*&,int,int ,int,int,int,int,int,int);
unsigned realRND(unsigned m);
double f0( double t, double d ){
@@ -1825,9 +1823,6 @@ void drawpoly(int* x, int* y, int n, int hl, int hr, double t, int f1, int f2, i
if(!lt[minY] || !lt[maxY])
vMap -> change(minY,maxY);
// f1 = f1 % n_function;
// f2 = f2 % n_function;
if(hl <= 1) hl = 2;
else if(hl >= 254) hl = 253;
@@ -2178,16 +2173,6 @@ void sTrack::load(int n){
XStream fin(0);
if ( n == 0 ){
profils = new PF[n_function];
profils[0] = f0;
profils[1] = f1;
profils[2] = f2;
profils[3] = f3;
profils[4] = f4;
profils[5] = f5;
}
trackName[5] += n;
if(!fin.open(GetTargetName(trackName),XS_IN)){
trackName[5] -= n;

2
surmap/track.h
View File

@@ -217,7 +217,7 @@ struct sTrack {
};
typedef double (*PF)(double,double);
extern PF* profils;
extern PF profils[6];
extern sTrack Track;