# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1344911252 -10800
# Node ID e76a4e19363dde19ac7fab0148fd44f9cdd69704
# Parent  91edd8d1a3f5bb100201ceb7dc65b55e9eb7e3c2
Various cleanups.

diff -r 91edd8d1a3f5 -r e76a4e19363d final_isi/3d.c
--- a/final_isi/3d.c	Tue Aug 14 05:25:51 2012 +0300
+++ b/final_isi/3d.c	Tue Aug 14 05:27:32 2012 +0300
@@ -293,18 +293,14 @@
 
 /*******************************/
 
-extern signed int mul32(signed int a,signed int b);
-
-#define jmul32(a,b) (((long)(a)*(long)(b))>>16)
-
 eggine_do(char*b,sint rot,int zoom,int basex,int basey) {
 	register sint i; sint j; sint fzed[20],fcez[20];
 
 	if(obu.faces==bugi_faces){
 		bugi_vxes[5].y=bugi_vxes[6].y=
-			1000+mul32(700,sini16[(taimeri*13)&255]);
+			1000+mul32(700,sini16[(pwplib_timer()*13)&255]);
 		bugi_vxes[7].y=bugi_vxes[8].y=
-			1000+mul32(700,sini16[(taimeri*7)&255]);
+			1000+mul32(700,sini16[(pwplib_timer()*7)&255]);
 	}
 
 	/***** rotate vertices *****/
diff -r 91edd8d1a3f5 -r e76a4e19363d final_isi/wrapper.c
--- a/final_isi/wrapper.c	Tue Aug 14 05:25:51 2012 +0300
+++ b/final_isi/wrapper.c	Tue Aug 14 05:27:32 2012 +0300
@@ -22,8 +22,11 @@
 
 void uncrunch(unsigned char*src,char*dst,int lgt)
 {
-  char attr=0x07,*nxtlin=dst+160;
-  for(;lgt>0;lgt--){
+  char attr=0x07,
+       *nxtlin = dst + 160;
+
+  for(;lgt>0;lgt--)
+  {
     int c=*src++;
     if(c>=32){dst[0]=c;dst[1]=attr;dst+=2;}else
     if(c<16)attr=(attr&0xf0)|c;else
@@ -60,7 +63,7 @@
   pwplib.videobuf.d=tmp;
 }
 
-int attrdump(char*s,char*d,int howmany)  /* fisi */
+void attrdump(char*s,char*d,int howmany)  /* fisi */
 {
   dumpbuf(s,d,howmany>>1);
 }
@@ -74,7 +77,7 @@
   fprintf(stderr,"dump216\n");  /* fisi */
 }
 
-int dumphybrid(uchar*a,uchar*b,uchar*d)  /* fisi */
+void dumphybrid(uchar*a,uchar*b,uchar*d)  /* fisi */
 {
   char tmp[80*50*2];int y=25;d=tmp;
   
@@ -91,7 +94,7 @@
 //  pwplib.dump_ibm();
 }
 
-int polytxloop(sint h,char*di,uint x1,sint dx0,sint dx1,char*txr,
+void polytxloop(sint h,char*di,uint x1,sint dx0,sint dx1,char*txr,
                sint dv,sint du)  /* fisi */
 {
   int x0=0,u=0,tpv=0;
diff -r 91edd8d1a3f5 -r e76a4e19363d final_isi/wrapper.h
--- a/final_isi/wrapper.h	Tue Aug 14 05:25:51 2012 +0300
+++ b/final_isi/wrapper.h	Tue Aug 14 05:27:32 2012 +0300
@@ -1,24 +1,10 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <unistd.h>
-
 #include "../pwplib/pwplib.h"
-
-#define sqrt sqrt__
-#define cprintf printf
-
-#define DEBUG(a) fprintf(stderr,a "\n")
-
-#define taimeri pwplib_timer()
-
-/*extern inline int dummy(){}*/
-
-/* taimeri => gettimer(); */
+typedef unsigned short int sint16;
 
 typedef unsigned char uchar;
 typedef signed int sint;
 #define uint unsigned int
 typedef signed char schar;
 
-/**/
+void         waitretrace();
+signed int   mul32(int a, int b);