mirror of
https://github.com/ondra-novak/gates_of_skeldal.git
synced 2025-07-16 03:06:45 -04:00
libs compiles
This commit is contained in:
Ondřej Novák
parent
1b0f7fe0c2
commit
a7278bac40
121 changed files with 1528 additions and 1731 deletions
|
|
@ -2,4 +2,4 @@ SET(files automap.c clk_map.c dialogy.c dump.cpp enemy.c engine2.c g
|
|||
builder.c engine1.c gamesave.c interfac.c kniha.c macros.c realgame.c setup.c sndandmus.c specproc.c)
|
||||
|
||||
add_executable(skeldal ${files})
|
||||
|
||||
target_link_libraries(skeldal skeldal_libs)
|
||||
|
|
|
|||
|
|
@ -208,14 +208,12 @@ void psani_poznamek_event(EVENT_MSG *msg,void **data)
|
|||
data;
|
||||
if (msg->msg==E_INIT)
|
||||
{
|
||||
int *p;
|
||||
char *c;
|
||||
char *c;
|
||||
x = va_arg(msg->data, int);
|
||||
y = va_arg(msg->data, int);
|
||||
c = va_arg(msg->data, char *);
|
||||
|
||||
set_font(H_FLITT5,NOSHADOW(0));
|
||||
p=msg->data;
|
||||
x=p[0];
|
||||
y=p[1];
|
||||
c=*(char **)(p+2);
|
||||
strcpy(text,c);
|
||||
save=(char *)getmem(strlen(text)+1);
|
||||
strcpy(save,text);
|
||||
|
|
@ -242,7 +240,7 @@ void psani_poznamek_event(EVENT_MSG *msg,void **data)
|
|||
{
|
||||
char c;
|
||||
|
||||
c=*(char *)msg->data;
|
||||
c=va_arg(msg->data, int);
|
||||
set_font(H_FLITT5,NOSHADOW(0));
|
||||
if (c)
|
||||
{
|
||||
|
|
@ -438,7 +436,7 @@ static void draw_amap_sector(int x,int y,int sector,int mode,int turn,int line1,
|
|||
void herni_cas(char *s)
|
||||
{
|
||||
int mes,den,hod,min;
|
||||
long cas;
|
||||
int32_t cas;
|
||||
|
||||
cas=game_time;
|
||||
mes=cas/(360*24*30);cas%=360*24*30;
|
||||
|
|
@ -464,7 +462,7 @@ void herni_cas(char *s)
|
|||
static void zobraz_herni_cas(void)
|
||||
{
|
||||
static char text[100];
|
||||
static long old_time=-1;
|
||||
static int32_t old_time=-1;
|
||||
char cas[100];
|
||||
|
||||
if (old_time!=game_time)
|
||||
|
|
@ -627,7 +625,8 @@ void *map_keyboard(EVENT_MSG *msg,void **usr)
|
|||
if (msg->msg==E_AUTOMAP_REDRAW) draw=4;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=(*(int *)msg->data)>>8;
|
||||
int d = va_arg(msg->data, int);
|
||||
c=d>>8;
|
||||
switch (c)
|
||||
{
|
||||
case 'H':yr++;draw=4;break;
|
||||
|
|
@ -641,10 +640,8 @@ void *map_keyboard(EVENT_MSG *msg,void **usr)
|
|||
case 15:
|
||||
case 50:
|
||||
case 1:
|
||||
(*(int *)msg->data)=0;
|
||||
unwire_proc();
|
||||
wire_proc();
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -893,14 +890,16 @@ char map_target_cancel(int id,int xa,int ya,int xr,int yr)
|
|||
void map_teleport_keyboard(EVENT_MSG *msg,void **usr)
|
||||
{
|
||||
usr;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
switch (*(short *)msg->data>>8)
|
||||
if (msg->msg==E_KEYBOARD) {
|
||||
int c = va_arg(msg->data, int);
|
||||
switch (c>>8)
|
||||
{
|
||||
case 1:
|
||||
case 15:
|
||||
case 50: exit_wait=1; msg->msg=-1;break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
static char path_ok(word sector)
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ void show_money()
|
|||
{
|
||||
char c[20];
|
||||
set_font(H_FONT7,RGB555(28,28,21));
|
||||
sprintf(c,"%ld",money);
|
||||
sprintf(c,"%d",money);
|
||||
set_aligned_position(460,13,2,2,c);
|
||||
outtext(c);
|
||||
}
|
||||
|
|
@ -275,7 +275,7 @@ word *bott_clear(void)
|
|||
{
|
||||
word *bott_scr;
|
||||
|
||||
long sz;
|
||||
int32_t sz;
|
||||
bott_scr=(word *)getmem(sz = scr_linelen2*104*2);
|
||||
memset(bott_scr,0,sz);
|
||||
return bott_scr;
|
||||
|
|
@ -290,7 +290,7 @@ static void draw_small_icone(int num,int x,int y)
|
|||
put_textured_bar(pic,x,y,13,13,num,0);
|
||||
}
|
||||
|
||||
static void bott_fletna_normal(void **pp,long *s)
|
||||
static void bott_fletna_normal(void **pp,int32_t *s)
|
||||
{
|
||||
word *bott_scr;
|
||||
int i,x;
|
||||
|
|
@ -308,7 +308,7 @@ static void bott_fletna_normal(void **pp,long *s)
|
|||
RestoreScreen();
|
||||
}
|
||||
|
||||
static void bott_draw_normal(void **pp,long *s)
|
||||
static void bott_draw_normal(void **pp,int32_t *s)
|
||||
{
|
||||
int i,j;int x,xs=0,y;
|
||||
word *bott_scr;
|
||||
|
|
@ -415,7 +415,7 @@ void bott_timer_draw(struct the_timer *q)
|
|||
bott_timer=NULL;
|
||||
}
|
||||
|
||||
void bott_disp_text_proc(void **pp,long *ss)
|
||||
void bott_disp_text_proc(void **pp,int32_t *ss)
|
||||
{
|
||||
char *p,*text;
|
||||
int y=20;
|
||||
|
|
@ -471,7 +471,7 @@ static void MaskPutPicture(int x, int y, char mask, word color, char blend, void
|
|||
}
|
||||
|
||||
|
||||
void bott_draw_rune(void **pp,long *ss)
|
||||
void bott_draw_rune(void **pp,int32_t *ss)
|
||||
{
|
||||
int sel_zivel=showrune/10;
|
||||
int sel_rune=showrune%10;
|
||||
|
|
@ -519,7 +519,7 @@ void bott_text_forever()
|
|||
bott_timer=NULL;
|
||||
}
|
||||
|
||||
void bott_draw_proc(void **p,long *s)
|
||||
void bott_draw_proc(void **p,int32_t *s)
|
||||
{
|
||||
switch (bott_display)
|
||||
{
|
||||
|
|
@ -645,7 +645,7 @@ int enter_tab[VIEW3D_Z+1][VIEW3D_X*2+1]=
|
|||
void crt_minimap_itr(int sector,int smer,int itrx,int itry, int automap)
|
||||
{
|
||||
static int sector_temp;
|
||||
static long sideflags;
|
||||
static int32_t sideflags;
|
||||
static short enter=0;
|
||||
short savee;
|
||||
|
||||
|
|
|
|||
|
|
@ -514,7 +514,7 @@ static void stop_edit_name()
|
|||
{
|
||||
shut_downing_text=1;send_message(E_KEYBOARD,13);
|
||||
task_sleep(NULL);
|
||||
if (edit_task>0 && is_running(edit_task))
|
||||
if (edit_task>0 && is_running(edit_task))
|
||||
shut_down_task(edit_task);
|
||||
shut_downing_text=0;
|
||||
}
|
||||
|
|
@ -752,7 +752,8 @@ static void enter_reaction(EVENT_MSG *msg,void **unused)
|
|||
unused;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
if (*(char *)msg->data==13 && !shut_downing_text)
|
||||
int c = va_arg(msg->data, int);
|
||||
if (c==13 && !shut_downing_text)
|
||||
{
|
||||
send_message(E_KEYBOARD,13);
|
||||
bott_draw(1);
|
||||
|
|
@ -766,7 +767,8 @@ static void enter_reaction(EVENT_MSG *msg,void **unused)
|
|||
static void enter_reaction2(EVENT_MSG *msg,void **unused)
|
||||
{
|
||||
unused;
|
||||
if (msg->msg==E_KEYBOARD && *(char *)msg->data==13 && !shut_downing_text && ~b_disables & 0x3)
|
||||
int c = va_arg(msg->data, int)
|
||||
if (msg->msg==E_KEYBOARD && c==13 && !shut_downing_text && ~b_disables & 0x3)
|
||||
{
|
||||
send_message(E_KEYBOARD,13);
|
||||
bott_draw(1);
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
#include <stdio.h>
|
||||
#include <mem.h>
|
||||
|
||||
unsigned long l;
|
||||
uint32_t l;
|
||||
|
||||
#define ZAKLAD_CRC 0xC005
|
||||
|
||||
char data[100000];
|
||||
long delka;
|
||||
int32_t delka;
|
||||
FILE *f;
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ typedef struct t_paragraph
|
|||
unsigned alt:15;
|
||||
unsigned visited:1;
|
||||
unsigned first:1;
|
||||
long position;
|
||||
int32_t position;
|
||||
}T_PARAGRAPH;
|
||||
|
||||
#define STR_BUFF_SIZ 4096
|
||||
|
|
@ -126,7 +126,7 @@ static int glob_y;
|
|||
static int last_pgf;
|
||||
|
||||
static word *paleta;
|
||||
static long loc_anim_render_buffer;
|
||||
static int32_t loc_anim_render_buffer;
|
||||
static short task_num=-1;
|
||||
|
||||
void small_anm_buff(void *target,void *buff,void *paleta);
|
||||
|
|
@ -688,9 +688,9 @@ static void key_check(EVENT_MSG *msg,void **unused)
|
|||
unused;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=*(char *)msg->data;
|
||||
d=*(int *)msg->data>>8;
|
||||
if (c==0)
|
||||
int c = va_arg(msg->data, int);
|
||||
d=c>>8;
|
||||
if (c & 0xFF)
|
||||
{
|
||||
switch(d)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
#include <bgraph.h>
|
||||
|
||||
FILE *dlg;
|
||||
long *odstavce=NULL;
|
||||
int32_t *odstavce=NULL;
|
||||
int pocet;
|
||||
|
||||
int selptr=0;
|
||||
|
|
@ -61,11 +61,11 @@ int count_pargh()
|
|||
void read_pargh()
|
||||
{
|
||||
int s,i;
|
||||
long *d;
|
||||
int32_t *d;
|
||||
char c;
|
||||
if (odstavce!=NULL) free(odstavce);
|
||||
odstavce=NULL;
|
||||
s=(pocet=i=count_pargh())*sizeof(long)*2;
|
||||
s=(pocet=i=count_pargh())*sizeof(int32_t)*2;
|
||||
if (s==0) return;
|
||||
odstavce=getmem(s);
|
||||
d=odstavce;
|
||||
|
|
@ -92,9 +92,9 @@ void dlg_error(char *chyba)
|
|||
exit(1);
|
||||
}
|
||||
|
||||
long *najdi_odstavec(int odstavec)
|
||||
int32_t *najdi_odstavec(int odstavec)
|
||||
{
|
||||
long *d;
|
||||
int32_t *d;
|
||||
int i;
|
||||
|
||||
|
||||
|
|
@ -111,7 +111,7 @@ long *najdi_odstavec(int odstavec)
|
|||
|
||||
char jdi_na_odstavec(int odstavec)
|
||||
{
|
||||
long *l,m;
|
||||
int32_t *l,m;
|
||||
char c;
|
||||
|
||||
l=najdi_odstavec(odstavec);
|
||||
|
|
@ -121,9 +121,9 @@ char jdi_na_odstavec(int odstavec)
|
|||
return c;
|
||||
}
|
||||
|
||||
void set_flags(int n,long maskand,long maskor)
|
||||
void set_flags(int n,int32_t maskand,int32_t maskor)
|
||||
{
|
||||
long *l;
|
||||
int32_t *l;
|
||||
l=najdi_odstavec(n);
|
||||
l[1]&=(maskand<<24)+0xffffff;
|
||||
l[1]|=maskor<<24;
|
||||
|
|
@ -152,7 +152,7 @@ int nparam(int n,char *c)
|
|||
void proved_goto(int num)
|
||||
{
|
||||
char c;
|
||||
long l;
|
||||
int32_t l;
|
||||
l=ftell(dlg);
|
||||
c=jdi_na_odstavec(num);
|
||||
while (c & 1)
|
||||
|
|
@ -220,7 +220,7 @@ void proved_d(char *code,char *text)
|
|||
}
|
||||
else if (*code==4)
|
||||
{
|
||||
long *l=najdi_odstavec(param(text));
|
||||
int32_t *l=najdi_odstavec(param(text));
|
||||
char c,*d;
|
||||
|
||||
c=l[1]>>24;
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ static EVENT_PROC(mob_reload)
|
|||
if (counter++==10)
|
||||
{
|
||||
TMOB *m;
|
||||
long vl;
|
||||
int32_t vl;
|
||||
|
||||
static int last;
|
||||
counter=0;
|
||||
|
|
@ -344,7 +344,7 @@ static void mob_sound_event(TMOB *m,int event)
|
|||
play_sample_at_sector(m->cislo_vzoru+16*6+event+monster_block,viewsector,m->sector,0,0);
|
||||
}
|
||||
|
||||
void load_enemies(short *data,int size,int *grptr,TMOB *template,long tsize)
|
||||
void load_enemies(short *data,int size,int *grptr,TMOB *template,int32_t tsize)
|
||||
{
|
||||
int i;
|
||||
short cisla[256];
|
||||
|
|
|
|||
|
|
@ -45,21 +45,21 @@ void sikma_zleva(void);
|
|||
//#pragma aux sikma_zleva parm modify [EAX EBX ECX EDX ESI EDI]
|
||||
void sikma_zprava(void);
|
||||
//#pragma aux sikma_zprava parm modify [EAX EBX ECX EDX ESI EDI]
|
||||
/*void zooming_dx(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
/*void zooming_dx(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming_dx parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void zooming32(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void zooming32(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming32 parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void zooming32b(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void zooming32b(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming32b parm [ESI][EDI][EAX][EBX][ECX] modify [EAX EDX]
|
||||
void zooming_lo(void *source,void *target,void *xlat,long xysize);
|
||||
void zooming_lo(void *source,void *target,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming_lo parm [ESI][EDI][EBX][ECX] modify [EAX EDX]
|
||||
void zooming256(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void zooming256(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming256 parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void zooming256b(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void zooming256b(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming256b parm [ESI][EDI][EAX][EBX][ECX] modify [EAX EDX]
|
||||
void zooming64(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void zooming64(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming64 parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void zooming64b(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void zooming64b(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux zooming64b parm [ESI][EDI][EAX][EBX][ECX] modify [EAX EDX]
|
||||
void scroll_support_dx(void *lbuf,void *src1,void *src2,int size1);
|
||||
//#pragma aux scroll_support_dx parm [EDI][ESI][EDX][ECX] modify [EAX]
|
||||
|
|
@ -78,38 +78,38 @@ void scroll_support_64b(void *lbuf,void *src1,void *src2,int size1,void *xlat);
|
|||
void fcdraw(void *source,void *target, void *table);
|
||||
//#pragma aux fcdraw parm [EDX][EBX][EAX] modify [ECX ESI EDI];
|
||||
|
||||
/*void lodka32(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
/*void lodka32(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka32 parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void lodka_dx(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void lodka_dx(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka_dx parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void lodka32b(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void lodka32b(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka32b parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
|
||||
void lodka256(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void lodka256(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka256 parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void lodka256b(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void lodka256b(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka256b parm [ESI][EDI][EAX][EBX][ECX] modify [EAX EDX]
|
||||
|
||||
void lodka64(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void lodka64(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka64 parm [ESI][EDI][EAX][EBX][ECX] modify [EDX]
|
||||
void lodka64b(void *source,void *target,void *background,void *xlat,long xysize);
|
||||
void lodka64b(void *source,void *target,void *background,void *xlat,int32_t xysize);
|
||||
//#pragma aux lodka64b parm [ESI][EDI][EAX][EBX][ECX] modify [EAX EDX]
|
||||
*/
|
||||
|
||||
void *p,*p2,*pozadi,*podlaha,*strop,*sit;int i;
|
||||
void (*zooming)(void *source,long target,word *background,void *xlat,long xysize);
|
||||
void (*turn)(long lbuf,void *src1,void *src2,int size1);
|
||||
void (*zooming)(void *source,int32_t target,word *background,void *xlat,int32_t xysize);
|
||||
void (*turn)(int32_t lbuf,void *src1,void *src2,int size1);
|
||||
word *GetBuffer2nd();
|
||||
word *background;
|
||||
char debug=0,nosides=0,nofloors=0,drwsit=0,show_names=0,show_lives=0;
|
||||
static long old_timer;
|
||||
static int32_t old_timer;
|
||||
|
||||
static void wait_timer()
|
||||
{
|
||||
sleep_ms(10);
|
||||
}
|
||||
|
||||
/*void zooming1(void *source,long target,word *background,void *xlat,long xysize)
|
||||
/*void zooming1(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
wait_timer();
|
||||
if (backgrnd_mode)
|
||||
|
|
@ -119,7 +119,7 @@ static void wait_timer()
|
|||
showview(0,0,0,0);
|
||||
}
|
||||
/*
|
||||
void zooming2(void *source,long target,word *background,void *xlat,long xysize)
|
||||
void zooming2(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
word *lbuffer=LockDirectScreen();
|
||||
wait_timer();
|
||||
|
|
@ -130,12 +130,12 @@ void zooming2(void *source,long target,word *background,void *xlat,long xysize)
|
|||
UnlockDirectScreen();
|
||||
}
|
||||
|
||||
void zooming3(void *source,long target,word *background,void *xlat,long xysize)
|
||||
void zooming3(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
source;target;background;xlat;xysize;
|
||||
}
|
||||
|
||||
/*void zooming4(void *source,long target,word *background,void *xlat,long xysize)
|
||||
/*void zooming4(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
word *lbuffer=LockDirectScreen();
|
||||
wait_timer();
|
||||
|
|
@ -146,7 +146,7 @@ void zooming3(void *source,long target,word *background,void *xlat,long xysize)
|
|||
UnlockDirectScreen();
|
||||
}*/
|
||||
/*
|
||||
void zooming5(void *source,long target,word *background,void *xlat,long xysize)
|
||||
void zooming5(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
wait_timer();
|
||||
if (backgrnd_mode)
|
||||
|
|
@ -155,7 +155,7 @@ void zooming5(void *source,long target,word *background,void *xlat,long xysize)
|
|||
zooming256b(source,(void *)target,background+3,xlat,xysize);
|
||||
}
|
||||
|
||||
void zooming6(void *source,long target,word *background,void *xlat,long xysize)
|
||||
void zooming6(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
word *lbuffer=LockDirectScreen();
|
||||
wait_timer();
|
||||
|
|
@ -166,7 +166,7 @@ void zooming6(void *source,long target,word *background,void *xlat,long xysize)
|
|||
UnlockDirectScreen();
|
||||
}
|
||||
/*
|
||||
void zooming7(void *source,long target,word *background,void *xlat,long xysize)
|
||||
void zooming7(void *source,int32_t target,word *background,void *xlat,int32_t xysize)
|
||||
{
|
||||
wait_timer();
|
||||
if (backgrnd_mode)
|
||||
|
|
@ -176,38 +176,38 @@ void zooming7(void *source,long target,word *background,void *xlat,long xysize)
|
|||
}
|
||||
*/
|
||||
|
||||
void turn1(long lbuf,void *src1,void *src2,int size1)
|
||||
void turn1(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
//wait_timer();
|
||||
// scroll_support_dx(lbuf+GetScreenAdr(),src1,src2,size1);
|
||||
showview(0,0,0,0);
|
||||
}
|
||||
|
||||
/*void turn2(long lbuf,void *src1,void *src2,int size1)
|
||||
/*void turn2(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
wait_timer();
|
||||
scroll_support_256((lbuf>>1)+lbuffer,src1,src2,size1,xlatmem);
|
||||
}
|
||||
*/
|
||||
void turn3(long lbuf,void *src1,void *src2,int size1)
|
||||
void turn3(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
lbuf;src1;src2;size1;
|
||||
}
|
||||
/*
|
||||
void turn4(long lbuf,void *src1,void *src2,int size1)
|
||||
void turn4(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
wait_timer();
|
||||
scroll_support_32b((void *)(lbuf*2),src1,src2,size1);
|
||||
}
|
||||
|
||||
void turn5(long lbuf,void *src1,void *src2,int size1)
|
||||
void turn5(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
wait_timer();
|
||||
scroll_support_256b((void *)lbuf,src1,src2,size1,xlatmem);
|
||||
}
|
||||
*/
|
||||
/*
|
||||
void turn6(long lbuf,void *src1,void *src2,int size1)
|
||||
void turn6(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
word *lbuffer=LockDirectScreen();
|
||||
wait_timer();
|
||||
|
|
@ -215,7 +215,7 @@ void turn6(long lbuf,void *src1,void *src2,int size1)
|
|||
UnlockDirectScreen();
|
||||
}
|
||||
/*
|
||||
void turn7(long lbuf,void *src1,void *src2,int size1)
|
||||
void turn7(int32_t lbuf,void *src1,void *src2,int size1)
|
||||
{
|
||||
wait_timer();
|
||||
scroll_support_64b((void *)(lbuf*2),src1,src2,size1,xlatmem);
|
||||
|
|
@ -245,7 +245,7 @@ void calc_points(void)
|
|||
}
|
||||
}
|
||||
|
||||
void calc_x_buffer(long *ptr,long txt_size_x, long len,long total,long scale1)
|
||||
void calc_x_buffer(int32_t *ptr,int32_t txt_size_x, int32_t len,int32_t total,int32_t scale1)
|
||||
{
|
||||
int i,j,old,z=-1;
|
||||
|
||||
|
|
@ -264,7 +264,7 @@ void calc_x_buffer(long *ptr,long txt_size_x, long len,long total,long scale1)
|
|||
|
||||
}
|
||||
|
||||
void calc_y_buffer(short *ptr,long txt_size_y, long len,long total)
|
||||
void calc_y_buffer(short *ptr,int32_t txt_size_y, int32_t len,int32_t total)
|
||||
{
|
||||
int i,j,old;
|
||||
|
||||
|
|
@ -445,7 +445,7 @@ static void zooming_forward_backward(word *background,char back)
|
|||
{
|
||||
if (!zooming_step) return;
|
||||
{
|
||||
long tmp=get_timer_value();
|
||||
int32_t tmp=get_timer_value();
|
||||
void *buffer=DxPrepareWalk(SCREEN_OFFLINE);
|
||||
int tpoints[4]={90,31,90+460,31+259};
|
||||
|
||||
|
|
@ -482,7 +482,7 @@ void zooming_backward(word *background)
|
|||
if (!zooming_step) return;
|
||||
for (i=0;i<ZOOM_PHASES;i+=zooming_step)
|
||||
{
|
||||
zoom.xtable=(long *)&zooming_xtable[i];
|
||||
zoom.xtable=(int32_t *)&zooming_xtable[i];
|
||||
zoom.ytable=(short *)&zooming_ytable[i];
|
||||
zoom.texture_line=0;
|
||||
do_events();
|
||||
|
|
@ -495,7 +495,7 @@ void zooming_backward(word *background)
|
|||
if (!zooming_step) return;
|
||||
for (i=ZOOM_PHASES-1;i>=0;i-=zooming_step)
|
||||
{
|
||||
zoom.xtable=(long *)&zooming_xtable[i];
|
||||
zoom.xtable=(int32_t *)&zooming_xtable[i];
|
||||
zoom.ytable=(short *)&zooming_ytable[i];
|
||||
zoom.texture_line=0;
|
||||
do_events();
|
||||
|
|
@ -510,7 +510,7 @@ static void turn_left_right(char right)
|
|||
{
|
||||
if (!rot_phases) return;
|
||||
{
|
||||
long tmp=get_timer_value();
|
||||
int32_t tmp=get_timer_value();
|
||||
void *buffer=DxPrepareTurn(SCREEN_OFFLINE);
|
||||
|
||||
int maxtime=5*rot_phases;
|
||||
|
|
@ -959,7 +959,7 @@ void map_pos(int celx,int cely,int posx,int posy,int posz,int *x,int *y)
|
|||
T_INFO_Y *yd;
|
||||
T_INFO_X *x3d;
|
||||
int ys1,ys2,xs1,xs2;
|
||||
static long zoomtab_x[640];
|
||||
static int32_t zoomtab_x[640];
|
||||
static short zoomtab_y[360];
|
||||
static lastcely=-1;
|
||||
int randx,randy;
|
||||
|
|
@ -1012,14 +1012,14 @@ void map_pos(int celx,int cely,int posx,int posy,int posz,int *x,int *y)
|
|||
if ((cely<<1)+posy!=lastcely)
|
||||
{
|
||||
lastcely=(cely<<1)+posy;
|
||||
calc_x_buffer((long *)&zoomtab_x,xs2,xs1,640,xs2);
|
||||
calc_x_buffer((int32_t *)&zoomtab_x,xs2,xs1,640,xs2);
|
||||
calc_y_buffer((short *)&zoomtab_y,ys2,ys1,360);
|
||||
}
|
||||
if (y-ysr<0) ysr=y;
|
||||
zoom.startptr=GetBuffer2nd()+y*640+x+SCREEN_OFFSET;
|
||||
zoom.texture=(short *)((char *)(&pic[3+SHADE_PAL])+xofs);
|
||||
zoom.texture_line=xs;
|
||||
zoom.xtable=(long *)&zoomtab_x;
|
||||
zoom.xtable=(int32_t *)&zoomtab_x;
|
||||
zoom.ytable=(short *)&zoomtab_y;
|
||||
zoom.palette=(word *)&pic[3+cely*256+(secnd_shade?SHADE_STEPS*256:0)];
|
||||
zoom.ycount=ysr;
|
||||
|
|
@ -1092,7 +1092,7 @@ void draw_placed_texture(short *txtr,int celx,int cely,int posx,int posy,int pos
|
|||
/*void draw_placed_texture(short *txtr,int celx,int cely,int posx,int posy,int posz,char turn)
|
||||
{
|
||||
int x,y,xsr,ysr;
|
||||
long zoomtab_x[640];
|
||||
int32_t zoomtab_x[640];
|
||||
short zoomtab_y[360];
|
||||
int xs,ys,xofs,xmax;
|
||||
|
||||
|
|
@ -1122,7 +1122,7 @@ void draw_placed_texture(short *txtr,int celx,int cely,int posx,int posy,int pos
|
|||
xofs=0;
|
||||
xmax=xsr;
|
||||
}
|
||||
calc_x_buffer((long *)&zoomtab_x,320,last_scale,640,last_scale);
|
||||
calc_x_buffer((int32_t *)&zoomtab_x,320,last_scale,640,last_scale);
|
||||
calc_y_buffer((short *)&zoomtab_y,320,last_scale,360);
|
||||
if (y-ysr<0) ysr=y;
|
||||
if (ysr<=0) return;
|
||||
|
|
@ -1130,7 +1130,7 @@ void draw_placed_texture(short *txtr,int celx,int cely,int posx,int posy,int pos
|
|||
else zoom.startptr=GetBuffer2nd()+y*640+x+SCREEN_OFFSET;
|
||||
zoom.texture=(short *)((char *)(&txtr[3+SHADE_PAL])+xofs);
|
||||
zoom.texture_line=xs;
|
||||
zoom.xtable=(long *)&zoomtab_x;
|
||||
zoom.xtable=(int32_t *)&zoomtab_x;
|
||||
zoom.ytable=(short *)&zoomtab_y;
|
||||
zoom.palette=(word *)&txtr[3+cely*256+(secnd_shade?SHADE_STEPS*256:0)];
|
||||
zoom.ycount=ysr;
|
||||
|
|
|
|||
|
|
@ -50,8 +50,8 @@ void clear_buff(word *background,word backcolor,int lines);
|
|||
typedef struct zoominfo
|
||||
{
|
||||
void *startptr, *texture;
|
||||
long texture_line,line_len;
|
||||
long *xtable;
|
||||
int32_t texture_line,line_len;
|
||||
int32_t *xtable;
|
||||
short *ytable;
|
||||
word *palette;
|
||||
word ycount;
|
||||
|
|
@ -61,7 +61,7 @@ typedef struct zoominfo
|
|||
|
||||
typedef struct t_info_y
|
||||
{
|
||||
long drawline; //ukazatel na radku na ktere bude stena zacinat
|
||||
int32_t drawline; //ukazatel na radku na ktere bude stena zacinat
|
||||
word vert_size; //konecna velikost steny, pokud ma pocatecni velikost TXT_SIZE_Y
|
||||
word vert_total; //maximalni velikost textury aby jeste nepresahla obrazovku
|
||||
short zoom_table[TAB_SIZE_Y]; //tabulka pro zoomovaci rutiny
|
||||
|
|
@ -73,7 +73,7 @@ typedef struct t_info_x_3d
|
|||
integer xpos; //bod od leveho okraje
|
||||
word txtoffset; //posunuti x vuci texture
|
||||
word point_total; //rozdil mezi levym prednim a levym zadnim okrajem postranni steny (v adresach)
|
||||
long zoom_table[VIEW_SIZE_X]; //zoomovaci tabulka pro osu x pro postranni steny
|
||||
int32_t zoom_table[VIEW_SIZE_X]; //zoomovaci tabulka pro osu x pro postranni steny
|
||||
}T_INFO_X_3D;
|
||||
|
||||
typedef struct t_info_x
|
||||
|
|
@ -84,12 +84,12 @@ typedef struct t_info_x
|
|||
word txtoffset; //posunuti x vuci texture
|
||||
word max_x; //pocet viditelnych bodu z textury
|
||||
word point_total; //celkovy pocet adres mezi levym a pravym okrajem
|
||||
long zoom_table[VIEW_SIZE_X]; //zoomovaci tabulka pro osu x pro kolme steny
|
||||
int32_t zoom_table[VIEW_SIZE_X]; //zoomovaci tabulka pro osu x pro kolme steny
|
||||
}T_INFO_X;
|
||||
|
||||
typedef struct t_floor_map
|
||||
{
|
||||
long lineofs,linesize,counter,txtrofs;
|
||||
int32_t lineofs,linesize,counter,txtrofs;
|
||||
}T_FLOOR_MAP;
|
||||
|
||||
typedef struct all_view
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ void sikma_zleva(void)
|
|||
const unsigned char *pixmap = zoom.texture;
|
||||
const short *ytable = zoom.ytable;
|
||||
while (cy) {
|
||||
const long *xtable = zoom.xtable;
|
||||
const int32_t *xtable = zoom.xtable;
|
||||
word cx = zoom.xmax;
|
||||
word *scr_iter = scr;
|
||||
const unsigned char *pixmap_iter = pixmap;
|
||||
|
|
@ -93,7 +93,7 @@ void sikma_zprava(void)
|
|||
const unsigned char *pixmap = zoom.texture;
|
||||
const short *ytable = zoom.ytable;
|
||||
while (cy) {
|
||||
const long *xtable = zoom.xtable;
|
||||
const int32_t *xtable = zoom.xtable;
|
||||
word cx = zoom.xmax;
|
||||
word *scr_iter = scr;
|
||||
const unsigned char *pixmap_iter = pixmap;
|
||||
|
|
@ -161,7 +161,7 @@ void fcdraw(void *source,void *target, void *table)
|
|||
word *src = (word *)source;
|
||||
word *trg = (word *)target;
|
||||
T_FLOOR_MAP *t = (T_FLOOR_MAP *)table;
|
||||
unsigned long cc;
|
||||
uint32_t cc;
|
||||
|
||||
do {
|
||||
word *ss = t->txtrofs/2+src;
|
||||
|
|
@ -368,8 +368,8 @@ void small_anm_delta(void *target,void *buff,void *paleta)
|
|||
{
|
||||
word *t = (word *)target;
|
||||
word *pal = (word *)paleta;
|
||||
unsigned long *deltastart = (unsigned long *)buff;
|
||||
unsigned long ofs = *deltastart++;
|
||||
uint32_t *deltastart = (uint32_t *)buff;
|
||||
uint32_t ofs = *deltastart++;
|
||||
unsigned char *control = (unsigned char *)deltastart;
|
||||
unsigned char *pixels = control + ofs;
|
||||
int y;
|
||||
|
|
|
|||
|
|
@ -64,8 +64,8 @@ typedef struct s_save
|
|||
char stereing;
|
||||
char swapchans;
|
||||
char out_filter;
|
||||
long glob_flags;
|
||||
long game_time;
|
||||
int32_t glob_flags;
|
||||
int32_t game_time;
|
||||
char runes[5];
|
||||
char level_name[12];
|
||||
short picks; //pocet_sebranych predmetu v mysi
|
||||
|
|
@ -78,9 +78,9 @@ typedef struct s_save
|
|||
|
||||
static int get_list_count();
|
||||
|
||||
static word vypocet_crc(char *data,long delka)
|
||||
static word vypocet_crc(char *data,int32_t delka)
|
||||
{
|
||||
unsigned long l=0;
|
||||
uint32_t l=0;
|
||||
do
|
||||
{
|
||||
l=(l<<8)|(delka>0?*data++:0);delka--;
|
||||
|
|
@ -118,7 +118,7 @@ int load_org_map(char *filename,TSTENA **sides,TSECTOR **sectors,TMAP_EDIT_INFO
|
|||
FILE *f;
|
||||
void *temp;
|
||||
int sect;
|
||||
long size,r;
|
||||
int32_t size,r;
|
||||
char nmapend=1;
|
||||
char *c;
|
||||
|
||||
|
|
@ -352,7 +352,7 @@ int save_map_state() //uklada stav mapy pro savegame (neuklada aktualni pozici);
|
|||
char *bf;
|
||||
TMPFILE_WR *fsta;
|
||||
int i;
|
||||
long siz;
|
||||
int32_t siz;
|
||||
TSTENA *org_sides;
|
||||
TSECTOR *org_sectors;
|
||||
short res=-1;
|
||||
|
|
@ -432,7 +432,7 @@ int load_map_state() //obnovuje stav mapy; nutno volat po zavolani load_map;
|
|||
char *bf;
|
||||
TMPFILE_RD *fsta;
|
||||
int i;
|
||||
long siz;
|
||||
int32_t siz;
|
||||
short res=-2;
|
||||
unsigned char ver=0;
|
||||
|
||||
|
|
@ -867,11 +867,11 @@ int load_game(int slotnum)
|
|||
return r;
|
||||
}
|
||||
|
||||
static void load_specific_file(int slot_num,char *filename,void **out,long *size) //call it in task!
|
||||
static void load_specific_file(int slot_num,char *filename,void **out,int32_t *size) //call it in task!
|
||||
{
|
||||
FILE *slot;
|
||||
char *c,*d;
|
||||
long siz;
|
||||
int32_t siz;
|
||||
char fname[12];
|
||||
char succes=0;
|
||||
|
||||
|
|
@ -1028,7 +1028,7 @@ static void read_story_task(va_list args)
|
|||
TSTR_LIST ls;
|
||||
void *text_data;
|
||||
char *c,*d;
|
||||
long size;
|
||||
int32_t size;
|
||||
|
||||
load_specific_file(slot,STORY_BOOK,&text_data,&size);
|
||||
if (text_data!=NULL)
|
||||
|
|
@ -1258,12 +1258,12 @@ static int slot_pos;
|
|||
|
||||
void save_step_next(EVENT_MSG *msg,void **unused)
|
||||
{
|
||||
char c;
|
||||
int c;
|
||||
|
||||
unused;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=*(char *)msg->data;
|
||||
c=va_arg(msg->data, int);
|
||||
if (c==13)
|
||||
{
|
||||
send_message(E_KEYBOARD,c);
|
||||
|
|
@ -1471,7 +1471,7 @@ static int load_map_state_partial(char *level_fname,int mapsize) //obnovuje stav
|
|||
char *bf;
|
||||
TMPFILE_RD *fsta;
|
||||
int i;
|
||||
long siz;
|
||||
int32_t siz;
|
||||
short res=-2;
|
||||
unsigned char ver;
|
||||
|
||||
|
|
|
|||
|
|
@ -444,7 +444,7 @@ typedef struct tdregisters
|
|||
{
|
||||
int h_num;
|
||||
char name[13];
|
||||
void (*proc)(void **,long *);
|
||||
void (*proc)(void **,int32_t *);
|
||||
char path;
|
||||
}TDREGISTERS;
|
||||
|
||||
|
|
@ -453,7 +453,7 @@ typedef struct tstena
|
|||
char prim,sec,oblouk,side_tag;
|
||||
unsigned short sector_tag;
|
||||
char xsec,ysec;
|
||||
unsigned long flags;
|
||||
uint32_t flags;
|
||||
char prim_anim,sec_anim,lclip,action;
|
||||
}TSTENA;
|
||||
|
||||
|
|
@ -504,7 +504,7 @@ typedef struct the_timer
|
|||
int id;
|
||||
int counter,count_max,calls;
|
||||
void (*proc)(struct the_timer *);
|
||||
long userdata[4];
|
||||
int32_t userdata[4];
|
||||
struct the_timer *next;
|
||||
char zavora;
|
||||
}THE_TIMER;
|
||||
|
|
@ -563,8 +563,8 @@ extern char group_sort[POCET_POSTAV]; //pretrideni skupin
|
|||
extern char global_anim_counter;
|
||||
extern char one_buffer; //1 zapina pouziti pouze jednoho bufferu pro render
|
||||
extern char save_map; //1 oznamuje ze pri opusteni levelu je nutne ulozit stav mapy
|
||||
extern long money; //stav konta hracu
|
||||
extern long level_map[]; //tabulka urovni
|
||||
extern int32_t money; //stav konta hracu
|
||||
extern int32_t level_map[]; //tabulka urovni
|
||||
extern char true_seeing; //1 oznamuje ze bezi kouzlo true_seeing
|
||||
extern char set_halucination;
|
||||
extern int hal_sector; //cislo sektoru a smeru pri halucinaci
|
||||
|
|
@ -572,7 +572,7 @@ extern int hal_dir;
|
|||
extern char side_touched; //promena se nastavuje na 1 pri kazdem uspesnem dotyku steny
|
||||
extern char *texty_knihy; //jmeno souboru s textamy knihy
|
||||
extern int cur_page; //cislo stranky v knize;
|
||||
extern long game_time; //hraci cas
|
||||
extern int32_t game_time; //hraci cas
|
||||
extern char autoattack;
|
||||
extern char enable_sort;
|
||||
extern char last_send_action; //naposled vyslana akce
|
||||
|
|
@ -622,15 +622,15 @@ void calc_animations(void);
|
|||
int load_map(char *filename);
|
||||
void other_draw();
|
||||
void refresh_scene();
|
||||
void pcx_fade_decomp(void **p,long *s);
|
||||
void pcx_15bit_decomp(void **p,long *s);
|
||||
void pcx_15bit_autofade(void **p,long *s);
|
||||
void pcx_15bit_backgrnd(void **p,long *s);
|
||||
void pcx_8bit_decomp(void **p,long *s);
|
||||
void hi_8bit_correct(void **p,long *s);
|
||||
void pcx_8bit_nopal(void **p,long *s);
|
||||
void set_background(void **p,long *s);
|
||||
void wav_load(void **p,long *s);
|
||||
void pcx_fade_decomp(void **p,int32_t *s);
|
||||
void pcx_15bit_decomp(void **p,int32_t *s);
|
||||
void pcx_15bit_autofade(void **p,int32_t *s);
|
||||
void pcx_15bit_backgrnd(void **p,int32_t *s);
|
||||
void pcx_8bit_decomp(void **p,int32_t *s);
|
||||
void hi_8bit_correct(void **p,int32_t *s);
|
||||
void pcx_8bit_nopal(void **p,int32_t *s);
|
||||
void set_background(void **p,int32_t *s);
|
||||
void wav_load(void **p,int32_t *s);
|
||||
void wire_main_functs();
|
||||
void ukaz_kompas(char mode);
|
||||
void *timming(EVENT_MSG *msg,void **data);
|
||||
|
|
@ -726,8 +726,8 @@ void turn_zoom(int smer);
|
|||
void a_touch(int sector,int dir);
|
||||
int do_action(int action_numb,int sector,int direct,int flags,int nosend);
|
||||
void delay_action(int action_numb,int sector,int direct,int flags,int nosend,int delay);
|
||||
long load_section(FILE *f,void **section, int *sct_type,long *sect_size);
|
||||
void prepare_graphics(int *ofs,char *names,long size,void *decomp,int class);
|
||||
int32_t load_section(FILE *f,void **section, int *sct_type,int32_t *sect_size);
|
||||
void prepare_graphics(int *ofs,char *names,int32_t size,void *decomp,int class);
|
||||
void show_automap(char full);
|
||||
void draw_medium_map();
|
||||
void anim_sipky(int h,int mode);
|
||||
|
|
@ -802,7 +802,7 @@ extern short water_breath; //vec pro dychani pod vodou
|
|||
extern short flute_item;
|
||||
|
||||
void load_items(void);
|
||||
void load_item_map(void *p,long s);
|
||||
void load_item_map(void *p,int32_t s);
|
||||
void draw_placed_items_normal(int celx,int cely,int sect,int side);
|
||||
|
||||
#define SPL_INVIS 0x1 //hrac je neviditelny
|
||||
|
|
@ -930,7 +930,7 @@ typedef struct thuman
|
|||
short inv[MAX_INV]; //inventar
|
||||
short level; //uroven
|
||||
short weapon_expy[TPW_MAX]; //zkusenosti za zbrane
|
||||
long exp; //zkusenost
|
||||
int32_t exp; //zkusenost
|
||||
char female; //1 kdyz zena
|
||||
char utek; //hodnota udavajici pocet kroku pri uteku
|
||||
HUM_ACTION *zvolene_akce; //ukazatel na tabulku zvolenych akci
|
||||
|
|
@ -968,7 +968,7 @@ void calc_fly();
|
|||
void zmen_skupinu(THUMAN *p);
|
||||
void add_to_group(int num);
|
||||
void group_all(void);
|
||||
void build_items_called(void **p,long *s);
|
||||
void build_items_called(void **p,int32_t *s);
|
||||
void real_regeneration(); //regenerace postav behem hry v realu (pouze kondice a mana)
|
||||
char sleep_regenerace(THUMAN *p); //regenerace postav behem spani
|
||||
char check_jidlo_voda(THUMAN *p);
|
||||
|
|
@ -1154,7 +1154,7 @@ typedef struct tma_sound
|
|||
char volume; //5
|
||||
char soundid; //6
|
||||
unsigned short freq; //8
|
||||
long start_loop,end_loop,offset;//20
|
||||
int32_t start_loop,end_loop,offset;//20
|
||||
char filename[12]; //32
|
||||
}TMA_SOUND;
|
||||
|
||||
|
|
@ -1162,7 +1162,7 @@ typedef struct tma_sound
|
|||
typedef struct tma_text
|
||||
{
|
||||
char action,flags,eflags,pflags;
|
||||
long textindex;
|
||||
int32_t textindex;
|
||||
}TMA_TEXT;
|
||||
|
||||
typedef struct tma_send_action
|
||||
|
|
@ -1247,7 +1247,7 @@ typedef struct tma_globe
|
|||
unsigned short sector; //sektor of action target, when event occured
|
||||
unsigned char side; //side of action target, when event occured
|
||||
unsigned char cancel; //1 - cancel event
|
||||
unsigned long param; //event depend param - zero is default
|
||||
uint32_t param; //event depend param - zero is default
|
||||
}TMA_GLOBE;
|
||||
|
||||
|
||||
|
|
@ -1396,7 +1396,7 @@ char test_playing(int track);
|
|||
void stop_track_free(int track);
|
||||
void mute_all_tracks(char all);
|
||||
void kill_all_sounds();
|
||||
void create_sound_table(char *template,long size);
|
||||
void create_sound_table(char *template,int32_t size);
|
||||
void create_sound_table_old();
|
||||
void start_play_flute(char );
|
||||
void stop_play_flute();
|
||||
|
|
@ -1458,7 +1458,7 @@ typedef struct tmob
|
|||
char flee_num; //pravdepodobnost uteku
|
||||
char anim_counts[6]; //pocet animacnich policek pro kazdy pohyb
|
||||
char mobs_name[7]; //zaklad jmena souboru pro moba
|
||||
long experience; //zkusenost
|
||||
int32_t experience; //zkusenost
|
||||
char vlajky; //BIT0 - 1 v boji
|
||||
char anim_phase; //cinnost kterou mob dela
|
||||
short csektor; //Cilovy sektor
|
||||
|
|
@ -1501,7 +1501,7 @@ char track_mob(int sect,int dir);//trackuje pritomnost potvory v urcitem smeru
|
|||
void stop_all_mobs();
|
||||
int utok_na_sektor(THUMAN *p,TMOB *m,int chaos,int bonus);
|
||||
int vyber_potvoru(int sect,int dir,int *chaos); //vybere potvoru ze sektoru a smeru. Vraci take pocet potvor v promenne *chaos
|
||||
void load_enemies(short *data,int size,int *grptr,TMOB *template,long tsize);
|
||||
void load_enemies(short *data,int size,int *grptr,TMOB *template,int32_t tsize);
|
||||
char mob_test_na_bitvu(TMOB *p); //nastavi p->vlajky|MOB_INBATTLE pokud potvora muze vstoupit do bitvy;
|
||||
void send_mob_to(int m,word *path);
|
||||
void save_enemy_paths(TMPFILE_WR *f);
|
||||
|
|
@ -1622,7 +1622,7 @@ int message(int butts,char def,char canc,char *keys,...);
|
|||
void type_text(); //event procedura (parms: X,Y,TEXT,MAX_SPACE,MAX_CHARS);
|
||||
void type_text_v2(va_list args);//char *text_buffer,int x,int y,int max_size,int max_chars,int font,int color,void (*exit_proc)(char));
|
||||
void zalamovani(char *source,char *target,int maxxs,int *xs,int *ys);
|
||||
void col_load(void **data,long *size);
|
||||
void col_load(void **data,int32_t *size);
|
||||
void open_story_file();
|
||||
void write_story_text(char *text);
|
||||
void close_story_file();
|
||||
|
|
@ -1702,7 +1702,7 @@ typedef struct _tag_globalEventDef
|
|||
unsigned short sector; //sektor of action target, when event occured
|
||||
unsigned char side; //side of action target, when event occured
|
||||
unsigned char cancel; //
|
||||
long param; //event depend param - zero is default
|
||||
int32_t param; //event depend param - zero is default
|
||||
}SGlobalEventDef;
|
||||
|
||||
extern SGlobalEventDef GlobEventList[MAGLOB_NEXTID];
|
||||
|
|
@ -1715,7 +1715,7 @@ static __inline char GlobEvent(int event, int sector, int side)
|
|||
}
|
||||
|
||||
|
||||
static __inline char GlobEvents(int firstevid, int lastevid, int sector, int side, long param)
|
||||
static __inline char GlobEvents(int firstevid, int lastevid, int sector, int side, int32_t param)
|
||||
{
|
||||
int i;
|
||||
for (i=firstevid;i<=lastevid;i++) if (GlobEventList[i].param==param)
|
||||
|
|
@ -1726,7 +1726,7 @@ static __inline char GlobEvents(int firstevid, int lastevid, int sector, int sid
|
|||
}
|
||||
|
||||
|
||||
static __inline char TimerEvents(int sector, int side, long time)
|
||||
static __inline char TimerEvents(int sector, int side, int32_t time)
|
||||
{
|
||||
int i;
|
||||
for (i=MAGLOB_ONTIMER1;i<=MAGLOB_ONTIMER4;i++) if (GlobEventList[i].param && GlobEventList[i].param<=time)
|
||||
|
|
|
|||
127
game/interfac.c
127
game/interfac.c
|
|
@ -303,12 +303,11 @@ void type_text(EVENT_MSG *msg,void **data)
|
|||
char *c;
|
||||
|
||||
set_font(H_FBOLD,RGB555(31,31,31));
|
||||
p=msg->data;
|
||||
x=p[0];
|
||||
y=p[1];
|
||||
c=*(char **)(p+2);
|
||||
max_size=*(int *)(p+3);
|
||||
max_chars=*(int *)(p+4);
|
||||
x=va_arg(msg->data, int);
|
||||
y=va_arg(msg->data, int);
|
||||
c=va_arg(msg->data, char *);
|
||||
max_size=va_arg(msg->data,int);
|
||||
max_chars=va_arg(msg->data, int);
|
||||
strcpy(text,c);
|
||||
source=c;
|
||||
index=strchr(text,0)-text;
|
||||
|
|
@ -330,9 +329,8 @@ void type_text(EVENT_MSG *msg,void **data)
|
|||
}
|
||||
else if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
char c;
|
||||
char c = va_arg(msg->data, int);
|
||||
|
||||
c=*(char *)msg->data;
|
||||
set_font(H_FBOLD,RGB555(31,31,31));
|
||||
if (c)
|
||||
{
|
||||
|
|
@ -487,7 +485,7 @@ void type_text_v2(va_list args)
|
|||
}
|
||||
|
||||
|
||||
void col_load(void **data,long *size)
|
||||
void col_load(void **data,int32_t *size)
|
||||
{
|
||||
int siz=*size;
|
||||
char *s,*c;
|
||||
|
|
@ -580,30 +578,31 @@ typedef struct radio_butt_data
|
|||
char *texty;
|
||||
}TRADIO_BUTT_DATA;
|
||||
|
||||
static void radio_butts_init(OBJREC *o,long *params)
|
||||
static void radio_butts_init(OBJREC *o,va_list params)
|
||||
{
|
||||
char *c,*z;
|
||||
long cnt=0,*q,*d,*zz;
|
||||
int32_t cnt=0,*q,*zz;
|
||||
int i;
|
||||
TRADIO_BUTT_DATA *rd;
|
||||
|
||||
d=params;
|
||||
for (i=0;i<*params;i++)
|
||||
va_list d;
|
||||
va_copy(d, params);
|
||||
int count = va_arg(d, int);
|
||||
for (i=0;i<count;i++)
|
||||
{
|
||||
d+=1;
|
||||
c=get_title(d);
|
||||
c=va_arg(d, char *);
|
||||
cnt+=strlen(c);cnt++;
|
||||
}
|
||||
rd=New(TRADIO_BUTT_DATA);
|
||||
o->userptr=(void *)rd;
|
||||
zz=q=(long *)getmem(cnt+8);
|
||||
*q++=1;*q++=*params;
|
||||
d=params;
|
||||
zz=q=(int32_t *)getmem(cnt+8);
|
||||
*q++=1;*q++=count;
|
||||
va_end(d);
|
||||
va_copy(d, params);
|
||||
z=(char *)q;
|
||||
for (i=0;i<*params;i++)
|
||||
for (i=0;i<count;i++)
|
||||
{
|
||||
d+=1;
|
||||
c=get_title(d);
|
||||
c=va_arg(d, char *);
|
||||
strcpy(z,c);
|
||||
z=strchr(z,'\0');z++;
|
||||
}
|
||||
|
|
@ -614,14 +613,14 @@ static void radio_butts_init(OBJREC *o,long *params)
|
|||
static void radio_butts_draw(int x1,int y1,int x2,int y2,OBJREC *o)
|
||||
{
|
||||
int step,size,sizpul,i;
|
||||
long *params;
|
||||
int32_t *params;
|
||||
char *texts;
|
||||
CTL3D *clt;
|
||||
TRADIO_BUTT_DATA *rd;
|
||||
|
||||
x2;
|
||||
rd=(TRADIO_BUTT_DATA *)o->userptr;
|
||||
params=(long *)rd->texty;
|
||||
params=(int32_t *)rd->texty;
|
||||
step=(y2-y1)/(*(params+1));
|
||||
size=(step*9)/10;
|
||||
sizpul=size>>1;
|
||||
|
|
@ -637,7 +636,7 @@ static void radio_butts_draw(int x1,int y1,int x2,int y2,OBJREC *o)
|
|||
clt=def_border(5,curcolor);
|
||||
for (i=0;i<*(params+1);i++,y1+=step)
|
||||
{
|
||||
if (*(long *)o->data==i)
|
||||
if (*(int32_t *)o->data==i)
|
||||
{
|
||||
int xx1=x1+2,yy1=y1+1,xx2=x1+size-2,yy2=y1+size-3,xxs=(xx1+xx2)>>1,yys=(yy1+yy2)>>1;
|
||||
curcolor=0x0;
|
||||
|
|
@ -670,13 +669,13 @@ static void radio_butts_event(EVENT_MSG *msg,OBJREC *o)
|
|||
if (ms->event_type & 0x02)
|
||||
{
|
||||
TRADIO_BUTT_DATA *rd;
|
||||
long *params;
|
||||
int32_t *params;
|
||||
|
||||
rd=(TRADIO_BUTT_DATA *)o->userptr;
|
||||
params=(long *)rd->texty;
|
||||
params=(int32_t *)rd->texty;
|
||||
sel=(ms->y-o->locy)/(o->ys/(*(params+1)));
|
||||
if (sel>=*(params+1)) sel=*(params+1)-1;
|
||||
*(long *)o->data=sel;
|
||||
*(int32_t *)o->data=sel;
|
||||
*params=0;
|
||||
redraw_object(o);
|
||||
*params=1;
|
||||
|
|
@ -697,10 +696,10 @@ static void radio_butts_done(OBJREC *o)
|
|||
|
||||
void radio_butts_gr(OBJREC *o)
|
||||
{
|
||||
o->runs[0]=radio_butts_init;
|
||||
o->runs[1]=radio_butts_draw;
|
||||
o->runs[2]=radio_butts_event;;
|
||||
o->runs[3]=radio_butts_done;;
|
||||
o->call_init=radio_butts_init;
|
||||
o->call_draw=radio_butts_draw;
|
||||
o->call_event=radio_butts_event;;
|
||||
o->call_done=radio_butts_done;;
|
||||
o->datasize=4;
|
||||
}
|
||||
|
||||
|
|
@ -715,7 +714,7 @@ void radio_butts_gr(OBJREC *o)
|
|||
return znak=='A';
|
||||
}
|
||||
*/
|
||||
long get_disk_free(char disk)
|
||||
int32_t get_disk_free(char disk)
|
||||
{
|
||||
return 10*1024*1024;
|
||||
/* struct diskfree_t ds;
|
||||
|
|
@ -729,7 +728,7 @@ void start_check()
|
|||
/*
|
||||
char *c;
|
||||
unsigned drv;
|
||||
long siz;
|
||||
int32_t siz;
|
||||
struct meminfo memory;
|
||||
get_mem_info(&memory);
|
||||
concat(c,pathtable[SR_TEMP],TEMP_FILE);
|
||||
|
|
@ -762,7 +761,7 @@ void start_check()
|
|||
/*
|
||||
typedef struct dos_extra_block
|
||||
{
|
||||
long sector;
|
||||
int32_t sector;
|
||||
word pocet;
|
||||
word buffer_ofs;
|
||||
word buffer_seg;
|
||||
|
|
@ -772,7 +771,7 @@ typedef struct dos_extra_block
|
|||
typedef struct disk_label
|
||||
{
|
||||
word nula;
|
||||
long serial;
|
||||
int32_t serial;
|
||||
char label[11];
|
||||
char type[8];
|
||||
};
|
||||
|
|
@ -808,13 +807,13 @@ typedef struct disk_label
|
|||
|
||||
*/
|
||||
/*
|
||||
long read_serial(char drive)
|
||||
int32_t read_serial(char drive)
|
||||
{
|
||||
word segment;
|
||||
word selector;
|
||||
struct disk_label *p;
|
||||
RMREGS regs;
|
||||
long serial;
|
||||
int32_t serial;
|
||||
|
||||
dosalloc(32,&segment,&selector);
|
||||
regs.eax=0x6900;
|
||||
|
|
@ -830,7 +829,7 @@ long read_serial(char drive)
|
|||
|
||||
static void crash_event1(THE_TIMER *t)
|
||||
{
|
||||
long serial;
|
||||
int32_t serial;
|
||||
int i;
|
||||
|
||||
serial=read_serial(t->userdata[1]);
|
||||
|
|
@ -843,7 +842,7 @@ static void crash_event1(THE_TIMER *t)
|
|||
|
||||
static void crash_event2(THE_TIMER *t)
|
||||
{
|
||||
long serial;
|
||||
int32_t serial;
|
||||
int i;
|
||||
|
||||
serial=read_serial(t->userdata[1]);
|
||||
|
|
@ -856,7 +855,7 @@ static void crash_event2(THE_TIMER *t)
|
|||
|
||||
static void crash_event3(THE_TIMER *t)
|
||||
{
|
||||
long serial;
|
||||
int32_t serial;
|
||||
int i;
|
||||
|
||||
serial=read_serial(t->userdata[1]);
|
||||
|
|
@ -875,21 +874,21 @@ void check_number_1phase(char *exename) //check serial number!
|
|||
int h;
|
||||
char buffer[_MAX_PATH];
|
||||
unsigned short date,time;
|
||||
long serial;
|
||||
int32_t serial;
|
||||
|
||||
_fullpath(buffer,exename,_MAX_PATH);
|
||||
t=add_to_timer(TM_HACKER,2000,1,crash_event1);
|
||||
t->userdata[0]=*(long *)error_hack;
|
||||
t->userdata[1]=(long)buffer[0]-'@';
|
||||
t->userdata[0]=*(int32_t *)error_hack;
|
||||
t->userdata[1]=(int32_t)buffer[0]-'@';
|
||||
t=add_to_timer(TM_HACKER,3000,1,crash_event2);
|
||||
t->userdata[0]=*(long *)error_hack;
|
||||
t->userdata[1]=(long)buffer[0]-'@';
|
||||
t->userdata[0]=*(int32_t *)error_hack;
|
||||
t->userdata[1]=(int32_t)buffer[0]-'@';
|
||||
h=open(exename,O_RDONLY);
|
||||
_dos_getftime(h,&date,&time);
|
||||
serial=(date<<16) | time;
|
||||
t=add_to_timer(TM_HACKER,4000,1,crash_event3);
|
||||
t->userdata[0]=~serial;
|
||||
t->userdata[1]=(long)buffer[0]-'@';
|
||||
t->userdata[1]=(int32_t)buffer[0]-'@';
|
||||
close(h);
|
||||
}
|
||||
|
||||
|
|
@ -958,20 +957,21 @@ void animate_checkbox(int first_id,int last_id,int step)
|
|||
|
||||
void skeldal_checkbox(OBJREC *o)
|
||||
{
|
||||
// o->runs[0]=skeldal_checkbox_init;
|
||||
o->runs[1]=skeldal_checkbox_draw;
|
||||
o->runs[2]=skeldal_checkbox_event;
|
||||
// o->call_init=skeldal_checkbox_init;
|
||||
o->call_draw=skeldal_checkbox_draw;
|
||||
o->call_event=skeldal_checkbox_event;
|
||||
o->datasize=1;
|
||||
}
|
||||
|
||||
//------------------------------------------
|
||||
|
||||
static void setup_button_init(OBJREC *o,char **params)
|
||||
static void setup_button_init(OBJREC *o,va_list params)
|
||||
{
|
||||
void **d;
|
||||
char title = va_arg(params, char *);
|
||||
d=NewArr(void *,2);
|
||||
d[0]=NewArr(char,strlen(*params)+1);
|
||||
strcpy(d[0],*params);
|
||||
d[0]=NewArr(char,strlen(title)+1);
|
||||
strcpy(d[0],title);
|
||||
d[1]=NULL;
|
||||
o->userptr=(void *)d;
|
||||
*(char *)o->data=0;
|
||||
|
|
@ -1038,10 +1038,10 @@ static void setup_button_done(OBJREC *o)
|
|||
|
||||
void setup_ok_button(OBJREC *o)
|
||||
{
|
||||
o->runs[0]=setup_button_init;
|
||||
o->runs[1]=setup_button_draw;
|
||||
o->runs[2]=setup_button_event;
|
||||
o->runs[3]=setup_button_done;
|
||||
o->call_init=setup_button_init;
|
||||
o->call_draw=setup_button_draw;
|
||||
o->call_event=setup_button_event;
|
||||
o->call_done=setup_button_done;
|
||||
o->datasize=1;
|
||||
}
|
||||
|
||||
|
|
@ -1052,10 +1052,10 @@ typedef struct skeldal_soupak_params_t {
|
|||
void *bgpic;
|
||||
} skeldal_soupak_params;
|
||||
|
||||
static void skeldal_soupak_init (OBJREC *o,int *params)
|
||||
static void skeldal_soupak_init (OBJREC *o,va_list params)
|
||||
{
|
||||
skeldal_soupak_params *p = getmem(sizeof(skeldal_soupak_params));
|
||||
p->range = *params;
|
||||
p->range = va_arg(params, int);
|
||||
p->bgpic = NULL;
|
||||
o->userptr=p;
|
||||
}
|
||||
|
|
@ -1132,10 +1132,10 @@ static void skeldal_soupak_done(OBJREC *o)
|
|||
|
||||
void skeldal_soupak(OBJREC *o)
|
||||
{
|
||||
o->runs[0]=skeldal_soupak_init;
|
||||
o->runs[1]=skeldal_soupak_draw;
|
||||
o->runs[2]=skeldal_soupak_event;
|
||||
o->runs[3]=skeldal_soupak_done;
|
||||
o->call_init=skeldal_soupak_init;
|
||||
o->call_draw=skeldal_soupak_draw;
|
||||
o->call_event=skeldal_soupak_event;
|
||||
o->call_done=skeldal_soupak_done;
|
||||
o->datasize=4;
|
||||
}
|
||||
|
||||
|
|
@ -1479,7 +1479,8 @@ static void smlouvat_enter(EVENT_MSG *msg,OBJREC *o)
|
|||
o;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
switch( *(char *)msg->data)
|
||||
int c = va_arg(msg->data, int);
|
||||
switch(c)
|
||||
{
|
||||
case 13:goto_control(30);terminate_gui();break;
|
||||
case 27:goto_control(20);terminate_gui();break;
|
||||
|
|
|
|||
26
game/inv.c
26
game/inv.c
|
|
@ -61,7 +61,7 @@ TSHOP *cur_shop;
|
|||
TSHOP **shop_list=NULL;int max_shops=0; //shop_list=prima spojeni s obchody
|
||||
void *shop_hacek=NULL; //hacek za ktery visi cely shop strom (free(shop_hacek) - odalokuje shopy)
|
||||
//hacek lze ulozit do savegame -> ulozi se cely stav obchodu
|
||||
long shop_hacek_size=0; //toto je jeho delka
|
||||
int32_t shop_hacek_size=0; //toto je jeho delka
|
||||
|
||||
#define ico_extract(icnnum) (((char*)ablock(ikon_libs+(icnnum)/IT_LIB_SIZE))+IT_ICONE_SIZE*((icnnum)%IT_LIB_SIZE))
|
||||
|
||||
|
|
@ -138,7 +138,7 @@ void item_sound_event(int item,int sector)
|
|||
play_sample_at_sector(glob_items[item].sound+sound_handle,viewsector,sector,0,0);
|
||||
}
|
||||
|
||||
static void items_15to16_correct(void **p,long *s)
|
||||
static void items_15to16_correct(void **p,int32_t *s)
|
||||
{
|
||||
int i,j;
|
||||
char *cur=(char *)(*p);
|
||||
|
|
@ -161,7 +161,7 @@ void load_items()
|
|||
char *name;
|
||||
FILE *f;THANDLE_DATA *h;
|
||||
int sect,i,hs;
|
||||
long size;
|
||||
int32_t size;
|
||||
void *p;
|
||||
|
||||
f=NULL;i=0;
|
||||
|
|
@ -349,7 +349,7 @@ short create_item_money(int obnos)
|
|||
return i+1;
|
||||
}
|
||||
|
||||
void load_item_map(void *p,long s)
|
||||
void load_item_map(void *p,int32_t s)
|
||||
{
|
||||
word itmc;
|
||||
int sect;
|
||||
|
|
@ -1164,7 +1164,7 @@ void display_rings()
|
|||
}
|
||||
}
|
||||
|
||||
void *build_items_wearing(THUMAN *h, long *s)
|
||||
void *build_items_wearing(THUMAN *h, int32_t *s)
|
||||
{
|
||||
int i,vzhled,it;
|
||||
word *p,hx,hy;
|
||||
|
|
@ -1215,7 +1215,7 @@ void *build_items_wearing(THUMAN *h, long *s)
|
|||
}
|
||||
|
||||
|
||||
void build_items_called(void **p,long *s)
|
||||
void build_items_called(void **p,int32_t *s)
|
||||
{
|
||||
*p=build_items_wearing(&postavy[memman_handle-H_POSTAVY], s);
|
||||
}
|
||||
|
|
@ -1343,8 +1343,8 @@ static T_INV_SCRIPT script[]=
|
|||
|
||||
static int calc_value(int parm,int lenght)
|
||||
{
|
||||
long l;
|
||||
if (parm>=0) l=*(long *)(((char *)human_selected)+parm);
|
||||
int32_t l;
|
||||
if (parm>=0) l=*(int32_t *)(((char *)human_selected)+parm);
|
||||
else
|
||||
switch (parm)
|
||||
{
|
||||
|
|
@ -1357,10 +1357,10 @@ static int calc_value(int parm,int lenght)
|
|||
}
|
||||
switch(lenght)
|
||||
{
|
||||
case 1:l=(long)((signed char)l);break;
|
||||
case 1:l=(int32_t)((signed char)l);break;
|
||||
default:
|
||||
case 2:l=(long)((short)l);break;
|
||||
case 4:l=(long)l;break;
|
||||
case 2:l=(int32_t)((short)l);break;
|
||||
case 4:l=(int32_t)l;break;
|
||||
}
|
||||
return l;
|
||||
}
|
||||
|
|
@ -2164,7 +2164,7 @@ void *inv_keyboard(EVENT_MSG *msg,void **usr)
|
|||
usr;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=(*(int *)msg->data)>>8;
|
||||
c=va_arg(msg->data, int)>>8;
|
||||
switch (c)
|
||||
{
|
||||
case 0x17:
|
||||
|
|
@ -2819,7 +2819,7 @@ void unwire_shop()
|
|||
|
||||
void wire_shop()
|
||||
{
|
||||
long size;
|
||||
int32_t size;
|
||||
static TSHOP *last_shop=NULL;
|
||||
static void *pic=NULL;
|
||||
mute_all_tracks(0);
|
||||
|
|
|
|||
|
|
@ -146,7 +146,7 @@ typedef struct tkouzlo
|
|||
TKOUZLO *spell_table[MAX_SPELLS];
|
||||
short *vls_table[MAX_SPELLS]; //nove vlastnosti postav
|
||||
//pokud je cislo vetsi nez 0x7f00 pak dolni byte uvadi percentualni pomer
|
||||
static long _flag_map[MAX_SPELLS]; //tabulka nastavenych priznaku pro kouzlo.
|
||||
static int32_t _flag_map[MAX_SPELLS]; //tabulka nastavenych priznaku pro kouzlo.
|
||||
//prvnich 16 bitu je pro postavu
|
||||
//hornich 16 bitu je globalne
|
||||
|
||||
|
|
@ -186,7 +186,7 @@ static void play_anim(va_list args) //tasked animation
|
|||
int block=va_arg(args,int);
|
||||
#define ANIM_SIZE (320*180*2)
|
||||
void *anm;
|
||||
long *l,c;
|
||||
int32_t *l,c;
|
||||
|
||||
if (running_anm)
|
||||
{
|
||||
|
|
@ -552,7 +552,7 @@ char hod_na_uspech(int cil,TKOUZLO *k)
|
|||
|
||||
void spell_end_global()
|
||||
{
|
||||
long l=0;
|
||||
int32_t l=0;
|
||||
int i;
|
||||
for(i=0;i<MAX_SPELLS;i++) l|=_flag_map[i];
|
||||
if (!(l & FLG_TRUESEEING)) true_seeing=0;
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
int **macros=NULL;
|
||||
void *macro_block;
|
||||
int macro_block_size;
|
||||
long sound_side_flags=0; //kopie flagu steny pro zvuk
|
||||
int32_t sound_side_flags=0; //kopie flagu steny pro zvuk
|
||||
static char codelock_memory[16][8];
|
||||
static short rand_value;
|
||||
static int program_counter=0;
|
||||
|
|
@ -501,7 +501,7 @@ static void ma_wbook(TMA_LOADLEV *l)
|
|||
free(s);
|
||||
}
|
||||
|
||||
static void ma_send_experience(long what)
|
||||
static void ma_send_experience(int32_t what)
|
||||
{
|
||||
int maxl,i;
|
||||
THUMAN *h;
|
||||
|
|
@ -627,9 +627,9 @@ void macro_register_global_event(TMULTI_ACTION *q)
|
|||
GlobEventList[q->globe.event].param+=game_time;
|
||||
else
|
||||
{
|
||||
long den=24*60*6;
|
||||
long cas=((-GlobEventList[q->globe.event].param/100)*60+(-GlobEventList[q->globe.event].param%100))*6;
|
||||
long curtm=game_time % den;
|
||||
int32_t den=24*60*6;
|
||||
int32_t cas=((-GlobEventList[q->globe.event].param/100)*60+(-GlobEventList[q->globe.event].param%100))*6;
|
||||
int32_t curtm=game_time % den;
|
||||
if (cas<=curtm) cas+=den;
|
||||
GlobEventList[q->globe.event].param=game_time-curtm+cas;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ jp1:lodsb
|
|||
}
|
||||
}*/
|
||||
|
||||
static void nahraj_rozdilovy_pcx(void **pp,long *s)
|
||||
static void nahraj_rozdilovy_pcx(void **pp,int32_t *s)
|
||||
{
|
||||
char *org,*pos;
|
||||
char *vysl;
|
||||
|
|
@ -315,8 +315,8 @@ static void klavesnice(EVENT_MSG *msg,void **unused)
|
|||
{
|
||||
for(cursor=0;cursor<5;cursor++) if (cur_dir[cursor]==SELECT) break;
|
||||
if (cursor==5) cursor=-1;
|
||||
|
||||
switch(*((char *)msg->data+1))
|
||||
int c = va_arg(msg->data,int);
|
||||
switch(c)
|
||||
{
|
||||
case 'H':cursor--;if (cursor<0) cursor=0;break;
|
||||
case 'P':cursor++;if (cursor>4) cursor=4;break;
|
||||
|
|
|
|||
|
|
@ -85,16 +85,16 @@ char force_start_dialog=0;
|
|||
int start_dialog_number=0;
|
||||
int start_dialog_mob=0;
|
||||
|
||||
long money=0;
|
||||
int32_t money=0;
|
||||
|
||||
char runes[5]={0,0,0,0,0};
|
||||
|
||||
char group_sort[POCET_POSTAV]={0,1,2,3,4,5};
|
||||
|
||||
long load_section(FILE *f,void **section, int *sct_type,long *sect_size)
|
||||
int32_t load_section(FILE *f,void **section, int *sct_type,int32_t *sect_size)
|
||||
//
|
||||
{
|
||||
long s;
|
||||
int32_t s;
|
||||
char c[20];
|
||||
|
||||
*section=NULL;
|
||||
|
|
@ -109,7 +109,7 @@ long load_section(FILE *f,void **section, int *sct_type,long *sect_size)
|
|||
}
|
||||
|
||||
|
||||
void prepare_graphics(int *ofs,char *names,long size,void *decomp,int class)
|
||||
void prepare_graphics(int *ofs,char *names,int32_t size,void *decomp,int class)
|
||||
{
|
||||
char *p,*end;
|
||||
|
||||
|
|
@ -192,7 +192,7 @@ char *pripona(char *filename,char *pripona)
|
|||
void show_loading_picture(char *filename)
|
||||
{
|
||||
void *p;
|
||||
long s;
|
||||
int32_t s;
|
||||
|
||||
p=afile(filename,SR_BGRAFIKA,&s);
|
||||
put_picture(0,0,p);
|
||||
|
|
@ -211,13 +211,13 @@ int load_map(char *filename)
|
|||
FILE *f;
|
||||
void *temp;
|
||||
int sect;
|
||||
long size,r;
|
||||
int32_t size,r;
|
||||
char nmapend=1;
|
||||
int ofsts=START_HANDLE;
|
||||
char *c,*d;
|
||||
char snd_load=0;
|
||||
void *mob_template;
|
||||
long mob_size;
|
||||
int32_t mob_size;
|
||||
int suc;
|
||||
|
||||
map_with_password=0;
|
||||
|
|
@ -312,7 +312,7 @@ int load_map(char *filename)
|
|||
SEND_LOG("(GAME) Loading enemies...",0,0);
|
||||
if (mob_template==NULL)
|
||||
{
|
||||
long h;char *p;
|
||||
int32_t h;char *p;
|
||||
|
||||
alock(H_ENEMY);
|
||||
p=ablock(H_ENEMY);p+=8;
|
||||
|
|
@ -492,7 +492,7 @@ void leave_current_map()
|
|||
|
||||
|
||||
|
||||
long actn_flags(TSTENA *q,long flags)
|
||||
int32_t actn_flags(TSTENA *q,int32_t flags)
|
||||
{
|
||||
flags>>=24;
|
||||
flags&=0x1f;
|
||||
|
|
@ -697,7 +697,7 @@ void calc_fly()
|
|||
|
||||
}
|
||||
|
||||
extern long sound_side_flags;
|
||||
extern int32_t sound_side_flags;
|
||||
|
||||
|
||||
void calc_animations()
|
||||
|
|
@ -789,7 +789,7 @@ int get_action_delay(TSTENA *q)
|
|||
return 0;
|
||||
}
|
||||
*/
|
||||
void check_codelock_log(int sector,unsigned long flags)
|
||||
void check_codelock_log(int sector,uint32_t flags)
|
||||
{
|
||||
int i;
|
||||
TSTENA *p;
|
||||
|
|
@ -1912,7 +1912,7 @@ void *game_keyboard(EVENT_MSG *msg,void **usr)
|
|||
if (cur_mode==MD_END_GAME) return NULL;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=(*(int *)msg->data)>>8;
|
||||
c=va_arg(msg->data, int)>>8;
|
||||
while (_bios_keybrd(_KEYBRD_READY) ) _bios_keybrd(_KEYBRD_READ);
|
||||
switch (c)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
#define DELITEL 0xC005
|
||||
|
||||
|
||||
unsigned long vysledek;
|
||||
uint32_t vysledek;
|
||||
|
||||
main()
|
||||
{
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ char **texty;
|
|||
|
||||
char skip_intro=0;
|
||||
char autosave_enabled=0;
|
||||
long game_time=0;
|
||||
int32_t game_time=0;
|
||||
int charmin=3;
|
||||
int charmax=3;
|
||||
|
||||
|
|
@ -123,11 +123,11 @@ static char windowedzoom=1;
|
|||
static char monitor=0;
|
||||
static int refresh=0;
|
||||
|
||||
void pcx_fade_decomp(void **p,long *s);
|
||||
void pcx_15bit_decomp(void **p,long *s);
|
||||
void pcx_15bit_autofade(void **p,long *s);
|
||||
void pcx_15bit_backgrnd(void **p,long *s);
|
||||
void pcx_8bit_decomp(void **p,long *s);
|
||||
void pcx_fade_decomp(void **p,int32_t *s);
|
||||
void pcx_15bit_decomp(void **p,int32_t *s);
|
||||
void pcx_15bit_autofade(void **p,int32_t *s);
|
||||
void pcx_15bit_backgrnd(void **p,int32_t *s);
|
||||
void pcx_8bit_decomp(void **p,int32_t *s);
|
||||
|
||||
char *texty_knihy;
|
||||
static char *patch_file=NULL;
|
||||
|
|
@ -360,7 +360,7 @@ int ask_video()
|
|||
return c-1;
|
||||
}
|
||||
|
||||
void pcx_fade_decomp(void **p,long *s)
|
||||
void pcx_fade_decomp(void **p,int32_t *s)
|
||||
{
|
||||
char *buff;
|
||||
int r = load_pcx(*p,*s,A_FADE_PAL,&buff,mglob.fade_r,mglob.fade_g,mglob.fade_b);
|
||||
|
|
@ -370,7 +370,7 @@ void pcx_fade_decomp(void **p,long *s)
|
|||
*p=buff;
|
||||
}
|
||||
|
||||
void pcx_15bit_decomp(void **p,long *s)
|
||||
void pcx_15bit_decomp(void **p,int32_t *s)
|
||||
{
|
||||
char *buff;
|
||||
int r = load_pcx(*p,*s,A_16BIT,&buff);
|
||||
|
|
@ -380,7 +380,7 @@ void pcx_15bit_decomp(void **p,long *s)
|
|||
*p=buff;
|
||||
}
|
||||
|
||||
void pcx_15bit_autofade(void **p,long *s)
|
||||
void pcx_15bit_autofade(void **p,int32_t *s)
|
||||
{
|
||||
char *buff;
|
||||
int r = load_pcx(*p,*s,A_16BIT,&buff);
|
||||
|
|
@ -391,16 +391,16 @@ void pcx_15bit_autofade(void **p,long *s)
|
|||
buff[5]=0x80;
|
||||
}
|
||||
|
||||
void pcx_15bit_backgrnd(void **p,long *s)
|
||||
void pcx_15bit_backgrnd(void **p,int32_t *s)
|
||||
{
|
||||
char *buff;
|
||||
long i;long *z;
|
||||
int32_t i;int32_t *z;
|
||||
|
||||
if (*p!=NULL)
|
||||
{
|
||||
int r = load_pcx(*p,*s,A_16BIT,&buff);
|
||||
assert(r>0);
|
||||
z=(long *)buff;
|
||||
z=(int32_t *)buff;
|
||||
*s=r;
|
||||
for(i=*s;i>0;i-=4,z++) *z|=0x80008000;
|
||||
free(*p);
|
||||
|
|
@ -408,7 +408,7 @@ void pcx_15bit_backgrnd(void **p,long *s)
|
|||
}
|
||||
}
|
||||
|
||||
void pcx_8bit_nopal(void **p,long *s)
|
||||
void pcx_8bit_nopal(void **p,int32_t *s)
|
||||
{
|
||||
char *buff;
|
||||
|
||||
|
|
@ -423,7 +423,7 @@ void pcx_8bit_nopal(void **p,long *s)
|
|||
}
|
||||
|
||||
|
||||
void pcx_8bit_decomp(void **p,long *s)
|
||||
void pcx_8bit_decomp(void **p,int32_t *s)
|
||||
{
|
||||
char *buff;
|
||||
int r = load_pcx(*p,*s,A_8BIT,&buff);
|
||||
|
|
@ -433,7 +433,7 @@ void pcx_8bit_decomp(void **p,long *s)
|
|||
*p=buff;
|
||||
}
|
||||
|
||||
void hi_8bit_correct(void **p,long *s)
|
||||
void hi_8bit_correct(void **p,int32_t *s)
|
||||
{
|
||||
word *ptr=(word *)*p;
|
||||
int i;
|
||||
|
|
@ -447,7 +447,7 @@ void hi_8bit_correct(void **p,long *s)
|
|||
}
|
||||
|
||||
|
||||
void set_background(void **p,long *s)
|
||||
void set_background(void **p,int32_t *s)
|
||||
{
|
||||
word *data;
|
||||
word *ptr;
|
||||
|
|
@ -601,7 +601,7 @@ void *timming(EVENT_MSG *msg,void **data)
|
|||
data;
|
||||
if (msg->msg==E_INIT) return &timming;
|
||||
*otevri_zavoru=1;
|
||||
j=*(int *)msg->data;
|
||||
j=va_arg(msg->data,int);
|
||||
for (i=0;i<j;i++)
|
||||
{
|
||||
p=&timer_tree;
|
||||
|
|
@ -862,7 +862,7 @@ void global_kbd(EVENT_MSG *msg,void **usr)
|
|||
usr;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=(*(int *)msg->data)>>8;
|
||||
c=va_arg(msg->data,int)>>8;
|
||||
if (c==';') save_dump(GetScreenAdr(), DxGetResX(), DxGetResY(), scr_linelen2);
|
||||
}
|
||||
return;
|
||||
|
|
@ -973,7 +973,7 @@ static void patch_error(int err)
|
|||
|
||||
void init_skeldal(void)
|
||||
{
|
||||
char c[200],d[200];
|
||||
char c[MAX_FILESYSTEM_PATH],d[MAX_FILESYSTEM_PATH];
|
||||
int verr;
|
||||
|
||||
boldcz=LoadDefaultFont();
|
||||
|
|
@ -998,7 +998,7 @@ SEND_LOG("(INIT) Initializing engine.",0,0);
|
|||
/*SEND_LOG("(INIT) Loading DOS error handler.",0,0);
|
||||
install_dos_error(device_error,(char *)getmem(4096)+4096);*/
|
||||
swap_error=swap_error_exception;
|
||||
sprintf(d,"%s%s",pathtable[SR_DATA],"skeldal.ddl");
|
||||
snprintf(d,sizeof(d),"%s%s",pathtable[SR_DATA],"skeldal.ddl");
|
||||
SEND_LOG("(INIT) Initializing memory manager",0,0);
|
||||
init_manager(d,c);
|
||||
SEND_LOG("(GAME) Memory manager initialized. Using DDL: '%s' Temp dir: '%s'",d,c);
|
||||
|
|
@ -1104,7 +1104,7 @@ extern char running_battle;
|
|||
if (msg->msg==E_RELOADMAP)
|
||||
{
|
||||
int i;
|
||||
ReloadMapInfo *minfo=(ReloadMapInfo *)msg->data;
|
||||
ReloadMapInfo *minfo=va_arg(msg->data, ReloadMapInfo *);
|
||||
const char *fname=minfo->fname;
|
||||
int sektor=minfo->sektor;
|
||||
strncpy(loadlevel.name,fname,sizeof(loadlevel.name));
|
||||
|
|
|
|||
|
|
@ -195,10 +195,10 @@ int calcul_volume(int chan,int x,int y,int side,int volume)
|
|||
return 0;
|
||||
}
|
||||
|
||||
void wav_load(void **p,long *s)
|
||||
void wav_load(void **p,int32_t *s)
|
||||
{
|
||||
char *sr;
|
||||
long *d;
|
||||
int32_t *d;
|
||||
char *c;
|
||||
char *tg;
|
||||
void *tgr;
|
||||
|
|
@ -238,7 +238,7 @@ void wav_load(void **p,long *s)
|
|||
|
||||
s=siz & 3;
|
||||
siz>>=2;
|
||||
d=(long *)tg;
|
||||
d=(int32_t *)tg;
|
||||
for(;siz--;d++) *d^=0x80808080;
|
||||
c=(char *)d;
|
||||
for(;s--;c++) *c^=0x80;
|
||||
|
|
@ -515,7 +515,7 @@ void play_sample_at_channel(int sample,int channel,int vol)
|
|||
}
|
||||
|
||||
|
||||
void create_sound_table(char *template,long size)
|
||||
void create_sound_table(char *template,int32_t size)
|
||||
{
|
||||
char *c,*s;
|
||||
int i=0;
|
||||
|
|
@ -533,12 +533,12 @@ void create_sound_table(char *template,long size)
|
|||
void create_sound_table_old()
|
||||
{
|
||||
char *c,*s;
|
||||
long pocet;
|
||||
int32_t pocet;
|
||||
int i=0;
|
||||
|
||||
if (sound_table==NULL) sound_table=create_list(2);
|
||||
s=c=ablock(H_SOUND_DAT);
|
||||
memcpy(&pocet,s,sizeof(long));c+=4;
|
||||
memcpy(&pocet,s,sizeof(int32_t));c+=4;
|
||||
while (pocet--)
|
||||
{
|
||||
if (c[0]!=0) str_replace(&sound_table,i,c);
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ static int autostart_round=0;
|
|||
|
||||
char autoattack=0;
|
||||
char immortality=0;
|
||||
long level_map[]=
|
||||
int32_t level_map[]=
|
||||
{400, //level 2
|
||||
1000, // 3
|
||||
1800, // 4
|
||||
|
|
@ -689,8 +689,8 @@ void wire_end_game()
|
|||
void konec_presunu(EVENT_MSG *msg,void **unused)
|
||||
{
|
||||
unused;
|
||||
|
||||
if (msg->msg==E_KEYBOARD && ((*(int *)msg->data)>>8)==28 && !pass_zavora)
|
||||
int d = va_arg(msg->data, int);
|
||||
if (msg->msg==E_KEYBOARD && (d>>8)==28 && !pass_zavora)
|
||||
{
|
||||
unwire_proc();
|
||||
wire_jadro_souboje();
|
||||
|
|
@ -1913,7 +1913,7 @@ void programming_keyboard(EVENT_MSG *msg,void **unused)
|
|||
unused;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=(*(int *)msg->data)>>8;
|
||||
c=va_arg(msg->data, int)>>8;
|
||||
while (_bios_keybrd(_KEYBRD_READY) ) _bios_keybrd(_KEYBRD_READ);
|
||||
switch (c)
|
||||
{
|
||||
|
|
@ -2284,7 +2284,7 @@ void send_experience(TMOB *p,int dostal)
|
|||
player_check_death(postavy+select_player,0);
|
||||
}
|
||||
}
|
||||
if (dostal>0) postavy[select_player].exp+=(long)((float)p->experience*(float)dostal/p->vlastnosti[VLS_MAXHIT]);
|
||||
if (dostal>0) postavy[select_player].exp+=(int32_t)((float)p->experience*(float)dostal/p->vlastnosti[VLS_MAXHIT]);
|
||||
check_player_new_level(&postavy[select_player]);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,11 @@
|
|||
|
||||
|
||||
///store to temp storage
|
||||
void temp_storage_store(const char *name, const void *data, long size);
|
||||
void temp_storage_store(const char *name, const void *data, int32_t size);
|
||||
///find in temp storage - returns -1 = not found, otherwise size of data
|
||||
long temp_storage_find(const char *name);
|
||||
int32_t temp_storage_find(const char *name);
|
||||
///retrieve from temp storage (returns same as find)
|
||||
long temp_storage_retrieve(const char *name, void *data, long size);
|
||||
int32_t temp_storage_retrieve(const char *name, void *data, int32_t size);
|
||||
|
||||
void temp_storage_list(void (*callback)(const char *, void *), void *context);
|
||||
|
||||
|
|
@ -19,8 +19,8 @@ TMPFILE_WR *temp_storage_create(const char *name);
|
|||
TMPFILE_WR *temp_storage_append(const char *name);
|
||||
void temp_storage_close_rd(TMPFILE_RD *f);
|
||||
void temp_storage_close_wr(TMPFILE_WR *f);
|
||||
void temp_storage_write(const void *data, unsigned long size, TMPFILE_WR *f);
|
||||
unsigned long temp_storage_read(void *data, unsigned long size, TMPFILE_RD *f);
|
||||
void temp_storage_write(const void *data, uint32_t size, TMPFILE_WR *f);
|
||||
uint32_t temp_storage_read(void *data, uint32_t size, TMPFILE_RD *f);
|
||||
void temp_storage_skip(TMPFILE_RD *f, int bytes);
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
#include <mem.h>
|
||||
#include <conio.h>
|
||||
#include <bios.h>
|
||||
#define EVENT_MSG long
|
||||
#define EVENT_MSG int32_t
|
||||
#include "globals.h"
|
||||
#include <memman.c>
|
||||
#include <strlite.c>
|
||||
|
|
@ -15,7 +15,7 @@ TSTR_LIST skini;
|
|||
#define PLAYERS 3
|
||||
|
||||
void *datablast;
|
||||
long datablastsize;
|
||||
int32_t datablastsize;
|
||||
char *lasterror=NULL;
|
||||
char relarr[6];
|
||||
char szBuff[65536];
|
||||
|
|
@ -42,8 +42,8 @@ typedef struct s_save
|
|||
char stereing;
|
||||
char swapchans;
|
||||
char out_filter;
|
||||
long glob_flags;
|
||||
long game_time;
|
||||
int32_t glob_flags;
|
||||
int32_t game_time;
|
||||
char runes[5];
|
||||
char level_name[12];
|
||||
short picks; //pocet_sebranych predmetu v mysi
|
||||
|
|
@ -72,7 +72,7 @@ typedef struct _tkzlall
|
|||
{
|
||||
TKOUZLO kouzlo;
|
||||
short vlstab[24];
|
||||
long flagmap;
|
||||
int32_t flagmap;
|
||||
}TKZLALL;
|
||||
|
||||
THUMAN postavy[6],postavy2[6];
|
||||
|
|
@ -115,9 +115,9 @@ word keyconv(word key)
|
|||
|
||||
#define ZAKLAD_CRC 0xC005
|
||||
|
||||
static word vypocet_crc(char *data,long delka)
|
||||
static word vypocet_crc(char *data,int32_t delka)
|
||||
{
|
||||
unsigned long l=0;
|
||||
uint32_t l=0;
|
||||
do
|
||||
{
|
||||
l=(l<<8)|(delka>0?*data++:0);delka--;
|
||||
|
|
@ -171,10 +171,10 @@ void *loadmem(void *to,void *from,int size)
|
|||
return (void *)((char *)from+size);
|
||||
}
|
||||
|
||||
long load_section(FILE *f,void **section, int *sct_type,long *sect_size)
|
||||
int32_t load_section(FILE *f,void **section, int *sct_type,int32_t *sect_size)
|
||||
//
|
||||
{
|
||||
long s;
|
||||
int32_t s;
|
||||
char c[20];
|
||||
|
||||
*section=NULL;
|
||||
|
|
@ -189,11 +189,11 @@ long load_section(FILE *f,void **section, int *sct_type,long *sect_size)
|
|||
}
|
||||
|
||||
|
||||
static void load_specific_file(char *slotname,char *filename,void **out,long *size)
|
||||
static void load_specific_file(char *slotname,char *filename,void **out,int32_t *size)
|
||||
{
|
||||
FILE *slot;
|
||||
char *c,*d;
|
||||
long siz;
|
||||
int32_t siz;
|
||||
char fname[12];
|
||||
char succes=0;
|
||||
|
||||
|
|
@ -490,7 +490,7 @@ int tracemap(char *name)
|
|||
FILE *f;
|
||||
void *section;
|
||||
int type;
|
||||
long size,s;
|
||||
int32_t size,s;
|
||||
|
||||
f=fopen(name,"rb");
|
||||
if (f==NULL) return -1;
|
||||
|
|
|
|||
|
|
@ -424,7 +424,7 @@ void wizard_kbd(EVENT_MSG *msg,void **usr)
|
|||
usr;
|
||||
if (msg->msg==E_KEYBOARD)
|
||||
{
|
||||
c=(*(int *)msg->data)>>8;
|
||||
int c=va_arg(msg->data,int)>>8;
|
||||
msg->msg=-1;
|
||||
switch (c)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue