archives/gates_of_skeldal
2
0
Fork 0
mirror of https://github.com/ondra-novak/gates_of_skeldal.git synced 2025-07-15 10:46:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

boat in exploration is drawn by compositor

Browse source
This commit is contained in:
Ondřej Novák 2025-02-17 21:08:03 +01:00
parent 232dae6708
commit 05c1f952c4
12 changed files with 323 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

22
game/builder.c
View file

@ -81,6 +81,7 @@ char obl_max_anim=1;
char anim_mirror=0;
static char showrune=0;
static int showruneitem=0;
static char lodka_loaded=0;
@ -1102,12 +1103,13 @@ static void zobraz_lodku(const word *lodka, word *screen, int size)
{
int32_t scr_linelen2 = GetScreenPitch();
lodka+=3;
int x;
while (size)
{
for (x=0;x<640 && size;x++)
{
if (*lodka!=0) screen[x]=*lodka;
if (*lodka!=0x8000) screen[x]=*lodka;
lodka++;
size--;
}
@ -1263,7 +1265,17 @@ void render_scene(int sector, int smer)
if (cancel_render) return;
}
calc_spectxtrs();
if (lodka) zobraz_lodku(ablock(H_LODKA),LODKA_POS,LODKA_SIZ);
if (lodka) {
if (cur_mode == MD_GAME) {
if (!lodka_loaded) {
game_display_load_sprite(H_LODKA, (const unsigned short *)ablock(H_LODKA));
lodka_loaded = 1;
}
game_display_place_sprite(H_LODKA, 0, SCREEN_OFFLINE+301);
} else {
zobraz_lodku(ablock(H_LODKA),LODKA_POS,LODKA_SIZ);
}
}
}
@ -1273,7 +1285,7 @@ void death_screen() {
int ys;
int y = 160;
const char *t = texty[65];
DECL_VLA(char, buff, strlen(t)+4);
DECL_VLA(char, buff, strlen(t)+4);
set_font(H_FBOLD, RGB555_ALPHA(31,31,31));
zalamovani(t,buff, 440, &xs, &ys);
t = buff;
@ -1379,3 +1391,7 @@ void display_ver(int x,int y,int ax,int ay)
set_font(H_FTINY,RGB555(31,31,31));set_aligned_position(x,y,ax,ay,ver);
outtext(ver);showview(0,0,0,0);
}
void hide_boat() {
game_display_hide_sprite(H_LODKA);
}

1
game/globals.h
View file

@ -1814,6 +1814,7 @@ char *change_extension_support(char *buffer, const char *filename,char *new_exte
#define set_file_extension(filename, extension) change_extension_support((char *)alloca(strlen(filename)+strlen(extension)), (filename), (extension))
void load_enemy_to_map(int i, int sector, int dir, const TMOB *t);
void hide_boat();
//extras
#include "extras.h"

5
game/realgame.c
View file

@ -217,7 +217,7 @@ void sanitize_map() {
s->sec = 0;
}
if ((s->oblouk & 0x0F)> max_obl) {
s->oblouk &= ~0x0F;
s->oblouk &= ~0x0F;
}
if (s->prim + (s->prim_anim & 0xF) > max_side) {
s->prim_anim = max_side - (s->prim_anim & 0xF);
@ -226,7 +226,7 @@ void sanitize_map() {
s->sec_anim = max_side - (s->sec_anim & 0xF);
}
}
}
int load_map(const char *filename)
@ -1182,6 +1182,7 @@ void check_players_place(char mode) {
if (map_sectors[sect].sector_type != S_LODKA && lodka) {
set_backgrnd_mode(0);
lodka = 0;
hide_boat();
}
}
}

12
game/skeldal.c
View file

@ -92,6 +92,7 @@ static char titles_on=0;
const void *pcx_fade_decomp(const void *p, int32_t *s);
const void *pcx_15bit_decomp(const void *p, int32_t *s);
const void *pcx_15bit_decomp_transp0(const void *p, int32_t *s);
const void *pcx_15bit_autofade(const void *p, int32_t *s);
const void *pcx_15bit_backgrnd(const void *p, int32_t *s);
const void *pcx_8bit_decomp(const void *p, int32_t *s);
@ -130,7 +131,7 @@ TDREGISTERS registred[]=
{H_FKNIHA,"kniha.fon",NULL,SR_FONT},
{H_FBIG,"timese.fon",NULL,SR_FONT},
{H_IOBLOUK,"ioblouk.pcx",pcx_8bit_decomp,SR_BGRAFIKA},
{H_LODKA,"lodka.pcx",pcx_15bit_decomp,SR_BGRAFIKA},
{H_LODKA,"lodka.pcx",pcx_15bit_decomp_transp0,SR_BGRAFIKA},
{H_IDESKA,"ideska.pcx",pcx_8bit_decomp,SR_BGRAFIKA},
{H_IMRIZ1,"imriz1.pcx",pcx_8bit_decomp,SR_BGRAFIKA},
{H_RAMECEK,"ramecek.pcx",pcx_8bit_decomp,SR_BGRAFIKA},
@ -296,6 +297,14 @@ const void *pcx_15bit_decomp(const void *p, int32_t *s)
*s=r;
return buff;
}
const void *pcx_15bit_decomp_transp0(const void *p, int32_t *s)
{
char *buff;
int r = load_pcx(p,*s,A_16BIT_ZERO_TRANSP,&buff);
assert(r > 0);
*s=r;
return buff;
}
const void *pcx_15bit_autofade(const void *p, int32_t *s)
{
@ -1022,6 +1031,7 @@ void unwire_main_functs(void)
disable_click_map();
cancel_render=1;
wire_proc=wire_main_functs;
hide_boat();
}

121
game/souboje.c
View file

@ -29,6 +29,7 @@ short cislo_kola;
HUM_ACTION spell_string;
short caster;
short vybrana_zbran=-1;
static char group_flee = 0;
char plr_switcher[POCET_POSTAV];
static int pohyblivost_counter[POCET_POSTAV];
static int autostart_round=0;
@ -552,7 +553,7 @@ void auto_group()
{
p->groupnum=t++;
for(j=i+1;q=&postavy[j],j<POCET_POSTAV;j++)
if (p->sektor==q->sektor && p->direction==q->direction && p->inmaphash == current_map_hash && q->used && q->lives)
if (p->sektor==q->sektor && p->inmaphash == current_map_hash && q->used && q->lives)
q->groupnum=p->groupnum;
}
@ -911,29 +912,15 @@ void prejdi_na_pohled(THUMAN *p)
}
int hromadny_utek;
static int UtekHromadne(int sector)
{
int minact=999;
int i;
int p=0;
for (i=0;i<POCET_POSTAV;i++) if (postavy[i].used && postavy[i].sektor==sector && postavy[i].kondice>2 && postavy[i].inmaphash == current_map_hash)
{
int wf=weigth_defect(postavy+i)+2;
if (postavy[i].provadena_akce==NULL || postavy[i].provadena_akce->action!=AC_RUN) return 0;
if (postavy[i].utek<minact) minact=postavy[i].utek;
if (postavy[i].kondice/wf<minact) minact=postavy[i].kondice/wf;
p++;
}
return p>1?minact:0;
}
void utek_postavy(THUMAN *p)
void utek_postavy(THUMAN *p, char group)
{
int minact=0;
p->actions=p->utek;
if (game_extras & EX_GROUP_FLEE && (minact=UtekHromadne(p->sektor))!=0)
if (group)
{
int i;
minact = 5;
p->actions=minact;
hromadny_utek=p->sektor;
for (i=0;i<POCET_POSTAV;i++) if (postavy[i].used && postavy[i].sektor==p->sektor && postavy[i].inmaphash == current_map_hash)
@ -1353,7 +1340,10 @@ void jadro_souboje(EVENT_MSG *msg,void **unused) //!!!! Jadro souboje
else
{
SEND_LOG("(BATTLE) Player Action '%s', number: %d",p->jmeno,p->provadena_akce->action);
switch(p->provadena_akce->action)
if (group_flee) {
group_flee = 0;
utek_postavy(p, 1);
} else switch(p->provadena_akce->action)
{
case AC_MOVE:
{
@ -1401,7 +1391,7 @@ void jadro_souboje(EVENT_MSG *msg,void **unused) //!!!! Jadro souboje
}
break;
case AC_STAND:pomala_regenerace_postavy(p);break;
case AC_RUN:utek_postavy(p);break;
case AC_RUN:utek_postavy(p,0);break;
case AC_MAGIC:
prejdi_na_pohled(p);
bott_draw(1);
@ -1769,38 +1759,49 @@ void program_draw()
maxy;
schovej_mysku();
for(j=0;j<POCET_POSTAV;j++)
if (postavy[i=group_sort[j]].used)
{
int y;
if (group_flee) {
trans_bar(0,377-15,640,15,0);
for (j = 0; j < POCET_POSTAV; ++j) if (postavy[j].groupnum == cur_group) {
set_font(H_FLITT5,PRG_COLOR);
int y=386-10;
set_aligned_position(x,y,1,2,texty[AC_RUN+40]);
outtext(texty[40+AC_RUN]);
x+=74;
}
} else {
for(j=0;j<POCET_POSTAV;j++)
if (postavy[i=group_sort[j]].used)
{
int y;
y=postavy[i].programovano*10;
if (y>maxy) maxy=y;
}
if (!maxy && (pgm_help || rune_name!=NULL)) maxy+=10;
if (maxy)
{
maxy+=5;
trans_bar(0,377-maxy,640,maxy,0);
}
for(j=0;j<POCET_POSTAV;j++)
if (postavy[i=group_sort[j]].used)
{
HUM_ACTION *c;
int y,j;
c=postavy[i].provadena_akce;
if (c==NULL) continue;
y=386-10*postavy[i].programovano;
set_font(H_FLITT5,PRG_COLOR);
for(j=0;j<postavy[i].programovano;j++)
{
set_aligned_position(x,y,1,2,texty[c->action+40]);
outtext(texty[c->action+40]);
c++;
y+=+10;
}
x+=74;
}
y=postavy[i].programovano*10;
if (y>maxy) maxy=y;
}
if (!maxy && (pgm_help || rune_name!=NULL)) maxy+=10;
if (maxy)
{
maxy+=5;
trans_bar(0,377-maxy,640,maxy,0);
}
for(j=0;j<POCET_POSTAV;j++)
if (postavy[i=group_sort[j]].used)
{
HUM_ACTION *c;
int y,j;
c=postavy[i].provadena_akce;
if (c==NULL) continue;
y=386-10*postavy[i].programovano;
set_font(H_FLITT5,PRG_COLOR);
for(j=0;j<postavy[i].programovano;j++)
{
set_aligned_position(x,y,1,2,texty[c->action+40]);
outtext(texty[c->action+40]);
c++;
y+=+10;
}
x+=74;
}
}
if(pgm_help || rune_name!=NULL)
{
char *c;
@ -1810,7 +1811,7 @@ void program_draw()
set_aligned_position(580,376,1,2,c);
outtext(c);
}
ukaz_mysku();
ukaz_mysku();
}
@ -2000,7 +2001,10 @@ static void zahajit_kolo(char prekvapeni)
if (w==0) w=select_weapon(p,0);
else if (w==3) w=select_weapon(p,0),monster|=monster_far;
else w--,monster|=monster_far;
if (p->used && !p->programovano && p->lives && p->inmaphash == current_map_hash) {
if (p->used && group_flee) {
p->programovano = 1;
p->zvolene_akce->action=AC_RUN;
} else if (p->used && !p->programovano && p->lives && p->inmaphash == current_map_hash) {
if (prekvapeni || !p->actions || !autoattack || !monster)
{
p->programovano++;p->zvolene_akce->action=AC_STAND;
@ -2038,13 +2042,18 @@ char mask_click(int id,int xa,int ya,int xr,int yr)
souboje_stisknout(d);
switch(d)
{
case AC_RUN: postavy[select_player].utek=5+postavy[select_player].actions;
case AC_RUN:
if (lodka) {
group_flee = 1;break;
} else {
postavy[select_player].utek=5+postavy[select_player].actions;
}
CASE_FALLTHROUGH;
case AC_ATTACK:
case AC_STAND:
case AC_ARMOR:
case AC_MOVE:
case AC_MAGIC:if (postavy[select_player].actions)
case AC_MAGIC:if (postavy[select_player].actions && (d != AC_MOVE || !lodka))
{
HUM_ACTION *c;
postavy[select_player].direction=viewdir;
@ -2061,7 +2070,7 @@ char mask_click(int id,int xa,int ya,int xr,int yr)
souboje_vybrano(d);
}
break;
case AC_CANCEL:zrusit_akce();break;
case AC_CANCEL:zrusit_akce();group_flee = 0;break;
case AC_START:zahajit_kolo(0);
souboje_stisknout(d);
return 0;