Skip to content

Commit 0872085

Browse files
AMDmi3AMDmi3
committed
Get rid of deprecated register keyword
1 parent 4baeaf7 commit 0872085

File tree

27 files changed

+185
-186
lines changed

27 files changed

+185
-186
lines changed

‎lib/utils/xzip/inzip.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ void send_bits(int value,int length)
143143

144144
unsigned bi_reverse(unsigned code,int len)
145145
{
146-
register unsigned res = 0;
146+
unsigned res = 0;
147147
do {
148148
res |= code & 1;
149149
code >>= 1, res <<= 1;
@@ -307,7 +307,7 @@ static config configuration_table[10] = {
307307

308308
void lm_init(int pack_level,ushort* flags)
309309
{
310-
register unsigned j;
310+
unsigned j;
311311

312312
//if(pack_level < 1 || pack_level > 9) ErrH.Abort(IErrMsg);
313313

@@ -383,15 +383,15 @@ void lm_free(void)
383383
int longest_match(IPos cur_match)
384384
{
385385
unsigned chain_length = max_chain_length;
386-
register uchar *scan = window + strstart;
387-
register uchar *match;
388-
register int len;
386+
uchar *scan = window + strstart;
387+
uchar *match;
388+
int len;
389389
int best_len = prev_length;
390390
IPos limit = strstart > (IPos)MAX_DIST ? strstart - (IPos)MAX_DIST : NIL;
391391

392-
register uchar *strend = window + strstart + MAX_MATCH;
393-
register uchar scan_end1 = scan[best_len-1];
394-
register uchar scan_end = scan[best_len];
392+
uchar *strend = window + strstart + MAX_MATCH;
393+
uchar scan_end1 = scan[best_len-1];
394+
uchar scan_end = scan[best_len];
395395
if(prev_length >= good_match){
396396
chain_length >>= 2;
397397
}
@@ -427,7 +427,7 @@ int longest_match(IPos cur_match)
427427

428428
void fill_window(void)
429429
{
430-
register unsigned n, m;
430+
unsigned n, m;
431431
unsigned more = (unsigned)(window_size - (unsigned int)lookahead - (unsigned int)strstart);
432432
if(more == (unsigned)EOF){
433433
more--;
@@ -514,7 +514,7 @@ unsigned int deflate(void)
514514
IPos prev_match;
515515
int flush;
516516
int match_available = 0;
517-
register unsigned match_length = MIN_MATCH - 1;
517+
unsigned match_length = MIN_MATCH - 1;
518518

519519
if(level <= 3) return deflate_fast();
520520

‎lib/xtool/xbuffer/xbsearch.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
int XBuffer::search(const char* what, int mode, int cs)
44
{
5-
register int i,j;
5+
int i,j;
66
unsigned int wlen = strlen(what) - 1;
77
if(mode == XB_GLOBAL) { i = 0; mode = XB_FORWARD; } else i = offset;
88
if(mode == XB_FORWARD){
@@ -55,7 +55,7 @@ int XBuffer::search(const char* what, int mode, int cs)
5555

5656
int XBuffer::search(char* what, int mode, int cs)
5757
{
58-
register int i,j;
58+
int i,j;
5959
unsigned int wlen = strlen(what) - 1;
6060
if(mode == XB_GLOBAL) { i = 0; mode = XB_FORWARD; } else i = offset;
6161
if(mode == XB_FORWARD){

‎src/3d/3dgraph.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ void Normal::calc_intensity() // Metal
398398
{
399399
int Intens;
400400
if(n_power){
401-
register int Ln = Vector(*this)*Refl;
402-
register int RV = (Refl - (Vector(*this)*Ln >> 13))*View;
401+
int Ln = Vector(*this)*Refl;
402+
int RV = (Refl - (Vector(*this)*Ln >> 13))*View;
403403
if(Ln < 0 || RV < 0){
404404
I = 0;
405405
I_8 = 0;
@@ -409,7 +409,7 @@ void Normal::calc_intensity() // Metal
409409
+ (Ln >> 1);
410410
}
411411
else{
412-
register int Ln = Vector(*this)*Refl;
412+
int Ln = Vector(*this)*Refl;
413413
if(Ln < 0){
414414
I = 0;
415415
I_8 = 0;

‎src/3d/dynamics.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ inline int get_three_heights(int x,int y)
949949
if(!p)
950950
return 255;
951951
p += x & clip_mask_x;
952-
register unsigned char attr = *(p + H_SIZE);
952+
unsigned char attr = *(p + H_SIZE);
953953
if(!(attr & DOUBLE_LEVEL))
954954
return *p;
955955
//64 bit problem
@@ -4259,7 +4259,7 @@ models.
42594259
int obb_disjoint(const DBM& B, const DBV& T, double ax, double ay, double az, double bx, double by, double bz)
42604260
{
42614261
double t, s;
4262-
register int r;
4262+
int r;
42634263
double Bf[9];
42644264
const double reps = 1e-6;
42654265

‎src/3d/optimize.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ void Model::draw_child(const Vector& R,const DBM& A_c2p,const DBM& A_p2c)
268268
}
269269
void Model::z_buffering_draw()
270270
{
271-
register int i;
271+
int i;
272272
for(i = 0;i < num_vert;i++)
273273
vertices[i].fast_convert_z();
274274

@@ -339,7 +339,7 @@ void Object::pixel_draw()
339339

340340
void Model::pixel_draw()
341341
{
342-
register int i;
342+
int i;
343343
for(i = 0;i < num_vert;i++)
344344
vertices[i].fast_convert_z();
345345

‎src/dast/poly3d.cpp‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ inline uchar* get_up_ground( int x, int y )
5757

5858

5959
/*uchar sqr3( int x ){
60-
register uchar i;
60+
uchar i;
6161
6262
//if ( x >= 512 ) ErrH.Abort( "DAST : greater when table sqrt3" );
6363
if ( x >= 512 ) return 8;
@@ -102,8 +102,8 @@ dastPoly3D::dastPoly3D( Vector _p, int _n ){
102102
p = new Vector;
103103
*p = _p;
104104

105-
/* register uchar *l1 = get_real_ground(0, p[0].x & clip_mask_x, p[0].y);
106-
register uchar *l2 = get_real_ground(1, p[0].x & clip_mask_x, p[0].y);
105+
/* uchar *l1 = get_real_ground(0, p[0].x & clip_mask_x, p[0].y);
106+
uchar *l2 = get_real_ground(1, p[0].x & clip_mask_x, p[0].y);
107107
108108
if ( abs( *l1 - p[0].z) < abs(*l2 - p[0].z)){
109109
pf = &get_up_ground;
@@ -172,14 +172,14 @@ int dastPoly3D::quant_make_sign(void){
172172
p->y <<= 16; p->y += 1<<15;
173173

174174
if ( abs(dx ) > abs(dy) ) max = abs(dx); else max = abs(dy);
175-
register int tt = (1<<16)/max;
175+
int tt = (1<<16)/max;
176176

177177
dx *= tt;
178178
dy *= tt;
179179

180180
for( int i = 0; i < max; i++){
181-
register int x = (p->x)>>16;
182-
register int y = (p->y)>>16;
181+
int x = (p->x)>>16;
182+
int y = (p->y)>>16;
183183
//dastPutSandOnMapAlt( x ,y, uchar(p->z), uchar(5), dastResSign -> wide[n][count] );
184184
dastPutSandOnMapAlt( x ,y, uchar(p->z), uchar(6), dastResSign -> wide[n][count] );
185185
//regRender(x - 7, y - 7, x + 7, y + 7, 0);
@@ -251,7 +251,7 @@ void dastPoly3D::make_dast( void ){
251251
int mv;
252252
float dxh, dyh, dzh;
253253
int mh;
254-
register float x, y, z;
254+
float x, y, z;
255255
int i, j, k;
256256
int *h;
257257
int *hh;
@@ -267,8 +267,8 @@ void dastPoly3D::make_dast( void ){
267267
268268
// Нахождение уровня машинки
269269
270-
register uchar *l1 = get_real_ground(0, p[0].x & clip_mask_x, p[0].y);
271-
register uchar *l2 = get_real_ground(1, p[0].x & clip_mask_x, p[0].y);
270+
uchar *l1 = get_real_ground(0, p[0].x & clip_mask_x, p[0].y);
271+
uchar *l2 = get_real_ground(1, p[0].x & clip_mask_x, p[0].y);
272272
273273
if ( abs( *l1 - p[0].z) < abs(*l2 - p[0].z)){
274274
down = 0;
@@ -358,13 +358,13 @@ void dastPoly3D::make_dast( void ){
358358
}
359359
360360
if ( xr > xl ) {
361-
register int tmp = xr;
361+
int tmp = xr;
362362
xr = xl;
363363
xl = tmp;
364364
}
365365
366366
if ( yr > yl ) {
367-
register int tmp = yr;
367+
int tmp = yr;
368368
yr = yl;
369369
yl = tmp;
370370
}
@@ -388,7 +388,7 @@ void dastPoly3D::make_dast( void ){
388388
// Цикл по шагам сдвига ковша.
389389
390390
for( i = 0; i < mh + d_wide; i++){
391-
register float xx = x, yy = y, zz = z;
391+
float xx = x, yy = y, zz = z;
392392
393393
394394
// Цикл по точкам ковша - сдвигание поверхности.
@@ -446,7 +446,7 @@ const int _boder_ = 8;
446446
void dastPoly3D::make_dast( void ){
447447
int dxv, dyv, dzv, mv;
448448
int dxh, dyh, dzh, mh;
449-
register int x, y, z;
449+
int x, y, z;
450450
int i, j, k;
451451
int *h;
452452
int *hh;
@@ -462,8 +462,8 @@ void dastPoly3D::make_dast( void ){
462462
463463
// Нахождение уровня машинки
464464
465-
register uchar *l1 = get_real_ground(0, p[0].x & clip_mask_x, p[0].y);
466-
register uchar *l2 = get_real_ground(1, p[0].x & clip_mask_x, p[0].y);
465+
uchar *l1 = get_real_ground(0, p[0].x & clip_mask_x, p[0].y);
466+
uchar *l2 = get_real_ground(1, p[0].x & clip_mask_x, p[0].y);
467467
468468
if ( abs( *l1 - p[0].z) < abs(*l2 - p[0].z)){
469469
down = 0;
@@ -551,13 +551,13 @@ void dastPoly3D::make_dast( void ){
551551
}
552552
553553
if ( xr > xl ) {
554-
register int tmp = xr;
554+
int tmp = xr;
555555
xr = xl;
556556
xl = tmp;
557557
}
558558
559559
if ( yr > yl ) {
560-
register int tmp = yr;
560+
int tmp = yr;
561561
yr = yl;
562562
yl = tmp;
563563
}
@@ -584,14 +584,14 @@ void dastPoly3D::make_dast( void ){
584584
// Цикл по шагам сдвига ковша.
585585
586586
for( i = 0; i < mh + 4; i++){
587-
register int xx = x, yy = y, zz = z;
587+
int xx = x, yy = y, zz = z;
588588
589589
// Цикл по точкам ковша - пересыпание сдвинутой поверхности.
590590
591591
memset( hh - _boder_*2, 0, (mv+_boder_*4)*sizeof( int ));
592592
593593
for( j = 0; j < mv; j++){
594-
register int ha = h[j];
594+
int ha = h[j];
595595
596596
hh[j] += ha>>2;
597597
@@ -609,7 +609,7 @@ void dastPoly3D::make_dast( void ){
609609
610610
for( j = -_boder_*2; j < mv+_boder_*2; j++){
611611
int _h_;
612-
register xxx = (xx >> 16) & clip_mask_x, yyy = yy >> 16;
612+
xxx = (xx >> 16) & clip_mask_x, yyy = yy >> 16;
613613
614614
p0 = pf( xxx, yyy );
615615
_h_ = hh[j] >> 10;
@@ -669,7 +669,7 @@ void dastPoly3D::make_dast( void ){
669669
memset( hh - _boder_*2, 0, (mv+_boder_*4)*sizeof( int ));
670670
671671
for( j = 0; j < mv; j++){
672-
register int ha = h[j];
672+
int ha = h[j];
673673
674674
hh[j] += ha>>2;
675675
@@ -698,12 +698,12 @@ void dastPoly3D::make_dast( void ){
698698
p0 = pf( (( x >> 16) & clip_mask_x), y>>16 );
699699
*p0 += hhh;
700700
701-
register int _xx = xx, _yy = yy;
701+
int _xx = xx, _yy = yy;
702702
703703
for( k = 0; k < 8*hhh; k++){//6
704704
int xxx = _xx , yyy = _yy;
705705
706-
register int _xxx = (xxx >> 16) & clip_mask_x, _yyy = yyy >> 16;
706+
int _xxx = (xxx >> 16) & clip_mask_x, _yyy = yyy >> 16;
707707
uchar tt = 0;
708708
tt = hhh - (k>>3);
709709
@@ -785,7 +785,7 @@ void dastPoly3D::make_mole( dastResourcePoly3D* res ){
785785
return;
786786

787787
unsigned int scale;
788-
register int dz = *get_down_ground( (p_array[0].x) & clip_mask_x, p_array[0].y );
788+
int dz = *get_down_ground( (p_array[0].x) & clip_mask_x, p_array[0].y );
789789

790790
if ( dz < 50 ) scale = 1 << 15;
791791
else if ( dz < 120 ) scale = 1 << 14;
@@ -810,7 +810,7 @@ int dastPoly3D::make_first_mole( dastResourcePoly3D* res ){
810810
if (!vMap -> lineT[p->y & clip_mask_y])
811811
return 0;
812812

813-
register int dz = *get_down_ground( (p->x) & clip_mask_x, p->y );
813+
int dz = *get_down_ground( (p->x) & clip_mask_x, p->y );
814814

815815
n -= 3;
816816
count -= 3;
@@ -841,7 +841,7 @@ int dastPoly3D::make_last_mole( dastResourcePoly3D* res ){
841841
if (!vMap -> lineT[p->y & clip_mask_y])
842842
return 0;
843843

844-
register int dz = *get_down_ground( (p->x) & clip_mask_x, p->y );
844+
int dz = *get_down_ground( (p->x) & clip_mask_x, p->y );
845845

846846
count += 3;
847847

@@ -871,7 +871,7 @@ int dastPoly3D::make_catch_dolly( dastResourcePoly3D* res ){
871871
if (!vMap -> lineT[p->y & clip_mask_y])
872872
return 0;
873873

874-
register int dz = *get_down_ground( (p->x) & clip_mask_x, p->y );
874+
int dz = *get_down_ground( (p->x) & clip_mask_x, p->y );
875875

876876
if ( dz < 50 ) scale = 1 << 15;
877877
else if ( dz < 160 ) scale = 1 << 14;
@@ -1009,7 +1009,7 @@ void dastPutSpriteOnMapAlt(int x, int y, uchar *data, int x_size, int y_size, un
10091009
for( j = x - (x_size>>1); j < x + (x_size>>1); j++, data++){
10101010
llt = get_down_ground( (j) & clip_mask_x, i );
10111011
if (BREAKABLE_TERRAIN(*(llt + H_SIZE))){
1012-
register int dz = (*data)*scale>>15;
1012+
int dz = (*data)*scale>>15;
10131013
if ( *llt + dz < 256 ) *llt += dz;
10141014
else *llt = 255;
10151015
}
@@ -1022,8 +1022,8 @@ void dastPutSandOnMapAlt(int x, int y, uchar _z, uchar newter, uchar wide){
10221022
uchar _d = 82;
10231023
newter <<= TERRAIN_OFFSET;
10241024

1025-
register int x_size = wide;
1026-
register int y_size = wide;
1025+
int x_size = wide;
1026+
int y_size = wide;
10271027

10281028
for( i = y - (y_size>>1); i < y + (y_size>>1); i++)
10291029
if (!lt[(i) & clip_mask_y]) return;
@@ -1036,7 +1036,7 @@ void dastPutSandOnMapAlt(int x, int y, uchar _z, uchar newter, uchar wide){
10361036
if ( *lc > _z ) lc = get_down_ground( (j) & clip_mask_x, i );
10371037
if (*lc + _d < _z) continue;
10381038

1039-
register uchar hh = RND(4);
1039+
uchar hh = RND(4);
10401040
//if ( GET_TERRAIN(*(lc + H_SIZE)) ){
10411041
*lc += hh + RND(2);
10421042
//*lc += RND(6);

0 commit comments

Comments
 (0)