libs compiles

Windows/BGraph2Dx.cpp

@@ -23,7 +23,7 @@ static int initSizeY = 480;
 static unsigned short *mainBuffer=NULL;
 static unsigned short *secondBuffer=NULL;
 static unsigned short *curBuffer=NULL;
-static unsigned long main_linelen;
+static uint32_t main_linelen;
 
 #ifdef _DX_REF
 #define DXDEVICE_TYPE D3DDEVTYPE_REF
@@ -139,7 +139,7 @@ static void ColCalc()
   {
   do
     {
-    long val;
+    int32_t val;
     printf("number:");
     scanf("%X",&val);
     printf("RGB555(%d,%d,%d)\n",(val>>10),(val>>5) & 0x1F, val & 0x1F);
@@ -662,7 +662,7 @@ void DxLockBuffers(BOOL lock)
   else UnLockBuffers();
 }
 
-void StripBlt(void *data, unsigned int startline, unsigned long width)
+void StripBlt(void *data, unsigned int startline, uint32_t width)
 {
   unsigned short *start=startline*scr_linelen2+GetScreenAdr();
   while (width--)

Windows/BGraph2Dx.h

@@ -5,9 +5,9 @@
 extern "C" {
 #endif
 
-extern long scr_linelen;
-extern long scr_linelen2;
-extern long dx_linelen;
+extern int32_t scr_linelen;
+extern int32_t scr_linelen2;
+extern int32_t dx_linelen;
 
 
 //inicializuje a otevira rezim 640x480x16b v DX - otevre okno, pripravi vse pro beh hry
@@ -35,8 +35,8 @@ void DxDialogs(char enable);
 
 void setvesa_displaystart(int x,int y);
 
-extern long scr_linelen;
-extern long scr_linelen2;
+extern int32_t scr_linelen;
+extern int32_t scr_linelen2;
 
 void DxSetInitResolution(int x, int y);
 int DxGetResX();
@@ -47,7 +47,7 @@ void DXMouseTransform(unsigned short *x, unsigned short *y);
 HWND GetGameWindow();
 void DxLockBuffers(BOOL lock);
 
-void StripBlt(void *data, unsigned int startline, unsigned long width);
+void StripBlt(void *data, unsigned int startline, uint32_t width);
 
 
 #ifdef __cplusplus

Windows/FCS_Tasker.c

@@ -173,7 +173,7 @@ void *task_sleep(void *data)
   return data;
   }
 
-void *task_wait_event(long event_number)
+void *task_wait_event(int32_t event_number)
   {
   void *p;
   suspend_task(currentFiber,event_number);

Windows/FCS_Tasker.h

@@ -17,7 +17,7 @@ void suspend_task(int id_num,int msg);
 void shut_down_task(int id_num);
 void unsuspend_task(EVENT_MSG *msg);
 void *task_sleep(void *data);
-void *task_wait_event(long event_number);
+void *task_wait_event(int32_t event_number);
 int q_any_task();
 char task_quitmsg();
 char task_quitmsg_by_id(int id);

Windows/Music.cpp

@@ -250,7 +250,7 @@ int MusicPlayer::Write(const char *buf, int len)
     if (_crossfadebytes)
     {
       short *data=(short *)wrtptr;
-      long a=data[0]+sample[0];
+      int32_t a=data[0]+sample[0];
       if (a<-32767) a=-32767;
       if (a>32767) a=32767;
       data[0]=(short)a;
@@ -383,16 +383,16 @@ DWORD WINAPI MusDecoder::StartMusDecoder(LPVOID data)
 
 UINT MusDecoder::MusDecodingThread()
 {
-  long blocksRemain=_header.blocks;
+  int32_t blocksRemain=_header.blocks;
   char *packbuf=0;
   short *unpackbuf=0;
-  long packbufsz=0;
-  long unpackbufsz=0;
+  int32_t packbufsz=0;
+  int32_t unpackbufsz=0;
   for (int i=0;i<blocksRemain;i++)
   {
     if (_stop) break;
-    long packedSize;
-    long unpackedSize;
+    int32_t packedSize;
+    int32_t unpackedSize;
     DWORD bytesread;
     if (ReadFile(_file,&packedSize,sizeof(packedSize),&bytesread,NULL)==FALSE) break;
     if (ReadFile(_file,&unpackedSize,sizeof(unpackedSize),&bytesread,NULL)==FALSE) break;

Windows/Music.h

@@ -41,8 +41,8 @@ public:
   void Flush(int t) {}
   int GetOutputTime() {return 1;}
   int GetWrittenTime() {return 1;}
-  unsigned long AddRef() {return 1;}
-  unsigned long Release() {return 1;}
+  uint32_t AddRef() {return 1;}
+  uint32_t Release() {return 1;}
   int Pause(int pause);
   bool IsOpenned() {return _opened;}
 };
@@ -51,11 +51,11 @@ public:
 struct MusFileHeader
     {
     short channels;
-    long  freq;
-    long  ssize;
-    long  blocks;
-    long  reserved1;
-    long  reserved2;
+    int32_t  freq;
+    int32_t  ssize;
+    int32_t  blocks;
+    int32_t  reserved1;
+    int32_t  reserved2;
     short ampltable[256];
     };
   #pragma pack()

Windows/WAInputPlugin.h

@@ -56,9 +56,9 @@ public:
     // returns time written in MS (used for synching up vis stuff)
   virtual int GetWrittenTime()=0;
 
-  virtual unsigned long AddRef()=0;
+  virtual uint32_t AddRef()=0;
 
-  virtual unsigned long Release()=0;
+  virtual uint32_t Release()=0;
 
 };
 

Windows/WaveOut.h

@@ -43,8 +43,8 @@ public:
 	virtual void Flush(int t);	
     virtual int GetOutputTime();
     virtual int GetWrittenTime();
-    virtual unsigned long AddRef() {return 1;}
-    virtual unsigned long Release() {return 0;}
+    virtual uint32_t AddRef() {return 1;}
+    virtual uint32_t Release() {return 0;}
 };
 
 

Windows/skeldal_win.c

@@ -16,8 +16,8 @@ HKL english_layout=NULL;
 #define GET_Y_LPARAM(lp)   ((int)(short)HIWORD(lp))
 
 
-static unsigned long keyqueue[MAX_KEYQUEUE];
-static unsigned long keyqueuelen=0;
+static uint32_t keyqueue[MAX_KEYQUEUE];
+static uint32_t keyqueuelen=0;
 static char wheel_mapping[2]={'Q','I'};
 static BOOL noextra;
 MS_EVENT win_mouseEvent;
@@ -143,7 +143,7 @@ void WaitMsgQueue()
   CheckMessageQueue();
   }
 
-unsigned long _bios_keybrd(int mode)
+uint32_t _bios_keybrd(int mode)
   {
 repeat:
   if (keyqueuelen)

Windows/skeldal_win.h

@@ -15,7 +15,7 @@ extern "C"
 
 #define TIMERSPEED 20;
 
-unsigned long _bios_keybrd(int mode);
+uint32_t _bios_keybrd(int mode);
 
 
 LRESULT GameMainWindowWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);

Windows/wa_ipc.h

@@ -398,10 +398,10 @@ do not use :)
 
 #define IPC_GETMBURL 246
 /* (requires Winamp 2.2+)
-** char buffer[4096]; // Urls can be VERY long
+** char buffer[4096]; // Urls can be VERY int32_t
 ** SendMessage(hwnd_winamp,WM_WA_IPC,(WPARAM)buffer,IPC_GETMBURL);
 ** IPC_GETMBURL will retrieve the current Minibrowser URL into buffer.
-** buffer must be at least 4096 bytes long.
+** buffer must be at least 4096 bytes int32_t.
 */
 
 
@@ -505,7 +505,7 @@ typedef struct
 
 #define IPC_GETUNCOMPRESSINTERFACE 331
 /* returns a function pointer to uncompress().
-** int (*uncompress)(unsigned char *dest, unsigned long *destLen, const unsigned char *source, unsigned long sourceLen);
+** int (*uncompress)(unsigned char *dest, uint32_t *destLen, const unsigned char *source, uint32_t sourceLen);
 ** right out of zlib, useful for decompressing zlibbed data.
 ** if you pass the parm of 0x10100000, it will return a wa_inflate_struct * to an inflate API.
 */
@@ -515,7 +515,7 @@ typedef struct {
   int (*inflateInit_)(void *strm,const char *version, int stream_size);
   int (*inflate)(void *strm, int flush);
   int (*inflateEnd)(void *strm);
-  unsigned long (*crc32)(unsigned long crc, const unsigned  char *buf, unsigned int len);
+  uint32_t (*crc32)(uint32_t crc, const unsigned  char *buf, unsigned int len);
 } wa_inflate_struct;
 
 
@@ -778,7 +778,7 @@ class SubsItem;
 
 typedef	struct {
 	unsigned char*	baseAddr;
-	long			rowBytes;
+	int32_t			rowBytes;
 } YV12_PLANE;
 
 typedef	struct {

Windows/zvuk_win.cpp

@@ -57,7 +57,7 @@ char start_mixing()
 void stop_mixing()
   {
   }
-void play_sample(int channel,void *sample,long size,long lstart,long sfreq,int type)
+void play_sample(int channel,void *sample,int32_t size,int32_t lstart,int32_t sfreq,int type)
   {
   }
 void set_channel_volume(int channel,int left,int right)
@@ -87,7 +87,7 @@ void mute_channel(int channel)
 void chan_break_loop(int channel)
   {
   }
-void chan_break_ext(int channel,void *org_sample,long size_sample) //zrusi loop s moznosti dohrat zvuk
+void chan_break_ext(int channel,void *org_sample,int32_t size_sample) //zrusi loop s moznosti dohrat zvuk
   {
   }