2c2
< /* note that on the mac keyboard, capitals are not recognized 'H'='h' */
---
> 
193c193
< //#include <malloc.h>
---
> #include <malloc.h>
282,283c282,283
< // #define RAND_MAX 32767
< // #include <device.h>
---
> #define RAND_MAX 32767
> #include <device.h>
806,807c806
< int drawportal(int II,int JJ,int KK,int thick, int whichway, float size,
<                int colorkey);
---
> drawportal(int II,int JJ,int KK,int thick, int whichway, float size);
1131c1130
< #define  NRM(p)           sqrt(DOT((p),(p)))
---
> #define  NRM(p)           fsqrt(DOT((p),(p)))
1143c1142
< int  speed  ;  //gcc doesn't approve of a variable speed in autotymer
---
> int speed;
1183,1186c1182,1184
< // Jan12-05: We change these because the Mac is so fast: 
< static float theta_jump[11]={0.125,0.25,0.375,0.5,0.75,1,1.5,2.5,3.75,5,7.5};
< static float rot_jump[11]={0.25,0.5,0.75,1,1.5,2,3,5,7.5,10,15};
< static float fore_jump[11]={.0625,.0625,.125,.125,.25,.25,.5,1.,2.,4.};
---
> static float theta_jump[8]={0.5,0.75,1,1.5,2.5,3.75,5,7.5};
> static float rot_jump[8]={1,1.5,2,3,5,7.5,10,15};
> static float fore_jump[8]={.125,.125,.25,.25,.5,1.,2.,4.};
1280c1278
< int drawportal(int II,int JJ,int KK,int thick, int whichway, float size,
---
> drawportal(int II,int JJ,int KK,int thick, int whichway, float size,
2969,2971d2966
< 
< //////////////
< #if 0
2973,2986d2967
<   if(caveyes)
< #ifdef CAVE
<      s_var = CAVEMalloc(sizeof(struct share_var))
< #endif
<      ;
<    else
<      s_var = malloc(sizeof(struct share_var));
<   if(s_var==NULL)
<     {fprintf(stderr,"No room to share! %x \n",s_var); exit(1);}
< }
< #endif
< 
< //////////
< void getmem(void){ 
2993d2973
< 
2995,2998c2975,2976
<      // tex_ptr=(tex_ptrs*)malloc(sizeof(struct tex_ptrs));
<      tex_ptr =malloc(sizeof(struct tex_ptrs));
<      //s_var =(share_var*)malloc(sizeof(struct share_var));}
<        s_var =malloc(sizeof(struct share_var));}
---
>      tex_ptr=(tex_ptrs*)malloc(sizeof(struct tex_ptrs));
>      s_var =(share_var*)malloc(sizeof(struct share_var));}
3233c3211
< #if 0
---
> #ifdef 0
3359c3337
<   thick=1;arg_gap=.15;rand_maze=0;arg_wnd=1; speed=1;
---
>   thick=1;arg_gap=.15;rand_maze=0;arg_wnd=1;speed=1;
3372,3377c3350,3353
< #if 0
<     case 's': // speed=atoi(optarg);
<          if(speed<1 || speed>8)speed=1;
<          else speed-=1;
<      break;
< #endif
---
>     case 's': speed=atoi(optarg);
>       if(speed<1 || speed>8)speed=1;
>       else speed-=1;
>       break;
3414,3418c3390,3393
< // theta_jump[1]=.25 rot_jump[1]=.5 fore_jump[1]=.0625
<  static  int cnt4D =(int)( max_theta_delay*((90.0/.25)-1)+1);
<  static  int cnt3Drot=(int)(90.0/.5);
<  static  int cnt3Dmove=(int)( 8.0/.0625);
<  static  int elevDelay=(int)( 4.0/.0625);
---
>  static int cnt4D=(max_theta_delay*((90.0/theta_jump[speed])-1))+1;
>  static int cnt3Drot= 90.0/rot_jump[speed];
>  static int cnt3Dmove= 8.0/fore_jump[speed];
>  static int elevDelay= 4.0/fore_jump[speed];
3652c3627
<      if(key=='j'){morph=0;frozen=0;}
---
>      if(key=='H'){morph=0;frozen=0;}
4174c4149
< 	LABEL2(80,2420,"(H)ypertour pause/unpause/qu(j)t%s","");}
---
> 	LABEL2(80,2420,"(H)ypertour pause/unpause/quit%s","");}
4445c4420
< int main(int argc, char **argv){  
---
> void main(int argc, char **argv){