diff --git a/.gitignore b/.gitignore index cb384a3..03d8ad6 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,8 @@ .svn _UpgradeReport_Files /Bin -/Debug \ No newline at end of file +/Debug +/build +/.cproject +/.project +/.settings diff --git a/.settings/.gitignore b/.settings/.gitignore new file mode 100644 index 0000000..d81d4c4 --- /dev/null +++ b/.settings/.gitignore @@ -0,0 +1 @@ +/language.settings.xml diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 0000000..6a96ec4 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,6 @@ +cmake_minimum_required(VERSION 3.28) +project(skeldal) + +include_directories(platform libs) +add_compile_options(-funsigned-char) +add_subdirectory(game) diff --git a/GAME/DUMP.C b/GAME/DUMP.C deleted file mode 100644 index d9837d4..0000000 --- a/GAME/DUMP.C +++ /dev/null @@ -1,81 +0,0 @@ -#include -#include -#include -#include -#include -#include - -static int latest_version(char *wild,int numpos) - { - WIN32_FIND_DATA ff; - HANDLE rc; - int i=0,j=-1; - char *p; - - rc=FindFirstFile(wild,&ff); - if (rc!=INVALID_HANDLE_VALUE) - do - { - p=ff.cFileName+numpos; - sscanf(p,"%d",&i); - if (i>j) j=i; - } - while (FindNextFile(rc,&ff)); - FindClose(rc); - return j; - } - -void save_dump() - { - static dump_counter=-1; - FILE *f; - int i,r,g,b,x,y; - word *a; - char c[20]; - - if (dump_counter==-1) - { - dump_counter=latest_version("DUMP*.BMP",4); - SEND_LOG("(DUMP) Dump counter sets to %d",dump_counter,0); - } - sprintf(c,"DUMP%04d.BMP",++dump_counter); - SEND_LOG("(DUMP) Saving screen shot named '%s'",c,0); - f=fopen(c,"wb"); - fputc('B',f);fputc('M',f); - i=DxGetResX()*DxGetResY()*3+0x36; - fwrite(&i,1,4,f);i=0; - fwrite(&i,1,4,f); - i=0x36; - fwrite(&i,1,4,f); - i=0x28; - fwrite(&i,1,4,f); - i=DxGetResX(); - fwrite(&i,1,4,f); - i=DxGetResY(); - fwrite(&i,1,4,f); - i=1; - fwrite(&i,1,2,f); - i=24; - fwrite(&i,1,2,f); - i=0; - fwrite(&i,1,4,f); - i=DxGetResX()*DxGetResY()*3; - fwrite(&i,1,4,f); - for(i=4,r=0;i>0;i--) fwrite(&r,1,4,f); - for(y=DxGetResY();y>0;y--) - { - word *scr=GetScreenAdr(); - a=scr+(y-1)*scr_linelen2; - for(x=0;x>3; - r=i>>8; - i=((r*256)+g)*256+b; - fwrite(&i,1,3,f); - } - } - fclose(f); - } - diff --git a/INST/SETUP.C b/INST/SETUP.C index 6a305f2..35738b1 100644 --- a/INST/SETUP.C +++ b/INST/SETUP.C @@ -169,10 +169,10 @@ static void cpy_error_proc(int event,char *name) switch(event) { - case CPERR_OPEN:hlaska="Nemohu otevt soubor :";break; - case CPERR_READ:hlaska="Nastala chyba pi ten z CD. Vyjmte CD, oistte jej a opt ho vlote do mechaniky";break; - case CPERR_WRITE:hlaska="Nastala chyba pi zapisu na disk. Mon u je pln. Soubor:";break; - default:hlaska="Nastala neznma chyba. "; + case CPERR_OPEN:hlaska="Nemohu otev��t soubor :";break; + case CPERR_READ:hlaska="Nastala chyba p�i �ten� z CD. Vyjm�te CD, o�ist�te jej a op�t ho vlo�te do mechaniky";break; + case CPERR_WRITE:hlaska="Nastala chyba p�i zapisu na disk. Mo�n� u� je pln�. Soubor:";break; + default:hlaska="Nastala nezn�ma chyba. "; } text=alloca(strlen(hlaska)+strlen(name)+10); strcpy(text,hlaska); @@ -187,7 +187,7 @@ static void cpy_error_proc(int event,char *name) static void stop_copy() { - if (msg_box("Konec instalace?",'\x2',"Hra jet nen kompletn nainstalovna. Opravdu chce ukonit instaltora?","Ano","Ne",NULL)==1) + if (msg_box("Konec instalace?",'\x2',"Hra je�t� nen� kompletn� nainstalov�na. Opravdu chce� ukon�it instal�tora?","Ano","Ne",NULL)==1) { close_ini(); shutdown(); @@ -197,7 +197,7 @@ static void stop_copy() static void stop_setup() { - if (msg_box("Konec?",'\x2',"Tato volba ukon SETUP bez uloen zmn. Opravdu chce ukonit program?","Ano","Ne",NULL)==1) + if (msg_box("Konec?",'\x2',"Tato volba ukon�� SETUP bez ulo�en� zm�n. Opravdu chce� ukon�it program?","Ano","Ne",NULL)==1) { shutdown(); home_path(target_path); @@ -208,10 +208,10 @@ static void stop_setup() static void display_progress(void) { - def_dialoge(312,380,310,75,"Kopruj se soubory...",3); + def_dialoge(312,380,310,75,"Kop�ruj� se soubory...",3); define(10,10,27,290,15,0,done_bar,100); property(bbutt,NULL,flat_color(0x1e0),WINCOLOR); - define(30,5,5,80,15,2,button,"Peruit");on_change(stop_copy); + define(30,5,5,80,15,2,button,"P�eru�it");on_control_change(stop_copy); property(def_border(1,0),&font6x9,flat_color(0),BUTTONCOLOR); define(20,5,10,200,12,3,input_line,2048);set_default(""); property(NULL,&font6x9,flat_color(0),WINCOLOR); @@ -303,9 +303,9 @@ static void open_handbook(char *file) if (find_window(win_handbook)!=NULL) close_window(find_window(win_handbook)); if (handbook!=NULL) release_list(handbook); handbook=read_text(file); - win_handbook=def_dialoge(54,54,450,350,"Pruka",2); + win_handbook=def_dialoge(54,54,450,350,"P��ru�ka",2); def_listbox(9,5,25,420,290,handbook,0,WINCOLOR);property(def_border(0,WINCOLOR),&font6x9,NULL,WINCOLOR); - define(20,5,5,60,15,2,button2,"Zavt");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(close_current); + define(20,5,5,60,15,2,button2,"Zav��t");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(close_current); redraw_window(); } @@ -341,7 +341,7 @@ static void read_dirlist() else if (dirlist[i]!=NULL && !strcmp(dirlist[i],"..")) { - str_insline(&dirlist,0,"<- zpt"); + str_insline(&dirlist,0,"<- zp�t"); str_replace(&dirlist,i,NULL); i++; } @@ -390,7 +390,7 @@ static void select_dir() { int i=f_get_value(0,59); if (dirlist[i]==NULL) return; - if (!strcmp(dirlist[i],"<- zpt")) chdir("..");else chdir(dirlist[i]); + if (!strcmp(dirlist[i],"<- zp�t")) chdir("..");else chdir(dirlist[i]); update_list(); } @@ -403,7 +403,7 @@ static get_script(char *source,char *target) if (i) { shutdown(); - if (i==1) puts("Nemohu nast INSTALL.INF"); + if (i==1) puts("Nemohu na��st INSTALL.INF"); if (i==2) puts("Chyba kompilace scriptu INSTALL.INF"); abort(); } @@ -435,20 +435,20 @@ static load_window() read_dirlist(); read_disk_list(); def_dialoge(200,100,340,300,PRG_HEADER,3); - define(-1,5,20,1,1,0,label,"Jmno sloky"); + define(-1,5,20,1,1,0,label,"Jm�no slo�ky"); define(10,5,35,330,10,0,input_line,2048);property(def_border(5,WINCOLOR),&font6x9,NULL,0x7fff); set_full_target_path(0); for(i=0;i"); - set_value(0,20,""); + set_value(0,10,""); + set_value(0,20,""); } else { @@ -521,7 +521,7 @@ static EVENT_PROC(esc_mode2) zobraz_mysku(); redraw_desktop(); goto_control(0); - terminate(); + terminate_gui(); } } } @@ -531,9 +531,9 @@ static char test_mode() char i,j,c; if (msg_box("Test grafiky",'\x1', - "Instaltor nyn vyzkou zvolen grafick reim. " - "Pokud obrazovka zstane ern, nebo zobraz nesmysly, stisknte " - "ESC a instaltor obnov pvodn reim.","Start","Zruit",NULL)==2) return 0; + "Instal�tor nyn� vyzkou�� zvolen� grafick� re�im. " + "Pokud obrazovka z�stane �ern�, nebo zobraz� nesmysly, stiskn�te " + "ESC a instal�tor obnov� p�vodn� re�im.","Start","Zru�it",NULL)==2) return 0; send_message(E_ADD,E_KEYBOARD,esc_mode2); donegr(); i=initgr_spec(f_get_value(0,9)); @@ -542,7 +542,7 @@ static char test_mode() zobraz_mysku(); redraw_desktop(); } - if (!i && (j=msg_box("Test grafiky",'\x2',"Vidi prosted instaltoru sprvn?","Ano","Ne",NULL))==1) + if (!i && (j=msg_box("Test grafiky",'\x2',"Vidi� prost�ed� instal�toru spr�vn�?","Ano","Ne",NULL))==1) { vmode=f_get_value(0,9); if (vmode==0) initgr_low(); @@ -583,7 +583,7 @@ static void select_vga() def_dialoge(20,300,156,156,"Kvalita grafiky",2); define(9,0,20,156,80,0,listbox,video_ls,0x03ff,0);c_default(vmode); property(NULL,vga_font,NULL,WINCOLOR); - define(20,38,5,80,20,3,button,"Zmnit te");on_change(test_mode); + define(20,38,5,80,20,3,button,"Zm�nit te�");on_control_change(test_mode); property(bbutt,NULL,NULL,BUTTONCOLOR); redraw_window(); } @@ -611,19 +611,19 @@ static void select_mode_win() { def_dialoge(224,270,192,156,"Instalovat",2); default_font=&font6x9; - define(10,30,40,132,30,0,button,"Automaticky");property(bbutt,NULL,NULL,BUTTONCOLOR);on_change(terminate); - define(30,30,80,132,30,0,button,"Podle pn");property(bbutt,NULL,NULL,BUTTONCOLOR);on_change(terminate); - define(40,50,15,92,20,3,button,"Konec");property(bbutt,NULL,NULL,BUTTONCOLOR);on_change(stop_copy); + define(10,30,40,132,30,0,button,"Automaticky");property(bbutt,NULL,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(30,30,80,132,30,0,button,"Podle p��n�");property(bbutt,NULL,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(40,50,15,92,20,3,button,"Konec");property(bbutt,NULL,NULL,BUTTONCOLOR);on_control_change(stop_copy); redraw_window(); } static void select_mode_win_setup() { - def_dialoge(224,270,192,156,"Monosti:",2); + def_dialoge(224,270,192,156,"Mo�nosti:",2); default_font=&font6x9; - define(10,30,40,132,30,0,button,"Nastaven");property(bbutt,NULL,NULL,BUTTONCOLOR);on_change(terminate); - define(30,30,80,132,30,0,button,"Odinstalovn");property(bbutt,NULL,NULL,BUTTONCOLOR);on_change(terminate); - define(40,50,15,92,20,3,button,"Konec");property(bbutt,NULL,NULL,BUTTONCOLOR);on_change(stop_setup); + define(10,30,40,132,30,0,button,"Nastaven�");property(bbutt,NULL,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(30,30,80,132,30,0,button,"Odinstalov�n�");property(bbutt,NULL,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(40,50,15,92,20,3,button,"Konec");property(bbutt,NULL,NULL,BUTTONCOLOR);on_control_change(stop_setup); redraw_window(); } @@ -657,7 +657,7 @@ static void device_select2() char c; def_dialoge(270,240,100,100,device_name(i),3); define(10,10,25,60,40,0,radio_butts,3,"LPT 1","LPT 2","PC Speaker");c_default(0); - define(20,10,5,80,20,2,button,"Ok");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(terminate); + define(20,10,5,80,20,2,button,"Ok");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); c=f_get_value(0,10); @@ -674,7 +674,7 @@ static void device_select2() static void select_sound(); static void detect_sound() { - if (msg_box("Rozpoznn zvukov karty",'\x2',"Opravdu chce nechat rozpoznat zvukovou kartu? Na nkterch potach me automatick rozpoznvn zpsobit zatuhnut potae.","Ano","Ne",NULL)==2) return; + if (msg_box("Rozpozn�n� zvukov� karty",'\x2',"Opravdu chce� nechat rozpoznat zvukovou kartu? Na n�kter�ch po��ta��ch m��e automatick� rozpozn�v�n� zp�sobit zatuhnut� po��ta�e.","Ano","Ne",NULL)==2) return; if (mixer_running) stop_mixing(); mixer_running=0; set_enable(0,70,mixer_running); @@ -695,15 +695,15 @@ static char sound_scan() if (sound_info.device!=DEV_NOSOUND) { if (sound_info.device==DEV_DAC) - if (msg_box("Varovn!",'\x1',"Vybran zvukov zazen pouv nestandardn pstupy a vyuv " - "nkterch skrytch trik systmu. Na nkterch potach nemus pracovat sprvn. " - "Toto zazen nedoke pracovat pod WINDOWS95 nebo jinm OS vjma DOSu. " - "Pro zrychlen prce odinstalujte ze systmu jakkoliv EMM manager (EMM386, QEMM, apod.) " - "Chcete pokraovat?","Ano","Ne",NULL)==2) return 1; + if (msg_box("Varov�n�!",'\x1',"Vybran� zvukov� za��zen� pou��v� nestandardn� p��stupy a vyu��v� " + "n�kter�ch skryt�ch trik� syst�mu. Na n�kter�ch po��ta��ch nemus� pracovat spr�vn�. " + "Toto za��zen� nedok��e pracovat pod WINDOWS95 nebo jin�m OS v�jma DOSu. " + "Pro zrychlen� pr�ce odinstalujte ze syst�mu jak�koliv EMM manager (EMM386, QEMM, apod.) " + "Chcete pokra�ovat?","Ano","Ne",NULL)==2) return 1; get_value(sound_win,20,buffer); if (sscanf(buffer,"%x",&sound_info.port)!=1) { - msg_box("Pozor!",'\x1',"Mus vyplnit sprvn Port","Ok",NULL); + msg_box("Pozor!",'\x1',"Mus�� vyplnit spr�vn� Port","Ok",NULL); return 1; } } @@ -746,22 +746,22 @@ void select_sound() default_font=&font6x9; for(i=0;i<8;i++) str_add(&ls,device_name(i)); str_replace(&ls,0,""); - sound_win=def_dialoge(200,300,300,156,"Zvukov karta",2); - define(9,2,20,170,85,0,listbox,ls,0x03ff,0);c_default(sound_info.device);on_change(device_select2); + sound_win=def_dialoge(200,300,300,156,"Zvukov� karta",2); + define(9,2,20,170,85,0,listbox,ls,0x03ff,0);c_default(sound_info.device);on_control_change(device_select2); property(def_border(0,0x4210),vga_font,NULL,WINCOLOR); define(-1,180,20,1,1,0,label,"Port:"); define(20,10,20,30,12,1,input_line,3);property(def_border(0,0x4210),vga_font,NULL,WINCOLOR); set_default(itoa(sound_info.port,buff,16)); define(-1,180,40,1,1,0,label,"DMA:"); i=sound_info.dma;i-=(i>2)+(i>4); - define(30,40,40,30,30,1,radio_butts,3,"0","1","3");c_default(i);on_change(change_dma); - define(35,10,40,30,30,1,radio_butts,3,"5","6","7");c_default(i-3);on_change(change_dma); + define(30,40,40,30,30,1,radio_butts,3,"0","1","3");c_default(i);on_control_change(change_dma); + define(35,10,40,30,30,1,radio_butts,3,"5","6","7");c_default(i-3);on_control_change(change_dma); define(-1,180,80,1,1,0,label,"IRQ:"); i=sound_info.irq;i-=2*(i>1)+(i>4)+(i>6); define(40,40,80,30,40,1,radio_butts,4,"2","3","5","7");c_default(i); - define(50,10,5,80,20,2,button,"Test");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(test_sound); - define(60,100,5,80,20,2,button,"Rozpoznat");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(detect_sound); - define(70,190,5,80,20,2,button,"Stop");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(stop_sound); + define(50,10,5,80,20,2,button,"Test");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(test_sound); + define(60,100,5,80,20,2,button,"Rozpoznat");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(detect_sound); + define(70,190,5,80,20,2,button,"Stop");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(stop_sound); redraw_window(); set_enable(0,70,mixer_running); device_select(); @@ -773,7 +773,7 @@ static void back_start() stop_sound(); sound_scan(); while (waktual!=NULL) close_current(); - terminate(); + terminate_gui(); } static void control_window(void *forward,void *back,void *help); @@ -823,7 +823,7 @@ void static show_space(char device) if (device>='A' && device<='Z') { if (device!=lastdevice) lastvalue=get_disk_free(device-'@')/1024; - sprintf(buff,"Na disku %c: je volnch %d Kb",device,lastvalue); + sprintf(buff,"Na disku %c: je voln�ch %d Kb",device,lastvalue); lastdevice=device; set_value(0,80,buff); } @@ -932,7 +932,7 @@ static void start_install() strupr(target_path); if (validate_path(target_path)==0) { - msg_box("Cesta je patn",'\x1',"Cesta s clovm adresem je chybn zadna. Nepouvejte dlouh nzvy z WINDOWS 95!","OK",NULL); + msg_box("Cesta je �patn�",'\x1',"Cesta s c�lov�m adres��em je chybn� zad�na. Nepou��vejte dlouh� n�zvy z WINDOWS 95!","OK",NULL); return; } get_script(_SOURCE_,target_path); @@ -946,21 +946,21 @@ static void start_install() diskfree=get_disk_free(target_path[0]-'@'); if (maxcopy>diskfree) { - if (msg_box("Nedostatek msta!",'\x1',"Instaltor vypotal, e BS zaberou vce msta ne mte na svm disku. " - "Pokud vak pouvate kompriman program jako je teba DRVSPACE, pak mohou bt daje o " - "volnm mstu nepesne. I pes to, e nen voln msto chcete pokraovat?","Ano","Ne",NULL)==2) return; + if (msg_box("Nedostatek m�sta!",'\x1',"Instal�tor vypo��tal, �e BS zaberou v�ce m�sta ne� m�te na sv�m disku. " + "Pokud v�ak pou��vate komprima�n� program jako je t�eba DRVSPACE, pak mohou b�t �daje o " + "voln�m m�stu nep�esne. I p�es to, �e nen� voln� m�sto chcete pokra�ovat?","Ano","Ne",NULL)==2) return; } else if (maxcopy+1024*1024>diskfree) { - if (msg_box("Mlo msta",'\x2',"Po nainstalovn by mlo zbt alespo 1MB pro bh. Souasn prostor" - "umouje hru nainstalovat, avak hru nebude mon spustit. Pokraovat?","Ano","Ne",NULL)==2) return; + if (msg_box("M�lo m�sta",'\x2',"Po nainstalov�n� by m�lo zb�t alespo� 1MB pro b�h. Sou�asn� prostor" + "umo��uje hru nainstalovat, av�ak hru nebude mo�n� spustit. Pokra�ovat?","Ano","Ne",NULL)==2) return; } maxcopy=maxcopy<<1; while (waktual!=NULL) close_current(); cascade_mkdir(target_path); if (create_ini(target_path,SKELDAL_INI)) { - msg_box(PRG_HEADER,'\x1',"Nemohu vytvoit konfiguran soubor. Zkontroluj spravnost zpisu cesty","Ok",NULL); + msg_box(PRG_HEADER,'\x1',"Nemohu vytvo�it konfigura�n� soubor. Zkontroluj spravnost z�pisu cesty","Ok",NULL); clean_up(); return; } @@ -981,7 +981,7 @@ static void start_install() if (error) shutdown(),exit(1); close_current(); do_events(); - if (!autostart) msg_box("Hotovo",' ',"Hra 'Brny Skeldalu' je spn nainstalovna. Sputn provete z pkazov dky napsnm 'SKELDAL'","Konec",NULL); + if (!autostart) msg_box("Hotovo",' ',"Hra 'Br�ny Skeldalu' je �sp��n� nainstalov�na. Spu�t�n� prove�te z p��kazov� ��dky naps�n�m 'SKELDAL'","Konec",NULL); purge_file_list(); shutdown(); home_path(target_path); @@ -1028,26 +1028,26 @@ static void rozsah_window() exit_wait=0; default_font=&font6x9; def_dialoge(146,160,348,264,"Rozsah instalace",2); - define(10,10,30,70,30,0,button,"Minimln");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); - define(-1,90,30,1,1,0,label,"Instaluje jen nejdleitj soubory na HD"); - define(-1,90,40,1,1,0,label,"Ve ostatn se pak nat pmo z CD"); + define(10,10,30,70,30,0,button,"Minim�ln�");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); + define(-1,90,30,1,1,0,label,"Instaluje jen nejd�le�it�j�� soubory na HD"); + define(-1,90,40,1,1,0,label,"V�e ostatn� se pak na��t� p��mo z CD"); sprintf(buff,text,install_sizes[0]/1024); define(-1,90,50,1,1,0,label,buff); - define(20,10,80,70,30,0,button,"Stedn");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); - define(-1,90,80,1,1,0,label,"Instaluje vechny datov soubory na HD"); - define(-1,90,90,1,1,0,label,"Hudba a video se tou pmo z CD"); + define(20,10,80,70,30,0,button,"St�edn�");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); + define(-1,90,80,1,1,0,label,"Instaluje v�echny datov� soubory na HD"); + define(-1,90,90,1,1,0,label,"Hudba a video se �tou p��mo z CD"); sprintf(buff,text,install_sizes[1]/1024); define(-1,90,100,1,1,0,label,buff); - define(30,10,130,70,30,0,button,"Maximln");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); - define(-1,90,130,1,1,0,label,"Instaluje ve na v HD vetn hudby"); - define(-1,90,140,1,1,0,label,"a videa. Z CD se nenat vbec nic."); + define(30,10,130,70,30,0,button,"Maxim�ln�");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); + define(-1,90,130,1,1,0,label,"Instaluje v�e na v�� HD v�etn� hudby"); + define(-1,90,140,1,1,0,label,"a videa. Z CD se nena��t� v�bec nic."); sprintf(buff,text,install_sizes[2]/1024); define(-1,90,150,1,1,0,label,buff); - define(40,10,180,70,20,0,button,"Sloka");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(open_load_window); + define(40,10,180,70,20,0,button,"Slo�ka");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(open_load_window); define(60,90,185,250,11,0,input_line,2048);property(def_border(1,0x4210),&font6x9,NULL,0x7fff); set_default(target_path); on_event(show_space_event);on_exit(show_space_exit); - define(70,40,220,200,10,0,check_box,"Po nainstalovn hru automaticky spustit.");c_default(1); + define(70,40,220,200,10,0,check_box,"Po nainstalov�n� hru automaticky spustit.");c_default(1); define(80,10,10,250,11,2,view_line,100);set_default(""); show_space(target_path[0]); } @@ -1055,17 +1055,17 @@ static void rozsah_window() static void automatic_window() { char buff[100]; - char *text="Hra zabere zhruba %d KB msta"; + char *text="Hra zabere zhruba %d KB m�sta"; exit_wait=0; default_font=&font6x9; def_dialoge(110,200,420,80,"Instalovat kam?",2); - define(40,10,33,70,15,0,button,"Najt");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(open_load_window); + define(40,10,33,70,15,0,button,"Naj�t");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(open_load_window); define(60,90,35,310,11,0,input_line,2048);property(def_border(1,0x4210),&font6x9,NULL,0x7fff); set_default(target_path); on_event(show_space_event);on_exit(show_space_exit); - define(10,10,10,70,20,2,button,"Start");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); - define(20,90,10,70,20,2,button,"<< Zpt");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(back_start); + define(10,10,10,70,20,2,button,"Start");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); + define(20,90,10,70,20,2,button,"<< Zp�t");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(back_start); sprintf(buff,text,install_sizes[0]/1024); define(90,180,20,200,10,2,view_line,100);set_default(buff); define(80,180,10,200,10,2,view_line,100);set_default(""); @@ -1085,12 +1085,12 @@ static void control_next1() static void control_window(void *forward,void *back,void *help) { - def_dialoge(524,300,96,156,"Monosti",2); - define(10,8,30,80,20,0,button,"Dal >>");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(forward); - define(20,8,60,80,20,0,button,"<< Zpt");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(back); - define(30,8,90,80,20,0,button,"? Pomoc");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(help); + def_dialoge(524,300,96,156,"Mo�nosti",2); + define(10,8,30,80,20,0,button,"Dal�� >>");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(forward); + define(20,8,60,80,20,0,button,"<< Zp�t");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(back); + define(30,8,90,80,20,0,button,"? Pomoc");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(help); define(40,8,10,80,20,3,button,"Konec");property(bbutt,&font6x9,NULL,BUTTONCOLOR); - if (setup_mode) on_change(stop_setup);else on_change(stop_copy); + if (setup_mode) on_control_change(stop_setup);else on_control_change(stop_copy); set_enable(0,10,forward!=NULL); set_enable(0,20,back!=NULL); set_enable(0,30,help!=NULL); @@ -1164,7 +1164,7 @@ static void save_ini() char err=1; if (sound_scan()) return; - d=msg_box("Potvrzen?",'\x2',"Chce zapsat zmny do konfiguranho souboru hry?","Ano","Ne","Zruit",NULL); + d=msg_box("Potvrzen�?",'\x2',"Chce� zapsat zm�ny do konfigura�n�ho souboru hry?","Ano","Ne","Zru�it",NULL); if (d==3) return; if (d==1) { @@ -1193,12 +1193,12 @@ static void deinstall() char ig; int x,y; def_dialoge(200,200,250,156,"Odinstalovat?",2); - define(-1,10,30,200,100,0,label,"Tato volba odstran hru z vaeho disku."); - define(-1,10,40,200,100,0,label,"Pot ji nebude mone hru spustit"); - define(-1,10,50,200,100,0,label,"do novho nainstalovn z CD."); - define(10,30,80,150,10,0,check_box,"Zachovat uloen pozice");c_default(1); - define(20,10,10,80,30,3,button,"Ano");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(terminate); - define(30,10,10,80,30,2,button,"Proboha NE");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(terminate); + define(-1,10,30,200,100,0,label,"Tato volba odstran� hru z va�eho disku."); + define(-1,10,40,200,100,0,label,"Pot� ji� nebude mo�ne hru spustit"); + define(-1,10,50,200,100,0,label,"do nov�ho nainstalov�n� z CD."); + define(10,30,80,150,10,0,check_box,"Zachovat ulo�en� pozice");c_default(1); + define(20,10,10,80,30,3,button,"Ano");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(30,10,10,80,30,2,button,"Proboha NE");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); if (o_aktual->id==30) @@ -1266,12 +1266,12 @@ void warning() _outtext("(C)1998 Napoleon gameS - Setup version 1.0 written by Ondrej Novak\n" "Instalacni program ke hre Brany Skeldalu\n\nUpozorneni:\n"); _settextcolor(15); - _outtext(""); REPEAT(i,78) _outtext("");_outtext(""); + _outtext("�"); REPEAT(i,78) _outtext("�");_outtext("�"); REPEAT(j,5) { - _outtext(""); REPEAT(i,78)_outtext(" ");_outtext(""); + _outtext("�"); REPEAT(i,78)_outtext(" ");_outtext("�"); } - _outtext(""); REPEAT(i,78) _outtext("");_outtext(""); + _outtext("�"); REPEAT(i,78) _outtext("�");_outtext("�"); _settextcolor(13); _settextwindow(6,2,20,79); _outtext("Stiskem jakekoliv klavesy spustite instalacni program. Pokud potom obrazovka" @@ -1296,9 +1296,9 @@ static void ask_video() ask_video_win=def_dialoge(242,100,156,156,"Vyber grafiku",3); define(9,0,20,156,80,0,listbox,video_ls,0x03ff,0);c_default(vmode); property(NULL,vga_font,NULL,WINCOLOR); - define(20,5,5,60,20,2,button,"Konec");on_change(terminate); + define(20,5,5,60,20,2,button,"Konec");on_control_change(terminate_gui); property(bbutt,NULL,NULL,BUTTONCOLOR); - define(20,70,5,60,20,2,button,"OK");on_change(test_mode_xxx); + define(20,70,5,60,20,2,button,"OK");on_control_change(test_mode_xxx); property(bbutt,NULL,NULL,BUTTONCOLOR); redraw_window(); } @@ -1316,7 +1316,7 @@ static EVENT_PROC(esc_mode) rescue_mode=1; redraw_desktop(); vmode=0; - terminate(); + terminate_gui(); } } } @@ -1327,10 +1327,10 @@ static void about_window() char r=!rescue_mode; if (r) send_message(E_ADD,E_KEYBOARD,esc_mode); def_dialoge(200,100,240,144,PRG_HEADER,2); - define(-1,10,30,220,10,0,mid_label,"Vtej u instaltoru hry:"); - define(-1,10,42,220,10,0,mid_label,"Brny Skeldalu"); - define(-1,10,80,220,10,0,mid_label,"Instalan program napsal:"); - define(-1,10,92,220,10,0,mid_label,"Ondej Novk"); + define(-1,10,30,220,10,0,mid_label,"V�tej u instal�toru hry:"); + define(-1,10,42,220,10,0,mid_label,"Br�ny Skeldalu"); + define(-1,10,80,220,10,0,mid_label,"Instala�n� program napsal:"); + define(-1,10,92,220,10,0,mid_label,"Ond�ej Nov�k"); define(-1,10,110,220,10,0,mid_label,"(C)1998 Napoleon gameS"); redraw_window(); escape(); diff --git a/INST/SETVIDEO.C b/INST/SETVIDEO.C index c5505b3..838638a 100644 --- a/INST/SETVIDEO.C +++ b/INST/SETVIDEO.C @@ -143,7 +143,7 @@ long def_window(word xs,word ys,char *name) if (xs>=70) { define(1,1,1,19,16,1,button,"\x0f"); - property(NULL,icones,&icone_color,WINCOLOR);on_change(close_current); + property(NULL,icones,&icone_color,WINCOLOR);on_control_change(close_current); } return q; } @@ -188,9 +188,9 @@ void def_listbox(int id,word x,word y,word xs,word ys,TSTR_LIST ls,int ofs,int c define(id+1,x+xs+4,y+18,15,ys-35,0,scroll_bar_v,0,10,1,0x0200); property(&b2,NULL,NULL,WINCOLOR); define(id+2,x+xs+4,y,14,14,0,scroll_button,-1,0,"\x4"); - property(&b1,icones,black,WINCOLOR);on_change(scroll_support); + property(&b1,icones,black,WINCOLOR);on_control_change(scroll_support); define(id+3,x+xs+4,y+ys-14,14,14,0,scroll_button,1,10,"\6"); - property(&b1,icones,black,WINCOLOR);on_change(scroll_support); + property(&b1,icones,black,WINCOLOR);on_control_change(scroll_support); define(id,x,y,xs,ys,0,listbox,ls,color,ofs); property(&b2,NULL,NULL,WINCOLOR); } diff --git a/MAPS/EDIT_MAP.C b/MAPS/EDIT_MAP.C index 1cba926..7528502 100644 --- a/MAPS/EDIT_MAP.C +++ b/MAPS/EDIT_MAP.C @@ -189,10 +189,10 @@ char edit_side_save(int target,int smer) int selmode; apl=get_bit_fields(0,400,4); - if (apl==0) return msg_box("Editor stn",2,"Nen zakrtnut dn strana. Pokraovat?","Ano","Ne",NULL)==1; + if (apl==0) return msg_box("Editor st�n",2,"Nen� za�krtnut� ��dn� strana. Pokra�ovat?","Ano","Ne",NULL)==1; if (smer!=-1) if (count_of_sel()>1) - selmode=msg_box("Editor stn",'\x2',"Je oznaeno vce sektor. Chce upravit pouze ...","Aktuln","Vechny","Zmny","Zpt",NULL); + selmode=msg_box("Editor st�n",'\x2',"Je ozna�eno v�ce sektor�. Chce� upravit pouze ...","Aktu�ln�","V�echny","Zm�ny","Zp�t",NULL); else selmode=(apl!=1 && apl!=2 && apl!=4 && apl!=8 && target!=0)?3:1; else smer=0,apl=0xf,selmode=1; @@ -267,7 +267,7 @@ void *edit_side_predvolba_0(EVENT_MSG *msg) if (msg->msg==E_INIT) return &edit_side_predvolba_0; if (msg->msg==E_DONE) return NULL; c=(char *)msg->data; - strcpy(c,"Vlastnosti nastaveny jako pedvolba..."); + strcpy(c,"Vlastnosti nastaveny jako p�edvolba..."); c=strchr(c,'\0'); msg->data=(void *)c; msg->msg=-1; @@ -303,11 +303,11 @@ void action_flags() flags=f_get_value(0,350); memcpy(&b1,def_border(1,0),sizeof(CTL3D)); - def_dialoge(300,220,300,210,"Vce vlajek"); - define(CANCEL_BUTT,11,5,80,20,2,button,"Zruit");property(&b1,NULL,NULL,WINCOLOR); - on_change(terminate); + def_dialoge(300,220,300,210,"V�ce vlajek"); + define(CANCEL_BUTT,11,5,80,20,2,button,"Zru�it");property(&b1,NULL,NULL,WINCOLOR); + on_control_change(terminate_gui); define(OK_BUTT,100,5,80,20,2,button,"Ok");property(&b1,NULL,NULL,WINCOLOR); - on_change(terminate); + on_control_change(terminate_gui); define(10,10,20,250,10,0,check_box,side_flgs[24]); define(20,10,32,250,10,0,check_box,side_flgs[25]); define(30,10,44,250,10,0,check_box,side_flgs[26]); @@ -363,7 +363,7 @@ static void edit_vyklenek_start() id=find_free_vyklenek(); if (id==-1) { - msg_box("Omezeni!",'\x1',"V map je pouito ji mnoho vklenk ve zdi. Maximln poet je 256","Ok",NULL); + msg_box("Omezeni!",'\x1',"V map� je pou�ito ji� mnoho v�klenk� ve zdi. Maxim�ln� po�et je 256","Ok",NULL); return; } v=vyklenky+id; @@ -391,46 +391,46 @@ void edit_side(int source,int smer) memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - sprintf(s,"Vlastnosti stn, sektor %d stna %d",source,smer); + sprintf(s,"Vlastnosti st�n, sektor %d st�na %d",source,smer); def_window(400,324,s); waktual->x=125; waktual->y=60; waktual->modal=1; - define(CANCEL_BUTT,10,5,80,20,2,button,"Zruit");property(&b1,NULL,NULL,WINCOLOR); - on_change(close_current); + define(CANCEL_BUTT,10,5,80,20,2,button,"Zru�it");property(&b1,NULL,NULL,WINCOLOR); + on_control_change(close_current); define(OK_BUTT,190,5,80,20,2,button,"Ok");property(&b1,NULL,NULL,WINCOLOR); - on_change(edit_side_ok); - define(3400,100,5,80,20,2,button,"Pedvolba");property(&b1,NULL,NULL,WINCOLOR); - on_change(edit_side_predvolba_1);on_exit(edit_side_predvolba_2); - define(10,5,20,300,35,0,label,"Primrn: Sekundarn: Oblouk:");property(&b3,NULL,NULL,WINCOLOR); + on_control_change(edit_side_ok); + define(3400,100,5,80,20,2,button,"P�edvolba");property(&b1,NULL,NULL,WINCOLOR); + on_control_change(edit_side_predvolba_1);on_control_exit(edit_side_predvolba_2); + define(10,5,20,300,35,0,label,"Prim�rn�: Sekundarn�: Oblouk:");property(&b3,NULL,NULL,WINCOLOR); define(20,10,35,90,12,0,str_line,side_names);property(&b2,NULL,NULL,WINCOLOR);c_default(p->prim); - on_enter(string_list_sup); + on_control_enter(string_list_sup); define(30,110,35,90,12,0,str_line,side_names);property(&b2,NULL,NULL,WINCOLOR);c_default(p->sec); - on_enter(string_list_sup); + on_control_enter(string_list_sup); define(40,210,35,90,12,0,str_line,oblouky);property(&b2,NULL,NULL,WINCOLOR);c_default(p->oblouk & 0x0f); - on_enter(string_list_sup); - define(-1,5,60,250,12,0,label,"Animace primarn:"); - define(-1,5,75,250,12,0,label,"Animace sekundarn:"); - define(-1,5,90,250,12,0,label,"X pozice sek. stny:"); - define(-1,5,105,250,12,0,label,"Y pozice sek. stny:"); - define(-1,5,120,250,12,0,label,"Clov sektor udlosti:"); - define(-1,5,135,250,12,0,label,"Clov stna udlosti:"); + on_control_enter(string_list_sup); + define(-1,5,60,250,12,0,label,"Animace primarn�:"); + define(-1,5,75,250,12,0,label,"Animace sekundarn�:"); + define(-1,5,90,250,12,0,label,"X pozice sek. st�ny:"); + define(-1,5,105,250,12,0,label,"Y pozice sek. st�ny:"); + define(-1,5,120,250,12,0,label,"C�lov� sektor ud�losti:"); + define(-1,5,135,250,12,0,label,"C�lov� st�na ud�losti:"); define(-1,5,150,250,12,0,label,"Popis akce:"); - define(-1,260,60,100,12,0,label,"Aplikuj na stnu:"); + define(-1,260,60,100,12,0,label,"Aplikuj na st�nu:"); define(50,200,60,50,10,0,input_line,10,1,16,"%6d");property(&b2,NULL,NULL,WINCOLOR); - set_default(strs((p->prim_anim & 0xf)+1));on_exit(test_int); + set_default(strs((p->prim_anim & 0xf)+1));on_control_exit(test_int); define(60,200,75,50,10,0,input_line,10,1,16,"%6d");property(&b2,NULL,NULL,WINCOLOR); - set_default(strs((p->sec_anim & 0xf)+1));on_exit(test_int); + set_default(strs((p->sec_anim & 0xf)+1));on_control_exit(test_int); define(70,200,90,50,10,0,input_line,10,0,499,"%6d");property(&b2,NULL,NULL,WINCOLOR); - set_default(strs(p->xsec<<1));on_exit(test_int); + set_default(strs(p->xsec<<1));on_control_exit(test_int); define(80,200,105,50,10,0,input_line,10,0,511,"%6d");property(&b2,NULL,NULL,WINCOLOR); - set_default(strs(p->ysec<<1));on_exit(test_int); + set_default(strs(p->ysec<<1));on_control_exit(test_int); define(90,200,120,50,10,0,input_line,10,0,65535,"%6d");property(&b2,NULL,NULL,WINCOLOR); - set_default(strs(p->sector_tag));on_exit(test_int); + set_default(strs(p->sector_tag));on_control_exit(test_int); define(100,200,135,50,10,0,str_line,steny2);property(&b2,NULL,NULL,WINCOLOR); - c_default(p->side_tag & 0x3);on_enter(string_list_sup); + c_default(p->side_tag & 0x3);on_control_enter(string_list_sup); define(110,100,150,150,10,0,str_line,actions);property(&b2,NULL,NULL,WINCOLOR); - on_enter(string_list_sup); c_default(p->action); + on_control_enter(string_list_sup); c_default(p->action); define(120,10,175,150,10,0,check_box,side_flgs[0]); define(130,10,187,150,10,0,check_box,side_flgs[1]); define(140,10,199,150,10,0,check_box,side_flgs[2]); @@ -451,23 +451,23 @@ void edit_side(int source,int smer) define(290,10,283,75,10,0,check_box,side_flgs[17]); define(300,190,271,150,10,0,check_box,side_flgs[18]); define(310,10,295,75,11,0,check_box,side_flgs[19]); - define(400,290,80,100,10,0,check_box,"Severn"); - define(410,290,95,100,10,0,check_box,"Vchodn"); - define(420,290,110,100,10,0,check_box,"Jin"); - define(430,290,125,100,10,0,check_box,"Zpadn"); - define(340,290,150,100,15,0,button2,"Vce >>");on_change(action_flags); + define(400,290,80,100,10,0,check_box,"Severn�"); + define(410,290,95,100,10,0,check_box,"V�chodn�"); + define(420,290,110,100,10,0,check_box,"Ji�n�"); + define(430,290,125,100,10,0,check_box,"Z�padn�"); + define(340,290,150,100,15,0,button2,"V�ce >>");on_control_change(action_flags); define(350,290,150,100,15,0,value_store,4);c_default(p->flags & 0xfff00000); define(360,290,150,100,15,0,value_store,4);c_default(source); define(370,290,150,100,15,0,value_store,4);c_default(smer); define(-1,5,20,60,10,1,label,"Lclip:"); define(440,30,35,30,12,1,input_line,3,0,255,"%3d"); property(&b2,NULL,NULL,WINCOLOR); - set_default(strs(p->lclip));on_exit(test_int); + set_default(strs(p->lclip));on_control_exit(test_int); define(450,10,220,30,30,1,radio_butts,3,"-","\x4","\x6");c_default((p->oblouk>>5) & 0x3); property(NULL,icones,NULL,WINCOLOR); - define(460,10,175,80,12,1,button,"Vklenek");on_change(edit_vyklenek_start); - define(470,190,283,150,10,0,check_box,"Lze poloit za");c_default(p->oblouk>>7); - define(480,10,307,75,10,0,check_box,"Pedsunout s.");c_default(p->side_tag>>7); + define(460,10,175,80,12,1,button,"V�klenek");on_control_change(edit_vyklenek_start); + define(470,190,283,150,10,0,check_box,"Lze polo�it za");c_default(p->oblouk>>7); + define(480,10,307,75,10,0,check_box,"P�edsunout s.");c_default(p->side_tag>>7); fill_bit_fields(0,120,p->flags,20); if (source) fill_bit_fields(0,400,1<autoresizey=1; define(11,1,20,21,17,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,1,22,21,17,2,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(20,1,1,10,10,2,resizer); /* define(OK_BUTT,100,5,80,20,2,button,"Ok");property(&b1,NULL,NULL,WINCOLOR); on_change(terminate); - define(CANCEL_BUTT,10,5,80,20,2,button,"Zruit");property(&b1,NULL,NULL,WINCOLOR); + define(CANCEL_BUTT,10,5,80,20,2,button,"Zru�it");property(&b1,NULL,NULL,WINCOLOR); on_change(terminate); - define(-1,5,20,100,12,0,label,"Pipojen:"); + define(-1,5,20,100,12,0,label,"P�ipojen�:"); define(10,10,35,50,12,0,input_line,20,0,MAPSIZE-1,"%6d");property(&b2,NULL,NULL,WINCOLOR); set_default(strs(p->step_next[0]));on_exit(test_int); define(20,10,50,50,12,0,input_line,20,0,MAPSIZE-1,"%6d");property(&b2,NULL,NULL,WINCOLOR); @@ -519,9 +519,9 @@ void edit_sector(int source) define(40,10,80,50,12,0,input_line,20,0,MAPSIZE-1,"%6d");property(&b2,NULL,NULL,WINCOLOR); set_default(strs(p->step_next[3]));on_exit(test_int); define(50,70,35,80,12,0,button,"Sever");property(&b1,NULL,NULL,WINCOLOR);on_change(edit_side_sup); - define(60,70,50,80,12,0,button,"Vchod");property(&b1,NULL,NULL,WINCOLOR);on_change(edit_side_sup); + define(60,70,50,80,12,0,button,"V�chod");property(&b1,NULL,NULL,WINCOLOR);on_change(edit_side_sup); define(70,70,65,80,12,0,button,"Jih");property(&b1,NULL,NULL,WINCOLOR);on_change(edit_side_sup); - define(80,70,80,80,12,0,button,"Zpad");property(&b1,NULL,NULL,WINCOLOR);on_change(edit_side_sup); + define(80,70,80,80,12,0,button,"Z�pad");property(&b1,NULL,NULL,WINCOLOR);on_change(edit_side_sup); temp_source=source; */redraw_window(); escape(); @@ -679,47 +679,47 @@ void sector_details_call(int sect_num) define(-1,30,30,100,12,0,label,"Strop:"); define(-1,30,50,100,12,0,label,"Podlaha:"); define(-1,30,70,100,12,0,label,"Sektor:"); - define(-1,30,90,100,12,0,label,"Cl akce:"); - define(-1,30,110,100,12,0,label,"Stna akce:"); + define(-1,30,90,100,12,0,label,"C�l akce:"); + define(-1,30,110,100,12,0,label,"St�na akce:"); define(-1,30,130,100,12,0,label,"Popis akce:"); define(10,30,28,100,13,1,str_line,ceils);property(&b2,NULL,NULL,WINCOLOR); - c_default(p->ceil); on_enter(string_list_sup); + c_default(p->ceil); on_control_enter(string_list_sup); define(20,30,48,100,13,1,str_line,floors);property(&b2,NULL,NULL,WINCOLOR); - c_default(p->floor); on_enter(string_list_sup); + c_default(p->floor); on_control_enter(string_list_sup); define(30,30,68,100,13,1,str_line,sector_types);property(&b2,NULL,NULL,WINCOLOR); - c_default(p->sector_type); on_enter(string_list_sup); + c_default(p->sector_type); on_control_enter(string_list_sup); define(40,30,88,50,13,1,input_line,10,0,MAPSIZE,"%6d");property(&b2,NULL,NULL,WINCOLOR); - set_default(strs(p->sector_tag));on_exit(test_int); + set_default(strs(p->sector_tag));on_control_exit(test_int); define(50,30,108,100,13,1,str_line,steny2);property(&b2,NULL,NULL,WINCOLOR); - c_default(p->side_tag & 3); on_enter(string_list_sup); + c_default(p->side_tag & 3); on_control_enter(string_list_sup); define(60,30,128,150,13,1,str_line,actions);property(&b2,NULL,NULL,WINCOLOR); - c_default(p->action); on_enter(string_list_sup); + c_default(p->action); on_control_enter(string_list_sup); define(70,5,150,214,80,0,radio_butts,7, - "(1) Normln podlaha", + "(1) Norm�ln� podlaha", "(2) Dva druhy podlah", - "(3) Dva smry", - "(4) Dva smry a druhy", - "(5) tyi smry", - "(6) tyi smry a dva druhy", - "(7) achovnice");c_default(p->flags & 0x7); + "(3) Dva sm�ry", + "(4) Dva sm�ry a druhy", + "(5) �ty�i sm�ry", + "(6) �ty�i sm�ry a dva druhy", + "(7) �achovnice");c_default(p->flags & 0x7); define(80,5,150,214,80,1,radio_butts,7, - "(1) Normln strop", + "(1) Norm�ln� strop", "(2) Dva druhy strop", - "(3) Dva smry", - "(4) Dva smry a druhy", - "(5) tyi smry", - "(6) tyi smry a dva druhy", - "(7) achovnice");c_default(p->flags >> 4 & 0x7); + "(3) Dva sm�ry", + "(4) Dva sm�ry a druhy", + "(5) �ty�i sm�ry", + "(6) �ty�i sm�ry a dva druhy", + "(7) �achovnice");c_default(p->flags >> 4 & 0x7); define(90,5,240,214,10,0,check_box,"(?)Animace podlahy");c_default((p->flags & 0x8)!=0); define(95,5,240,214,10,1,check_box,"(?)Animace stropu");c_default((p->flags & 0x80)!=0); define(65,5,252,214,10,0,check_box,"Sekundarni shading");c_default((minfo[sect_num].flags & 0x100)>>8); - define(75,5,258,214,40,1,radio_butts,4,"*default*","ipka","Schody","Bez symbolu");c_default((minfo[sect_num].flags & 0x600)>>9); + define(75,5,258,214,40,1,radio_butts,4,"*default*","�ipka","Schody","Bez symbolu");c_default((minfo[sect_num].flags & 0x600)>>9); define(83,5,264,214,10,0,check_box,"!Automap (kouzlem)");c_default((minfo[sect_num].flags & 0x800)>>11); define(85,5,276,214,10,0,check_box,"!Summon");c_default((minfo[sect_num].flags & 0x1000)>>12); - define(87,5,288,214,10,0,check_box,"Neprojde hledanm cesty");c_default((minfo[sect_num].flags & 0x2000)>>13); - define(100,10,10,80,20,3,button,"Ok");property(&b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(110,10,10,80,20,2,button,"Zruit");property(&b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(120,100,10,80,20,2,button,"Pedvolba");property(&b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(87,5,288,214,10,0,check_box,"Neprojde hledan�m cesty");c_default((minfo[sect_num].flags & 0x2000)>>13); + define(100,10,10,80,20,3,button,"Ok");property(&b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(110,10,10,80,20,2,button,"Zru�it");property(&b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(120,100,10,80,20,2,button,"P�edvolba");property(&b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); set_enable(0,120,sect_num!=0); redraw_window(); do @@ -735,8 +735,8 @@ void sector_details_call(int sect_num) } else { - if (count_of_sel()<2 || (i=msg_box("Co te?",'\x2',"Mm vlastnosti aplikovat na jeden sektor nebo na vybranou oblast?", - "Na sektor","Na oblast","Zruit",NULL))==1) + if (count_of_sel()<2 || (i=msg_box("Co te�?",'\x2',"M�m vlastnosti aplikovat na jeden sektor nebo na vybranou oblast?", + "Na sektor","Na oblast","Zru�it",NULL))==1) { start=sect_num; end=sect_num; @@ -797,7 +797,7 @@ void get_error(char *err) p=(short *)0xb8000; if (p[0]==0xff) { - strcpy(err,"Neoekvan zhroucen."); + strcpy(err,"Neo�ek�van� zhroucen�."); return; } mezera=1;spc=1; @@ -883,48 +883,48 @@ void open_sector_win(void) memcpy(&f_sel,flat_color(0x0017),sizeof(charcolors)); sektor_win=def_window(120,325,"Vlastnosti"); waktual->y=2;waktual->x=SCR_WIDTH_X-120-3; - on_change(close_sector_win); - define(100,4,19,59,14,0,button2,"Sever:");on_change(run_edit_side); - define(110,4,49,59,14,0,button2,"Vchod:");on_change(run_edit_side); - define(120,4,79,59,14,0,button2,"Jih:");on_change(run_edit_side); - define(130,4,109,59,14,0,button2,"Zpad:");on_change(run_edit_side); + on_control_change(close_sector_win); + define(100,4,19,59,14,0,button2,"Sever:");on_control_change(run_edit_side); + define(110,4,49,59,14,0,button2,"V�chod:");on_control_change(run_edit_side); + define(120,4,79,59,14,0,button2,"Jih:");on_control_change(run_edit_side); + define(130,4,109,59,14,0,button2,"Z�pad:");on_control_change(run_edit_side); define(-1,5,140,59,10,0,label,"Strop:"); define(-1,5,170,59,10,0,label,"Podlaha:"); define(-1,5,200,59,10,0,label,"Typ sektoru:"); define(10,65,20,50,12,0,input_line,20,0,MAPSIZE-1,"%5d");property(&b2,NULL,&f_sel,WINCOLOR); - set_default("0");on_exit(test_int);on_event(chozeni); + set_default("0");on_control_exit(test_int);on_event(chozeni); define(20,65,50,50,12,0,input_line,20,0,MAPSIZE-1,"%5d");property(&b2,NULL,&f_sel,WINCOLOR); - set_default("0");on_exit(test_int);on_event(chozeni); + set_default("0");on_control_exit(test_int);on_event(chozeni); define(30,65,80,50,12,0,input_line,20,0,MAPSIZE-1,"%5d");property(&b2,NULL,&f_sel,WINCOLOR); - set_default("0");on_exit(test_int);on_event(chozeni); + set_default("0");on_control_exit(test_int);on_event(chozeni); define(40,65,110,50,12,0,input_line,20,0,MAPSIZE-1,"%5d");property(&b2,NULL,&f_sel,WINCOLOR); - set_default("0");on_exit(test_int);on_event(chozeni); + set_default("0");on_control_exit(test_int);on_event(chozeni); define(50,5,35,95,12,0,str_line,side_names);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(60,5,65,95,12,0,str_line,side_names);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(70,5,95,95,12,0,str_line,side_names);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(80,5,125,95,12,0,str_line,side_names);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(140,103,35,12,12,0,check_box,"");o_end->runs[2]=o_end->events[3]; define(150,103,65,12,12,0,check_box,"");o_end->runs[2]=o_end->events[3]; define(160,103,95,12,12,0,check_box,"");o_end->runs[2]=o_end->events[3]; define(170,103,125,12,12,0,check_box,"");o_end->runs[2]=o_end->events[3]; define(200,5,155,110,12,0,str_line,ceils);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(210,5,185,110,12,0,str_line,floors);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(220,5,215,110,12,0,str_line,sector_types);property(&b2,NULL,&f_sel,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(set_change_map); + c_default(0); on_control_enter(string_list_sup);on_control_change(set_change_map); define(-1,1,30,60,10,3,label,"Sektor:"); - define(OK_BUTT,60,67,55,17,3,button2,"Aplikuj");on_change(Apply); - define(300,4,67,55,17,3,button2,"Detaily");on_change(sector_details); + define(OK_BUTT,60,67,55,17,3,button2,"Aplikuj");on_control_change(Apply); + define(300,4,67,55,17,3,button2,"Detaily");on_control_change(sector_details); define(5,60,30,55,12,3,input_line,20,0,MAPSIZE-1,"%5d");property(&b2,NULL,NULL,WINCOLOR); - set_default("?");on_change(chozeni2); - define(310,4,3,112,20,3,button,"Testovat mapu");on_change(testmap); - define(320,4,47,55,17,2,button2,"Zoom+");on_change(zoomin); - define(330,4,47,55,17,3,button2,"Zoom-");on_change(zoomout); + set_default("?");on_control_change(chozeni2); + define(310,4,3,112,20,3,button,"Testovat mapu");on_control_change(testmap); + define(320,4,47,55,17,2,button2,"Zoom+");on_control_change(zoomin); + define(330,4,47,55,17,3,button2,"Zoom-");on_control_change(zoomout); send_message(E_ADD,E_KEYBOARD,chozeni2); waktual->popup=1; } @@ -992,20 +992,20 @@ void open_draw_win(void) memcpy(&f_sel,flat_color(0x0017),sizeof(charcolors)); draw_win=def_window(120,165,"Vlajky"); waktual->y=2;waktual->x=SCR_WIDTH_X-120-3; - define(10,5,30,100,10,0,check_box,"Rozdlit");c_default(1); - on_change(draw_win_1); - define(20,5,45,100,10,0,check_box,"!Hra");c_default(0); - on_change(draw_win_2); - define(30,5,60,100,10,0,check_box,"!Nestvra");c_default(0); - on_change(draw_win_2); - define(40,5,75,100,10,0,check_box,"!Vc");c_default(0); - on_change(draw_win_2); + define(10,5,30,100,10,0,check_box,"Rozd�lit");c_default(1); + on_control_change(draw_win_1); + define(20,5,45,100,10,0,check_box,"!Hra�");c_default(0); + on_control_change(draw_win_2); + define(30,5,60,100,10,0,check_box,"!Nestv�ra");c_default(0); + on_control_change(draw_win_2); + define(40,5,75,100,10,0,check_box,"!V�c");c_default(0); + on_control_change(draw_win_2); define(50,5,90,100,10,0,check_box,"!Zvuk");c_default(0); - on_change(draw_win_2); + on_control_change(draw_win_2); define(60,5,105,100,10,0,check_box,"PrimVis");c_default(0); - on_change(draw_win_2); - define(70,5,18,110,17,3,button2,"Zoom in");on_change(zoomin); - define(80,5,1,110,17,3,button2,"Zoom out");on_change(zoomout); + on_control_change(draw_win_2); + define(70,5,18,110,17,3,button2,"Zoom in");on_control_change(zoomin); + define(80,5,1,110,17,3,button2,"Zoom out");on_control_change(zoomout); waktual->popup=1; } @@ -1039,7 +1039,7 @@ static void veci_ve_vyklenku(TSTR_LIST *ls,short *list) for(i=0;list[i]!=0;i++) { int it=list[i]-1; - if (it>=max_items) str_add(ls,"");else str_add(ls,item_list[it].jmeno); + if (it>=max_items) str_add(ls,"");else str_add(ls,item_list[it].jmeno); } } @@ -1116,40 +1116,40 @@ void edit_vyklenek(int idnum) memcpy(&old,v,sizeof(TVYKLENEK)); veci_ve_vyklenku(&vyklist,&v->items); create_isort_list(&ls_sorts,-1); - def_dialoge(70,100,500,200,"Oprava vklenk"); + def_dialoge(70,100,500,200,"Oprava v�klenk�"); define(9,10,20,200,126,0,listbox,ls_sorts,RGB555(31,31,31),0); property(&b3,NULL,NULL,WINCOLOR);c_default(0); define(10,216,40,21,87,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&b2,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(&b1,icones,NULL,WINCOLOR);on_change(scroll_support); + property(&b1,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,130,21,17,0,scroll_button,1,10,"\x1f"); - property(&b1,icones,NULL,WINCOLOR);on_change(scroll_support); + property(&b1,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(20,0,0,0,0,0,value_store,4);c_default(idnum); define(29,10,20,200,120,1,listbox,vyklist,RGB555(31,31,31),0); property(&b3,NULL,NULL,WINCOLOR);c_default(0); - define(40,242,40,40,15,0,button,">>");on_change(add_to_vyk); - define(50,242,60,40,15,0,button,"<<");on_change(remove_from_vyk); + define(40,242,40,40,15,0,button,">>");on_control_change(add_to_vyk); + define(50,242,60,40,15,0,button,"<<");on_control_change(remove_from_vyk); define(80,30,150,120,12,1,str_line,typy_veci);c_default(0); - property(&b2,NULL,NULL,WINCOLOR);on_enter(string_list_sup);on_change(change_grep); + property(&b2,NULL,NULL,WINCOLOR);on_control_enter(string_list_sup);on_control_change(change_grep); define(-1,150,150,50,10,1,label,"Filtr:"); - define(90,10,150,10,10,1,check_box,"");c_default(0);on_change(change_grep); + define(90,10,150,10,10,1,check_box,"");c_default(0);on_control_change(change_grep); define(-1,10,30,1,10,3,label,"Xpos Ypos Xsiz Ysiz Sector Pos"); define(100,8,12,40,12,3,input_line,10,0,500,"%4d");set_default(strs(v->xpos)); - property(&b2,NULL,NULL,WINCOLOR);on_exit(test_int); + property(&b2,NULL,NULL,WINCOLOR);on_control_exit(test_int); define(110,53,12,40,12,3,input_line,10,0,500,"%4d");set_default(strs(v->ypos)); - property(&b2,NULL,NULL,WINCOLOR);on_exit(test_int); + property(&b2,NULL,NULL,WINCOLOR);on_control_exit(test_int); define(120,98,12,40,12,3,input_line,10,0,500,"%4d");set_default(strs(v->xs)); - property(&b2,NULL,NULL,WINCOLOR);on_exit(test_int); + property(&b2,NULL,NULL,WINCOLOR);on_control_exit(test_int); define(130,143,12,40,12,3,input_line,10,0,500,"%4d");set_default(strs(v->ys)); - property(&b2,NULL,NULL,WINCOLOR);on_exit(test_int); + property(&b2,NULL,NULL,WINCOLOR);on_control_exit(test_int); define(140,188,12,40,12,3,input_line,10,0,maplen,"%4d");set_default(strs(v->sector)); - property(&b2,NULL,NULL,WINCOLOR);on_exit(test_int); + property(&b2,NULL,NULL,WINCOLOR);on_control_exit(test_int); define(150,233,12,40,12,3,input_line,10,0,3,"%4d");set_default(strs(v->dir)); - property(&b2,NULL,NULL,WINCOLOR);on_exit(test_int); - define(200,5,5,60,20,2,button,"Ok");on_change(terminate);property(&b1,NULL,NULL,WINCOLOR); - define(210,70,5,60,20,2,button,"Zruit");on_change(terminate);property(&b1,NULL,NULL,WINCOLOR); - define(220,135,5,60,20,2,button,"Vymazat");on_change(terminate);property(&b1,NULL,NULL,WINCOLOR); + property(&b2,NULL,NULL,WINCOLOR);on_control_exit(test_int); + define(200,5,5,60,20,2,button,"Ok");on_control_change(terminate_gui);property(&b1,NULL,NULL,WINCOLOR); + define(210,70,5,60,20,2,button,"Zru�it");on_control_change(terminate_gui);property(&b1,NULL,NULL,WINCOLOR); + define(220,135,5,60,20,2,button,"Vymazat");on_control_change(terminate_gui);property(&b1,NULL,NULL,WINCOLOR); redraw_window(); opp: escape(); @@ -1163,7 +1163,7 @@ void edit_vyklenek(int idnum) v->dir=vals(150); } else if (o_aktual->id==220) - if (msg_box("Mapedit",'\x2',"Chce opravdu vklenek zbourat?","Ano","Ne",NULL)==1) + if (msg_box("Mapedit",'\x2',"Chce� opravdu v�klenek zbourat?","Ano","Ne",NULL)==1) { v->sector=0; } diff --git a/MAPS/ITEMS.C b/MAPS/ITEMS.C index 2095cea..558949d 100644 --- a/MAPS/ITEMS.C +++ b/MAPS/ITEMS.C @@ -184,14 +184,14 @@ void generate_item_tree(TITEM *start,TSTR_LIST *list, char first) char *d; d=strchr(tree,'\0')-3; - strcpy(d," "); + strcpy(d,"�� "); } else { char *d; d=strchr(tree,'\0')-3; - strcpy(d," "); + strcpy(d,"�� "); } if (start->jmeno[0]=='~') sprintf(c,"%08X %s%s",(int)start,tree,start->popis); @@ -213,7 +213,7 @@ void generate_item_tree(TITEM *start,TSTR_LIST *list, char first) char *d; d=strchr(tree,'\0')-3; - strcpy(d,"\xdb "); + strcpy(d,"�\xdb "); } generate_item_tree(start->inside,list,0); } @@ -550,15 +550,15 @@ int select_ikon_lib(int last) for (i=0;i<30;i++) { define(i+10,x,y,45,55,0,ikona);c_default(last+i); - property(def_border(5,WINCOLOR),NULL,NULL,WINCOLOR);on_change(terminate); + property(def_border(5,WINCOLOR),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); x+=48;if (x+48>490) {y+=58;x=5;} } define(300,10,10,80,20,3,button,"<<"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); define(310,10,10,80,20,2,button,">>"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); - define(320,175-40,10,80,20,3,button,"Zruit"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(320,175-40,10,80,20,3,button,"Zru�it"); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); do { @@ -587,10 +587,10 @@ void change_item_ikone() } char nvlast[][16]= - {"cSla","Schopnost magie","Pohyblivost","Obratnost","Max zrann", - "Kondice","Max mana","Obrana(doln)","Obrana(Horn)","tok(Doln)", - "tok(Horn)","Ohe","Voda","Zem","Vzduch","Mysl","Magick sla(D)", - "Magick sla(H)","\0"}; + {"cS�la","Schopnost magie","Pohyblivost","Obratnost","Max zran�n�", + "Kondice","Max mana","Obrana(doln�)","Obrana(Horn�)","�tok(Doln�)", + "�tok(Horn�)","Ohe�","Voda","Zem�","Vzduch","Mysl","Magick� s�la(D)", + "Magick� s�la(H)","\0"}; void ukaz_vlastnosti(int pocet,int x,int y,int id,short *it) { @@ -633,13 +633,13 @@ void oprav_vlastnosti(TITEM *it) define(190,5,272,100,10,0,check_box,"Na nohy"); define(200,105,200,100,10,0,check_box,"Na chodidla"); define(210,105,212,100,10,0,check_box,"Na ramena"); - define(220,105,224,100,10,0,check_box,"Na zda"); - define(300,10,10,80,20,2,button,"Zruit");on_change(terminate); + define(220,105,224,100,10,0,check_box,"Na z�da"); + define(300,10,10,80,20,2,button,"Zru�it");on_control_change(terminate_gui); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(310,10,40,80,20,2,button,"Ok");on_change(terminate); + define(310,10,40,80,20,2,button,"Ok");on_control_change(terminate_gui); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(-1,225,206,70,10,0,label,"Magick tok"); - define(250,225,218,70,70,0,radio_butts,5,"Ohe","Voda","Zem","Vzduch","Mysl"); + define(-1,225,206,70,10,0,label,"Magick� �tok"); + define(250,225,218,70,70,0,radio_butts,5,"Ohe�","Voda","Zem�","Vzduch","Mysl"); c_default(it->zmeny[VLS_MGZIVEL]); fill_bit_fields(0,130,it->place_map,11); redraw_window(); @@ -679,7 +679,7 @@ void save_edited_item() it->magie=vals(110); it->silaspell=vals(120); it->ikona=f_get_value(0,130); - terminate(); + terminate_gui(); } TITEM *select_item(TITEM *it); @@ -695,17 +695,17 @@ void e_item_insert_inside() it=isolate_item(it); if (insert_inside(it,is)==NULL) { - msg_box("Chyba integrity:",'\x1',"Nelze vloit tento pedmt do zvolenho " - "Patrn se pokou vloit tut vc samu do sebe. Nebo vc nen " - "izolovna, nebo ji nelze izolovat. Je mon e se sna vloit " - "vc do vci, kter je uvnit tto vci, nebo v uvnit vci, kter " - "je uvnit vci, do kter chce vc umstit atd. Mohlo by dojit k " - "zacyklen a to nelze dopustit. Program bude vc izolovat, jeliko " - "ji nelze rekonstruovat pvodn stav","Budu si pamatovat",NULL); + msg_box("Chyba integrity:",'\x1',"Nelze vlo�it tento p�edm�t do zvolen�ho " + "Patrn� se pokou��� vlo�it tut�� v�c samu do sebe. Nebo v�c nen� " + "izolov�na, nebo ji nelze izolovat. Je mo�n� �e se sna��� vlo�it " + "v�c do v�ci, kter� je uvnit� t�to v�ci, nebo v uvnit� v�ci, kter� " + "je uvnit� v�ci, do kter� chce� v�c um�stit atd. Mohlo by dojit k " + "zacyklen� a to nelze dopustit. Program bude v�c izolovat, jeliko� " + "ji� nelze rekonstruovat p�vodn� stav","Budu si pamatovat",NULL); insert_isolated(it); return; } - terminate(); + terminate_gui(); } void e_item_insert_map() @@ -721,23 +721,23 @@ void item_edit(TITEM *it) CTL3D *c; c=def_border(5,WINCOLOR); - def_dialoge(120,80,410,300,"Oprava daj o pedmtu"); + def_dialoge(120,80,410,300,"Oprava �daj� o p�edm�tu"); curfont=vga_font; default_font=curfont; - define(-1,5,20,50,10,0,label,"Jmno (31 znak)"); + define(-1,5,20,50,10,0,label,"Jm�no (31 znak�)"); define(15,10,35,288,12,0,input_line,31);set_default(it->jmeno); property(def_border(2,WINCOLOR),NULL,flat_color(RGB555(15,0,0)),WINCOLOR); - define(-1,5,50,50,10,0,label,"Popis (63 znak)"); + define(-1,5,50,50,10,0,label,"Popis (63 znak�)"); define(20,10,65,380,12,0,input_line,63);set_default(it->popis); property(def_border(2,WINCOLOR),NULL,flat_color(0xF),WINCOLOR); define(5,0,0,0,0,0,value_store,4);set_default(&it); define(30,10,30,80,20,1,button,"Vlastnosti"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(otevri_vlastnosti); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(otevri_vlastnosti); define(-1,5,80,100,10,0,label,"Hmotnost"); define(-1,5,95,100,10,0,label,"Nosnost"); - define(-1,5,110,100,10,0,label,"ID Kle"); + define(-1,5,110,100,10,0,label,"ID Kl��e"); define(-1,5,125,100,10,0,label,"?Hodnota"); - define(-1,5,140,100,10,0,label,".Udlosti"); + define(-1,5,140,100,10,0,label,"�.Ud�losti"); define(-1,5,155,100,10,0,label,"Druh"); def_border(5,WINCOLOR); define(40,105,80,60,12,0,input_line,7,-32767,+32767,"%6d"); @@ -752,18 +752,18 @@ void item_edit(TITEM *it) property(c,NULL,NULL,WINCOLOR);on_exit(test_int);set_default(strs(it->use_event)); define(90,80,155,120,108,0,radio_butts,10, "Nespecif.", - "Brnn", - "Run zbra", + "Brn�n�", + "Ru�n� zbra�", "Svitek/Hulka", - "Steln zbr.", - "Vrhac", - "Lektvar/Mch", - "Jdlo", + "St�eln� zbr.", + "Vrhac�", + "Lektvar/M�ch", + "J�dlo", "Batoh/Truhla", - "Specialn");c_default(it->druh); + "Specialn�");c_default(it->druh); define(-1,105,80,100,10,1,label,"Kouzlo:"); define(-1,105,95,100,10,1,label,"Mana celk:"); - define(-1,105,110,100,10,1,label,"Sla kouzla"); + define(-1,105,110,100,10,1,label,"S�la kouzla"); define(100,55,80,60,12,1,input_line,7,-32767,32767,"%6d");on_exit(test_int); property(c,NULL,NULL,WINCOLOR);set_default(strs(it->spell)); define(110,55,95,60,12,1,input_line,7,-32767,32767,"%6d");on_exit(test_int); @@ -771,11 +771,11 @@ void item_edit(TITEM *it) define(120,55,110,60,12,1,input_line,7,-32767,32767,"%6d");on_exit(test_int); property(c,NULL,NULL,WINCOLOR);set_default(strs(it->silaspell)); define(130,10,180,45,55,0,ikona);c_default(it->ikona); - property(c,NULL,NULL,WINCOLOR);on_change(change_item_ikone); - define(300,10,10,80,20,3,button,"Ulo");property(def_border(1,0),NULL,NULL,RGB(0,24,0));on_change(save_edited_item); - define(310,100,10,80,20,3,button,"Vloit do");property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(e_item_insert_inside); - define(320,100,10,80,20,2,button,"Umstit");property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(e_item_insert_map); - define(330,10,10,80,20,2,button,"Zruit");property(def_border(1,0),NULL,flat_color(RGB555(31,31,31)),RGB555(16,0,0);on_change(terminate); + property(c,NULL,NULL,WINCOLOR);on_control_change(change_item_ikone); + define(300,10,10,80,20,3,button,"Ulo�");property(def_border(1,0),NULL,NULL,RGB(0,24,0));on_control_change(save_edited_item); + define(310,100,10,80,20,3,button,"Vlo�it do");property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(e_item_insert_inside); + define(320,100,10,80,20,2,button,"Um�stit");property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(e_item_insert_map); + define(330,10,10,80,20,2,button,"Zru�it");property(def_border(1,0),NULL,flat_color(RGB555(31,31,31)),RGB555(16,0,0);on_control_change(terminate_gui); redraw_window(); escape(); close_current(); @@ -794,7 +794,7 @@ void select_item_edit() sscanf(ls[i],"%X",&it); if ((unsigned short)it->druh>=256) { - msg_box("Nelze!",'\x1',"Nelze upravovat tento druh vci","Beru na vdom",NULL); + msg_box("Nelze!",'\x1',"Nelze upravovat tento druh v�ci","Beru na v�dom�",NULL); return; } item_edit(it); @@ -815,12 +815,12 @@ void select_item_klon() sscanf(ls[i],"%X",&it); if ((unsigned short)it->druh>=256) { - msg_box("Nelze!",'\x1',"Nelze klonovat tento druh vci","Beru na vdom",NULL); + msg_box("Nelze!",'\x1',"Nelze klonovat tento druh v�ci","Beru na v�dom�",NULL); return; } if (it->inside!=NULL) { - i=msg_box("Klonovat",'\x2',"Klonovat i vci uvnit?","Ano","Ne",NULL); + i=msg_box("Klonovat",'\x2',"Klonovat i v�ci uvnit�?","Ano","Ne",NULL); } it=clone_item(it,i==1); generate_item_tree(item_tree,&ls,1); @@ -875,10 +875,10 @@ void select_item_delete() sscanf(ls[i],"%X",&it); if (item_tree==it && it->next==NULL) { - msg_box("Nelze!",'\x1',"Jeden pedmt mus zstat","Ok",NULL); + msg_box("Nelze!",'\x1',"Jeden p�edm�t mus� z�stat","Ok",NULL); return; } - if (msg_box("Pedmty",'\x2',"Vymazat vybranou vc","Souhlas","Ne",NULL)==2) return; + if (msg_box("P�edm�ty",'\x2',"Vymazat vybranou v�c","Souhlas","Ne",NULL)==2) return; isolate_item(it); delete_item(it); check_for_empty_loc(); @@ -945,7 +945,7 @@ TITEM *select_item(TITEM *it) if (q==it) break; } if (i==ls) i=0; - def_dialoge(120,80,410,300,"Pedmty"); + def_dialoge(120,80,410,300,"P�edm�ty"); default_font=vga_font; memcpy(&b2,def_border(5,WINCOLOR),sizeof(CTL3D)); define(9,5,20,380,210,0,listbox,il,RGB555(31,31,31),9); @@ -953,23 +953,23 @@ TITEM *select_item(TITEM *it) define(10,1,40,19,171,1,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&b2,NULL,NULL,WINCOLOR);c_default(0);c_default(i); define(11,1,20,21,17,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,1,213,21,17,1,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(5,0,0,0,0,0,value_store,4);set_default(&it); - define(20,5,5,80,15,3,button,"Upravit");on_change(select_item_edit); + define(20,5,5,80,15,3,button,"Upravit");on_control_change(select_item_edit); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(30,5,25,80,15,3,button,"Klonovat");on_change(select_item_klon); + define(30,5,25,80,15,3,button,"Klonovat");on_control_change(select_item_klon); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(40,5,45,80,15,3,button,"Vymazat");on_change(select_item_delete); + define(40,5,45,80,15,3,button,"Vymazat");on_control_change(select_item_delete); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(50,5,5,80,15,2,button,"Zruit");on_change(terminate); + define(50,5,5,80,15,2,button,"Zru�it");on_control_change(terminate_gui); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(60,5,25,80,15,2,button,"Vyber");on_change(terminate); + define(60,5,25,80,15,2,button,"Vyber");on_control_change(terminate_gui); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(70,90,5,80,15,3,button,"Izoluj");on_change(select_item_isolate); + define(70,90,5,80,15,3,button,"Izoluj");on_control_change(select_item_isolate); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(80,90,25,80,15,3,button,"Mapa");on_change(items_on_map_show); + define(80,90,25,80,15,3,button,"Mapa");on_control_change(items_on_map_show); property(def_border(1,0),NULL,NULL,WINCOLOR); redraw_window(); escape(); diff --git a/MAPS/ITEMS2.C b/MAPS/ITEMS2.C index 6d7f4cd..231f3e6 100644 --- a/MAPS/ITEMS2.C +++ b/MAPS/ITEMS2.C @@ -190,15 +190,15 @@ int select_ikon_lib(int last) for (i=0;i<30;i++) { define(i+10,x,y,45,55,0,ikona);c_default(last+i); - property(def_border(5,WINCOLOR),NULL,NULL,0);on_change(terminate); + property(def_border(5,WINCOLOR),NULL,NULL,0);on_control_change(terminate_gui); x+=48;if (x+48>490) {y+=58;x=5;} } define(300,10,10,80,20,3,button,"<<"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); define(310,10,10,80,20,2,button,">>"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); - define(320,175-40,10,80,20,3,button,"Zruit"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(320,175-40,10,80,20,3,button,"Zru�it"); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); do { @@ -227,10 +227,10 @@ void change_item_ikone() } char nvlast[][16]= - {"Sla","Schopnost magie","Pohyblivost","Obratnost","Max zrann", - "Kondice","Max mana","Obrana(doln)","Obrana(Horn)","tok(Doln)", - "tok(Horn)","Ohe","Voda","Zem","Vzduch","Mysl","ivoty Regen", - "Mana Regen","Kondice Regen","Magick sla(D)", "Magick sla(H)","","innek zsahu","*"}; + {"S�la","Schopnost magie","Pohyblivost","Obratnost","Max zran�n�", + "Kondice","Max mana","Obrana(doln�)","Obrana(Horn�)","�tok(Doln�)", + "�tok(Horn�)","Ohe�","Voda","Zem�","Vzduch","Mysl","�ivoty Regen", + "Mana Regen","Kondice Regen","Magick� s�la(D)", "Magick� s�la(H)","","��innek z�sahu","*"}; void ukaz_vlastnosti(int pocet,int x,int y,int id,short *it) { @@ -277,13 +277,13 @@ void oprav_vlastnosti(TITEM *it) define(190,5,272,100,10,0,check_box,"Na nohy"); define(200,105,200,100,10,0,check_box,"Na chodidla"); define(210,105,212,100,10,0,check_box,"Na ramena"); - define(220,105,224,100,10,0,check_box,"Na zda"); */ - define(300,10,10,80,20,2,button,"Zruit");on_change(terminate); + define(220,105,224,100,10,0,check_box,"Na z�da"); */ + define(300,10,10,80,20,2,button,"Zru�it");on_control_change(terminate_gui); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(310,10,40,80,20,2,button,"Ok");on_change(terminate); + define(310,10,40,80,20,2,button,"Ok");on_control_change(terminate_gui); property(def_border(1,0),NULL,NULL,WINCOLOR); - define(-1,225,216,70,10,0,label,"Magick tok"); - define(250,225,228,70,70,0,radio_butts,5,"Ohe","Voda","Zem","Vzduch","Mysl"); + define(-1,225,216,70,10,0,label,"Magick� �tok"); + define(250,225,228,70,70,0,radio_butts,5,"Ohe�","Voda","Zem�","Vzduch","Mysl"); c_default(it->zmeny[VLS_MGZIVEL]); // fill_bit_fields(0,130,it->place_map,11); redraw_window(); @@ -311,7 +311,7 @@ void item_special(TITEM *it) int i,y; CTL3D *c; - def_dialoge(140,100,410,320,"Special - obrzky v letu"); + def_dialoge(140,100,410,320,"Special - obr�zky v letu"); y=20;c=def_border(5,WINCOLOR); for(i=0;i<16;i++) { @@ -321,10 +321,10 @@ void item_special(TITEM *it) } define(-1,5,20,1,1,0,label,"Zezadu"); define(-1,5,85,1,1,0,label,"Ze strany"); - define(-1,5,150,1,1,0,label,"Zepedu"); - define(-1,5,215,1,1,0,label,"Vbuch"); - define(300,10,10,80,20,2,button,"Zruit");on_change(terminate); - define(310,100,10,80,20,2,button,"Ok");on_change(terminate); + define(-1,5,150,1,1,0,label,"Zep�edu"); + define(-1,5,215,1,1,0,label,"V�buch"); + define(300,10,10,80,20,2,button,"Zru�it");on_control_change(terminate_gui); + define(310,100,10,80,20,2,button,"Ok");on_control_change(terminate_gui); redraw_window(); escape(); if (o_aktual->id==310) @@ -394,14 +394,14 @@ void items_adjusting() yy2=350-y2-vec[1]; if (yy1<0 || yy2<0) { - msg_box("Chyba!",'\x1',"Nelze zobrazit, protoe nhled je zsti mimo obrazovku!","Ok",NULL); + msg_box("Chyba!",'\x1',"Nelze zobrazit, proto�e n�hled je z��sti mimo obrazovku!","Ok",NULL); return; } preview_win=def_window(300,400,"View"); define(10,150-malexs/2,350-maleys,malexs,maleys,0,pcx_view);set_default(ITEM_MALE); define(20,150+x1-vec[0]/2,yy1,1,1,0,pcx_view);set_default(filename); define(30,150+x2-vec[0]/2,yy2,1,1,0,pcx_view);set_default(filename); - define(40,5,5,80,20,2,button,"Ok");on_change(close_current); + define(40,5,5,80,20,2,button,"Ok");on_control_change(close_current); movesize_win(waktual,0,0,300,400); redraw_window(); free(vec); @@ -440,18 +440,18 @@ void item_sound_call(TITEM *it) memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - def_dialoge(100,50,300,250,"Zvuk pi dopadu (destrukci)"); + def_dialoge(100,50,300,250,"Zvuk p�i dopadu (destrukci)"); concat(c,sample_path,"*.wav"); list=read_directory(c,DIR_BREIF,_A_NORMAL); read_ddl_list_wav(&list); define(9,10,20,200,126,0,listbox,list,0x7fff,0); - property(&b3,NULL,NULL,WINCOLOR);c_default(0);on_change(mob_test_sound); + property(&b3,NULL,NULL,WINCOLOR);c_default(0);on_control_change(mob_test_sound); define(10,217,40,19,87,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&b2,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,130,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); { int z,y; char *s; @@ -462,10 +462,10 @@ void item_sound_call(TITEM *it) define(20,120,y,120,12,0,input_line,13);property(&b2,NULL,NULL,WINCOLOR); set_default(s); define(40,245,y,20,12,0,button,"<"); - property(&b1,NULL,NULL,WINCOLOR);on_change(mob_sound_copy); + property(&b1,NULL,NULL,WINCOLOR);on_control_change(mob_sound_copy); } - define(100,5,5,80,20,2,button,"Ok");on_change(terminate); property(&b1,NULL,NULL,WINCOLOR); - define(110,90,5,80,20,2,button,"Zruit");on_change(terminate); property(&b1,NULL,NULL,WINCOLOR); + define(100,5,5,80,20,2,button,"Ok");on_control_change(terminate_gui); property(&b1,NULL,NULL,WINCOLOR); + define(110,90,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui); property(&b1,NULL,NULL,WINCOLOR); redraw_window(); escape(); if (o_aktual->id==100) @@ -523,7 +523,7 @@ void save_edited_item() it->shiftup=0xff; w=find_window(preview_win); if (w!=NULL) close_window(w); - terminate(); + terminate_gui(); } @@ -593,23 +593,23 @@ void item_edit(TITEM *it) if (anm>=str_count(weapons)) anm=0; c=def_border(5,WINCOLOR); - def_dialoge(220,80,410,350,"Oprava daj o pedmtu"); + def_dialoge(220,80,410,350,"Oprava �daj� o p�edm�tu"); curfont=vga_font; default_font=curfont; - define(-1,5,20,50,10,0,label,"Jmno (31 znak)"); + define(-1,5,20,50,10,0,label,"Jm�no (31 znak�)"); define(15,10,35,288,12,0,input_line,31);set_default(it->jmeno); property(def_border(2,WINCOLOR),NULL,flat_color(RGB555(16,0,0)),WINCOLOR); - define(-1,5,50,50,10,0,label,"Popis (31 znak)"); + define(-1,5,50,50,10,0,label,"Popis (31 znak�)"); define(20,10,65,380,12,0,input_line,31);set_default(it->popis); property(def_border(2,WINCOLOR),NULL,flat_color(0xF),WINCOLOR); define(5,0,0,0,0,0,value_store,4);set_default(&it); define(30,10,30,80,20,1,button,"Vlastnosti"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(otevri_vlastnosti); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(otevri_vlastnosti); define(-1,5,80,100,10,0,label,"Hmotnost"); define(-1,5,95,100,10,0,label,"Nosnost"); - define(-1,5,110,100,10,0,label,"ID Kle"); + define(-1,5,110,100,10,0,label,"ID Kl��e"); define(-1,5,125,100,10,0,label,"?Hodnota"); - define(-1,5,140,100,10,0,label,".Udlosti"); + define(-1,5,140,100,10,0,label,"�.Ud�losti"); define(-1,5,155,100,10,0,label,"Druh"); def_border(5,WINCOLOR); define(40,105,80,60,12,0,input_line,7,-32767,+32767,"%6d"); @@ -626,7 +626,7 @@ void item_edit(TITEM *it) on_enter(string_list_sup);c_default(it->druh); define(-1,105,80,100,10,1,label,"Kouzlo:"); define(-1,105,95,100,10,1,label,"Mana celk:"); - define(-1,105,110,100,10,1,label,"Cena vci"); + define(-1,105,110,100,10,1,label,"Cena v�ci"); define(-1,105,125,100,10,1,label,"Poloha1(XY)"); define(-1,105,140,100,10,1,label,"Poloha2(XY)"); define(100,55,80,50,12,1,input_line,7,-32767,32767,"%6d");on_exit(test_int); @@ -643,29 +643,29 @@ void item_edit(TITEM *it) property(c,NULL,NULL,WINCOLOR);set_default(strs(it->polohy[1][0]));on_event(adjust_enter); define(170,5,140,45,12,1,input_line,7,-32767,32767,"%5d");on_exit(test_int); property(c,NULL,NULL,WINCOLOR);set_default(strs(it->polohy[1][1]));on_event(adjust_enter); - define(175,5,155,60,20,1,button,"Zobraz");on_change(items_adjusting); + define(175,5,155,60,20,1,button,"Zobraz");on_control_change(items_adjusting); define(180,80,175,220,12,0,str_line,umisteni_veci);property(c,NULL,NULL,WINCOLOR); on_enter(string_list_sup);c_default(it->umisteni); define(200,80,190,220,12,0,str_line,typy_zbrani);property(c,NULL,NULL,WINCOLOR); on_enter(string_list_sup);c_default(it->typ_zbrane); - define(210,80,205,220,10,0,check_box,"Pi dopadu se zni"); - define(220,80,217,220,10,0,check_box,"Existuje dokud je pouvn"); + define(210,80,205,220,10,0,check_box,"P�i dopadu se zni��"); + define(220,80,217,220,10,0,check_box,"Existuje dokud je pou��v�n"); define(130,10,180,45,55,0,ikona);c_default(it->ikona); - property(c,NULL,NULL,0);on_change(change_item_ikone); - define(-1,150,25,120,12,2,label,"Obrzkov script"); + property(c,NULL,NULL,0);on_control_change(change_item_ikone); + define(-1,150,25,120,12,2,label,"Obr�zkov� script"); define(190,150,10,120,12,2,str_line,vzhled_veci);property(c,NULL,NULL,WINCOLOR); c_default(it->vzhled); on_enter(string_list_sup); - define(-1,150,60,120,12,2,label,"Animace zbran"); + define(-1,150,60,120,12,2,label,"Animace zbran�"); define(400,150,45,120,12,2,str_line,weapons);property(c,NULL,NULL,WINCOLOR); - c_default(anm); on_enter(string_list_sup);on_change(update_hitpos); + c_default(anm); on_enter(string_list_sup);on_control_change(update_hitpos); define(-1,10,45,1,12,3,label,"Hit Pos:"); define(410,90,45,40,12,3,input_line,7,0,255,"%4d");on_exit(test_int); property(c,NULL,NULL,WINCOLOR);set_default(strs(it->hitpos)); - define(300,10,35,80,20,2,button,"Ulo");property(def_border(1,0),NULL,NULL,RGB555(0,20,0));on_change(save_edited_item); - define(320,10,70,80,20,2,button,"Zvuk");property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(item_sound); - define(330,10,10,80,20,2,button,"Zruit");property(def_border(1,0),NULL,flat_color(RGB555(31,31,31)),RGB555(20,0,0));on_change(terminate); - define(310,10,10,80,20,3,button,"Special");property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(otevri_special); - define(340,10,95,80,20,2,button,"Aff");property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(spell_affections); + define(300,10,35,80,20,2,button,"Ulo�");property(def_border(1,0),NULL,NULL,RGB555(0,20,0));on_control_change(save_edited_item); + define(320,10,70,80,20,2,button,"Zvuk");property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(item_sound); + define(330,10,10,80,20,2,button,"Zru�it");property(def_border(1,0),NULL,flat_color(RGB555(31,31,31)),RGB555(20,0,0));on_control_change(terminate_gui); + define(310,10,10,80,20,3,button,"Special");property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(otevri_special); + define(340,10,95,80,20,2,button,"Aff");property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(spell_affections); define(700,0,0,0,0,0,value_store,4);c_default(it->zmeny[VLS_KOUZLA]); redraw_window(); fill_bit_fields(0,210,it->flags,2); @@ -695,7 +695,7 @@ void create_ibuffer_list() else sprintf(c,"%3d %s",i,q->jmeno); if (str_replace(&ls_buffer,i,c)==NULL) return; } - if (i==0) str_replace(&ls_buffer,0," -1 "); + if (i==0) str_replace(&ls_buffer,0," -1 <�adn� p�edm�ty>"); str_delfreelines(&ls_buffer); } @@ -716,7 +716,7 @@ void create_isort_list(TSTR_LIST *ls_sorts,int filter) cc=1; } } - if (!cc) str_replace(ls_sorts,0," -1 "); + if (!cc) str_replace(ls_sorts,0," -1 <�adn� vzory>"); str_delfreelines(ls_sorts); } @@ -732,7 +732,7 @@ void save_items() f=fopen(ITEMS_DAT,"wb"); if (f==NULL) { - msg_box("Chyba",'\x1',"Nemohu uloit vzory pedmt","Panika",NULL); + msg_box("Chyba",'\x1',"Nemohu ulo�it vzory p�edm�t�","Panika",NULL); return; } save_section(f,item_list,SV_ITLIST,sizeof(TITEM)*max_items); @@ -817,7 +817,7 @@ void clone_item() j=aloc_free_item(); if (j==-1) { - msg_box("Nelze!",'\0x1',"MAPEDIT je omezen na poet vech monch vzor ve he","Ok",NULL); + msg_box("Nelze!",'\0x1',"MAPEDIT je omezen na po�et v�ech mo�n�ch vzor� ve h�e","Ok",NULL); return; } i=f_get_value(0,9); @@ -853,11 +853,11 @@ void delete_item_sort() i=f_get_value(0,9); sscanf(ls_sorts[i],"%d",&i); if (i<0 || i>=max_items) return; - if (msg_box("Dotaz?",'\x02',"Opravdu m v myslu vymazat tento vzor? Je mon," - " e na tento vzor se odvolvj pedmty v jin map. MAPEDIT je " - "neme vymazat, a mohou se dal prc zmnit v pedmt jin!", - "Pesto vymazat","Zruit",NULL)==2) return; - strcpy(item_list[i].jmeno,"??? Vymazn"); + if (msg_box("Dotaz?",'\x02',"Opravdu m�� v �myslu vymazat tento vzor? Je mo�n�," + " �e na tento vzor se odvol�v�j� p�edm�ty v jin� map�. MAPEDIT je " + "nem��e vymazat, a mohou se dal�� pr�c� zm�nit v p�edm�t jin�!", + "P�esto vymazat","Zru�it",NULL)==2) return; + strcpy(item_list[i].jmeno,"??? Vymaz�n"); while (max_items && item_list[max_items-1].jmeno[0]=='?') max_items--; create_isort_list(&ls_sorts,grep_num); send_message(E_GUI,9,E_CONTROL,1,ls_sorts); @@ -899,27 +899,27 @@ void open_item_win() default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); memcpy(&f_sel,flat_color(RGB555(0,0,24)),sizeof(charcolors)); - item_win=def_window(200,300,"Pedmty"); + item_win=def_window(200,300,"P�edm�ty"); waktual->y=2;waktual->x=SCR_WIDTH_X-20-160-3; waktual->minsizx=120; waktual->minsizy=100; - on_change(close_current); + on_control_change(close_current); define(9,5,20,170,240,0,listbox,ls_buffer,RGB555(31,31,0),0);c_default(0); property(&b2,NULL,&f_sel,WINCOLOR); o_end->autoresizex=1; o_end->autoresizey=1; define(10,3,41,19,198,1,scroll_bar_v,0,10,1,SCROLLBARCOL); - property(&b2,NULL,NULL,WINCOLOR);on_change(scroll_support); + property(&b2,NULL,NULL,WINCOLOR);on_control_change(scroll_support); o_end->autoresizey=1; define(11,3,20,19,19,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,3,40,19,19,2,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(20,3,1,10,10,2,resizer); - define(30,5,10,50,20,3,button,"Pekr."); - property(&b1,NULL,NULL,WINCOLOR);on_change(refresh_itm); - define(30,60,10,50,20,3,button,"Vyma"); - property(&b1,NULL,NULL,WINCOLOR);on_change(it_kos); + define(30,5,10,50,20,3,button,"P�ekr."); + property(&b1,NULL,NULL,WINCOLOR);on_control_change(refresh_itm); + define(30,60,10,50,20,3,button,"Vyma�"); + property(&b1,NULL,NULL,WINCOLOR);on_control_change(it_kos); movesize_win(waktual,waktual->x,waktual->y,waktual->xs,150); redraw_window(); @@ -934,7 +934,7 @@ void umisti_item() if (selected_place==-1) { - msg_box("Nic nen vybrno",'\x01',"Nejdve klikni my na map, na msto kam chce pedmt umstit","Ok",NULL); + msg_box("Nic nen� vybr�no",'\x01',"Nejd��ve klikni my�� na map�, na m�sto kam chce� p�edm�t um�stit","Ok",NULL); return; } i=f_get_value(0,9); @@ -942,7 +942,7 @@ void umisti_item() for(j=0;jminsizx=130; waktual->minsizy=170; - on_change(close_current); + on_control_change(close_current); define(9,5,20,170,240,0,listbox,ls_sorts,RGB555(31,31,0),0);c_default(0); property(&b2,NULL,&f_sel,WINCOLOR); o_end->autoresizex=1; o_end->autoresizey=1; define(10,3,41,19,198,1,scroll_bar_v,0,10,1,SCROLLBARCOL); - property(&b2,NULL,NULL,WINCOLOR);on_change(scroll_support); + property(&b2,NULL,NULL,WINCOLOR);on_control_change(scroll_support); o_end->autoresizey=1; define(11,3,20,19,19,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,3,110,19,19,2,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(20,3,1,10,10,2,resizer); - define(30,5,35,50,20,3,button,"Vyma");on_change(delete_item_sort); + define(30,5,35,50,20,3,button,"Vyma�");on_control_change(delete_item_sort); property(&b1,NULL,NULL,WINCOLOR); - define(40,5,60,50,20,3,button,"Klonuj");on_change(clone_item); + define(40,5,60,50,20,3,button,"Klonuj");on_control_change(clone_item); property(&b1,NULL,NULL,WINCOLOR); - define(50,5,85,50,20,3,button,"Oprav");on_change(edit_selected_item); + define(50,5,85,50,20,3,button,"Oprav");on_control_change(edit_selected_item); property(&b1,NULL,NULL,WINCOLOR); - define(60,10,35,60,20,2,button,"Umstit");on_change(umisti_item); + define(60,10,35,60,20,2,button,"Um�stit");on_control_change(umisti_item); property(&b1,NULL,NULL,WINCOLOR); - define(70,10,60,60,20,2,button,"Vlo do");on_change(vloz_do_item); + define(70,10,60,60,20,2,button,"Vlo� do");on_control_change(vloz_do_item); property(&b1,NULL,NULL,WINCOLOR); - define(80,10,85,60,20,2,button,"Test");on_change(inv_testmap); + define(80,10,85,60,20,2,button,"Test");on_control_change(inv_testmap); property(&b1,NULL,NULL,WINCOLOR); define(90,5,10,170,12,3,str_line,typy_veci);c_default(grep_num>-1?grep_num:0); - property(&b2,NULL,&f_sel,WINCOLOR);on_enter(string_list_sup);on_change(change_grep); + property(&b2,NULL,&f_sel,WINCOLOR);on_enter(string_list_sup);on_control_change(change_grep); o_end->autoresizex=1; - define(100,10,10,10,10,2,check_box,"");c_default(grep_num>-1);on_change(change_grep); + define(100,10,10,10,10,2,check_box,"");c_default(grep_num>-1);on_control_change(change_grep); movesize_win(waktual,waktual->x,160,waktual->xs,SCR_WIDTH_Y-20-160); redraw_window(); } @@ -1198,7 +1198,7 @@ void re_build_shop_list(TSTR_LIST *ls,TSHOP *p, int count) str_add(ls,s); p++; } - str_add(ls,""); + str_add(ls,""); } @@ -1218,7 +1218,7 @@ void re_build_item_list(TSTR_LIST *ls,TPRODUCT *p,int count) *ls=create_list(16); if (!count || p==NULL) { - str_add(ls,""); + str_add(ls,"<��dn� p�edm�t>"); return; } while (count--) @@ -1229,7 +1229,7 @@ void re_build_item_list(TSTR_LIST *ls,TPRODUCT *p,int count) d=p->item; if (p->trade_flags & SHP_TYPE) sprintf(s,"typ: <%s>",typy_veci[d]); - else if (d>=max_items) strcpy(s,""); + else if (d>=max_items) strcpy(s,""); else sprintf(s,"%c%c%c%c %s (%d)",(p->trade_flags & SHP_SELL?'P':219), (p->trade_flags & SHP_BUY?'N':219), @@ -1270,17 +1270,17 @@ static void close_edit_shop() p->spec_max=vals(230); if (s[0]==0) { - msg_box("Editor obchod",'\x1',"Obchod mus mt svho prodavae (shopkeeppera). Obchod bude oznaen jako smazan.","Ok",NULL); - strcpy(s,"*vymazn*"); + msg_box("Editor obchod�",'\x1',"Obchod mus� m�t sv�ho prodava�e (shopkeeppera). Obchod bude ozna�en jako smazan�.","Ok",NULL); + strcpy(s,"*vymaz�n*"); } if (s[0]=='<') { - msg_box("Editor obchod",'\x1',"Obchodnk m neplatn jmno","Ok",NULL); + msg_box("Editor obchod�",'\x1',"Obchodn�k m� neplatn� jm�no","Ok",NULL); return; } strcpy(p->keeper,s); if (!p->products && s[0]!='*') - msg_box("Editor obchod",'\x1',"S nim se neobchoduje. Nejsou definovny dn produkty. Tato situace me vst ke krachu hry!","Beru na vdom",NULL); + msg_box("Editor obchod�",'\x1',"S ni��m se neobchoduje. Nejsou definov�ny ��dn� produkty. Tato situace m��e v�st ke krachu hry!","Beru na v�dom�",NULL); send_message(E_GUI,9,E_CONTROL,0,&ls); release_list(ls); close_current(); @@ -1428,42 +1428,42 @@ void edit_shop(int i) re_build_item_list(&ls,shp->list,shp->products); memcpy(&ctl1,def_border(1,0),sizeof(ctl1)); memcpy(&ctl2,def_border(2,WINCOLOR),sizeof(ctl2)); - def_window(400,300,"Editor obchod"); - on_change(close_edit_shop); + def_window(400,300,"Editor obchod�"); + on_control_change(close_edit_shop); define(500,0,0,0,0,0,value_store,4);c_default(i); define(9,10,20,200,166,0,listbox,ls,RGB555(31,31,31),0); - property(&ctl1,NULL,NULL,WINCOLOR);c_default(0);on_change(show_selected); + property(&ctl1,NULL,NULL,WINCOLOR);c_default(0);on_control_change(show_selected); define(10,217,40,19,127,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&ctl1,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,170,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(20,75,30,60,20,1,button,"Voit");property(&ctl1,NULL,NULL,WINCOLOR);on_change(add_item); - define(60,75,55,60,20,1,button,"Pepsat");property(&ctl1,NULL,NULL,WINCOLOR);on_change(rewrite_item); - define(30,10,30,60,20,1,button,"Typ");property(&ctl1,NULL,NULL,WINCOLOR);on_change(add_type); - define(40,10,55,60,20,1,button,"Odebrat");property(&ctl1,NULL,NULL,WINCOLOR);on_change(remove_item); - define(50,10,10,80,20,2,button,"Zavt");property(&ctl1,NULL,NULL,WINCOLOR);on_change(close_edit_shop); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(20,75,30,60,20,1,button,"Vo�it");property(&ctl1,NULL,NULL,WINCOLOR);on_control_change(add_item); + define(60,75,55,60,20,1,button,"P�epsat");property(&ctl1,NULL,NULL,WINCOLOR);on_control_change(rewrite_item); + define(30,10,30,60,20,1,button,"Typ");property(&ctl1,NULL,NULL,WINCOLOR);on_control_change(add_type); + define(40,10,55,60,20,1,button,"Odebrat");property(&ctl1,NULL,NULL,WINCOLOR);on_control_change(remove_item); + define(50,10,10,80,20,2,button,"Zav��t");property(&ctl1,NULL,NULL,WINCOLOR);on_control_change(close_edit_shop); define(100,10,80,150,12,1,str_line,shop_items);property(&ctl2,NULL,NULL,WINCOLOR); - c_default(0); on_enter(string_list_sup);on_change(zjisti_cenu); + c_default(0); on_enter(string_list_sup);on_control_change(zjisti_cenu); define(-1,155,100,1,1,1,label,"Cena:"); define(110,10,100,90,12,1,input_line,10,0,9999999,"%7d");property(&ctl2,NULL,NULL,WINCOLOR); set_default(strs(item_list[0].cena));on_exit(test_int); - define(-1,155,120,1,1,1,label,"Poet:"); + define(-1,155,120,1,1,1,label,"Po�et:"); define(120,10,120,90,12,1,input_line,10,-1,9999999,"%7d");property(&ctl2,NULL,NULL,WINCOLOR); set_default(strs(1));on_exit(test_int); - define(130,10,135,150,10,1,check_box,"Prodvat");c_default(1); + define(130,10,135,150,10,1,check_box,"Prod�vat");c_default(1); define(140,10,147,150,10,1,check_box,"Nakupovat");c_default(0); - define(150,10,159,150,10,1,check_box,"Zbo pibv");c_default(0); - define(160,10,171,150,10,1,check_box,"Nen vdy na sklad");c_default(0); + define(150,10,159,150,10,1,check_box,"Zbo�� p�ib�v�");c_default(0); + define(160,10,171,150,10,1,check_box,"Nen� v�dy na sklad�");c_default(0); define(-1,10,200,1,1,0,label,"Shopkeeper:"); define(200,100,200,200,12,0,input_line,15);set_default(shp->keeper);property(&ctl2,NULL,NULL,WINCOLOR); - define(-1,10,220,1,1,0,label,"Obrzek:"); + define(-1,10,220,1,1,0,label,"Obr�zek:"); define(210,100,220,100,12,0,input_line,12);set_default(shp->picture);property(&ctl2,NULL,NULL,WINCOLOR); - define(215,220,218,80,14,0,button,"Nalistuj");property(&ctl1,NULL,NULL,WINCOLOR);on_change(browse_dialogs); + define(215,220,218,80,14,0,button,"Nalistuj");property(&ctl1,NULL,NULL,WINCOLOR);on_control_change(browse_dialogs); define(-1,10,240,1,1,0,label,"Rozptyl cen +/- [%]"); define(220,150,240,60,12,0,input_line,6,0,100,"%5d");set_default(strs(shp->koef));on_exit(test_int);property(&ctl2,NULL,NULL,WINCOLOR); - define(-1,220,240,1,1,0,label,"Poet spec:"); + define(-1,220,240,1,1,0,label,"Po�et spec:"); define(230,320,240,60,12,0,input_line,6,0,100,"%5d");set_default(strs(shp->spec_max));on_exit(test_int);property(&ctl2,NULL,NULL,WINCOLOR); { char s[50]; @@ -1482,7 +1482,7 @@ static void close_shop_list() send_message(E_GUI,9,E_CONTROL,0,&ls); for(i=0;ikeeper,"*vymazn*"); + strcpy(p->keeper,"*vymaz�n*"); re_build_shop_list(&ls,shop_list,max_shops); send_message(E_GUI,9,E_CONTROL,1,ls); } @@ -1570,18 +1570,18 @@ void open_shop_list() ls_sorts=NULL; re_build_shop_list(&ls,shop_list,max_shops); memcpy(&ctl1,def_border(1,0),sizeof(ctl1)); - shop_window=def_window(250,220,"Seznam obchod"); - on_change(close_shop_list); + shop_window=def_window(250,220,"Seznam obchod�"); + on_control_change(close_shop_list); define(9,10,20,200,166,0,listbox,ls,RGB555(31,31,31),0); property(&ctl1,NULL,NULL,WINCOLOR);c_default(0);//on_change(edit_shop_item); define(10,217,40,19,127,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&ctl1,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,170,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(200,5,5,70,20,3,button,"Oprava");on_change(open_shop_editor);property(&ctl1,NULL,NULL,WINCOLOR); - define(210,80,5,70,20,3,button,"Vymazat");on_change(erase_shop);property(&ctl1,NULL,NULL,WINCOLOR); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(200,5,5,70,20,3,button,"Oprava");on_control_change(open_shop_editor);property(&ctl1,NULL,NULL,WINCOLOR); + define(210,80,5,70,20,3,button,"Vymazat");on_control_change(erase_shop);property(&ctl1,NULL,NULL,WINCOLOR); movesize_win(waktual,10,10,250,220); } else select_window(shop_window); @@ -1618,7 +1618,7 @@ void save_shop(TSHOP *p,FILE *f) { char s[300]; - sprintf(s,"Duplicitn pedmt v definici v obchodu '%s'. Soubor obchodu bude uloen, ale vlastn hra me na tomto pedmtu zkrachovat!",p->keeper); + sprintf(s,"Duplicitn� p�edm�t v definici v obchodu '%s'. Soubor obchodu bude ulo�en, ale vlastn� hra m��e na tomto p�edm�tu zkrachovat!",p->keeper); msg_box("Shop edit",'\x1',s,"Ok",NULL); typs++; } diff --git a/MAPS/MAPEDIT.C b/MAPS/MAPEDIT.C index 5c75af9..e7389c7 100644 --- a/MAPS/MAPEDIT.C +++ b/MAPS/MAPEDIT.C @@ -46,10 +46,10 @@ word icone_color[7]={RGB555(8,8,8),RGB555(31,31,31),RGB555(0,0,15),RGB555(16,16, extern word sipka; static char *error_texts[]= { - "Progamov chyba", - "Prv bc udlost zpsobila neplatnou referenci pami!", - "Prv bc udlost zpsobila zpracovn neplatn instrukce!", - "Systm zachytil neoekvanou chybu programu!" + "Progamov� chyba", + "Pr�v� b���c� ud�lost zp�sobila neplatnou referenci pam��i!", + "Pr�v� b���c� ud�lost zp�sobila zpracov�n� neplatn� instrukce!", + "Syst�m zachytil neo�ek�vanou chybu programu!" }; static char ask_exit_status; @@ -123,7 +123,7 @@ EVENT_PROC(exit_key) WHEN_MSG(E_KEYBOARD) { c=GET_DATA(int); - if ((c & 0xff)==0 && (c>>8)=='D') terminate(); + if ((c & 0xff)==0 && (c>>8)=='D') terminate_gui(); if ((c & 0xff)==0 && (c>>8)==';') about(); if ((c & 0xff)==0 && (c>>8)=='?') save_dump(); if ((c & 0xff)==0 && (c>>8)=='<') movesize_test(); @@ -141,7 +141,7 @@ EVENT_PROC(wait_ms_key) WHEN_MSG(E_MOUSE) { ms=get_mouse(GET_MSG_VAR()); - if (ms->event_type & 4) terminate(); + if (ms->event_type & 4) terminate_gui(); } } @@ -281,7 +281,7 @@ void prg_error(EVENT_MSG *msg,void **unused) } zobraz_mysku(); showview(0,0,0,0); - *err=2-msg_box(error_texts[0],' ',c,"Ignoruj","Konec","Ulo mapu",NULL); + *err=2-msg_box(error_texts[0],' ',c,"Ignoruj","Konec","Ulo� mapu",NULL); if (*err==-1) save_all_map(); } } @@ -399,7 +399,7 @@ long def_window(word xs,word ys,char *name) if (xs>=70) { define(1,1,1,19,16,1,button,"\x0f"); - property(NULL,icones,&icone_color,WINCOLOR);on_change(close_test); + property(NULL,icones,&icone_color,WINCOLOR);on_control_change(close_test); } return q; } @@ -465,14 +465,14 @@ void about() define(-1,5,25,29,29,0,dtext,"\x8");property(NULL,icones,&c,WINCOLOR); define(-1,75,25,100,29,0,dtext,"MAPEDIT");property(NULL,NULL,&c2,WINCOLOR); define(-1,200,35,60,29,0,label,"verze 2.0");property(NULL,NULL,&c3,WINCOLOR); - define(-1,20,80,200,10,0,label,"Napsno pro hru \"Brny Skeldalu\""); + define(-1,20,80,200,10,0,label,"Naps�no pro hru \"Br�ny Skeldalu\""); define(-1,20,92,200,10,0,label,"(C) 1997 Napoleon gameS "); - define(-1,20,104,200,10,0,label,"Naprogamoval: Ondej Novk "); - define(-1,20,116,200,10,0,label,"Tento software sm bt pouit jen"); - define(-1,20,128,200,10,0,label,"ve spojen s vvojem hry \"Brny"); - define(-1,20,140,200,10,0,label,"Skeldalu\" (a ppadn dal verze)"); - define(-1,20,152,200,10,0,label,"a to pouze leny vvojovho tmu."); - define(10,110,170,80,20,0,button,"Ok");on_change(close_test); + define(-1,20,104,200,10,0,label,"Naprogamoval: Ond�ej Nov�k "); + define(-1,20,116,200,10,0,label,"Tento software sm� b�t pou�it jen"); + define(-1,20,128,200,10,0,label,"ve spojen� s v�vojem hry \"Br�ny"); + define(-1,20,140,200,10,0,label,"Skeldalu\" (a p��padn� dal�� verze)"); + define(-1,20,152,200,10,0,label,"a to pouze �leny v�vojov�ho t�mu."); + define(10,110,170,80,20,0,button,"Ok");on_control_change(close_test); } else select_window(about_win); redraw_window(); @@ -500,7 +500,7 @@ void close_app(void) desktop_add_window(w); define(-1,0,0,mx,my,0,fog_bar);property(NULL,NULL,NULL,RGB555(16,0,0)); redraw_desktop(); - if ((ask_exit_status=msg_box("Dotaz?",'\x2',"Chce program ukonit, nebo nahrt jinou mapu?","Jinou mapu","Ukonit","Ne",NULL))!=3) terminate(); + if ((ask_exit_status=msg_box("Dotaz?",'\x2',"Chce� program ukon�it, nebo nahr�t jinou mapu?","Jinou mapu","Ukon�it","Ne",NULL))!=3) terminate_gui(); close_window(w); do_events(); } @@ -563,11 +563,11 @@ void open_editor_win() if (find_window(editor_win)==NULL) { editor_win=def_window(100,150,"Editory"); - define(10,10,25,80,20,0,button,"map script");on_change(edit_script_file); - define(20,10,50,80,20,0,button,"map texty");on_change(edit_script_file); - define(30,10,75,80,20,0,button,"items.scr");on_change(edit_script_file); - define(40,10,100,80,20,0,button,"items.pic");on_change(edit_script_file); - define(50,10,125,80,20,0,button,"animator");on_change(call_animator); + define(10,10,25,80,20,0,button,"map script");on_control_change(edit_script_file); + define(20,10,50,80,20,0,button,"map texty");on_control_change(edit_script_file); + define(30,10,75,80,20,0,button,"items.scr");on_control_change(edit_script_file); + define(40,10,100,80,20,0,button,"items.pic");on_control_change(edit_script_file); + define(50,10,125,80,20,0,button,"animator");on_control_change(call_animator); redraw_window(); } else @@ -583,27 +583,27 @@ void create_menu(void) menu_win=def_window(400,150,"Map Edit v2.0 for Windows - " MAPEDIT_VERSION ); waktual->x=120; waktual->y=250; - on_change(close_app); + on_control_change(close_app); curcolor=WINCOLOR; default_font=icones; - define(10,5,25,29,29,0,button,"\x8");property(NULL,NULL,&c,WINCOLOR);on_change(edit_basic_maze); - define(20,5,55,29,29,0,button,"\x9");property(NULL,NULL,&c,WINCOLOR);on_change(editor_veci); - define(30,5,85,29,29,0,button,"\xA");property(NULL,NULL,&c,WINCOLOR);on_change(enemy_window); + define(10,5,25,29,29,0,button,"\x8");property(NULL,NULL,&c,WINCOLOR);on_control_change(edit_basic_maze); + define(20,5,55,29,29,0,button,"\x9");property(NULL,NULL,&c,WINCOLOR);on_control_change(editor_veci); + define(30,5,85,29,29,0,button,"\xA");property(NULL,NULL,&c,WINCOLOR);on_control_change(enemy_window); c[1]=RGB555(20,0,0);c[2]=RGB555(0,0,16); - define(40,200,25,29,29,0,button,"e");property(NULL,NULL,&c,WINCOLOR);on_change(shop_train_edit); + define(40,200,25,29,29,0,button,"e");property(NULL,NULL,&c,WINCOLOR);on_control_change(shop_train_edit); c[1]=RGB555(31,31,31);c[2]=RGB555(24,24,24); c[3]=RGB555(20,0,0);c[4]=RGB555(0,0,16); - define(50,200,55,29,29,0,button,"E");property(NULL,NULL,&c,WINCOLOR);on_change(open_editor_win); - define(60,200,85,29,29,0,button,"S");property(NULL,NULL,&c,WINCOLOR);on_change(save_all_map); - define(70,5,115,29,29,0,button,"P");property(NULL,NULL,&c,WINCOLOR);on_change(pcxviewer); + define(50,200,55,29,29,0,button,"E");property(NULL,NULL,&c,WINCOLOR);on_control_change(open_editor_win); + define(60,200,85,29,29,0,button,"S");property(NULL,NULL,&c,WINCOLOR);on_control_change(save_all_map); + define(70,5,115,29,29,0,button,"P");property(NULL,NULL,&c,WINCOLOR);on_control_change(pcxviewer); memcpy(c,flat_color(RGB555(0,0,15)),sizeof(FC_TABLE)); - define(-1,45,35,90,20,0,label,"Kreslen mapy");property(NULL,vga_font,&c,WINCOLOR); - define(-1,45,65,90,20,0,label,"Pokldn pedmt");property(NULL,vga_font,&c,WINCOLOR); - define(-1,45,95,90,20,0,label,"Umsovn nestvr");property(NULL,vga_font,&c,WINCOLOR); + define(-1,45,35,90,20,0,label,"Kreslen� mapy");property(NULL,vga_font,&c,WINCOLOR); + define(-1,45,65,90,20,0,label,"Pokl�d�n� p�edm�t�");property(NULL,vga_font,&c,WINCOLOR); + define(-1,45,95,90,20,0,label,"Um�s�ov�n� nestv�r");property(NULL,vga_font,&c,WINCOLOR); define(-1,240,35,90,20,0,label,"Obchody");property(NULL,vga_font,&c,WINCOLOR); - define(-1,240,65,90,20,0,label,"Editor script");property(NULL,vga_font,&c,WINCOLOR); - define(-1,240,95,90,20,0,label,"Uloen mapy");property(NULL,vga_font,&c,WINCOLOR); - define(-1,45,125,90,20,0,label,"Prohle PCX");property(NULL,vga_font,&c,WINCOLOR); + define(-1,240,65,90,20,0,label,"Editor script�");property(NULL,vga_font,&c,WINCOLOR); + define(-1,240,95,90,20,0,label,"Ulo�en� mapy");property(NULL,vga_font,&c,WINCOLOR); + define(-1,45,125,90,20,0,label,"Prohl��e� PCX");property(NULL,vga_font,&c,WINCOLOR); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); //set_enable(0,20,0); @@ -715,8 +715,8 @@ static ask_password_event(EVENT_MSG *msg,OBJREC *obj) WHEN_MSG(E_KEYBOARD) { char c=GET_DATA(char); - if (c==13) {goto_control(20);terminate();} - if (c==27) {goto_control(30);terminate();} + if (c==13) {goto_control(20);terminate_gui();} + if (c==27) {goto_control(30);terminate_gui();} } } @@ -726,19 +726,19 @@ char ask_password(char *pass,char text) switch (text) { - case 0:c="Proven";break; - case 1:c="Zmna hesla";break; + case 0:c="Prov��en�";break; + case 1:c="Zm�na hesla";break; case 2:c="Kontrola";break; } def_dialoge(320-100,240-50,200,90,c); - define(-1,10,20,1,1,0,label,"Vlo heslo:"); + define(-1,10,20,1,1,0,label,"Vlo� heslo:"); define(10,10,40,180,12,0,input_line,49); property(def_border(3,WINCOLOR),NULL,flat_color(RGB555(31,31,31)),RGB555(8,8,8)); if (text==1)set_default(pass);else set_default("");on_event(ask_password_event); define(20,5,5,50,20,2,button,"OK"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); - define(30,5,5,50,20,3,button,"Zruit"); - property(def_border(1,0),NULL,NULL,WINCOLOR);on_change(terminate); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(30,5,5,50,20,3,button,"Zru�it"); + property(def_border(1,0),NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); goto_control(10); escape(); @@ -763,7 +763,7 @@ char check_data_password(void) if (ask_password(text,0)==0) return 0; if (strcmp(data_password,text)) { - msg_box("Chyba!",1,"Chybn heslo! Pstup zamtnut!","OK",NULL); + msg_box("Chyba!",1,"Chybn� heslo! P��stup zam�tnut!","OK",NULL); return 0; } else @@ -927,7 +927,7 @@ int main(int argc,char *argv[]) init_maps(); set_defaults(); if (load_map(filename)) - msg_box(filename,'\01',"Tento soubor je bu neiteln, nebo pokozen","Pokraovat",NULL); + msg_box(filename,'\01',"Tento soubor je bu� ne�iteln�, nebo po�kozen�","Pokra�ovat",NULL); if (check_password(NULL)==0) if (ask_password(test,0)==0 || check_password(test)==0) { @@ -937,8 +937,8 @@ int main(int argc,char *argv[]) } if (maplen<2) { - sel=msg_box(filename,' ',"Soubor neexistuje, bude vytvoen nov. Nyn je nutn nastavit zkladn stny" - " a jin dal parametry pro tuto mapu","Pokraujem","Zavit",NULL); + sel=msg_box(filename,' ',"Soubor neexistuje, bude vytvo�en nov�. Nyn� je nutn� nastavit z�kladn� st�ny" + " a jin� dal�� parametry pro tuto mapu","Pokra�ujem","Zav�it",NULL); if (sel==1) { newmap=1; diff --git a/MAPS/MAPY.C b/MAPS/MAPY.C index 752bc70..300736d 100644 --- a/MAPS/MAPY.C +++ b/MAPS/MAPY.C @@ -34,37 +34,37 @@ static char nocenter=0; #define MODRA RGB555(0,0,31) char _actions []= - "\0" - "Otevi dvee\0" - "Zavi dvee\0" - "Otevi nebo zavi\0" - "Spus animaci prim\0" - "Uka prim. stnu\0" - "Schovej prim.stnu\0" - "Uk/schov.pri.stnu\0" - "Spus animaci sek.\0" - "Uka sek. stnu\0" - "Schovej sek. stnu\0" - "Uk/schov.sek.stnu\0" + "<��dn�>\0" + "Otev�i dve�e\0" + "Zav�i dve�e\0" + "Otev�i nebo zav�i\0" + "Spus� animaci prim\0" + "Uka� prim. st�nu\0" + "Schovej prim.st�nu\0" + "Uk/schov.pri.st�nu\0" + "Spus� animaci sek.\0" + "Uka� sek. st�nu\0" + "Schovej sek. st�nu\0" + "Uk/schov.sek.st�nu\0" "Schovej prim.&sek.\0" "Zobraz text\0" - "Kod.zmek (star-Nepouvat!)\0" - "Otevi teleport\0" - "Uzavi teleport\0" - "Kodov zmek (log)\0" + "Kod.z�mek (star�-Nepou��vat!)\0" + "Otev�i teleport\0" + "Uzav�i teleport\0" + "Kodov� z�mek (log)\0" "Konec hry\0" "\\\0"; char chka[]={0,1,1,1,1,1,1,1,1,1,1,1,0}; -char _steny2 []="Severn\0Vchodn\0Jin\0Zpadn\0\\\0"; -char _zivly []="Ohe\0Voda\0Zem\0Vzduch\0Mysl\0\\\0"; +char _steny2 []="Severn�\0V�chodn�\0Ji�n�\0Z�padn�\0\\\0"; +char _zivly []="Ohe�\0Voda\0Zem�\0Vzduch\0Mysl\0\\\0"; char _sector_types[]= - "!Voln!\0""Normaln\0""Schody\0""Loka na vod\0""Lva\0" - "Smr sever\0""Smr vchod\0""Smr jih\0""Smr zpad\0""Voda\0""Sloup\0""Dira\0""Teleport\0" - "Tlatko(norm)\0""Tlatko(zmak)\0" - "Fltna (Sever)\0""Fltna (Vchod)\0""Fltna (Jih)\0""Fltna (Zpad)\0" - "Oputn mapy\0""Vr\0""Sloup&Smrt\0""Ubra ivoty\0" + "!Voln�!\0""Normaln�\0""Schody\0""Lo�ka na vod�\0""L�va\0" + "Sm�r sever\0""Sm�r v�chod\0""Sm�r jih\0""Sm�r z�pad\0""Voda\0""Sloup\0""Dira\0""Teleport\0" + "Tla��tko(norm)\0""Tla��tko(zma�k)\0" + "Fl�tna (Sever)\0""Fl�tna (V�chod)\0""Fl�tna (Jih)\0""Fl�tna (Z�pad)\0" + "Opu�t�n� mapy\0""V�r\0""Sloup&Smrt\0""Ub�ra �ivoty\0" "\\\0"; char _type_multi_actions[]= @@ -80,82 +80,82 @@ char _type_multi_actions[]= "\\\0"; char _typy_zbrani[]= - "Me (tk ostr rovn)\0" - "Sekera (tk ostr ost.)\0" - "Kladivo (tup)\0" - "Hl\0" - "Dka (Lehk ostr)\0" - "p (steln)\0" - "Ostatn / Spec\0" + "Me� (t��k� ostr� rovn�)\0" + "Sekera (t��k� ostr� ost.)\0" + "Kladivo (tup�)\0" + "H�l\0" + "D�ka (Lehk� ostr�)\0" + "��p (st�eln�)\0" + "Ostatn� / Spec\0" "\\\0"; char _typy_veci[]= - "Nespecifikovno\0" - "Zbra tv v tv\0" - "Vrhac zbra\0" - "Steln zbra\0" + "Nespecifikov�no\0" + "Zbra� tv��� v tv��\0" + "Vrhac� zbra�\0" + "St�eln� zbra�\0" "Zbroj\0" - "Svitek / Hlka\0" + "Svitek / H�lka\0" "Lektvar\0" "Voda\0" - "Jdlo\0" - "Speciln\0" + "J�dlo\0" + "Speci�ln�\0" "Runa\0" - "Penze\0" + "Pen�ze\0" "Svitek s textem\0" "Prach\0" - "Ostatn\0" + "Ostatn�\0" "\\\0"; char _umisteni_veci[]= "Nikam\0" "Zavazadlo\0" - "Na tlo (nahoe)\0" - "Na tlo (dole)\0" + "Na t�lo (naho�e)\0" + "Na t�lo (dole)\0" "Na hlavu\0" "Na nohy\0" - "Kutna (na tlo/nahoe/dole/helma)\0" + "Kutna (na t�lo/naho�e/dole/helma)\0" "Na krk\0" "Do ruky\0" - "Obouru\0" + "Obouru�\0" "Prsten\0" - "p\0" + "��p\0" "\\0"; char _side_flgs[]= "Automap\0" - "Neprchoz(hrc)\0" - "Neprchoz(nestvra)\0" - "Neprchoz(vc)\0" - "Neprchoz(zvuk)\0" + "Nepr�choz�(hr�c)\0" + "Nepr�choz�(nestv�ra)\0" + "Nepr�choz�(v�c)\0" + "Nepr�choz�(zvuk)\0" "Poplach\0" - "Prchoz akce\0" - "Prchledn stna\0" + "Pr�choz� akce\0" + "Pr�chledn� st�na\0" "Prim:Animace\0" - "Prim:Viditeln\0" - "Prim:Tam a zpt\0" - "Prim:Smr\0" + "Prim:Viditeln�\0" + "Prim:Tam a zp�t\0" + "Prim:Sm�r\0" "Sek:Animace\0" - "Sek:Viditeln\0" - "Sek:Tam a zpt\0" - "Sek:Smr\0" - "Lev oblouk\0" - "Prav oblouk\0" - "Dva druhy stn\0" + "Sek:Viditeln�\0" + "Sek:Tam a zp�t\0" + "Sek:Sm�r\0" + "Lev� oblouk\0" + "Prav� oblouk\0" + "Dva druhy st�n\0" "Spec. mapovat\0" - "Kopruj pchoz udlost\0" - "Poli jinou udlost\0" - "Aplikuj i z druh strany\0" - "Autoanimace pepna\0" - "Zmna automapingu\0" - "Zmna prchodnosti(hr)\0" - "Zmna prchodnosti(nestvra)\0" - "Zmna prchodnosti(vc)\0" - "Zmna prchodnosti(zvuk)\0" - "Tajn stna\0" + "Kop�ruj p��choz� ud�lost\0" + "Po�li jinou ud�lost\0" + "Aplikuj i z druh� strany\0" + "Autoanimace p�ep�na��\0" + "Zm�na automapingu\0" + "Zm�na pr�chodnosti(hr��)\0" + "Zm�na pr�chodnosti(nestv�ra)\0" + "Zm�na pr�chodnosti(v�c)\0" + "Zm�na pr�chodnosti(zvuk)\0" + "Tajn� st�na\0" "TRUESEE (iluze)\0" - "Neviditeln na map\0" - "Potvora je ve he\0" + "Neviditeln� na map�\0" + "Potvora je ve h�e\0" "Potvora je v oblasti\0" "\\\0"; @@ -918,9 +918,9 @@ void create_map_win(int xp,...) autocenter_map(); cl[0]=0;cl[1]=0x610; - map_win=def_window(500,451,"Kreslen mapy"); + map_win=def_window(500,451,"Kreslen� mapy"); waktual->x=7;waktual->y=2; - on_change(close_with_tool); + on_control_change(close_with_tool); define(10,2,20,473,408,0,workspace); property(def_border(1,0),NULL,NULL,WINCOLOR); o_end->autoresizex=1;o_end->autoresizey=1; @@ -928,23 +928,23 @@ void create_map_win(int xp,...) waktual->minsizx=140; waktual->minsizy=90; define(20,3,42,17,365,1,scroll_bar_v,-100,100,(59*8)/M_ZOOM,SCROLLBARCOL); - property(ctl,NULL,NULL,WINCOLOR);c_default(ymap_offs);on_change(scroll_workspace); + property(ctl,NULL,NULL,WINCOLOR);c_default(ymap_offs);on_control_change(scroll_workspace); o_end->autoresizey=1; define(21,1,20,21,17,1,scroll_button,-2,-100,"\x1e"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); define(22,1,22,21,17,2,scroll_button,2,100,"\x1f"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); define(30,26,3,352,15,3,scroll_bar_h,-100,100,(59*8)/M_ZOOM,SCROLLBARCOL); - property(ctl,NULL,NULL,WINCOLOR);c_default(xmap_offs);on_change(scroll_workspace); + property(ctl,NULL,NULL,WINCOLOR);c_default(xmap_offs);on_control_change(scroll_workspace); o_end->autoresizex=1; define(31,96,1,21,19,2,scroll_button,2,100,"\x1c"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); define(32,1,1,21,19,3,scroll_button,-2,-100,"\x1d"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); define(40,60,1,30,19,2,button,"/");property(NULL,icones,&cl,WINCOLOR); - on_enter(layer_show);on_exit(layer_hide);on_change(layer_plus); + on_control_enter(layer_show);on_control_exit(layer_hide);on_control_change(layer_plus); define(50,28,1,30,19,2,button,"\\");property(NULL,icones,&cl,WINCOLOR); - on_enter(layer_show);on_exit(layer_hide);on_change(layer_minus); + on_control_enter(layer_show);on_control_exit(layer_hide);on_control_change(layer_minus); define(60,1,1,19,19,2,resizer); xpp=&xp; xpp++; @@ -961,13 +961,13 @@ void create_map_win(int xp,...) tool_bar=def_window(90,90,"Tools"); waktual->x=SCR_WIDTH_X-1-94;waktual->y=desktop_y_size-90-3; define(20,1,55,40,34,0,toggle_button,"\xC");property(NULL,icones,&icone_color,WINCOLOR); - on_change(tool_select);c_default(tool_sel==20); + on_control_change(tool_select);c_default(tool_sel==20); define(30,42,20,40,34,0,toggle_button,"\xD");property(NULL,icones,&icone_color,WINCOLOR); - on_change(tool_select);c_default(tool_sel==30); + on_control_change(tool_select);c_default(tool_sel==30); define(40,42,55,40,34,0,toggle_button,"\xE");property(NULL,icones,&icone_color,WINCOLOR); - on_change(tool_select);c_default(tool_sel==40); + on_control_change(tool_select);c_default(tool_sel==40); define(10,1,20,40,34,0,toggle_button,"\xB");property(NULL,icones,&icone_color,WINCOLOR); - on_change(tool_select);c_default(tool_sel==10); + on_control_change(tool_select);c_default(tool_sel==10); } if (tool_sel==10)open_draw_win(); if (tool_sel==40)open_wiz_tool(); diff --git a/MAPS/MOB_EDIT.C b/MAPS/MOB_EDIT.C index 2c4869c..09fe8f0 100644 --- a/MAPS/MOB_EDIT.C +++ b/MAPS/MOB_EDIT.C @@ -236,7 +236,7 @@ void create_enemy_list() str_add(&enemy_list,s); } else; - str_add(&enemy_list," -1 "); + str_add(&enemy_list," -1 "); } @@ -266,14 +266,14 @@ void new_mob() } static char nvlast[][16]= - {"Sla","UM(%kouzlen)","Pohyblivost","Obratnost","Max zrann", - "","","Obrana(doln)","Obrana(Horn)","tok(Doln)", - "tok(Horn)","Ohe","Voda","Zem","Vzduch","Mysl","ivoty Regen", - "","","Magick sla(D)", "Magick sla(H)","","innek zsahu","*"}; + {"S�la","UM(%kouzlen�)","Pohyblivost","Obratnost","Max zran�n�", + "","","Obrana(doln�)","Obrana(Horn�)","�tok(Doln�)", + "�tok(Horn�)","Ohe�","Voda","Zem�","Vzduch","Mysl","�ivoty Regen", + "","","Magick� s�la(D)", "Magick� s�la(H)","","��innek z�sahu","*"}; char smery_anim[][7]= - {"Vped","Vlevo","Vzad","Vpravo","tok","Zsah"}; + {"Vp�ed","Vlevo","Vzad","Vpravo","�tok","Z�sah"}; char smery_znaky[]="FLBRCH"; char sekvence[]="0123456789ABCDEF"; @@ -314,8 +314,8 @@ char load_sequence(char *mobname,int otoceni) char text[256]; if (load_ddl_seq(st,otoceni)) return 0; - sprintf(text,"Nemohu nalezt soubor %s jen ma obsahovat sekvence animac pro tuto potvoru...",s); - msg_box("Upozornn!",'\x1',text,"Beru na vdom",NULL); + sprintf(text,"Nemohu nalezt soubor %s jen� ma obsahovat sekvence animac� pro tuto potvoru...",s); + msg_box("Upozorn�n�!",'\x1',text,"Beru na v�dom�",NULL); return 1; } while(otoceni--) @@ -331,8 +331,8 @@ char load_sequence(char *mobname,int otoceni) { char text[256]; - sprintf(text,"Soubor %s obsahuje chybn daje",s); - msg_box("Upozornn!",'\x1',text,"Beru na vdom",NULL); + sprintf(text,"Soubor %s obsahuje chybn� �daje",s); + msg_box("Upozorn�n�!",'\x1',text,"Beru na v�dom�",NULL); return 1; } return 0; @@ -504,13 +504,13 @@ void mob_turn() void mob_ask_delete() { - if (msg_box("Dotaz?",'\x2',"Opravdu chce potovoru vymazat ze seznam vzor? Ujisti se, e tuto potvoru nepouv v dn jin map","Ano","Ne",NULL)==1) - terminate(); + if (msg_box("Dotaz?",'\x2',"Opravdu chce� potovoru vymazat ze seznam� vzor�? Ujisti se, �e tuto potvoru nepou��v�� v ��dn� jin� map�","Ano","Ne",NULL)==1) + terminate_gui(); o_aktual=find_object(waktual,260); } char *sound_ev[]= - {"Pi chzi","tok","Zsah","Reserved"}; + {"P�i ch�zi","�tok","Z�sah","Reserved"}; void mob_test_sound() { @@ -555,15 +555,15 @@ void mob_inv() memcpy(&b1,def_border(1,0),sizeof(CTL3D)); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - def_dialoge(100,50,400,390,"Invent potvory"); + def_dialoge(100,50,400,390,"Invent�� potvory"); str_insline(&ls_sorts,0,""); for(i=0;iid==300) @@ -576,20 +576,20 @@ static char *aff_list[]= { "INVIS", "OKO ZA OKO", - "NASTAV TV", + "NASTAV TV��", "ENERGY DRAIN", "MANA SHIELD (*)", "SANCTUARY SHIELD (1/2 zasahu)", "HIGH SANCTUARY (omezit zasah)", "BLIND (slepota)", "REGENERACE (*)", - "OCHRANA PED ZIMOU (*)", - "OCHRANA PED REM (*)", + "OCHRANA P�ED ZIMOU (*)", + "OCHRANA P�ED ��REM (*)", "KNOCK BACK", "< volno >", "< volno >", "< volno >", - "Vyhrazeno pro dmona" + "Vyhrazeno pro d�mona" }; void spell_affections() @@ -607,14 +607,14 @@ void spell_affections() { define(i+10,10,20+i*12,250,10,0,check_box,aff_list[i]);c_default((m & (1<id==300) @@ -643,13 +643,13 @@ void mob_sound_call(int mob) list=read_directory(c,DIR_BREIF,_A_NORMAL); read_ddl_list_wav(&list); define(9,10,20,200,126,0,listbox,list,RGB555(31,31,31),0); - property(&b3,NULL,NULL,WINCOLOR);c_default(0);on_change(mob_test_sound); + property(&b3,NULL,NULL,WINCOLOR);c_default(0);on_control_change(mob_test_sound); define(10,217,40,19,87,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&b2,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,130,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); for(j=0;jid==100) @@ -708,17 +708,17 @@ static void open_dialog_edit_box() memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - def_dialoge(100,250,250,180,"Pia dialog"); + def_dialoge(100,250,250,180,"P�i�a� dialog"); define(9,10,20,200,126,0,listbox,dlg_names,RGB555(31,31,31),0); property(&b3,NULL,NULL,WINCOLOR);c_default(pgf2name(j)); define(10,217,40,19,87,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&b2,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,130,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(100,5,5,80,20,2,button,"Ok");on_change(terminate); property(&b1,NULL,NULL,WINCOLOR); - define(110,90,5,80,20,2,button,"Zruit");on_change(terminate); property(&b1,NULL,NULL,WINCOLOR); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(100,5,5,80,20,2,button,"Ok");on_control_change(terminate_gui); property(&b1,NULL,NULL,WINCOLOR); + define(110,90,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui); property(&b1,NULL,NULL,WINCOLOR); redraw_window(); escape(); if (o_aktual->id==100) @@ -753,7 +753,7 @@ void edit_mob(int i) define(200,310,35,290,1,0,pcx_view);set_default("_"); define(205,310,35,290,370,0,symetry);c_default(moblist[i].adjusting[0]); define(207,5,20,120,20,1,input_line,20);set_default(""); - define(-1,190,20,100,12,0,label,"Jmno potvory"); + define(-1,190,20,100,12,0,label,"Jm�no potvory"); define(10,300,20,200,12,0,input_line,31);set_default(moblist[i].name);property(def_border(2,WINCOLOR),NULL,NULL,WINCOLOR); z=0;b1=def_border(5,WINCOLOR); for(y=20;y<380;) @@ -761,7 +761,7 @@ void edit_mob(int i) if (nvlast[z][0]) { define(-1,5,y,140,12,0,label,nvlast[z]); - define(z+20,120,y,60,12,0,input_line,8,-32767,32767,"%6d");set_default(strs(moblist[i].vlastnosti[z]));on_exit(test_int); + define(z+20,120,y,60,12,0,input_line,8,-32767,32767,"%6d");set_default(strs(moblist[i].vlastnosti[z]));on_control_exit(test_int); property(b1,NULL,NULL,WINCOLOR); y+=15; } @@ -769,69 +769,69 @@ void edit_mob(int i) if (nvlast[z][0]=='*') break; } y+=15; - define(-1,5,y,140,12,0,label,"ivel:"); + define(-1,5,y,140,12,0,label,"�ivel:"); define(102,120,y,60,12,0,str_line,zivly);c_default(moblist[i].vlastnosti[VLS_MGZIVEL]);on_enter(string_list_sup);property(b1,NULL,NULL,WINCOLOR);y+=15; - define(-1,5,y,140,12,0,label,"Jmno grafiky"); - define(100,120,y,60,12,0,input_line,6);set_default(moblist[i].mobs_name);property(b1,NULL,NULL,WINCOLOR);on_exit(check_mobs_name);y+=15; + define(-1,5,y,140,12,0,label,"Jm�no grafiky"); + define(100,120,y,60,12,0,input_line,6);set_default(moblist[i].mobs_name);property(b1,NULL,NULL,WINCOLOR);on_control_exit(check_mobs_name);y+=15; define(-1,5,y,140,12,0,label,"Rychlost"); - define(101,130,y,30,12,0,input_line,3,0,128,"%3d");set_default(strs(moblist[i].speed));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR);y+=15; - define(-1,5,y,140,12,0,label,"ance tku"); - define(103,130,y,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].flee_num));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR);y+=15; + define(101,130,y,30,12,0,input_line,3,0,128,"%3d");set_default(strs(moblist[i].speed));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR);y+=15; + define(-1,5,y,140,12,0,label,"�ance �t�ku"); + define(103,130,y,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].flee_num));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR);y+=15; define(-1,5,y,140,12,0,label,"Kouzlo"); - define(104,130,y,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].casting));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR);y+=15; + define(104,130,y,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].casting));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR);y+=15; define(-1,5,y,140,12,0,label,"Specproc"); define(105,120,y,60,12,0,str_line,mob_procs);c_default(moblist[i].specproc);on_enter(string_list_sup);property(b1,NULL,NULL,WINCOLOR);y+=15; - y=260;define(-1,220,248,140,12,0,label,"Poet anim."); + y=260;define(-1,220,248,140,12,0,label,"Po�et anim."); for(z=0;z<6;z++) { define(-1,190,y,50,12,0,label,smery_anim[z]); - define(z+120,260,y,20,12,0,input_line,2,!z*2,15,"%2d");set_default(strs(moblist[i].anim_counts[z]));on_exit(test_int); + define(z+120,260,y,20,12,0,input_line,2,!z*2,15,"%2d");set_default(strs(moblist[i].anim_counts[z]));on_control_exit(test_int); property(b1,NULL,NULL,WINCOLOR); y+=15; } - define(127,285,320,20,12,0,input_line,2,1,15,"%2d");set_default(strs(moblist[i].hit_pos));on_exit(test_int); + define(127,285,320,20,12,0,input_line,2,1,15,"%2d");set_default(strs(moblist[i].hit_pos));on_control_exit(test_int); property(b1,NULL,NULL,WINCOLOR); - define(430,190,350,50,10,0,check_box,"Chod"); - define(440,190,362,50,10,0,check_box,"to"); - define(450,190,374,50,10,0,check_box,"Sly"); - define(460,250,350,100,10,0,check_box,"Jeden na polku"); - define(470,250,362,60,10,0,check_box,"Strce"); + define(430,190,350,50,10,0,check_box,"Chod�"); + define(440,190,362,50,10,0,check_box,"�to��"); + define(450,190,374,50,10,0,check_box,"Sly��"); + define(460,250,350,100,10,0,check_box,"Jeden na pol��ku"); + define(470,250,362,60,10,0,check_box,"Str��ce"); define(480,250,374,40,10,0,check_box,"Sebere"); - define(490,250,386,40,10,0,check_box,"Sbr"); - define(500,190,386,50,10,0,check_box,"Stl"); - define(510,20,438,50,10,0,check_box,"Dialog.");c_default(moblist[i].dialog>=0);on_change(open_dialog_edit_box); + define(490,250,386,40,10,0,check_box,"Sb�r�"); + define(500,190,386,50,10,0,check_box,"St��l�"); + define(510,20,438,50,10,0,check_box,"Dialog.");c_default(moblist[i].dialog>=0);on_control_change(open_dialog_edit_box); define(-1,190,50,50,12,0,label,"Dohled"); define(-1,190,65,50,12,0,label,"Dosah"); define(-1,190,80,50,12,0,label,"Expy:"); define(-1,190,95,50,12,0,label,"Bonus:"); - define(-1,190,110,50,12,0,label,"Penze:"); - define(160,260,50,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].dohled));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR); - define(170,260,65,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].dosah));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR); - define(175,250,80,55,12,0,input_line,6,0,999999,"%6d");set_default(strs(moblist[i].experience));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR); - define(176,250,95,55,12,0,input_line,6,0,65535,"%6d");set_default(strs(moblist[i].bonus));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR); - define(177,255,110,50,12,0,input_line,6,0,65535,"%5d");set_default(strs(moblist[i].money));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR); + define(-1,190,110,50,12,0,label,"Pen�ze:"); + define(160,260,50,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].dohled));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR); + define(170,260,65,30,12,0,input_line,3,0,255,"%3d");set_default(strs(moblist[i].dosah));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR); + define(175,250,80,55,12,0,input_line,6,0,999999,"%6d");set_default(strs(moblist[i].experience));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR); + define(176,250,95,55,12,0,input_line,6,0,65535,"%6d");set_default(strs(moblist[i].bonus));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR); + define(177,255,110,50,12,0,input_line,6,0,65535,"%5d");set_default(strs(moblist[i].money));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR); define(180,0,0,0,0,0,value_store,4);c_default(0);//cislo_animace define(185,0,0,0,0,0,value_store,4);c_default(0);//cislo_pozice define(190,0,0,0,0,0,value_store,4);c_default(i);//cislo_i b1=def_border(1,0); - define(210,190,144,80,20,0,button,"Dal >>");property(b1,NULL,NULL,WINCOLOR);on_change(mob_next); - define(220,190,166,80,20,0,button,"Otoit");property(b1,NULL,NULL,WINCOLOR);on_change(mob_turn); - define(230,190,188,80,20,0,button,"Test");property(b1,NULL,NULL,WINCOLOR);on_change(play_mob); - define(240,84,2,80,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(250,2,2,80,20,2,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(260,166,2,80,20,2,button,"Vymazat");property(b1,NULL,NULL,WINCOLOR);on_change(mob_ask_delete); - define(270,2,24,80,20,2,button,"Zvuky");property(b1,NULL,NULL,WINCOLOR);on_change(mob_sound); - define(280,84,24,80,20,2,button,"Invent");property(b1,NULL,NULL,WINCOLOR);on_change(mob_inv); - define(290,166,24,80,20,2,button,"Aff");property(b1,NULL,NULL,WINCOLOR);on_change(spell_affections); + define(210,190,144,80,20,0,button,"Dal�� >>");property(b1,NULL,NULL,WINCOLOR);on_control_change(mob_next); + define(220,190,166,80,20,0,button,"Oto�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(mob_turn); + define(230,190,188,80,20,0,button,"Test");property(b1,NULL,NULL,WINCOLOR);on_control_change(play_mob); + define(240,84,2,80,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(250,2,2,80,20,2,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(260,166,2,80,20,2,button,"Vymazat");property(b1,NULL,NULL,WINCOLOR);on_control_change(mob_ask_delete); + define(270,2,24,80,20,2,button,"Zvuky");property(b1,NULL,NULL,WINCOLOR);on_control_change(mob_sound); + define(280,84,24,80,20,2,button,"Invent��");property(b1,NULL,NULL,WINCOLOR);on_control_change(mob_inv); + define(290,166,24,80,20,2,button,"Aff");property(b1,NULL,NULL,WINCOLOR);on_control_change(spell_affections); define(-1,190,220,1,1,0,label,"Pals:"); - define(520,230,220,30,12,0,input_line,3,-127,127,"%3d");set_default(strs(moblist[i].paletts_count));on_exit(test_int);property(b1,NULL,NULL,WINCOLOR); + define(520,230,220,30,12,0,input_line,3,-127,127,"%3d");set_default(strs(moblist[i].paletts_count));on_control_exit(test_int);property(b1,NULL,NULL,WINCOLOR); for(y=0;y<6*16;y++) {define(300+y,0,0,0,0,0,value_store,4);c_default(moblist[i].adjusting[y]);} define(630,0,0,0,0,0,value_store,1);c_default(0);//IN_BATTLE; - define(640,190,400,50,10,0,check_box,"Prchoz"); - define(650,190,412,50,10,0,check_box,"Ct"); + define(640,190,400,50,10,0,check_box,"Pr�choz�"); + define(650,190,412,50,10,0,check_box,"C�t�"); define(660,190,424,100,10,0,check_box,"Astral (wind)"); define(670,300,400,100,10,0,check_box,"Reload mob"); - define(680,300,412,100,10,0,check_box,"Kouzl"); + define(680,300,412,100,10,0,check_box,"Kouzl�"); define(700,0,0,0,0,0,value_store,4);c_default(moblist[i].vlastnosti[VLS_KOUZLA]); movesize_win(waktual,0,0,DxGetResX(),DxGetResY()); check_mobs_name(); @@ -865,7 +865,7 @@ void edit_mob(int i) for(z=0;z<6*16;z++) p->adjusting[z]=f_get_value(0,300+z); if (p->name[0]=='\0') { - msg_box("Doporuen",' ',"Bylo by dobr potvoru nazvat, kvuli snadn manipulaci","Ok",NULL); + msg_box("Doporu�en�",' ',"Bylo by dobr� potvoru nazvat, kvuli snadn� manipulaci","Ok",NULL); strcpy(p->name,p->mobs_name); } p->lives=p->vlastnosti[VLS_MAXHIT]; @@ -889,7 +889,7 @@ void edit_mob(int i) { redraw=1; jdi_na_sektor(j); - if (msg_box("Potvora je v map. Vymazat?",'\0x2',"Chce vymazat tuto potvoru a vechny dal?","Ano","Ne",NULL)==2) return; + if (msg_box("Potvora je v map�. Vymazat?",'\0x2',"Chce� vymazat tuto potvoru a v�echny dal��?","Ano","Ne",NULL)==2) return; break; } for(j=0;jautoresizey=1; define(31,3,20,19,15,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(32,3,68,19,15,2,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(40,5,5,60,20,3,button,"Vymazat");property(b1,NULL,NULL,WINCOLOR);on_change(vymazat_moba); - define(50,5,30,60,20,3,button,"Umstit");property(b1,NULL,NULL,WINCOLOR);on_change(umistit_moba); - define(60,70,5,60,20,3,button,"Novou");property(b1,NULL,NULL,WINCOLOR);on_change(new_mob); - define(70,70,30,60,20,3,button,"Opravit");property(b1,NULL,NULL,WINCOLOR);on_change(edit_mob_event); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(40,5,5,60,20,3,button,"Vymazat");property(b1,NULL,NULL,WINCOLOR);on_control_change(vymazat_moba); + define(50,5,30,60,20,3,button,"Um�stit");property(b1,NULL,NULL,WINCOLOR);on_control_change(umistit_moba); + define(60,70,5,60,20,3,button,"Novou");property(b1,NULL,NULL,WINCOLOR);on_control_change(new_mob); + define(70,70,30,60,20,3,button,"Opravit");property(b1,NULL,NULL,WINCOLOR);on_control_change(edit_mob_event); movesize_win(waktual,SCR_WIDTH_X,0,170,SCR_WIDTH_Y-20); redraw_window(); } @@ -1051,7 +1051,7 @@ void *save_mob_map(long *size) for(i=0,c=0;i255) msg_box("Omezen",'\x1',"Nelze mt v jedn map vc potvor ne 255. MAPEDIT nkter nenahraje.","Ok",NULL); + if (c>255) msg_box("Omezen�",'\x1',"Nelze m�t v jedn� map� v�c potvor ne� 255. MAPEDIT n�kter� nenahraje.","Ok",NULL); p=data=getmem(*size=c*4); for(i=0;i",MSB_OK); + msg_box(ZMENIT,1,"Mus�� vybrat n�jakou grafiku. Klepni tam, jak je naps�no ",MSB_OK); return; } load_side_script(script_name); @@ -263,13 +263,13 @@ static void zmenit() i=change_side(f_get_value(0,130),c-1,get_bit_fields(0,160,3),f-1,name); if (i<-1) { - msg_box(ZMENIT,1,"Program odmtl (z njakch dvod) akci provst. Zkontrolujte vechny daje",MSB_OK); + msg_box(ZMENIT,1,"Program odm�tl (z n�jak�ch d�vod�) akci prov�st. Zkontrolujte v�echny �daje",MSB_OK); discharge_side_script(); return; } if (i==-1) { - msg_box(ZMENIT,1,"Nepovolen kombinace pol \"Hlavn\", \"Lev\" a \"Prav\"",MSB_OK); + msg_box(ZMENIT,1,"Nepovolen� kombinace pol� \"Hlavn�\", \"Lev�\" a \"Prav�\"",MSB_OK); discharge_side_script(); return; } @@ -291,14 +291,14 @@ static void vymazat() if (pos==0) { - msg_box(VYMAZAT,1,"Mus vybrat njakou grafiku. Klepni tam, jak je napsno ",MSB_OK); + msg_box(VYMAZAT,1,"Mus�� vybrat n�jakou grafiku. Klepni tam, jak je naps�no ",MSB_OK); return; } - if (msg_box(VYMAZAT,1,"Vymazat grafiku vetn ppadnch animac?",MSB_ANONE)==2) return; + if (msg_box(VYMAZAT,1,"Vymazat grafiku v�etn� p��padn�ch animac�?",MSB_ANONE)==2) return; load_side_script(script_name); if (delete_side(f_get_value(0,130),pos-1)) { - msg_box(VYMAZAT,1,"Program odmtl vymazat grafiky ze scriptu, nastala njak chyba.",MSB_OK); + msg_box(VYMAZAT,1,"Program odm�tl vymazat grafiky ze scriptu, nastala n�jak� chyba.",MSB_OK); discharge_side_script(); return; } @@ -306,18 +306,18 @@ static void vymazat() refresh_scrs(); } -#define ZALOZIT "Zaloit grafiku" +#define ZALOZIT "Zalo�it grafiku" static void add_graphics() { char name[200]; int c,d; get_value(0,100,name); - if (name[0]==0) {msg_box(ZALOZIT,1,"Mus vepsat njak jmno!",MSB_OK);return;} + if (name[0]==0) {msg_box(ZALOZIT,1,"Mus�� vepsat n�jak� jm�no!",MSB_OK);return;} load_side_script(script_name); if ((c=add_side(f_get_value(0,130),name,vals(110)))==-1) { - msg_box(ZALOZIT,1,"Nelze zaloit novou grafiku! Pli mnoho grafik, nebo nastala jin chyba.",MSB_OK); + msg_box(ZALOZIT,1,"Nelze zalo�it novou grafiku! P��li� mnoho grafik, nebo nastala jin� chyba.",MSB_OK); discharge_side_script(); } else save_side_script(script_name); @@ -350,12 +350,12 @@ static void nahled() list=f_get_value(0,130);pos=f_get_value(0,140)-1+vals(150)-1; if (pos<0) { - msg_box("Nhled",1,"Nen co zobrazit!",MSB_OK); + msg_box("N�hled",1,"Nen� co zobrazit!",MSB_OK); return; } load_side_script(script_name); tady: - def_dialoge(2,2,630,440,"Nhled grafiky"); + def_dialoge(2,2,630,440,"N�hled grafiky"); switch (list) { case 0: p1=def_nahled(10,5,25,get_side_name(list,pos,1)); @@ -372,9 +372,9 @@ static void nahled() swap=1; break; } - define(-1,5,5,80,20,2,button,"Ok");on_change(terminate); - define(110,100,5,80,20,2,button,">>");on_change(terminate); - define(120,190,5,80,20,2,button,"<<");on_change(terminate); + define(-1,5,5,80,20,2,button,"Ok");on_control_change(terminate_gui); + define(110,100,5,80,20,2,button,">>");on_control_change(terminate_gui); + define(120,190,5,80,20,2,button,"<<");on_control_change(terminate_gui); redraw_window(); p4=get_side_name(list,pos,0); if (p4!=NULL) set_enable(0,120,p4[0]=='*' && pos>0); @@ -404,51 +404,51 @@ void pcxviewer() memcpy(&b1,def_border(1,0),sizeof(CTL3D)); memcpy(&b2,def_border(5,WINCOLOR),sizeof(CTL3D)); memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); - pcxview_win=def_window(635,440,"Prohle obrazk PCX"); + pcxview_win=def_window(635,440,"Prohl��e� obrazk� PCX"); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - on_change(close_pcx_window); + on_control_change(close_pcx_window); - define(9,10,20,110,376,0,listbox,ls,0x7fff,0);on_change(read_pcx); + define(9,10,20,110,376,0,listbox,ls,0x7fff,0);on_control_change(read_pcx); property(&b3,NULL,NULL,WINCOLOR);c_default(0); define(10,126,40,21,337,0,scroll_bar_v,0,10,1,0x0200); property(&b2,NULL,NULL,WINCOLOR); define(11,126,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(&b1,icones,NULL,WINCOLOR);on_change(scroll_support); + property(&b1,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,126,380,21,17,0,scroll_button,1,10,"\x1f"); - property(&b1,icones,NULL,WINCOLOR);on_change(scroll_support); + property(&b1,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(-1,175,20,1,1,0,label,"Cesta:"); define(20,175,32,320,12,0,input_line,240);set_default(basic_path); - property(&b3,NULL,NULL,WINCOLOR);on_exit(get_directory); + property(&b3,NULL,NULL,WINCOLOR);on_control_exit(get_directory); define(30,175,50,2,2,0,picture2);c_default(0); - define(40,10,10,80,10,3,check_box,"Otoit");c_default(swap);on_change(change_swap); - define(45,10,25,160,10,3,check_box,"Grafika Skeldalu");c_default(0);on_change(get_directory); + define(40,10,10,80,10,3,check_box,"Oto�it");c_default(swap);on_control_change(change_swap); + define(45,10,25,160,10,3,check_box,"Grafika Skeldalu");c_default(0);on_control_change(get_directory); define(-1,5,80,110,75,1,label,"");property(&b2,NULL,NULL,WINCOLOR); - define(-1,10,80,100,70,1,label,"Nov grafika"); + define(-1,10,80,100,70,1,label,"Nov� grafika"); define(100,10,100,100,10,1,input_line,50);set_default("");property(&b3,NULL,NULL,WINCOLOR); - define(-1,10,115,100,12,1,label,"Snmk"); + define(-1,10,115,100,12,1,label,"Sn�mk�"); define(110,10,115,30,10,1,input_line,20,1,15,"%2d");set_default(strs(1));property(&b3,NULL,NULL,WINCOLOR); - on_exit(test_int); - define(120,10,130,60,20,1,button,"Zaloit");property(&b1,NULL,NULL,WINCOLOR); - on_change(add_graphics); - define(130,10,160,110,50,1,radio_butts,4,"Stna","Podlaha","Strop","Oblouk");c_default(0);on_change(refresh_scrs); + on_control_exit(test_int); + define(120,10,130,60,20,1,button,"Zalo�it");property(&b1,NULL,NULL,WINCOLOR); + on_control_change(add_graphics); + define(130,10,160,110,50,1,radio_butts,4,"St�na","Podlaha","Strop","Oblouk");c_default(0);on_control_change(refresh_scrs); define(-1,5,230,110,110,1,label,"");property(&b2,NULL,NULL,WINCOLOR); define(-1,10,230,100,10,1,label,"Vyber grafiku:"); define(140,10,255,100,10,1,str_line,side_names);on_enter(string_list_sup);c_default(0);property(&b2,NULL,NULL,WINCOLOR); - define(-1,10,270,100,12,1,label,"Snmek"); + define(-1,10,270,100,12,1,label,"Sn�mek"); define(150,10,270,30,12,1,input_line,20,1,15,"%2d");set_default(strs(1));property(&b3,NULL,NULL,WINCOLOR); - on_exit(test_int); - define(160,10,300,100,10,1,check_box,"Hlavn");c_default(0);on_change(clear_switchs); - define(170,10,312,100,10,1,check_box,"Lev");c_default(0);on_change(clear_switchs); - define(180,10,324,100,10,1,check_box,"Prav");c_default(0);on_change(clear_switchs); - define(190,20,345,80,20,1,button,"Piadit");property(&b1,NULL,NULL,WINCOLOR);on_change(zmenit); - define(200,20,370,80,20,1,button,"Vymazat");property(&b1,NULL,NULL,WINCOLOR);on_change(vymazat); - define(200,20,395,80,20,1,button,"Nhled");property(&b1,NULL,NULL,WINCOLOR);on_change(nahled); + on_control_exit(test_int); + define(160,10,300,100,10,1,check_box,"Hlavn�");c_default(0);on_control_change(clear_switchs); + define(170,10,312,100,10,1,check_box,"Lev�");c_default(0);on_control_change(clear_switchs); + define(180,10,324,100,10,1,check_box,"Prav�");c_default(0);on_control_change(clear_switchs); + define(190,20,345,80,20,1,button,"P�i�adit");property(&b1,NULL,NULL,WINCOLOR);on_control_change(zmenit); + define(200,20,370,80,20,1,button,"Vymazat");property(&b1,NULL,NULL,WINCOLOR);on_control_change(vymazat); + define(200,20,395,80,20,1,button,"N�hled");property(&b1,NULL,NULL,WINCOLOR);on_control_change(nahled); define(-1,130,20,1,400,1,label,"");property(def_border(4,WINCOLOR),NULL,NULL,WINCOLOR); - define(-1,100,30,1,1,1,label,"Tvrce"); - define(-1,100,45,1,1,1,label,"grafickch"); - define(-1,100,60,1,1,1,label,"script"); + define(-1,100,30,1,1,1,label,"Tv�rce"); + define(-1,100,45,1,1,1,label,"grafick�ch"); + define(-1,100,60,1,1,1,label,"script�"); } else { diff --git a/MAPS/STENY.C b/MAPS/STENY.C index e573723..07f45b2 100644 --- a/MAPS/STENY.C +++ b/MAPS/STENY.C @@ -163,7 +163,7 @@ void strlist_event(EVENT_MSG *msg,OBJREC *o) i++; } *d=i; - terminate(); + terminate_gui(); } } if (msg->msg==E_CONTROL) @@ -232,16 +232,16 @@ int string_list(char *c,int akt) def_window(WLISTX,WLISTY,"Vyber"); waktual->x=x1; waktual->y=y1; - on_change(terminate); + on_control_change(terminate_gui); set_window_modal(); define(19,5,20,WLISTX-30,WLISTY-20,0,listbox,c,RGB555(31,31,31),0);c_default(akt); - on_change(terminate); + on_control_change(terminate_gui); define(20,3,42,17,WLISTY-64,1,scroll_bar_v,0,1,18,SCROLLBARCOL); property(ctl,NULL,NULL,WINCOLOR);c_default(0); define(21,1,20,21,17,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); define(22,1,1,21,17,2,scroll_button,1,1,"\x1f"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); redraw_window(); send_message(E_GUI,19,E_CONTROL,2); redraw_window(); diff --git a/MAPS/WIZ_TOOL.C b/MAPS/WIZ_TOOL.C index 371a5fe..9d25296 100644 --- a/MAPS/WIZ_TOOL.C +++ b/MAPS/WIZ_TOOL.C @@ -92,7 +92,7 @@ void build_door(void) lclip=vals(210); if (anim1!=anim2 && (anim1==0 || anim2==0)) { - msg_box("Nelze!",'\x1',"Poet animac me bt bu u obou jedna, nebo se dn nesm jedn rovnat","Ok",NULL); + msg_box("Nelze!",'\x1',"Po�et animac� m��e b�t bu� u obou jedna, nebo se ��dn� nesm� jedn� rovnat","Ok",NULL); return; } dir=f_get_value(0,70); @@ -107,7 +107,7 @@ void build_door(void) TSTENA *sd1,*sd2; if (!mapa.sectordef[sector1].step_next[dir]) { - msg_box("Tmto smrem nelze vytvoit dvee",'\x1',"Ve vmi zvolenem smru nen vytvoen dn sektor. Nelze tmto smrem vytvoit dvee","Ok",NULL); + msg_box("T�mto sm�rem nelze vytvo�it dve�e",'\x1',"Ve v�mi zvolenem sm�ru nen� vytvo�en ��dn� sektor. Nelze t�mto sm�rem vytvo�it dve�e","Ok",NULL); return; } sector2=mapa.sectordef[sector1].step_next[dir]; @@ -158,7 +158,7 @@ void build_door(void) w=mapa.sectordef[sector1].step_next; if (!w[0] && !w[1] && !w[2] && !w[3]) { - msg_box("Nejsou dn vchody:",'\x1',"Zde nelze vytvoit tento druh stny","Ok",NULL); + msg_box("Nejsou ��dn� v�chody:",'\x1',"Zde nelze vytvo�it tento druh st�ny","Ok",NULL); return; } d=65535; @@ -190,7 +190,7 @@ void build_door(void) sd->sector_tag=sector1; } } - terminate(); + terminate_gui(); } void create_door(void) @@ -199,7 +199,7 @@ void create_door(void) CTL3D b1,b2,b3; if (count_of_sel()!=1) { - msg_box("Door Wizard:",'\x1',"Mus oznait pouze jeden sektor!","Ok",NULL); + msg_box("Door Wizard:",'\x1',"Mus�� ozna�it pouze jeden sektor!","Ok",NULL); return; } for (i=0;iid==30) @@ -320,11 +320,11 @@ void crt_oblouky() static void local_monsters_warning() { - char *c="Lokln nestvry"; + char *c="Lok�ln� nestv�ry"; if (f_get_value(0,96)) - msg_box(c,'\x1',"Zapnutm tto volby zajistte, e seznam nestvr se bude ukldat do souboru mapy, nikoliv do ENEMIES.DAT. Parametry nestvr budou platit pouze pro tuto mapu","Ok",NULL); + msg_box(c,'\x1',"Zapnut�m t�to volby zajist�te, �e seznam nestv�r se bude ukl�dat do souboru mapy, nikoliv do ENEMIES.DAT. Parametry nestv�r budou platit pouze pro tuto mapu","Ok",NULL); else - msg_box(c,'\x1',"Vypnutm tto volby mete o nkter nestvry pijt!","Ok",NULL); + msg_box(c,'\x1',"Vypnut�m t�to volby m��ete o n�kter� nestv�ry p�ij�t!","Ok",NULL); } static void zabezpecit() @@ -332,7 +332,7 @@ static void zabezpecit() int i,j; char text[50],verify[50]; - j=msg_box("Zabezpeen",2,"Zabezbeit lze mapu, nebo vechny datov soubory. Kter heslo chce zmnit?","Mapu","Data","Zpt",NULL); + j=msg_box("Zabezpe�en�",2,"Zabezbe�it lze mapu, nebo v�echny datov� soubory. Kter� heslo chce� zm�nit?","Mapu","Data","Zp�t",NULL); if (j==3) return; if (j==2) if (check_data_password()==0) return; else strcpy(text,set_data_password(NULL)); @@ -346,7 +346,7 @@ static void zabezpecit() { if (j==1) set_password(text);else set_data_password(text); } - else msg_box("Nejsou schodn",1,"Kontrola nesouhlasila. Heslo nebylo zmnno!","Ok",NULL); + else msg_box("Nejsou schodn�",1,"Kontrola nesouhlasila. Heslo nebylo zm�n�no!","Ok",NULL); } } @@ -360,17 +360,17 @@ void preference() memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - def_dialoge(100,50,350,290,"Globaln volby mapy"); - define(-1,10,25,150,12,0,label,"Pozad sever:"); - define(-1,10,45,150,12,0,label,"Pozad vchod:"); - define(-1,10,65,150,12,0,label,"Pozad jih:"); - define(-1,10,85,150,12,0,label,"Pozad zapad:"); - define(-1,10,105,150,12,0,label,"Barva erven:"); + def_dialoge(100,50,350,290,"Globaln� volby mapy"); + define(-1,10,25,150,12,0,label,"Pozad� sever:"); + define(-1,10,45,150,12,0,label,"Pozad� v�chod:"); + define(-1,10,65,150,12,0,label,"Pozad� jih:"); + define(-1,10,85,150,12,0,label,"Pozad� zapad:"); + define(-1,10,105,150,12,0,label,"Barva �erven�:"); define(-1,10,125,150,12,0,label,"Barva zelena:"); define(-1,10,145,150,12,0,label,"Barva modra:"); define(-1,10,165,150,12,0,label,"Start:"); - define(-1,10,185,150,12,0,label,"Start smr:"); - define(-1,10,25,150,12,3,label,"Jmno urovn:"); + define(-1,10,185,150,12,0,label,"Start sm�r:"); + define(-1,10,25,150,12,3,label,"Jm�no urovn�:"); for(i=0;i<4;i++) { define(10+10*i,150,25+20*i,100,15,0,input_line,12);set_default(mglob.back_fnames[i]); @@ -386,20 +386,20 @@ void preference() property(&b3,NULL,NULL,WINCOLOR);on_exit(test_int); define(90,150,185,100,60,0,radio_butts,4, "Sever", - "Vchod", + "V�chod", "Jih", - "Zpad");c_default(mglob.direction); + "Z�pad");c_default(mglob.direction); define(95,210,105,100,60,0,radio_butts,5, - "Normaln", - "Sopka (r)", - "Ledov j.(mrz)", + "Normaln�", + "Sopka (��r)", + "Ledov� j.(mr�z)", "Pod vodou", - "Msto");c_default(mglob.map_effector); - define(96,210,165,100,10,0,check_box,"Lokln nestvry");c_default(mglob.local_monsters);on_change(local_monsters_warning); - define(97,210,180,100,10,0,check_box,"Autom.stnuj p&s");c_default(mglob.map_autofadefc); - define(CANCEL_BUTT,10,10,80,20,2,button,"Zruit");on_change(terminate); - define(OK_BUTT,10,35,80,20,2,button,"Ok");on_change(terminate); - define(110,10,60,100,20,2,button,"Zabezpeen>>");on_change(zabezpecit); + "M�sto");c_default(mglob.map_effector); + define(96,210,165,100,10,0,check_box,"Lok�ln� nestv�ry");c_default(mglob.local_monsters);on_control_change(local_monsters_warning); + define(97,210,180,100,10,0,check_box,"Autom.st�nuj p&s");c_default(mglob.map_autofadefc); + define(CANCEL_BUTT,10,10,80,20,2,button,"Zru�it");on_control_change(terminate_gui); + define(OK_BUTT,10,35,80,20,2,button,"Ok");on_control_change(terminate_gui); + define(110,10,60,100,20,2,button,"Zabezpe�en�>>");on_control_change(zabezpecit); define(100,10,10,200,11,3,input_line,29);set_default(mglob.mapname); property(&b3,NULL,NULL,WINCOLOR); redraw_window(); @@ -523,16 +523,16 @@ void open_blok_window() def_dialoge(400,100,200,200,"Bloky"); define(50,10,20,100,10,0,check_box,"Na Okraji");c_default(0); - define(60,10,32,100,10,0,check_box,"Vn");c_default(0); + define(60,10,32,100,10,0,check_box,"Vn�");c_default(0); define(10,10,44,100,10,0,check_box,"Na severu");c_default(1); - define(20,10,56,100,10,0,check_box,"Na vchod");c_default(1); + define(20,10,56,100,10,0,check_box,"Na v�chod�");c_default(1); define(30,10,68,100,10,0,check_box,"Na jihu");c_default(1); - define(40,10,80,100,10,0,check_box,"Na zpad");c_default(1); + define(40,10,80,100,10,0,check_box,"Na z�pad�");c_default(1); define(-1,10,100,1,1,0,label,"Zap Vyp"); - define(100,40,112,150,10,0,check_box,"Prhlednost");c_default(0); - define(110,40,124,150,10,0,check_box,"Dva druhy stn");c_default(0); - define(120,40,136,150,10,0,check_box,"Tajn stny");c_default(0); - define(130,40,148,150,10,0,check_box,"Prim. viditeln");c_default(0); + define(100,40,112,150,10,0,check_box,"Pr�hlednost");c_default(0); + define(110,40,124,150,10,0,check_box,"Dva druhy st�n");c_default(0); + define(120,40,136,150,10,0,check_box,"Tajn� st�ny");c_default(0); + define(130,40,148,150,10,0,check_box,"Prim. viditeln�");c_default(0); define(140,40,160,150,10,0,check_box,"Prim. animace");c_default(0); define(200,40,172,30,30,0,radio_butts,3,"-","\x4","\x6");property(NULL,icones,NULL,WINCOLOR);c_default(0); define(101,25,112,10,10,0,check_box,"");c_default(0); @@ -541,7 +541,7 @@ void open_blok_window() define(131,25,148,10,10,0,check_box,"");c_default(0); define(141,25,160,10,10,0,check_box,"");c_default(0); define(151,25,172,10,10,0,check_box,"");c_default(0); - define(OK_BUTT,5,5,80,20,2,button,"Ok");on_change(terminate); + define(OK_BUTT,5,5,80,20,2,button,"Ok");on_control_change(terminate_gui); redraw_window(); escape(); on_flags=off_flags=depth=where=0; @@ -598,9 +598,9 @@ static void build_stairs() mapa.sidedef[target][dir2].flags&=~0x3; txtp1=sect;txtp2=target; } - else error="Nelze vytvoit schody na tento clovy sektor"; - else error="Nelze vytvoit schody tmto smrem. Vchod u existuje"; - else error="Pm spojen lze tvoit jen \"Na sektor\""; + else error="Nelze vytvo�it schody na tento c�lovy sektor"; + else error="Nelze vytvo�it schody t�mto sm�rem. V�chod u� existuje"; + else error="P��m� spojen� lze tvo�it jen \"Na sektor\""; else if (type!=2) if ((txtp1=mapa.sectordef[sect].step_next[dir2])) { @@ -619,7 +619,7 @@ static void build_stairs() { txtp2=target; if (!(txtp2=mapa.sectordef[target].step_next[dir1])) - if ((txtp2=add_sector(x+smery[dir1][0],y+smery[dir1][1],tlayer,0))<1) error="Nen msto pro sektor!"; + if ((txtp2=add_sector(x+smery[dir1][0],y+smery[dir1][1],tlayer,0))<1) error="Nen� m�sto pro sektor!"; else wire_sector(txtp2); wire_sector(target); mapa.sectordef[sect].sector_tag=txtp2; @@ -627,11 +627,11 @@ static void build_stairs() mapa.sectordef[target].sector_tag=txtp1; mapa.sectordef[target].sector_type=2; } - else error="Nen msto pro sektor!"; + else error="Nen� m�sto pro sektor!"; } - else error="V clovm pate nen msto pro sektor"; + else error="V c�lov�m pat�e nen� m�sto pro sektor"; } - else error="Z toho sektoru nelze tmto smrem vytvoit schody"; + else error="Z toho sektoru nelze t�mto sm�rem vytvo�it schody"; else if ((txtp1=mapa.sectordef[sect].step_next[dir2])) if ((txtp2=mapa.sectordef[target].step_next[dir1])) @@ -641,8 +641,8 @@ static void build_stairs() mapa.sectordef[target].sector_tag=txtp1; mapa.sectordef[target].sector_type=2; } - else error="Cilov sektor m chybn orientovan vchody"; - else error="Nelze vytvoit schody poadovanm smrem"; + else error="Cilov� sektor m� chybn� orientovan� v�chody"; + else error="Nelze vytvo�it schody po�adovan�m sm�rem"; if (error!=NULL) { msg_box("Stairs Wizard:",'\x1',error,"Ok",NULL); @@ -669,7 +669,7 @@ static void build_stairs() mapa.sidedef[txtp2][dir2].flags&=~SD_DOUBLE_SIDE; if (anim1) mapa.sidedef[txtp1][dir1].flags|=0x100; if (anim2) mapa.sidedef[txtp2][dir2].flags|=0x100; - terminate(); + terminate_gui(); } static void schody(void) @@ -678,7 +678,7 @@ static void schody(void) CTL3D b1,b2,b3; if (count_of_sel()!=1) { - msg_box("Stairs Wizard:",'\x1',"Mus oznait pouze jeden sektor!","Ok",NULL); + msg_box("Stairs Wizard:",'\x1',"Mus�� ozna�it pouze jeden sektor!","Ok",NULL); return; } for (i=0;iy=2;waktual->x=SCR_WIDTH_X-120-3; - on_change(close_wiz_tool); - define(10,10,25,100,19,0,button2,"Dvee");on_change(create_door); - define(10,10,45,100,19,0,button2,"Oblouky");on_change(crt_oblouky); - define(10,10,65,100,19,0,button2,"Schody");on_change(schody); - define(10,10,85,100,19,0,button2,"Globaln");on_change(preference); - define(10,10,105,100,19,0,button2,"Bloky");on_change(open_blok_window); - define(10,10,125,100,19,0,button2,"Multiakce");on_change(open_multiaction_window); - define(10,10,145,100,19,0,button2,"Pedvolba");on_change(predvolba); - define(10,10,165,100,19,0,button2,"Vbr");on_change(vyber); + on_control_change(close_wiz_tool); + define(10,10,25,100,19,0,button2,"Dve�e");on_control_change(create_door); + define(10,10,45,100,19,0,button2,"Oblouky");on_control_change(crt_oblouky); + define(10,10,65,100,19,0,button2,"Schody");on_control_change(schody); + define(10,10,85,100,19,0,button2,"Globaln�");on_control_change(preference); + define(10,10,105,100,19,0,button2,"Bloky");on_control_change(open_blok_window); + define(10,10,125,100,19,0,button2,"Multiakce");on_control_change(open_multiaction_window); + define(10,10,145,100,19,0,button2,"P�edvolba");on_control_change(predvolba); + define(10,10,165,100,19,0,button2,"V�b�r");on_control_change(vyber); } else { @@ -1064,7 +1064,7 @@ opakuj: l=read_directory(pathname,DIR_BREIF,_A_NORMAL); if (l==NULL && default_ext) { - msg_box("Browser",'\x1',"Funkce read_directory() vratila chybu. Adres je przdn nebo je nedostatek pamti","Ok",NULL); + msg_box("Browser",'\x1',"Funkce read_directory() vratila chybu. Adres�� je pr�zdn� nebo je nedostatek pam�ti","Ok",NULL); return; } default_font=vga_font; @@ -1105,24 +1105,24 @@ opakuj: void add_ma_flags(int start,int x,int y,TMULTI_ACTION *p) { - define(-1,x,y,1,1,0,label,"Podmnky"); + define(-1,x,y,1,1,0,label,"Podm�nky"); define(start+0,x+25,y+15,140,10,0,check_box,"Cancel program");c_default(p->general.cancel); - define(start+1,x+25,y+27,140,10,0,check_box,"Jedenkrt");c_default(p->general.once); - define(start+2,x+25,y+39,140,10,0,check_box,"spn prchod");c_default(p->general.ps); - define(start+3,x+25,y+51,140,10,0,check_box,"Nespn prchod");c_default(p->general.pf); - define(start+4,x+25,y+63,140,10,0,check_box,"spn dotyk");c_default(p->general.ts); - define(start+5,x+25,y+75,140,10,0,check_box,"Nespn dotyk");c_default(p->general.tf); - define(start+6,x+25,y+87,140,10,0,check_box,"Informace o zmku");c_default(p->general.li); - define(start+7,x+25,y+99,140,10,0,check_box,"Ped odchodem");c_default(p->general.ul); - define(start+8,x+25,y+111,140,10,0,check_box,"Pi pchodu akce");c_default(p->general.ia); - define(start+9,x+25,y+123,140,10,0,check_box,"Pi startu levelu");c_default(p->general.sp); - define(start+10,x+25,y+135,140,10,0,check_box,"Pi uzaven dve");c_default(p->general.as); - define(start+11,x+25,y+147,140,10,0,check_box,"Kade anim.polko");c_default(p->general.am); - define(start+12,x+25,y+159,140,10,0,check_box,"Kade druh a.p.");c_default(p->general.a2); - define(start+13,x+25,y+171,140,10,0,check_box,"Pi proveden akce");c_default(p->general.pa); - define(start+14,x+25,y+183,140,10,0,check_box,"spn SpecProc");c_default(p->general.us); - define(start+15,x+25,y+195,140,10,0,check_box,"Pi oteven dve");c_default(p->general.od); - define(start+16,x+25,y+207,140,10,0,check_box,"Udlost vklenku");c_default(p->general.vy); + define(start+1,x+25,y+27,140,10,0,check_box,"Jedenkr�t");c_default(p->general.once); + define(start+2,x+25,y+39,140,10,0,check_box,"�sp��n� pr�chod");c_default(p->general.ps); + define(start+3,x+25,y+51,140,10,0,check_box,"Ne�sp��n� pr�chod");c_default(p->general.pf); + define(start+4,x+25,y+63,140,10,0,check_box,"�sp��n� dotyk");c_default(p->general.ts); + define(start+5,x+25,y+75,140,10,0,check_box,"Ne�sp��n� dotyk");c_default(p->general.tf); + define(start+6,x+25,y+87,140,10,0,check_box,"Informace o z�mku");c_default(p->general.li); + define(start+7,x+25,y+99,140,10,0,check_box,"P�ed odchodem");c_default(p->general.ul); + define(start+8,x+25,y+111,140,10,0,check_box,"P�i p��chodu akce");c_default(p->general.ia); + define(start+9,x+25,y+123,140,10,0,check_box,"P�i startu levelu");c_default(p->general.sp); + define(start+10,x+25,y+135,140,10,0,check_box,"P�i uzav�en� dve��");c_default(p->general.as); + define(start+11,x+25,y+147,140,10,0,check_box,"Ka�de anim.pol��ko");c_default(p->general.am); + define(start+12,x+25,y+159,140,10,0,check_box,"Ka�de druh� a.p.");c_default(p->general.a2); + define(start+13,x+25,y+171,140,10,0,check_box,"P�i proveden� akce");c_default(p->general.pa); + define(start+14,x+25,y+183,140,10,0,check_box,"�sp��n� SpecProc");c_default(p->general.us); + define(start+15,x+25,y+195,140,10,0,check_box,"P�i otev�en� dve��");c_default(p->general.od); + define(start+16,x+25,y+207,140,10,0,check_box,"Ud�lost v�klenku");c_default(p->general.vy); } void read_ma_flags(int start,TMULTI_ACTION *p) @@ -1201,9 +1201,9 @@ void tma_sound_update() sprintf(c,"%6d",0);set_value(0,60,c); c_set_value(0,100,fmt.freq!=fmt.bps); } - else msg_box("Nesprvn WAV",'\x1',"Do hry lze vloit jen WAV ve formatu PCM mono!","Ok",NULL); + else msg_box("Nespr�vn� WAV",'\x1',"Do hry lze vlo�it jen WAV ve formatu PCM mono!","Ok",NULL); } - else msg_box("Chybn soubor WAV",'\x1',"Tento soubor neobsahuje platn format pro WAV","Ok",NULL); + else msg_box("Chybn� soubor WAV",'\x1',"Tento soubor neobsahuje platn� format pro WAV","Ok",NULL); free(riff); } @@ -1260,12 +1260,12 @@ void play_wav(va_list args) ofs=z[2]; if (endloop>samplesize) { - msg_box("Pozor",'\x1',"Konec opakovn le za koncem souboru!","Ok",NULL); + msg_box("Pozor",'\x1',"Konec opakov�n� le�� za koncem souboru!","Ok",NULL); endloop=samplesize; } if (startloop>endloop) { - msg_box("Pozor",'\x1',"Zatek opakovn le ZA jeho koncem!","Ok",NULL); + msg_box("Pozor",'\x1',"Za��tek opakov�n� le�� ZA jeho koncem!","Ok",NULL); startloop=endloop; } } @@ -1375,19 +1375,19 @@ void tma_sound(TMULTI_ACTION *q) memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); default_font=vga_font; memcpy(f_default,flat_color(0x0000),sizeof(charcolors)); - def_dialoge(100,50,350,390,"Editor zvukovch efekt"); + def_dialoge(100,50,350,390,"Editor zvukov�ch efekt�"); concat(c,sample_path,"*.wav"); list=read_directory(c,DIR_BREIF,_A_NORMAL); read_ddl_list_wav(&list); define(9,10,20,200,126,0,listbox,list,RGB555(31,31,31),0); - property(&b3,NULL,NULL,WINCOLOR);c_default(0);on_change(tma_sound_preview); + property(&b3,NULL,NULL,WINCOLOR);c_default(0);on_control_change(tma_sound_preview); define(10,217,40,19,87,0,scroll_bar_v,0,10,1,SCROLLBARCOL); property(&b2,NULL,NULL,WINCOLOR); define(11,216,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,216,130,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(-1,10,160,100,11,0,label,"Jmno:"); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(-1,10,160,100,11,0,label,"Jm�no:"); define(-1,10,175,100,11,0,label,"freq[Hz]:"); define(-1,10,190,100,11,0,label,"StartLoop:"); define(-1,10,205,100,11,0,label,"EndLoop:"); @@ -1409,21 +1409,21 @@ void tma_sound(TMULTI_ACTION *q) define(80,90,250,70,11,0,input_line,7,0,100,"%6d");on_exit(test_int); property(&b2,NULL,NULL,WINCOLOR);set_default(strs(q->sound.soundid)); define(100,20,265,100,11,0,check_box,"16Bit");c_default(q->sound.bit16 & 1); - define(110,20,277,100,11,0,check_box,"Zaka pi otevrn");c_default((q->sound.bit16 & 2)>>1); - define(120,20,290,100,11,0,check_box,"Zaka pi zavrn");c_default((q->sound.bit16 & 4)>>2); - define(130,20,302,100,11,0,check_box,"Nhodn stereo");c_default((q->sound.bit16 & 8)>>3); + define(110,20,277,100,11,0,check_box,"Zaka� p�i otev�r�n�");c_default((q->sound.bit16 & 2)>>1); + define(120,20,290,100,11,0,check_box,"Zaka� p�i zav�r�n�");c_default((q->sound.bit16 & 4)>>2); + define(130,20,302,100,11,0,check_box,"N�hodn� stereo");c_default((q->sound.bit16 & 8)>>3); define(290,5,80,100,11,1,check_box,"Preview");c_default(preview); - define(295,5,92,100,11,1,check_box,"AutoUpdate");c_default(autoupdate);on_change(tma_sound_autoupdate); + define(295,5,92,100,11,1,check_box,"AutoUpdate");c_default(autoupdate);on_control_change(tma_sound_autoupdate); define(300,5,20,100,20,1,button,"Ok");property(&b1,NULL,NULL,WINCOLOR); - on_change(terminate); + on_control_change(terminate_gui); define(310,5,45,100,20,1,button,"Zrusit");property(&b1,NULL,NULL,WINCOLOR); - on_change(terminate); + on_control_change(terminate_gui); define(320,5,160,100,20,1,button,"<< Update");property(&b1,NULL,NULL,WINCOLOR); - on_change(tma_sound_update); + on_control_change(tma_sound_update); define(330,5,135,45,20,1,button,"");property(&b1,NULL,NULL,WINCOLOR); - on_change(tma_sound_test); + on_control_change(tma_sound_test); define(340,60,135,45,20,1,button,"");property(&b1,NULL,NULL,WINCOLOR); - on_change(tma_sound_stop); + on_control_change(tma_sound_stop); add_ma_flags(400,165,175,q); redraw_desktop(); set_enable(0,320,!autoupdate); @@ -1613,7 +1613,7 @@ void tma_fireball(TMULTI_ACTION *p) p->fireball.speed=speed; new=1; } - define(-1,5,20,1,1,0,label,"Vystelen vc:"); + define(-1,5,20,1,1,0,label,"Vyst�elen� v�c:"); define(-1,5,35,1,1,0,label,"Xpoz <-63,63>:"); define(-1,5,50,1,1,0,label,"Ypoz <0,499>:"); define(-1,5,65,1,1,0,label,"Zpoz <0,319>:"); @@ -1631,8 +1631,8 @@ void tma_fireball(TMULTI_ACTION *p) define(50,150,80,60,12,0,input_line,3,0,319,"%3d");property(b1,NULL,NULL,WINCOLOR); set_default(strs(p->fireball.speed));on_exit(test_int); b1=def_border(1,0); - define(60,10,10,80,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(70,10,35,80,20,2,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(60,10,10,80,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(70,10,35,80,20,2,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); if (o_aktual->id==70) @@ -1665,25 +1665,25 @@ void tma_send(TMULTI_ACTION *q) b1=def_border(5,WINCOLOR); define(10,80,20,60,12,0,input_line,5,0,maplen,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->send_a.sector)); - define(-1,5,37,1,1,0,label,"Stna:"); + define(-1,5,37,1,1,0,label,"St�na:"); define(20,80,35,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->send_a.side); define(-1,5,52,1,1,0,label,"Akce:"); define(30,80,50,150,12,0,str_line,actions);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->send_a.s_action); - define(-1,5,67,1,1,0,label,"Zpodn:"); + define(-1,5,67,1,1,0,label,"Zpo�d�n�:"); define(40,80,65,60,12,0,input_line,5,0,255,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->send_a.delay)); - define(110,10,90,200,10,0,check_box,"Zmna automapingu"); - define(120,10,102,200,10,0,check_box,"Zmna prchodnosti(hr)"); - define(130,10,114,200,10,0,check_box,"Zmna prchodnosti(nestvra)"); - define(140,10,126,200,10,0,check_box,"Zmna prchodnosti(vc)"); - define(150,10,138,200,10,0,check_box,"Zmna prchodnosti(zvuk)"); + define(110,10,90,200,10,0,check_box,"Zm�na automapingu"); + define(120,10,102,200,10,0,check_box,"Zm�na pr�chodnosti(hr��)"); + define(130,10,114,200,10,0,check_box,"Zm�na pr�chodnosti(nestv�ra)"); + define(140,10,126,200,10,0,check_box,"Zm�na pr�chodnosti(v�c)"); + define(150,10,138,200,10,0,check_box,"Zm�na pr�chodnosti(zvuk)"); add_ma_flags(200,220,20,q); fill_bit_fields(0,110,q->send_a.change_bits,5); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1707,15 +1707,15 @@ void tma_loadlev(TMULTI_ACTION *q) define(-1,5,22,1,1,0,label,"Sektor:"); define(20,80,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->loadlev.start_pos)); - define(-1,5,37,1,1,0,label,"Smr:"); + define(-1,5,37,1,1,0,label,"Sm�r:"); define(30,80,35,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->loadlev.dir); - define(-1,5,52,1,1,0,label,"Jmno:"); + define(-1,5,52,1,1,0,label,"Jm�no:"); define(10,80,50,100,12,0,input_line,12);property(b1,NULL,NULL,WINCOLOR);set_default(q->loadlev.name); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1734,13 +1734,13 @@ void tma_play_anim(TMULTI_ACTION *q) def_dialoge(220,60,410,300,"Macro: Play animation"); b1=def_border(5,WINCOLOR); - define(-1,5,20,1,1,0,label,"Jmno:"); + define(-1,5,20,1,1,0,label,"Jm�no:"); define(10,80,22,100,12,0,input_line,12);property(b1,NULL,NULL,WINCOLOR);set_default(q->loadlev.name); define(20,20,40,100,10,0,check_box,"cls");c_default(q->loadlev.dir); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1761,13 +1761,13 @@ void tma_write_book(TMULTI_ACTION *q) b1=def_border(5,WINCOLOR); define(-1,5,20,1,1,0,label,"Kniha:"); define(10,80,35,100,12,0,input_line,12);property(b1,NULL,NULL,WINCOLOR);set_default(q->loadlev.name); - define(-1,5,50,1,1,0,label,"slo odstavce:"); + define(-1,5,50,1,1,0,label,"��slo odstavce:"); define(20,80,65,65,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->loadlev.start_pos)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1794,8 +1794,8 @@ void tma_swapsectors(TMULTI_ACTION *q) property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->swaps.sector2)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1813,13 +1813,13 @@ void tma_experience(TMULTI_ACTION *q) def_dialoge(220,60,410,300,"Macro: Send Experience"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"Zkuenost:"); + define(-1,5,22,1,1,0,label,"Zku�enost:"); define(20,100,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm1)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1841,13 +1841,13 @@ void tma_cancel_action(TMULTI_ACTION *q) define(-1,5,22,1,1,0,label,"Sektor:"); define(20,80,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->cactn.sector)); - define(-1,5,37,1,1,0,label,"Smr:"); + define(-1,5,37,1,1,0,label,"Sm�r:"); define(30,80,35,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->cactn.dir); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1868,21 +1868,21 @@ void tma_sharema(TMULTI_ACTION *q) define(-1,5,22,1,1,0,label,"Sektor:"); define(20,80,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm1)); - define(-1,5,37,1,1,0,label,"Smr:"); + define(-1,5,37,1,1,0,label,"Sm�r:"); define(30,80,35,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->twop.parm2); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); - define(-1,5,100,10,10,0,label,"Spust MA program na jinm"); - define(-1,5,110,10,10,0,label,"mst, tak jako by byl"); - define(-1,5,120,10,10,0,label,"definovn zde."); - define(-1,5,140,10,10,0,label,"Vyuit:"); - define(-1,5,150,10,10,0,label,"Sdlen jednoho program"); - define(-1,5,160,10,10,0,label,"Zmna v mst sdleni se pak"); - define(-1,5,170,10,10,0,label,"projev na vech mstech, kter"); - define(-1,5,180,10,10,0,label,"program sdlej."); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(-1,5,100,10,10,0,label,"Spust� MA program na jin�m"); + define(-1,5,110,10,10,0,label,"m�st�, tak jako by byl"); + define(-1,5,120,10,10,0,label,"definov�n zde."); + define(-1,5,140,10,10,0,label,"Vyu�it�:"); + define(-1,5,150,10,10,0,label,"Sd�len� jednoho program"); + define(-1,5,160,10,10,0,label,"Zm�na v m�st� sd�leni se pak"); + define(-1,5,170,10,10,0,label,"projev� na v�ech m�stech, kter�"); + define(-1,5,180,10,10,0,label,"program sd�lej�."); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1904,14 +1904,14 @@ void tma_teleport_group(TMULTI_ACTION *q) define(-1,5,22,1,1,0,label,"Sektor:"); define(20,80,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm1)); - define(-1,5,37,1,1,0,label,"Smr:"); + define(-1,5,37,1,1,0,label,"Sm�r:"); define(30,80,35,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->twop.parm2 & 3); define(40,80,59,100,10,0,check_box,"Povol efekt");c_default(q->twop.parm2>>7); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1930,16 +1930,16 @@ void tma_lock(TMULTI_ACTION *q) def_dialoge(220,60,410,300,"Macro: Lock"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"slo kle:"); + define(-1,5,22,1,1,0,label,"��slo kl��e:"); define(10,120,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->lock.key_id)); - define(-1,5,37,1,1,0,label,"Urove:"); + define(-1,5,37,1,1,0,label,"Urove�:"); define(20,120,35,60,12,0,input_line,5,-1,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->lock.thieflevel)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1957,7 +1957,7 @@ void tma_specproc(TMULTI_ACTION *q) def_dialoge(220,60,410,300,"Macro: Call Specproc"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"Jmno spec:"); + define(-1,5,22,1,1,0,label,"Jm�no spec:"); define(10,120,20,95,12,0,str_line,wall_procs);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->lock.key_id); define(-1,5,37,1,1,0,label,"Parametr:"); @@ -1965,8 +1965,8 @@ void tma_specproc(TMULTI_ACTION *q) property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->lock.thieflevel)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -1984,18 +1984,18 @@ void tma_ifjump(TMULTI_ACTION *q,int linenum,TSTR_LIST ls) def_dialoge(220,60,410,300,"Macro: If Jump"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"Podmnka:"); + define(-1,5,22,1,1,0,label,"Podm�nka:"); define(10,10,35,200,12,0,str_line,ls);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(abs(q->twop.parm1)-1); - define(-1,5,52,1,1,0,label,"slo dku:"); + define(-1,5,52,1,1,0,label,"��slo ��dku:"); define(20,120,50,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm2+linenum)); - define(30,5,75,100,30,0,radio_butts,2,"Skok kdy podmnka plat","Skok kdy podmnka neplat"); + define(30,5,75,100,30,0,radio_butts,2,"Skok kdy� podm�nka plat�","Skok kdy� podm�nka neplat�"); c_default(q->twop.parm1<0); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2014,16 +2014,16 @@ void tma_randjmp(TMULTI_ACTION *q,int linenum) def_dialoge(220,60,410,300,"Macro: If Jump"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"Pravdpodobnost: [%]"); + define(-1,5,22,1,1,0,label,"Pravd�podobnost: [%]"); define(10,120,35,60,12,0,input_line,5,0,100,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm1)); - define(-1,5,52,1,1,0,label,"slo dku:"); + define(-1,5,52,1,1,0,label,"��slo ��dku:"); define(20,120,50,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm2+linenum)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2043,18 +2043,18 @@ void tma_ifflagjump(TMULTI_ACTION *q,int linenum) if (q->twop.parm1==0) q->twop.parm1=1; def_dialoge(220,60,410,300,"Macro: If flag Jump"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"slo vlajky:"); + define(-1,5,22,1,1,0,label,"��slo vlajky:"); define(10,120,20,60,12,0,input_line,5,0,255,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(abs(q->twop.parm1)-1)); - define(-1,5,52,1,1,0,label,"slo dku:"); + define(-1,5,52,1,1,0,label,"��slo ��dku:"); define(20,120,50,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm2+linenum)); - define(30,5,75,100,30,0,radio_butts,2,"Skok kdy vlajka nastavena","Skok kdy vlajka vynulovna"); + define(30,5,75,100,30,0,radio_butts,2,"Skok kdy� vlajka nastavena","Skok kdy� vlajka vynulov�na"); c_default(q->twop.parm1<0); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2073,15 +2073,15 @@ void tma_setflag(TMULTI_ACTION *q) def_dialoge(220,60,410,300,"Macro: Change Flag"); b1=def_border(5,WINCOLOR); - define(-1,5,22,1,1,0,label,"slo vlajky:"); + define(-1,5,22,1,1,0,label,"��slo vlajky:"); define(10,120,20,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm1)); define(-1,5,37,1,1,0,label,"Akce:"); define(20,60,37,80,40,0,radio_butts,3,"Nulovat","Nastavit","Negovat");c_default(q->twop.parm2); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2106,13 +2106,13 @@ void tma_wound(TMULTI_ACTION *q) define(-1,5,37,1,1,0,label,"Max:"); define(20,120,35,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->wound.major)); - define(30,120,50,100,10,0,check_box,"Ohroz skupinu");c_default(q->wound.pflags & 1); - define(40,120,70,60,80,0,radio_butts,7,"Pm zrann","Hod na obranu","Ohe","Voda","Zem","Vzduch","Mysl"); + define(30,120,50,100,10,0,check_box,"Ohroz� skupinu");c_default(q->wound.pflags & 1); + define(40,120,70,60,80,0,radio_butts,7,"P��m� zran�n�","Hod na obranu","Ohe�","Voda","Zem�","Vzduch","Mysl"); c_default(q->wound.pflags>>1); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2139,8 +2139,8 @@ void tma_cmoney(TMULTI_ACTION *q) property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm2)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); tady: escape(); @@ -2148,7 +2148,7 @@ void tma_cmoney(TMULTI_ACTION *q) { int a=vals(10),b=vals(20); if (a>b) - { msg_box("Create Money",1,"Min mus bt men ne Max","OK",NULL);goto tady;} + { msg_box("Create Money",1,"Min mus� b�t men�� ne� Max","OK",NULL);goto tady;} q->twop.parm1=a; q->twop.parm2=b; read_ma_flags(200,q); @@ -2170,8 +2170,8 @@ static void tma_gomonster(TMULTI_ACTION *q) property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->twop.parm2)); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); tady: escape(); @@ -2201,14 +2201,14 @@ void tma_clock(TMULTI_ACTION *q) define(-1,5,37,1,1,0,label,"String:"); define(20,80,35,100,12,0,input_line,8);strncpy(s,q->clock.string,8);s[8]=0;set_default(s); property(b1,NULL,NULL,WINCOLOR); - define(-1,5,52,1,1,0,label,"slo:"); + define(-1,5,52,1,1,0,label,"��slo:"); define(30,80,50,30,12,0,input_line,8,0,15," %02d");set_default(strs(q->clock.codenum)); on_exit(test_int); property(b1,NULL,NULL,WINCOLOR); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2236,8 +2236,8 @@ void tma_text(TMULTI_ACTION *q,char *filename) if (id=load_string_list(&ls,filename)) { char s[300]; - if (id<0) sprintf(s,"Soubour %s chyb nebo je pokozen. Nelze editovat texty",filename); - else sprintf(s,"Chyba v souboru %s na dce %d",filename,id); + if (id<0) sprintf(s,"Soubour %s chyb� nebo je po�kozen. Nelze editovat texty",filename); + else sprintf(s,"Chyba v souboru %s na ��dce %d",filename,id); msg_box("Chyba!",'\x1',s,"Ok",NULL); return; } @@ -2247,7 +2247,7 @@ void tma_text(TMULTI_ACTION *q,char *filename) (q->text.textindex)++; if (q->text.textindex>=lcount) { - msg_box("Oznmen",'\x1',"dn texty nejsou k dispozici","Ok",NULL); + msg_box("Ozn�men�",'\x1',"��dn� texty nejsou k dispozici","Ok",NULL); return; } b1=def_border(5,WINCOLOR); @@ -2259,8 +2259,8 @@ void tma_text(TMULTI_ACTION *q,char *filename) property(b1,NULL,flat_color(0x1f),WINCOLOR); add_ma_flags(20,5,35,q); b1=def_border(1,0); - define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(CANCEL_BUTT,5,5,60,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(CANCEL_BUTT,5,5,60,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); id=o_aktual->id; @@ -2293,8 +2293,8 @@ void tma_dialog(TMULTI_ACTION *q) property(b1,NULL,flat_color(0x1f),WINCOLOR); add_ma_flags(20,5,35,q); b1=def_border(1,0); - define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(CANCEL_BUTT,5,5,60,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(CANCEL_BUTT,5,5,60,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); id=o_aktual->id; @@ -2327,8 +2327,8 @@ void tma_shop(TMULTI_ACTION *q) property(b1,NULL,flat_color(0x1f),WINCOLOR); add_ma_flags(20,5,35,q); b1=def_border(1,0); - define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(CANCEL_BUTT,5,5,60,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(CANCEL_BUTT,5,5,60,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); release_list(ls); @@ -2359,15 +2359,15 @@ void tma_create_dropi(TMULTI_ACTION *q,char *name) if (it>=lcount) it=0; b1=def_border(5,WINCOLOR); def_dialoge(420,120,250,290,name); - define(-1,5,20,1,1,0,label,"Vc:"); + define(-1,5,20,1,1,0,label,"V�c:"); define(10,5,19,170,12,1,str_line,ls); c_default(it); on_enter(string_list_sup); property(b1,NULL,flat_color(0x1f),WINCOLOR); add_ma_flags(20,5,35,q); b1=def_border(1,0); - define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(CANCEL_BUTT,5,5,60,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(CANCEL_BUTT,5,5,60,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); id=o_aktual->id; @@ -2393,8 +2393,8 @@ void tma_gen(TMULTI_ACTION *q,char *name) def_dialoge(420,120,250,290,name); add_ma_flags(20,5,35,q); b1=def_border(1,0); - define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(CANCEL_BUTT,5,5,60,20,2,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(OK_BUTT,5,5,60,20,3,button,"Ok");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(CANCEL_BUTT,5,5,60,20,2,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); id=o_aktual->id; @@ -2424,18 +2424,18 @@ void tma_unique(TMULTI_ACTION *q,char edit) if (!edit) { int i; - tma_create_dropi(q,"Zvol pedlohu"); + tma_create_dropi(q,"Zvol p�edlohu"); i=q->dropi.item; memcpy(&q->uniq.item,item_list+i,sizeof(q->uniq.item)); } def_dialoge(420,120,250,290,"Create Unique"); b1=def_border(1,0); define(10,10,19,230,15,1,button,"Oprav vlastnosti predmetu"); - on_change(tma_unique_edit); + on_control_change(tma_unique_edit); property(b1,NULL,flat_color(0x1f),WINCOLOR); define(20,0,0,0,0,0,value_store,4);c_default((int)&q->uniq.item); add_ma_flags(30,5,40,q); - define(OK_BUTT,5,5,60,20,3,button,"Zavt");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + define(OK_BUTT,5,5,60,20,3,button,"Zav��t");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); if (edit)escape();else tma_unique_edit(); read_ma_flags(30,q); @@ -2517,17 +2517,17 @@ void tma_globe(TMULTI_ACTION *q) define(10,80,50,60,12,0,input_line,10,0,maplen,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->globe.sector)); define(-1,5,37,1,1,0,label,"Pri vzniku udalosti poslat akci na:"); - define(-1,5,67,1,1,0,label,"Stna:"); + define(-1,5,67,1,1,0,label,"St�na:"); define(20,80,65,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->globe.side); - define(-1,5,80,100,10,0,label,"Pi volbe sektor 0 severni"); + define(-1,5,80,100,10,0,label,"P�i volbe sektor 0 severni"); define(-1,5,90,100,10,0,label,"se akce neposila"); define(30,20,110,100,10,0,check_box,"Zakaz puvodni chovani");c_default(q->globe.cancel); add_ma_flags(200,200,50,q); fill_bit_fields(0,110,q->send_a.change_bits,5); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2554,18 +2554,18 @@ void tma_sectnumjmp(TMULTI_ACTION *q,int linenum) define(-1,5,52,1,1,0,label,"Sektor:"); define(10,80,50,60,12,0,input_line,6,0,maplen,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->ifsec.sector)); - define(-1,5,67,1,1,0,label,"Stna:"); + define(-1,5,67,1,1,0,label,"St�na:"); define(20,80,65,100,12,0,str_line,steny2);on_enter(string_list_sup); property(b1,NULL,NULL,WINCOLOR);c_default(q->ifsec.side); - define(-1,5,82,1,1,0,label,"slo dku:"); + define(-1,5,82,1,1,0,label,"��slo ��dku:"); define(30,120,80,60,12,0,input_line,5,0,32767,"%5d");on_exit(test_int); property(b1,NULL,NULL,WINCOLOR);set_default(strs(q->ifsec.line+linenum)); - define(40,5,120,120,30,0,radio_butts,2,"Skok kdy podmnka plat","Skok kdy podmnka neplat"); + define(40,5,120,120,30,0,radio_butts,2,"Skok kdy� podm�nka plat�","Skok kdy� podm�nka neplat�"); c_default(q->ifsec.invert); add_ma_flags(200,220,20,q); b1=def_border(1,0); - define(OK_BUTT,5,30,80,20,2,button,"Ok");on_change(terminate);property(b1,NULL,flat_color(0x1f),WINCOLOR); - define(CANCEL_BUTT,5,5,80,20,2,button,"Zruit");on_change(terminate);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); + define(OK_BUTT,5,30,80,20,2,button,"Ok");on_control_change(terminate_gui);property(b1,NULL,flat_color(0x1f),WINCOLOR); + define(CANCEL_BUTT,5,5,80,20,2,button,"Zru�it");on_control_change(terminate_gui);property(b1,NULL,flat_color(RGB555(15,0,0)),WINCOLOR); redraw_window(); escape(); if (o_aktual->id==OK_BUTT) @@ -2666,23 +2666,23 @@ void create_multiaction_dialoge() for(i=0;i0) c_set_value(0,29,num-1); create_multiaction_list(&mul_list,sect,side); @@ -2743,26 +2743,26 @@ static void copy_and_paste() int sect=vals(10); int side=f_get_value(0,20); - def_dialoge(400,100,200,320,"Prce s pamt"); + def_dialoge(400,100,200,320,"Pr�ce s pam�t�"); b1=def_border(5,WINCOLOR); - define(10,10,20,180,20,0,button,"Koprovat do pamti");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(400,10,70,100,10,0,check_box,"Severn");c_default(side==0); - define(410,10,85,100,10,0,check_box,"Vchodn");c_default(side==1); - define(420,10,100,100,10,0,check_box,"Jin");c_default(side==2); - define(430,10,115,100,10,0,check_box,"Zpadn");c_default(side==3); - define(440,10,130,180,10,0,check_box,"Tam kde je prim. stna");c_default(0); + define(10,10,20,180,20,0,button,"Kop�rovat do pam�ti");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(400,10,70,100,10,0,check_box,"Severn�");c_default(side==0); + define(410,10,85,100,10,0,check_box,"V�chodn�");c_default(side==1); + define(420,10,100,100,10,0,check_box,"Ji�n�");c_default(side==2); + define(430,10,115,100,10,0,check_box,"Z�padn�");c_default(side==3); + define(440,10,130,180,10,0,check_box,"Tam kde je prim. st�na");c_default(0); define(445,10,150,180,12,0,str_line,side_names);property(b1,NULL,NULL,WINCOLOR);c_default(0); on_enter(string_list_sup); - define(450,10,170,180,10,0,check_box,"Tam kde je sec. stna");c_default(0); + define(450,10,170,180,10,0,check_box,"Tam kde je sec. st�na");c_default(0); define(455,10,190,180,12,0,str_line,side_names);property(b1,NULL,NULL,WINCOLOR);c_default(0); on_enter(string_list_sup); - define(-1,10,210,180,12,0,label,"Jak vloit?"); + define(-1,10,210,180,12,0,label,"Jak vlo�it?"); define(460,10,225,180,30,0,radio_butts,3, - "Pepsat ve", - "Pepsat pouit udl.", - "Pidat na konec");c_default(1); - define(20,10,260,180,20,0,button,"Vloit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); - define(30,10,285,180,20,0,button,"Zruit");property(b1,NULL,NULL,WINCOLOR);on_change(terminate); + "P�epsat v�e", + "P�epsat pou�it� ud�l.", + "P�idat na konec");c_default(1); + define(20,10,260,180,20,0,button,"Vlo�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); + define(30,10,285,180,20,0,button,"Zru�it");property(b1,NULL,NULL,WINCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); id=o_aktual->id; @@ -2884,13 +2884,13 @@ void open_multiaction_window() waktual->minsizx=120; waktual->minsizy=150; define(-1,5,20,1,1,0,label,"Sektor"); - define(-1,5,32,1,1,0,label,"Stna"); + define(-1,5,32,1,1,0,label,"St�na"); define(-1,5,44,1,1,0,label,"Program:"); define(-1,3,1,10,10,2,resizer); define(10,5,20,60,10,1,input_line,5,0,maplen-1,"%5d");set_default(strs(i));on_exit(test_int); property(NULL,NULL,flat_color(0x1f),WINCOLOR); define(20,5,32,60,10,1,str_line,steny2);c_default(0);on_enter(string_list_sup); - property(NULL,NULL,flat_color(0x1f),WINCOLOR);on_change(mult_change_dir); + property(NULL,NULL,flat_color(0x1f),WINCOLOR);on_control_change(mult_change_dir); create_multiaction_list(&mul_list,i,0); define(29,5,55,95,180,0,listbox,mul_list,RGB555(31,31,0),0);c_default(0); o_end->autoresizex=1; @@ -2899,14 +2899,14 @@ void open_multiaction_window() property(NULL,NULL,NULL,WINCOLOR); o_end->autoresizey=1; define(31,3,50,15,15,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(32,3,60,15,15,2,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(40,5,5,50,20,3,button,"Vyma");property(b1,NULL,NULL,WINCOLOR);on_change(delete_multiaction_ask); - define(50,60,5,50,20,3,button,"Edit");property(b1,NULL,NULL,WINCOLOR);on_change(edit_multiaction); - define(60,5,30,50,20,3,button,"Vlo");property(b1,NULL,NULL,WINCOLOR);on_change(create_multiaction_dialoge); - define(70,60,30,50,20,3,button,"Pamt");property(b1,NULL,NULL,WINCOLOR);on_change(copy_and_paste); - //define(70,60,30,50,20,3,button,"Poad");property(b1,NULL,NULL,WINCOLOR); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(40,5,5,50,20,3,button,"Vyma�");property(b1,NULL,NULL,WINCOLOR);on_control_change(delete_multiaction_ask); + define(50,60,5,50,20,3,button,"Edit");property(b1,NULL,NULL,WINCOLOR);on_control_change(edit_multiaction); + define(60,5,30,50,20,3,button,"Vlo�");property(b1,NULL,NULL,WINCOLOR);on_control_change(create_multiaction_dialoge); + define(70,60,30,50,20,3,button,"Pam�t");property(b1,NULL,NULL,WINCOLOR);on_control_change(copy_and_paste); + //define(70,60,30,50,20,3,button,"Po�ad�");property(b1,NULL,NULL,WINCOLOR); redraw_window(); } select_window(wiz_tool_numb);close_current(); diff --git a/VIDEO/MGIFEDIT.C b/VIDEO/MGIFEDIT.C index bc9ae5e..a0caa7f 100644 --- a/VIDEO/MGIFEDIT.C +++ b/VIDEO/MGIFEDIT.C @@ -63,7 +63,7 @@ static void f10exit() do { c=*(int*)task_wait_event(E_KEYBOARD); - if ((c & 0xff)==0 && (c>>8)=='D') terminate(); + if ((c & 0xff)==0 && (c>>8)=='D') terminate_gui(); if ((c & 0xff)==0 && (c>>8)=='C') { done_mysky(); @@ -122,7 +122,7 @@ long def_window(word xs,word ys,char *name) if (xs>=70) { define(1,1,1,19,16,1,button,"\x0f"); - property(NULL,icones,&icone_color,WINCOLOR);on_change(close_current); + property(NULL,icones,&icone_color,WINCOLOR);on_control_change(close_current); } return q; } @@ -149,10 +149,10 @@ int def_dialoge(word x,word y,word xs, word ys, char *name,char modal) static void display_progress(void) { - def_dialoge(10,300,620,80,"Natm informace o filmu...",1); + def_dialoge(10,300,620,80,"Na��t�m informace o filmu...",1); define(10,10,20,600,30,0,done_bar,100); property(def_border(3,WINCOLOR),NULL,flat_color(0x2e0),WINCOLOR); - define(30,5,5,80,20,2,button,"Konec");on_change(terminate); + define(30,5,5,80,20,2,button,"Konec");on_control_change(terminate_gui); property(def_border(1,0),vga_font,flat_color(0),BUTTONCOLOR); c_default(0); redraw_window(); @@ -222,11 +222,11 @@ void init_desktop(void) define(5,1,1,14,14,1,color_box);c_default(LABELCOLOR); define(10,2,20,320,180,0,pic_viewer);c_default(0); define(20,26,4,271,17,3,scroll_bar_h,0,total_frames-1,total_frames/16,0x0200); - property(def_border(3,WINCOLOR),NULL,NULL,WINCOLOR);c_default(0);on_change(change_frame_pos); + property(def_border(3,WINCOLOR),NULL,NULL,WINCOLOR);c_default(0);on_control_change(change_frame_pos); define(21,2,4,21,19,2,scroll_button,1,100,"\x1c"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); define(22,2,4,21,19,3,scroll_button,-1,-100,"\x1d"); - property(NULL,icones,&cl,WINCOLOR);on_change(scroll_support); + property(NULL,icones,&cl,WINCOLOR);on_control_change(scroll_support); redraw_desktop(); show_frame(0); } @@ -246,9 +246,9 @@ static void init_editor() switch(examine_mgif_file(show_progress)) { case EX_NOT_FOUND:chyba="MGIF soubor nenalezen!";break; - case EX_NO_SOUND:chyba="Film nem zvukovou stopu. Sestav jej se zvukem.";break; - case EX_READ_ERROR:chyba="Chyba pi ten. Film je mon pokozen";break; - case EX_SOUND_ERROR:chyba="Nekonzistentn zvukov stopa!";break; + case EX_NO_SOUND:chyba="Film nem� zvukovou stopu. Sestav jej se zvukem.";break; + case EX_READ_ERROR:chyba="Chyba p�i �ten�. Film je mo�n� po�kozen";break; + case EX_SOUND_ERROR:chyba="Nekonzistentn� zvukov� stopa!";break; default:chyba=NULL; } if (chyba!=NULL) @@ -406,9 +406,9 @@ void open_program_window(int track) cl1[0]=0x8000;cl1[1]=0xf; memcpy(cl2,flat_color(0),sizeof(cl2)); win_program=def_dialoge(10,250,620,220,smp_prg[track].sample_name,0); - define(10,10,20,500,70,0,track_view,&smp_prg[track].levy);on_change(change_frame_clk1); + define(10,10,20,500,70,0,track_view,&smp_prg[track].levy);on_control_change(change_frame_clk1); property(def_border(5,WINCOLOR),NULL,NULL,WINCOLOR);c_default(frame); - define(20,10,120,500,70,0,track_view,&smp_prg[track].pravy);on_change(change_frame_clk1); + define(20,10,120,500,70,0,track_view,&smp_prg[track].pravy);on_control_change(change_frame_clk1); property(def_border(5,WINCOLOR),NULL,NULL,WINCOLOR);c_default(frame); define(30,10,95,500,20,0,starts_view,smp_prg+track); property(def_border(5,WINCOLOR),NULL,NULL,WINCOLOR);c_default(frame); @@ -416,27 +416,27 @@ void open_program_window(int track) { int y=i; define(40+i,85,20+y,20,35,1,scroll_button,-1,0,"\x1e"); - property(NULL,icones,&cl1,WINCOLOR);on_change(change_vpoint);on_event(step_clear); + property(NULL,icones,&cl1,WINCOLOR);on_control_change(change_vpoint);on_event(step_clear); define(50+i,85,56+y,20,35,1,scroll_button,1,255,"\x1f"); - property(NULL,icones,&cl1,WINCOLOR);on_change(change_vpoint);on_event(step_clear); - define(60+i,10,20+y,20,70,1,button,"X");on_change(change_vpoint); + property(NULL,icones,&cl1,WINCOLOR);on_control_change(change_vpoint);on_event(step_clear); + define(60+i,10,20+y,20,70,1,button,"X");on_control_change(change_vpoint); property(NULL,vga_font,cl2,WINCOLOR); - define(70+i,32,20+y,50,20,1,button,"++");on_change(change_vpoint); + define(70+i,32,20+y,50,20,1,button,"+���+");on_control_change(change_vpoint); property(NULL,vga_font,cl2,WINCOLOR); define(80+i,32,45+y,50,20,1,scroll_button,-1,0,"+--+"); - property(NULL,vga_font,&cl2,WINCOLOR);on_change(change_vpoint);on_event(step_clear); + property(NULL,vga_font,&cl2,WINCOLOR);on_control_change(change_vpoint);on_event(step_clear); define(90+i,32,70+y,50,20,1,scroll_button,1,255,"+--+"); - property(NULL,vga_font,&cl2,WINCOLOR);on_change(change_vpoint);on_event(step_clear); + property(NULL,vga_font,&cl2,WINCOLOR);on_control_change(change_vpoint);on_event(step_clear); } define(200,10,95,95,20,1,button,"(re)Start");property(NULL,vga_font,&cl2,WINCOLOR); - on_change(toggle_restart); + on_control_change(toggle_restart); cl=def_border(1,0); - define(210,10,5,80,20,3,button,"Max");property(cl,vga_font,&cl2,BUTTONCOLOR);on_change(max_min_mid_align); - define(220,100,5,80,20,3,button,"Min");property(cl,vga_font,&cl2,BUTTONCOLOR);on_change(max_min_mid_align); - define(230,190,5,80,20,3,button,"Sted");property(cl,vga_font,&cl2,BUTTONCOLOR);on_change(max_min_mid_align); - define(240,280,5,80,20,3,button,"Jako doln");property(cl,vga_font,&cl2,BUTTONCOLOR);on_change(max_min_mid_align); - define(250,370,5,80,20,3,button,"Jako horn");property(cl,vga_font,&cl2,BUTTONCOLOR);on_change(max_min_mid_align); - define(260,10,10,80,10,2,check_box,"Vypnut");on_change(mute_channel);c_default(smp_prg[cur_track].muted); + define(210,10,5,80,20,3,button,"Max");property(cl,vga_font,&cl2,BUTTONCOLOR);on_control_change(max_min_mid_align); + define(220,100,5,80,20,3,button,"Min");property(cl,vga_font,&cl2,BUTTONCOLOR);on_control_change(max_min_mid_align); + define(230,190,5,80,20,3,button,"St�ed");property(cl,vga_font,&cl2,BUTTONCOLOR);on_control_change(max_min_mid_align); + define(240,280,5,80,20,3,button,"Jako doln�");property(cl,vga_font,&cl2,BUTTONCOLOR);on_control_change(max_min_mid_align); + define(250,370,5,80,20,3,button,"Jako horn�");property(cl,vga_font,&cl2,BUTTONCOLOR);on_control_change(max_min_mid_align); + define(260,10,10,80,10,2,check_box,"Vypnut");on_control_change(mute_channel);c_default(smp_prg[cur_track].muted); redraw_window(); mute_channel(); } @@ -505,22 +505,22 @@ void new_edit_sample(int track) memcpy(&b1,def_border(1,0),sizeof(CTL3D)); memcpy(&b2,def_border(5,WINCOLOR),sizeof(CTL3D)); memcpy(&b3,def_border(6,WINCOLOR),sizeof(CTL3D)); - def_dialoge(20,140,600,200,"Vlo nov zvuk",1); + def_dialoge(20,140,600,200,"Vlo� nov� zvuk",1); dir=create_list(2);str_add(&dir,""); - define(9,10,20,120,166,0,listbox,dir,0x7fff,0);on_change(dopln_jmeno_samplu); + define(9,10,20,120,166,0,listbox,dir,0x7fff,0);on_control_change(dopln_jmeno_samplu); property(&b3,NULL,NULL,WINCOLOR);c_default(0); define(10,137,40,19,127,0,scroll_bar_v,0,10,1,0x0200); property(&b2,NULL,NULL,WINCOLOR); define(11,136,20,21,17,0,scroll_button,-1,0,"\x1e"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); define(12,136,170,21,17,0,scroll_button,1,10,"\x1f"); - property(NULL,icones,NULL,WINCOLOR);on_change(scroll_support); - define(20,170,20,420,12,0,input_line,255);set_default(last_path);on_exit(change_dir); + property(NULL,icones,NULL,WINCOLOR);on_control_change(scroll_support); + define(20,170,20,420,12,0,input_line,255);set_default(last_path);on_control_exit(change_dir); property(&b3,vga_font,NULL,WINCOLOR); - define(-1,170,35,1,1,0,label,"Cesta a jmno zvuku"); - define(-1,170,65,1,1,0,label,"Jmno stopy (voliteln)"); - define(-1,170,95,1,1,0,label,"Zatek opakovn (-1 vyp)"); - define(-1,170,125,1,1,0,label,"Konec opakovn"); + define(-1,170,35,1,1,0,label,"Cesta a jm�no zvuku"); + define(-1,170,65,1,1,0,label,"Jm�no stopy (voliteln�)"); + define(-1,170,95,1,1,0,label,"Za��tek opakov�n� (-1 vyp)"); + define(-1,170,125,1,1,0,label,"Konec opakov�n�"); c=(smp_prg[track].sample_name);if (c==NULL) c=empty; define(30,170,50,420,12,0,input_line,255);set_default(c); property(&b3,vga_font,NULL,WINCOLOR); @@ -531,8 +531,8 @@ void new_edit_sample(int track) property(&b3,vga_font,NULL,WINCOLOR); define(60,290,140,100,12,0,input_line,199);set_default(itoa(smp_prg[track].loop_end,num,10)); property(&b3,vga_font,NULL,WINCOLOR); - define(100,10,10,80,20,2,button,"Storno");property(&b1,vga_font,NULL,BUTTONCOLOR);on_change(terminate); - define(110,10,35,80,20,2,button,"Ok");property(&b1,vga_font,NULL,BUTTONCOLOR);on_change(terminate); + define(100,10,10,80,20,2,button,"Storno");property(&b1,vga_font,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(110,10,35,80,20,2,button,"Ok");property(&b1,vga_font,NULL,BUTTONCOLOR);on_control_change(terminate_gui); define(120,10,70,38,20,2,button,"");property(&b1,vga_font,NULL,BUTTONCOLOR); define(130,52,70,38,20,2,button,"");property(&b1,vga_font,NULL,BUTTONCOLOR); redraw_window(); @@ -620,7 +620,7 @@ static void delete_sample() int i; i=f_get_value(0,9); if (i>=samples_total || i<0) return; - if (msg_box("Otzka?",'\x2',"Odstranit zvuk?","Ano","Ne",NULL)==2) return; + if (msg_box("Ot�zka?",'\x2',"Odstranit zvuk?","Ano","Ne",NULL)==2) return; open_program_window(-1); remove_sample(i); update_sample_list(); @@ -654,7 +654,7 @@ static void duplic_sample() static void prehrat_cele() { show_frame(-1); - def_dialoge(2,42,635,378,"Pehrt cel",1); + def_dialoge(2,42,635,378,"P�ehr�t cel�",1); redraw_window(); curcolor=0; start_mixing(); @@ -680,9 +680,9 @@ static void prehrat_preview() x=o->locx+320+4; y=o->locy+180+4; if (x>500) x=2;if (y>400) y=2; - def_dialoge(x,y,100,80,"Nhled",1); + def_dialoge(x,y,100,80,"N�hled",1); define(10,10,25,80,30,0,button,"STOP"); - property(def_border(1,0),vga_font,NULL,BUTTONCOLOR);on_change(stop_preview_clk); + property(def_border(1,0),vga_font,NULL,BUTTONCOLOR);on_control_change(stop_preview_clk); redraw_window(); preview_block(f_get_value(win_preview,20),o->locx,o->locy); close_current(); @@ -695,8 +695,8 @@ static void make() def_dialoge(10,300,620,80,"Sestavuji...",1); define(10,10,20,600,30,0,done_bar,100);c_default(0); property(def_border(3,WINCOLOR),NULL,flat_color(0x2e0),WINCOLOR); - define(20,5,5,480,12,3,input_line,100);set_default("Ukldm projekt...."); - define(30,5,5,80,20,2,button,"Stop");on_change(terminate); + define(20,5,5,480,12,3,input_line,100);set_default("Ukl�d�m projekt...."); + define(30,5,5,80,20,2,button,"Stop");on_control_change(terminate_gui); property(def_border(1,0),vga_font,NULL,BUTTONCOLOR); redraw_window(); save_project(prj_name); @@ -708,7 +708,7 @@ static void build() { int i; - if (msg_box(PRG_HEADER,'\x2',"Chce spustit REBUILD filmu? Tato funkce sestav CELOU zvukovou stopu, co me zabrat dost asu","Ano","Ne",NULL)==2) return; + if (msg_box(PRG_HEADER,'\x2',"Chce� spustit REBUILD filmu? Tato funkce sestav� CELOU zvukovou stopu, co� m��e zabrat dost �asu","Ano","Ne",NULL)==2) return; for(i=0;i"); exit(1); } @@ -893,8 +893,8 @@ void main(int argc,char **argv) prj_name=get_project_name(mgif_filename); switch (load_project(prj_name)) { - case -1:msg_box(PRG_HEADER,'\x1',"Chyba formtu v projektu!","Zavt",NULL);shutdown();exit(1); - case -2:msg_box(PRG_HEADER,'\x1',"Neoekvan eof souboru!","Zavt",NULL);shutdown();exit(1); + case -1:msg_box(PRG_HEADER,'\x1',"Chyba form�tu v projektu!","Zav��t",NULL);shutdown();exit(1); + case -2:msg_box(PRG_HEADER,'\x1',"Neo�ek�van� eof souboru!","Zav��t",NULL);shutdown();exit(1); } init_editor(); warn_size_mistmach(); diff --git a/Windows/skeldal_win.h b/Windows/skeldal_win.h index 513631a..ce564dc 100644 --- a/Windows/skeldal_win.h +++ b/Windows/skeldal_win.h @@ -48,3 +48,4 @@ void SetWheelMapping(char up, char down); #define WM_RELOADMAP (WM_APP+215) #define E_RELOADMAP 40 + diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt new file mode 100644 index 0000000..9a8d230 --- /dev/null +++ b/game/CMakeLists.txt @@ -0,0 +1,5 @@ +SET(files automap.c clk_map.c dialogy.c dump.cpp enemy.c engine2.c globmap.c inv.c kouzla.c menu.c skeldal.c souboje.c +builder.c engine1.c gamesave.c interfac.c kniha.c macros.c realgame.c setup.c sndandmus.c specproc.c) + +add_executable(skeldal ${files}) + diff --git a/GAME/AUTOMAP.C b/game/automap.c similarity index 98% rename from GAME/AUTOMAP.C rename to game/automap.c index 04b2bb0..ea1773e 100644 --- a/GAME/AUTOMAP.C +++ b/game/automap.c @@ -31,14 +31,14 @@ #define MEDIUM_MAP_LINE1 RGB555(25,20,17) #define MEDIUM_MAP_LINE2 RGB555(31,22,6) -word stairs_colors[]= +word stairs_colors[7]= {AUTOMAP_LINE1, RGB555(14,12,11), RGB555(15,14,12), RGB555(16,15,12), RGB555(17,16,13)}; -word arrow_colors[]= +word arrow_colors[7]= { AUTOMAP_LINE1, AUTOMAP_FORE @@ -389,6 +389,7 @@ static void draw_amap_sector(int x,int y,int sector,int mode,int turn,int line1, set_font(H_FSYMB,0);k>>=9; switch (k) { + default: case 3:break; case 2:set_font(H_FSYMB,0); font_color(stairs_colors); @@ -529,10 +530,10 @@ void draw_automap(int xr,int yr) map_yr=yp-yr*8; for(k=0;k<2;k++) for(i=1;imsg==E_INIT) xr=yr=0; @@ -643,7 +644,7 @@ void *map_keyboard(EVENT_MSG *msg,void **usr) (*(int *)msg->data)=0; unwire_proc(); wire_proc(); - + break; } } @@ -672,7 +673,7 @@ void show_automap(char full) change_click_map(clk_map_view,CLK_MAP_VIEW); } -static char mob_not_invis(sector) +static char mob_not_invis(int sector) { int m; m=mob_map[sector]; @@ -737,7 +738,7 @@ void draw_medium_map() } } -static char map_menu_glob_map(int id,int xa,int ya,int xr,int yr) +char map_menu_glob_map(int id,int xa,int ya,int xr,int yr) { id,xa,ya,xr,yr; id=set_select_mode(0); @@ -798,7 +799,7 @@ char map_menu(int id,int xa,int ya,int xr,int yr) mouse_set_default(H_MS_WHO); ukaz_mysku(); showview(0,0,0,0);break; - case 3: + case 3: unwire_proc();wire_proc();break; } return 1; @@ -881,7 +882,7 @@ void wire_kniha() hold_timer(TM_FAST_TIMER,1); } -static last_selected; +static int last_selected; char map_target_cancel(int id,int xa,int ya,int xr,int yr) { diff --git a/GAME/BOLDCZ.FON b/game/boldcz.fon similarity index 100% rename from GAME/BOLDCZ.FON rename to game/boldcz.fon diff --git a/GAME/BUILDER.C b/game/builder.c similarity index 97% rename from GAME/BUILDER.C rename to game/builder.c index 514327a..8e962ff 100644 --- a/GAME/BUILDER.C +++ b/game/builder.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -17,7 +16,7 @@ #include "engine1.h" #include #include "globals.h" -#include "Version.h" +#include "version.h" #define ZIVOTY_S 60 #define ZIVOTY_E 62 @@ -182,7 +181,7 @@ void show_money() { char c[20]; set_font(H_FONT7,RGB555(28,28,21)); - sprintf(c,"%d",money); + sprintf(c,"%ld",money); set_aligned_position(460,13,2,2,c); outtext(c); } @@ -276,8 +275,9 @@ word *bott_clear(void) { word *bott_scr; - bott_scr=(word *)getmem(scr_linelen2*104*2); - memset(bott_scr,0,_msize(bott_scr)); + long sz; + bott_scr=(word *)getmem(sz = scr_linelen2*104*2); + memset(bott_scr,0,sz); return bott_scr; } @@ -304,7 +304,7 @@ static void bott_fletna_normal(void **pp,long *s) set_aligned_position(x,32,1,1,texty[180+i]);outtext(texty[180+i]); } *pp=GetScreenAdr(); - *s=_msize(*pp); + *s=GetScreenSizeBytes(); RestoreScreen(); } @@ -400,7 +400,7 @@ static void bott_draw_normal(void **pp,long *s) } */ *pp=GetScreenAdr(); - *s=_msize(*pp); + *s=GetScreenSizeBytes(); RestoreScreen(); } @@ -438,11 +438,11 @@ void bott_disp_text_proc(void **pp,long *ss) } while (p[0]); *pp=GetScreenAdr(); - *ss=_msize(*pp); + *ss=GetScreenSizeBytes(); RestoreScreen(); } -void bott_disp_text(char *text) +void bott_disp_text(const char *text) { if (text==0) text="Chybi popisek!!"; zneplatnit_block(H_BOTTBAR); @@ -459,15 +459,15 @@ static void MaskPutPicture(int x, int y, char mask, word color, char blend, void { short *info=(short *)pic; char *data=(char *)(info+3+256); - word *pos=GetScreenAdr()+x+y*scr_linelen2; + word *pos=GetScreenAdr()+x+y*scr_linelen2; if (blend) color=color & 0xF7DE; - for (y=0;y>1; else - pos[x]=color; + pos[x]=color; } @@ -491,14 +491,14 @@ void bott_draw_rune(void **pp,long *ss) if (sel_zivel!=4)trans_bar(378+24+sel_zivel*24,0,96-sel_zivel*24,22,0); set_font(H_FBOLD,NOSHADOW(0)); position(120,30); - outtext(glob_items[showruneitem].jmeno); + outtext(glob_items[showruneitem].jmeno); sprintf(buff,"%s %d, %s %d",texty[11],get_spell_um(spell),texty[16],get_spell_mana(spell)); position (75,60); outtext(buff); put_picture(70,30,ablock(glob_items[showruneitem].vzhled+face_arr[0])); *pp=GetScreenAdr(); - *ss=_msize(*pp); - RestoreScreen(); + *ss=GetScreenSizeBytes(); + RestoreScreen(); } void bott_disp_rune(char rune, int item) @@ -642,7 +642,7 @@ int enter_tab[VIEW3D_Z+1][VIEW3D_X*2+1]= -void crt_minimap_itr(sector,smer,itrx,itry,automap) +void crt_minimap_itr(int sector,int smer,int itrx,int itry, int automap) { static int sector_temp; static long sideflags; @@ -690,7 +690,7 @@ void crt_minimap_itr(sector,smer,itrx,itry,automap) } -void create_minimap(sector,smer) +void create_minimap(int sector, int smer) { memset(minimap,0,sizeof(minimap)); dirs[1]=smer; @@ -702,7 +702,7 @@ void create_minimap(sector,smer) static const float Inv2=0.5; static const float Snapper=3<<22; -__inline int toInt( float fval ) +static __inline int toInt( float fval ) { fval += Snapper; return ( (*(int *)&fval)&0x007fffff ) - 0x00400000; @@ -712,7 +712,7 @@ __inline int toInt( float fval ) static void *check_autofade(void *image, char ceil, int dark) { char *data=image; - if (data[5]==0x80) + if (data[5]==0x80) { word *xy=(word *)image; if (mglob.map_autofadefc==1) @@ -767,7 +767,7 @@ int draw_basic_floor(int celx,int cely,int sector) return 0; } -static calc_item_shiftup(TITEM *it) +static int calc_item_shiftup(TITEM *it) { short *s; char *c; @@ -923,7 +923,7 @@ void draw_players(int sector,int dir,int celx,int cely) -int draw_sloup_sector(celx,cely,sector) +int draw_sloup_sector(int celx,int cely,int sector) { TSTENA *w,*q; int obl; @@ -1037,7 +1037,7 @@ static void zobraz_lodku(word *lodka, word *screen, int size) int x; while (size) { - for (x=0;x<640 && size;x++) + for (x=0;x<640 && size;x++) { if (*lodka!=0) screen[x]=*lodka; lodka++; @@ -1100,7 +1100,7 @@ static void trace_for_bgr(int dir) } -void render_scene(sector,smer) +void render_scene(int sector, int smer) { int i,j,s; @@ -1309,7 +1309,7 @@ void play_fx_at(int where) void display_ver(int x,int y,int ax,int ay) { - char *ver="Brny Skeldalu version "VERSION" (C)1998"; + char *ver="Br�ny Skeldalu version "VERSION" (C)1998"; set_font(H_FTINY,RGB555(31,31,31));set_aligned_position(x,y,ax,ay,ver); outtext(ver);showview(0,0,0,0); } diff --git a/GAME/CHARGEN.C b/game/chargen.c similarity index 100% rename from GAME/CHARGEN.C rename to game/chargen.c diff --git a/GAME/CHARGEN2.C b/game/chargen2.c similarity index 98% rename from GAME/CHARGEN2.C rename to game/chargen2.c index 0139e85..4346f38 100644 --- a/GAME/CHARGEN2.C +++ b/game/chargen2.c @@ -53,7 +53,7 @@ typedef struct staty static char women[MAX_XICHTS]={0,1,0,0,0,1,0,0};//,0,0}; static int cur_edited=0; static int cur_xicht=-1; -static int cur_page=1; +int cur_page=1; static int loc_select=-1; #define CLK_PAGE1 3 @@ -62,7 +62,7 @@ static int loc_select=-1; static T_CLK_MAP clk_page1[]= { - + }; static void display_character(THUMAN *p) @@ -119,7 +119,7 @@ static void tlac2(int x,int y,char *text,int pushed) set_aligned_position(x,y,1,1,text);outtext(text); } -static tlac2_press(int x,int y,char *text) +static void tlac2_press(int x,int y,char *text) { schovej_mysku(); tlac2(x,y,text,1); @@ -319,7 +319,7 @@ static char page1_tlac2(int id,int xa,int ya,int xr,int yr) } -void enter_generator() +char enter_generator() { int i; diff --git a/GAME/CLK_MAP.C b/game/clk_map.c similarity index 99% rename from GAME/CLK_MAP.C rename to game/clk_map.c index ad794a4..21bdc25 100644 --- a/GAME/CLK_MAP.C +++ b/game/clk_map.c @@ -251,7 +251,7 @@ char start_invetory(int id,int xa,int ya,int xr,int yr) { if (ms_last_event.event_type & 0x2) { - if (GetKeyState(VK_CONTROL) & 0x80) + if (get_control_key_state()) { if (p->sektor==viewsector) { @@ -418,7 +418,7 @@ static char sing_song_clk(int id,int xa,int ya,int xr,int yr) t->userdata[0]=viewsector; t->userdata[1]=viewdir; } - + } return id<12; } diff --git a/GAME/CRC.C b/game/crc.c similarity index 100% rename from GAME/CRC.C rename to game/crc.c diff --git a/GAME/DIALOGY.C b/game/dialogy.c similarity index 96% rename from GAME/DIALOGY.C rename to game/dialogy.c index b66b546..b523dc4 100644 --- a/GAME/DIALOGY.C +++ b/game/dialogy.c @@ -18,6 +18,7 @@ #include "engine1.h" #include #include "globals.h" +#include typedef struct t_paragraph { @@ -212,9 +213,9 @@ static void error(char *text) { char buff[256]; sprintf(buff,"%s v odstavci %d\r\nLocal_pgf=%d / DIALOG : %d / SENTENCE : %d\r\n",text,last_pgf+local_pgf,local_pgf,local_pgf/128,last_pgf); - MessageBox(NULL,buff,NULL,MB_OK|MB_ICONSTOP|MB_SYSTEMMODAL); +// MessageBox(NULL,buff,NULL,MB_OK|MB_ICONSTOP|MB_SYSTEMMODAL); SEND_LOG("(DIALOGS) Dialog error detected at %d:%d",local_pgf/128,last_pgf); - SEND_LOG("(DIALOGS) Error description: %s",text,0); + SEND_LOG("(DIALOGS) Error description: %s",text,0); } static void show_dialog_picture() @@ -241,7 +242,7 @@ static T_PARAGRAPH *find_paragraph(int num) { char s[80]; - sprintf(s,"Odstavec %d neexistuje! Odkaz byl vyvoln",num); + sprintf(s,"Odstavec %d neexistuje! Odkaz byl vyvol�n",num); error(s); return (T_PARAGRAPH *)pp; } @@ -392,7 +393,7 @@ static char *Get_string() if (i<=0) c=conv_text(texty[abs(i)]);else c=conv_text(level_texts[i]); return string_buffer; } - error("Oekv se etzec nebo index do tabulky etzc"); + error("O�ek�v� se �et�zec nebo index do tabulky �et�zc�"); exit(0); return NULL; } @@ -414,7 +415,7 @@ static short Get_short() pc+=2; return varibles[p]; } - error("Oekv se slo"); + error("O�ek�v� se ��slo"); exit(0); return 0; } @@ -601,7 +602,7 @@ static void pc_xicht(int xichtid) sn_nums[0]=i; strcpy(sn_nams[0],postavy[i].jmeno); sn_rods[0]=postavy[i].female; - iff=1; + iff=1; return; } iff=0; @@ -896,7 +897,7 @@ static void exit_dialog() norefresh=0; } starting_shop=-1; - SEND_LOG("(DIALOGS) Exiting dialog...",0,0); + SEND_LOG("(DIALOGS) Exiting dialog...",0,0); } @@ -1009,7 +1010,7 @@ static char ask_who_proc(int id,int xa,int ya,int xr,int yr) } -static dlg_ask_who() +static int dlg_ask_who() { draw_all(); mouse_set_default(H_MS_WHO); @@ -1031,7 +1032,7 @@ static dlg_ask_who() extern word weapon_skill[]; -static void pract(h,vls,how,max) +static void pract(int h,int vls,int how,int max) { iff=0; if (vls>=100) @@ -1062,7 +1063,7 @@ static void pract(h,vls,how,max) } } -static void pract_to(h,vls,how) +static void pract_to(int h, int vls,int how) { iff=0; if (vls>=100) @@ -1094,12 +1095,12 @@ static char oper_balance(int val1,int val2,int oper) case OPER_BIGEQ:return val1>=val2; case OPER_LOWEQ:return val1<=val2; case OPER_NOEQ:return val1!=val2; - default:error("Chybn operator porovnvn"); + default:error("Chybn� operator porovn�v�n�"); } return 0; } -static char test_vls(h,vls,oper,num) +static char test_vls(int h,int vls,int oper,int num) { int val; if (vls>=100) @@ -1284,7 +1285,7 @@ void do_dialog() default: { char s[80]; - sprintf(s,"Neznm instrukce: %d",i); + sprintf(s,"Nezn�m� instrukce: %d",i); error(s); } break; @@ -1344,11 +1345,11 @@ void call_dialog(int entr,int mob) schovej_mysku(); alock(H_DIALOGY_DAT); aswap(H_DIALOGY_DAT); - selected_player=-1; - do_dialog(); + selected_player=-1; + do_dialog(); } -char save_dialog_info(FILE *f) +char save_dialog_info(TMPFILE_WR *f) { int pgf_pocet; int *p,i; @@ -1359,7 +1360,7 @@ char save_dialog_info(FILE *f) SEND_LOG("(DIALOGS)(SAVELOAD) Saving dialogs info...",0,0); p=ablock(H_DIALOGY_DAT); pgf_pocet=*p; - fwrite(&pgf_pocet,1,4,f); + temp_storage_write(&pgf_pocet,1*4,f); siz=(pgf_pocet+3)/4; if (siz) { @@ -1372,15 +1373,15 @@ char save_dialog_info(FILE *f) int j=(i & 3)<<1; c[i>>2]|=(q[i].visited< #include #include -#include FILE *dlg; long *odstavce=NULL; diff --git a/game/dump.cpp b/game/dump.cpp new file mode 100644 index 0000000..727e458 --- /dev/null +++ b/game/dump.cpp @@ -0,0 +1,91 @@ +#include +#include +#include +#include +#include +#include + +int findMaxDumpNumber(const std::string &directoryPath) { + namespace fs = std::filesystem; + std::regex pattern(R"(dump(\d{4})\.bmp)"); + int maxNumber = -1; + + for (const auto &entry : fs::directory_iterator(directoryPath)) { + if (entry.is_regular_file()) { + std::smatch match; + std::string fileName = entry.path().filename().string(); + + if (std::regex_match(fileName, match, pattern)) { + int number = std::stoi(match[1]); // Extrahujeme číslo NNNN + if (number > maxNumber) { + maxNumber = number; // Aktualizujeme maximální číslo + } + } + } + } + + return maxNumber; +} + +extern "C" { +void save_dump(const uint16_t *screen_addr, + unsigned int width, + unsigned int height, + unsigned int linelen); +} + +void save_dump(const uint16_t *screen_addr, + unsigned int width, + unsigned int height, + unsigned int linelen) { + static int dump_counter = -1; + FILE *f; + int i, r, g, b, x, y; + const uint16_t *a; + char c[20]; + + if (dump_counter == -1) { + dump_counter = findMaxDumpNumber("."); + SEND_LOG("(DUMP) Dump counter sets to %d", dump_counter, 0); + } + sprintf(c, "dump%04d.bmp", ++dump_counter); + SEND_LOG("(DUMP) Saving screen shot named '%s'", c, 0); + f = fopen(c, "wb"); + fputc('B', f); + fputc('M', f); + i = width * height * 3 + 0x36; + fwrite(&i, 1, 4, f); + i = 0; + fwrite(&i, 1, 4, f); + i = 0x36; + fwrite(&i, 1, 4, f); + i = 0x28; + fwrite(&i, 1, 4, f); + i = width; + fwrite(&i, 1, 4, f); + i = height; + fwrite(&i, 1, 4, f); + i = 1; + fwrite(&i, 1, 2, f); + i = 24; + fwrite(&i, 1, 2, f); + i = 0; + fwrite(&i, 1, 4, f); + i = width * height * 3; + fwrite(&i, 1, 4, f); + for (i = 4, r = 0; i > 0; i--) + fwrite(&r, 1, 4, f); + for (y = height; y > 0; y--) { + const uint16_t *scr = screen_addr; + a = scr + (y - 1) * linelen; + for (x = 0; x < width; x++) { + i = a[x]; + b = (i & 0x1f) << 3; + g = (i & 0x7ff) >> 3; + r = i >> 8; + i = ((r * 256) + g) * 256 + b; + fwrite(&i, 1, 3, f); + } + } + fclose(f); +} diff --git a/GAME/ENCRYPT.C b/game/encrypt.c similarity index 100% rename from GAME/ENCRYPT.C rename to game/encrypt.c diff --git a/GAME/ENEMY.C b/game/enemy.c similarity index 97% rename from GAME/ENEMY.C rename to game/enemy.c index fa617e3..853adb0 100644 --- a/GAME/ENEMY.C +++ b/game/enemy.c @@ -106,38 +106,38 @@ void smeruj_moba(TMOB *m,int smer) } } -void save_enemy_paths(FILE *f) +void save_enemy_paths(TMPFILE_WR *f) { int i,s; word *w; for(i=0;idohled && (!(ps->vlastnosti[VLS_KOUZLA] & SPL_INVIS)||p->vlajky & MOB_SENSE) && ps->used && ps->lives) switch(dir) { @@ -555,8 +555,8 @@ int q_vidis_postavu(int sector,int dir,TMOB *p,int *otocit_se,char ret) { nd=alt; if (mob_check_next_sector(p->sector,nd,p->stay_strategy & MOB_BIG,p->vlajky & MOB_PASSABLE)==1) - { - nd=(alt+2)&3; + { + nd=(alt+2)&3; if (mob_check_next_sector(p->sector,nd,p->stay_strategy & MOB_BIG,p->vlajky & MOB_PASSABLE)==1) { nd=(alt+3)&3; @@ -832,7 +832,7 @@ void rozhodni_o_smeru(TMOB *p) if (v==1 && p->stay_strategy & MOB_GUARD) r=return_home(p,&dir); if (r) { - if (v<2) r=1;else r=rand()*v/(RAND_MAX+1)+1; + if (v<2) r=1;else r=rnd(v)+1; vdir=dir=mob_vyber_vychod(r,sect,dir,alone,passable); //if ( p->stay_strategy & MOB_WATCH && rnd(100)<20 && lv<128 && dir!=p->dir) dir=-1; } @@ -951,13 +951,13 @@ static void CheckMobStoned(int num) { TMOB *p=mobs+num; TMOBSAVEDATA *save; - if (!mobsavedata) + if (!mobsavedata) { mobsavedata=(TMOBSAVEDATA **)getmem(sizeof(TMOBSAVEDATA *)*MAX_MOBS); memset(mobsavedata,0,sizeof(TMOBSAVEDATA)*MAX_MOBS); } save=mobsavedata[num]; - if (save==NULL) + if (save==NULL) { save=mobsavedata[num]=(TMOBSAVEDATA *)getmem(sizeof(TMOBSAVEDATA)); save->anim_counter=p->anim_counter; @@ -1071,7 +1071,7 @@ void otoc_moba(TMOB *p) } -static mob_check_teleport(int sect,int num) +static int mob_check_teleport(int sect,int num) { int i; if (!ISTELEPORTSECT(sect)) return sect; @@ -1203,7 +1203,7 @@ void vymaz_zasahy(THE_TIMER *q) bott_draw(0); } -static drop_inventory(TMOB *p) +static int drop_inventory(TMOB *p) { int i,x,y,pl; short c[]={0,0}; @@ -1263,7 +1263,7 @@ void mob_hit(TMOB *mm,int dostal) mm->heady=mm->locy; mm->lives-=dostal; mob_dostal_pocet=dostal; - mm->dostal+=dostal; + mm->dostal+=dostal; if (dostal>0) mm->vlajky|=MOB_IN_BATTLE; //mm->stay_strategy|=MOB_WALK | MOB_WATCH; mm->dialog_flags|=0x2; @@ -1320,9 +1320,9 @@ void mob_strelba(TMOB *p) for(i=0;ikondice*100/h->vlastnosti[VLS_KONDIC]; for (i=0;i<2;i++) { - if (h->wearing[pos[i]]!=0) + if (h->wearing[pos[i]]!=0) { TITEM *it=glob_items+h->wearing[pos[i]]-1; if (it->zmeny[VLS_OBRAN_L] || it->zmeny[VLS_OBRAN_H]) { vlastnosti[VLS_OBRAN_L]-=it->zmeny[VLS_OBRAN_L]; - vlastnosti[VLS_OBRAN_H]-=it->zmeny[VLS_OBRAN_H]; + vlastnosti[VLS_OBRAN_H]-=it->zmeny[VLS_OBRAN_H]; vlastnosti[VLS_OBRAN_L]+=(2*it->zmeny[VLS_OBRAN_L])*factor/100; vlastnosti[VLS_OBRAN_H]+=(2*it->zmeny[VLS_OBRAN_H])*factor/100; } @@ -1435,7 +1435,7 @@ void mobs_hit(TMOB *p) h->utek--; } memcpy(vlastnosti,h->vlastnosti,sizeof(vlastnosti)); - spec=vlastnosti[VLS_KOUZLA]; + spec=vlastnosti[VLS_KOUZLA]; if (game_extras & EX_SHIELD_BLOCKING) PodporaStitu(h,vlastnosti); else uprav_podle_kondice(h,&pocet); h->dostal=vypocet_zasahu(p->vlastnosti,vlastnosti,pocet,0,0); //vypocet zasahu @@ -1481,7 +1481,7 @@ void mobs_live(int num) int xs,ys; p=&mobs[num]; - if (p->vlastnosti[VLS_KOUZLA] & SPL_STONED && p->lives>0) + if (p->vlastnosti[VLS_KOUZLA] & SPL_STONED && p->lives>0) { p->vlajky &= ~MOB_IN_BATTLE; return; @@ -1491,7 +1491,7 @@ void mobs_live(int num) char buff[256]; closemode(); sprintf(buff,"Potvora v neexistujicim sektoru (%d, %d) ",num,p->sector); - MessageBox(NULL,buff,NULL,MB_OK|MB_ICONEXCLAMATION); + display_error(buff); exit(1); } if (p->headx==p->locx && p->heady==p->locy && !p->anim_phase) @@ -1563,7 +1563,7 @@ void mobs_live(int num) p->locx+=xs; p->locy+=ys; if (xs!=0 || ys!=0) neco_v_pohybu=1; - if (p->locx>192 || p->locx<64 || p->locy>192 || p->locy<64) mob_check(num,p); + if (p->locx>192 || p->locx<64 || p->locy>192 || p->locy<64) mob_check(num,p); } p->anim_counter++; if (p->anim_phase==MOB_ATTACK) @@ -1640,7 +1640,7 @@ void check_all_mobs_battle() //kontroluje zda je nekdo v battle { p=&mobs[i]; if (p->vlajky & MOB_LIVE) - if (p->vlajky & MOB_IN_BATTLE) + if (p->vlajky & MOB_IN_BATTLE) b=1; } battle=b; @@ -1959,8 +1959,8 @@ char akce_moba_zac(TMOB *m) mob_sound_event(m,MBS_WALK); return 1; } - else - return 1; + else + return 1; } rozhodni_o_smeru(m); if (m->dir & 1)m->headx=mob_go_x[m->dir];else m->heady=mob_go_y[m->dir]; @@ -2050,7 +2050,7 @@ int utok_na_sektor(THUMAN *p,TMOB *mm,int ch,int bonus) } if (dostal) { - mm->dir=(p->direction+2)&3; + mm->dir=(p->direction+2)&3; play_sample_at_sector(H_SND_SWHIT1+rnd(2),viewsector,viewsector,0,0); if (p->vlastnosti[VLS_KOUZLA] & SPL_DRAIN) { diff --git a/GAME/ENGINE1.C b/game/engine1.c similarity index 99% rename from GAME/ENGINE1.C rename to game/engine1.c index 2b06abd..4acb7f0 100644 --- a/GAME/ENGINE1.C +++ b/game/engine1.c @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -107,7 +106,7 @@ static long old_timer; static void wait_timer() { - Sleep(10); + sleep_ms(10); } /*void zooming1(void *source,long target,word *background,void *xlat,long xysize) @@ -444,7 +443,7 @@ void create_zooming(void) static void zooming_forward_backward(word *background,char back) { - if (!zooming_step) return; + if (!zooming_step) return; { long tmp=get_timer_value(); void *buffer=DxPrepareWalk(SCREEN_OFFLINE); @@ -454,7 +453,7 @@ static void zooming_forward_backward(word *background,char back) int curtime; float phase; - do + do { curtime=get_timer_value()-tmp; phase=(curtime)*(1.0f/(float)maxtime); @@ -478,7 +477,7 @@ void zooming_backward(word *background) zooming_forward_backward(background,1); } /* - + int i; if (!zooming_step) return; for (i=0;iposx; - posy=drw->posy; + posy=drw->posy; cely=drw->cely; if (drw->txtr==NULL) return; posx+=64; diff --git a/GAME/ENGINE1.H b/game/engine1.h similarity index 100% rename from GAME/ENGINE1.H rename to game/engine1.h diff --git a/GAME/ENGINE2.ASM b/game/engine2.asm similarity index 100% rename from GAME/ENGINE2.ASM rename to game/engine2.asm diff --git a/GAME/engine2.c b/game/engine2.c similarity index 98% rename from GAME/engine2.c rename to game/engine2.c index 6e3777c..5ca53ad 100644 --- a/GAME/engine2.c +++ b/game/engine2.c @@ -1,8 +1,9 @@ #include #include "types.h" -#include "Engine1.h" +#include "engine1.h" #include +#include typedef ZOOMINFO tzoom; @@ -19,7 +20,7 @@ void sikma_zleva(void) const short *ytable = zoom.ytable; while (cy) { const long *xtable = zoom.xtable; - word cx = zoom.xmax; + word cx = zoom.xmax; word *scr_iter = scr; const unsigned char *pixmap_iter = pixmap; while (cx > 0) { @@ -35,11 +36,11 @@ void sikma_zleva(void) ytable++; scr-=scr_linelen2; cy--; - } + } - /* + /* __asm @@ -79,7 +80,7 @@ void sikma_zleva(void) mov [zoom]tzoom.ytable,edx ;uloaz na puvodni misto sub edi,[zoom]tzoom.line_len ;odecti tolik, kolik odpovida lince na obrazovce sub ecx,10000h ;sniz horni pulku ecx o jedna - jnz skzl3 ;opakuj dokud neni nula + jnz skzl3 ;opakuj dokud neni nula }*/ } @@ -93,7 +94,7 @@ void sikma_zprava(void) const short *ytable = zoom.ytable; while (cy) { const long *xtable = zoom.xtable; - word cx = zoom.xmax; + word cx = zoom.xmax; word *scr_iter = scr; const unsigned char *pixmap_iter = pixmap; while (cx > 0) { @@ -109,7 +110,7 @@ void sikma_zprava(void) ytable++; scr-=scr_linelen2; cy--; - } + } /* __asm { @@ -240,7 +241,7 @@ void klicovani_anm(void *target,void *source,char mirror) ++t; t[0] = p; t[scr_linelen2] = p; - ++t; + ++t; } else { t+=2; } @@ -263,14 +264,14 @@ ka_lp2: mov ebx,320 ka_lp1: lodsw movzx eax,ax test eax,0x8000 - jnz ka_skip + jnz ka_skip mov edx,eax and edx,0x7FE0 add eax,edx mov edx,eax shl edx,16 add edi,scr_linelen - or eax,edx + or eax,edx mov [edi],eax sub edi,scr_linelen mov [edi],eax @@ -300,7 +301,7 @@ kba_lp1: lodsw sub edi,4 movzx eax,ax test eax,0x8000 - jnz kba_skip + jnz kba_skip mov edx,eax and edx,0x7FE0 add eax,edx @@ -373,7 +374,7 @@ void small_anm_delta(void *target,void *buff,void *paleta) unsigned char *pixels = control + ofs; int y; - for (y = 0; y < 180; y++) { + for (y = 0; y < 180; y++) { word *tp = t; do { unsigned char c = *control++; @@ -383,7 +384,7 @@ void small_anm_delta(void *target,void *buff,void *paleta) y+=d; t+=(d+1)*scr_linelen2; break; - } else { + } else { tp+=2*c; c = *control++; while (c) { @@ -442,7 +443,7 @@ shmad4: add edi,scr_linelen void scroll_and_copy(void *pic,void *slide, void *scr, int _size,int shift, void *lineinfo) //#pragma aux scroll_and_copy parm[esi][ebx][edi][ecx][edx][eax] -{ +{ word *srcpc = (word *)pic; word *trg = (word *)scr; @@ -453,11 +454,11 @@ void scroll_and_copy(void *pic,void *slide, void *scr, int _size,int shift, void int y; for (y = 0; y < lc; y++ ) { - int left = __min(lnfo[0],lnfo[2]); - int right = __max(lnfo[1],lnfo[3]); + int left = MIN(lnfo[0],lnfo[2]); + int right = MAX(lnfo[1],lnfo[3]); int x; for (x = left; x <= right; x++) { - + word c = sld[x] = sld[x+shiftofs]; if (c & BGSWITCHBIT) { trg[x] = srcpc[x]; @@ -474,7 +475,7 @@ void scroll_and_copy(void *pic,void *slide, void *scr, int _size,int shift, void } /* - + __asm { mov esi,pic @@ -581,7 +582,7 @@ void enemy_draw(void *src,void *trg,int shade,int scale,int maxspace,int clip) int clipl = clip & 0xFFFF; int clipr = clip >> 16; int yiter; - + if (maxspace >= 470) return; //prepare ytable; @@ -590,13 +591,13 @@ void enemy_draw(void *src,void *trg,int shade,int scale,int maxspace,int clip) int accu = 0; int *w = ytable; int sp = maxspace*2; - + while (sp > 0 && rwofs >= 0) { *w++ = rwofs; accu+=320; while (accu >= scale && rwofs >= 0) { accu-=scale; - rwofs-=pcx; + rwofs-=pcx; } sp--; } @@ -638,7 +639,7 @@ void enemy_draw(void *src,void *trg,int shade,int scale,int maxspace,int clip) } ++xiter; } - + screen-=scr_linelen2; ++yiter; } @@ -784,7 +785,7 @@ void enemy_draw_transp(void *src,void *trg,void *shade,int scale,int maxspace,in accu+=320; while (accu >= scale && rwofs >= 0) { accu-=scale; - rwofs-=pcx; + rwofs-=pcx; } sp--; } @@ -826,7 +827,7 @@ void enemy_draw_transp(void *src,void *trg,void *shade,int scale,int maxspace,in } ++xiter; } - + screen-=scr_linelen2; ++yiter; } @@ -974,7 +975,7 @@ void enemy_draw_mirror_transp(void *src,void *trg,void *shade,int scale,int maxs accu+=320; while (accu >= scale && rwofs >= 0) { accu-=scale; - rwofs-=pcx; + rwofs-=pcx; } sp--; } @@ -1161,7 +1162,7 @@ void enemy_draw_mirror(void *src,void *trg,int shade,int scale,int maxspace,int accu+=320; while (accu >= scale && rwofs >= 0) { accu-=scale; - rwofs-=pcx; + rwofs-=pcx; } sp--; } @@ -1312,4 +1313,4 @@ edmerr: add esp,ed_stack;vymaz tabulku pop ebp ;obnov ebp } */ -} \ No newline at end of file +} diff --git a/GAME/extras.h b/game/extras.h similarity index 100% rename from GAME/extras.h rename to game/extras.h diff --git a/GAME/GAMESAVE.C b/game/gamesave.c similarity index 78% rename from GAME/GAMESAVE.C rename to game/gamesave.c index 8fd4ef6..175b343 100644 --- a/GAME/GAMESAVE.C +++ b/game/gamesave.c @@ -1,11 +1,8 @@ #include -#include -#include #include #include #include #include -#include #include #include #include @@ -17,11 +14,13 @@ #include #include #include -#include #include -#include +#include #include "globals.h" +#include "temp_storage.h" +#include +#include #define STATE_CUR_VER 1 #define _GAME_ST "_GAME.TMP" @@ -38,7 +37,7 @@ #define SSAVE_VERSION 0 -static FILE *story=NULL; +static TMPFILE_WR *story=NULL; static char load_another; char reset_mobiles=0; @@ -91,40 +90,30 @@ static word vypocet_crc(char *data,long delka) while(delka>-1); return l & 0xffff; } -static unable_open_temp(char *c) +static int unable_open_temp(char *c) { char d[]="Unable to open the file : ",*e; concat(e,d,c); closemode(); - MessageBox(NULL,e,NULL,MB_OK|MB_ICONSTOP); + display_error(e); SEND_LOG("(SAVELOAD) Open temp error detected (%s)",c,0); exit(1); } -static unable_write_temp(char *c) +static void unable_write_temp(char *c) { char d[]="Unable to write to the temp file : ",*e; concat(e,d,c); closemode(); - MessageBox(NULL,e,NULL,MB_OK|MB_ICONSTOP); + display_error(e); SEND_LOG("(SAVELOAD) Open temp error detected (%s)",c,0); exit(1); } -void expand_map_file_name(char *s) //prepise *.map na fullpath\*.TMP - { - char *c; - char *st; - c=strchr(s,0); - while (c!=s && *c!='.' && *c!='\\') c--; - if (*c=='.') strcpy(c,".TMP"); - concat(st,pathtable[SR_TEMP],s); - strcpy(s,st); - } -int load_org_map(char *filename,void **sides,void **sectors,void **coords,int *mapsize) +int load_org_map(char *filename,TSTENA **sides,TSECTOR **sectors,TMAP_EDIT_INFO **coords,int *mapsize) { FILE *f; void *temp; @@ -174,18 +163,18 @@ int load_org_map(char *filename,void **sides,void **sectors,void **coords,int *m return 0; } -void save_daction(FILE *f,int count,D_ACTION *ptr) +void save_daction(TMPFILE_WR *f,int count,D_ACTION *ptr) { if (ptr!=NULL) { save_daction(f,count+1,ptr->next); - fwrite(ptr,1,sizeof(D_ACTION),f); + temp_storage_write(ptr,sizeof(D_ACTION),f); } else - fwrite(&count,1,2,f); + temp_storage_write(&count,2,f); } -void load_daction(FILE *fsta) +void load_daction(TMPFILE_RD *fsta) { int i,j; i=0; @@ -194,19 +183,19 @@ void load_daction(FILE *fsta) D_ACTION *p; p=d_action; d_action=p->next;free(p); } - fread(&i,1,2,fsta);d_action=NULL; + temp_storage_read(&i,2,fsta);d_action=NULL; for(j=0;jnext=d_action; d_action=p; } } -void save_items(FILE *f) +void save_items(TMPFILE_WR *f) { int i,j; short *c; @@ -215,55 +204,55 @@ void save_items(FILE *f) if (map_items[i]!=NULL) { for(j=1,c=map_items[i];*c;c++,j++); - fwrite(&i,1,2,f); - fwrite(&j,1,2,f); - fwrite(map_items[i],2,j,f); + temp_storage_write(&i,2,f); + temp_storage_write(&j,2,f); + temp_storage_write(map_items[i],2*j,f); } i=-1; - fwrite(&i,1,2,f); + temp_storage_write(&i,2,f); } -void restore_items(FILE *f) +void restore_items(TMPFILE_RD *f) { short i,j; for(i=0;ivyk_max) return -2; - fread(map_vyk,vyk_max,sizeof(TVYKLENEK),fsta); + temp_storage_read(map_vyk,vyk_max*sizeof(TVYKLENEK),fsta); } return 0; } -void save_all_fly(FILE *fsta) +void save_all_fly(TMPFILE_WR *fsta) { LETICI_VEC *f; f=letici_veci; - fwrite(&f,1,sizeof(f),fsta); + temp_storage_write(&f,1*sizeof(f),fsta); while (f!=NULL) { short *c; - fwrite(f,1,sizeof(*f),fsta); + temp_storage_write(f,1*sizeof(*f),fsta); c=f->items; - if (c!=NULL) do fwrite(c,1,2,fsta); while (*c++); + if (c!=NULL) do temp_storage_write(c,1*2,fsta); while (*c++); f=f->next; } } -int load_all_fly(FILE *fsta) +int load_all_fly(TMPFILE_RD *fsta) { LETICI_VEC *f=NULL,*n,*p; p=letici_veci; while (p!=NULL) {stop_fly(letici_veci,0);p=p->next;} - fread(&f,1,sizeof(f),fsta); + temp_storage_read(&f,1*sizeof(f),fsta); p=letici_veci; while (f!=NULL) { short items[100],*c; n=New(LETICI_VEC); c=items;memset(items,0,sizeof(items)); - if (fread(n,1,sizeof(*n),fsta)!=sizeof(*n)) + if (temp_storage_read(n,1*sizeof(*n),fsta)!=sizeof(*n)) { free(n); if (p!=NULL) p->next=NULL; @@ -341,7 +330,7 @@ int load_all_fly(FILE *fsta) if (n->items!=NULL) { do - fread(c,1,2,fsta); + temp_storage_read(c,1*2,fsta); while (*c++); n->items=NewArr(short,c-items); memcpy(n->items,items,(c-items)*sizeof(short)); @@ -361,65 +350,62 @@ int save_map_state() //uklada stav mapy pro savegame (neuklada aktualni pozici); { char sta[200]; char *bf; - FILE *fsta; + TMPFILE_WR *fsta; int i; long siz; TSTENA *org_sides; TSECTOR *org_sectors; short res=-1; - int ver=0; + unsigned char ver=0; restore_sound_names(); strcpy(sta,level_fname); - expand_map_file_name(sta); - fsta=fopen(sta,"wb");if (fsta==NULL) unable_open_temp(sta); + fsta=temp_storage_create(sta);if (fsta==NULL) unable_open_temp(sta); SEND_LOG("(SAVELOAD) Saving map state for current map",0,0); if (load_org_map(level_fname,&org_sides,&org_sectors,NULL,NULL)) goto err; siz=(mapsize+7)/8; bf=(char *)getmem(siz); - ver=0; - fwrite(&ver,sizeof(ver),1,fsta); //<------------------------- ver=STATE_CUR_VER; - fwrite(&ver,sizeof(ver),1,fsta); //<------------------------- - fwrite(&mapsize,sizeof(mapsize),1,fsta); //<------------------------- + temp_storage_write(&ver,sizeof(ver)*1,fsta); //<------------------------- + temp_storage_write(&mapsize,sizeof(mapsize)*1,fsta); //<------------------------- memset(bf,0,siz); - fwrite(&siz,1,sizeof(siz),fsta); //<------------------------- + temp_storage_write(&siz,1*sizeof(siz),fsta); //<------------------------- for(i=0;i>3]|=1<<(i & 7); - if (!fwrite(bf,siz,1,fsta)) goto err; //<------------------------- + temp_storage_write(bf,siz*1,fsta); for(i=0;i>3]|=1<<(i & 7); - if (!fwrite(bf,siz,1,fsta)) goto err; //<------------------------- + temp_storage_write(bf,siz*1,fsta); save_map_description(fsta); for(i=0;iSTATE_CUR_VER) goto err; - if (!fread(&i,sizeof(mapsize),1,fsta)) goto err; + if (!temp_storage_read(&i,sizeof(mapsize)*1,fsta)) goto err; if (mapsize!=i) goto err; SEND_LOG("(SAVELOAD) Loading map state for current map",0,0); - fread(&siz,1,sizeof(siz),fsta); + temp_storage_read(&siz,1*sizeof(siz),fsta); bf=(char *)getmem(siz); - if (!fread(bf,siz,1,fsta)) goto err; + if (!temp_storage_read(bf,siz*1,fsta)) goto err; for (i=0;i>3]>>(i & 7)) & 1) map_coord[i].flags|=MC_AUTOMAP; - if (!fread(bf,siz,1,fsta)) goto err; + if (!temp_storage_read(bf,siz*1,fsta)) goto err; for (i=0;i>3]>>(i & 7)) & 1) map_coord[i].flags|=MC_DISCLOSED; - } - else - { - if (mapsize!=i) return fclose(fsta); - SEND_LOG("(SAVELOAD) Loading map state for current map",0,0); - fread(&siz,1,sizeof(siz),fsta); - bf=(char *)getmem(siz); - if (!fread(bf,siz,1,fsta)) goto err; - for (i=0;i>3]>>(i & 7)) & 1; - } load_map_description(fsta); - while (fread(&i,1,2,fsta) && i<=mapsize*4) - if (fread(map_sides+i,1,sizeof(TSTENA),fsta)!=sizeof(TSTENA)) goto err; - while (fread(&i,1,2,fsta) && i<=mapsize) - if (fread(map_sectors+i,1,sizeof(TSECTOR),fsta)!=sizeof(TSECTOR)) goto err; + while (temp_storage_read(&i,1*2,fsta) && i<=mapsize*4) + if (temp_storage_read(map_sides+i,1*sizeof(TSTENA),fsta)!=sizeof(TSTENA)) goto err; + while (temp_storage_read(&i,1*2,fsta) && i<=mapsize) + if (temp_storage_read(map_sectors+i,1*sizeof(TSECTOR),fsta)!=sizeof(TSECTOR)) goto err; if (reset_mobiles) //reloads mobiles if flag present { char mm[MAX_MOBS]; for(i=0;i> 1) | (c << 7); - /* + __asm { mov al,c @@ -563,100 +536,67 @@ _inline unsigned char rotate(unsigned char c) 2 internal error 3 checksum error */ -int pack_status_file(FILE *f,char *status_name) +int pack_status_file(FILE *f,const char *status_name) { int stt; char rcheck=0; - long fsz; + uint32_t fsz; char *buffer,*c,*fullnam; word crc; + unsigned char name_len; SEND_LOG("(SAVELOAD) Packing status file '%s'",status_name,0); - fullnam=alloca(strlen(status_name)+strlen(pathtable[SR_TEMP])+1); - if (fullnam==NULL) return 2; - strcpy(fullnam,pathtable[SR_TEMP]); - strcat(fullnam,status_name); - stt=open(fullnam,O_RDONLY | O_BINARY); - fsz=filelength(stt); - c=buffer=getmem(fsz+12+4+2); - strcpy(c,status_name);c+=12; - *(long *)c=fsz+2; - c+=sizeof(long); - read(stt,c,fsz); - close(stt); - crc=vypocet_crc(c,fsz); - c+=fsz; - memcpy(c,&crc,sizeof(crc)); - fsz+=12+4+2; + fsz = temp_storage_find(status_name); + if (fsz < 0) return 2; + name_len = (unsigned char)strlen(status_name); + uint32_t extra = 1+name_len+4; + c=buffer=getmem(fsz+extra); + *c = name_len; + ++c; + memcpy(c,status_name, name_len); + c += name_len; + memcpy(c,&fsz,4); + + temp_storage_retrieve(status_name, c, fsz); + + fsz+=extra; rcheck=(fwrite(buffer,1,fsz,f)!=(unsigned)fsz); free(buffer); - return rcheck; + return 0; } int unpack_status_file(FILE *f) { int stt; char rcheck=0; - long fsz; - char *buffer,*c,*fullnam; - char name[13]; - word crc,crccheck; + uint32_t fsz; + char *buffer; + unsigned char namelen = 0; + char name[256]; - name[12]=0; - name[11]=0; - fread(name,1,12,f); + fread(&namelen, 1,1, f); + if (namelen == 0) return -1; + fread(name, 1, namelen, f); SEND_LOG("(SAVELOAD) Unpacking status file '%s'",name,0); - if (name[0]==0) return -1; fread(&fsz,1,4,f); - c=buffer=(char *)getmem(fsz); + buffer=(char *)getmem(fsz); if (fread(buffer,1,fsz,f)!=(unsigned)fsz) return 1; - fullnam=alloca(strlen(name)+strlen(pathtable[SR_TEMP])+2); - if (fullnam==NULL) return 2; - strcpy(fullnam,pathtable[SR_TEMP]); - strcat(fullnam,name); - fsz-=2; - crc=vypocet_crc(c,fsz); - c+=fsz;memcpy(&crccheck,c,sizeof(crccheck)); - if (crc!=crccheck) - { - free(buffer); - return 3; - } - stt=open(fullnam,O_BINARY | O_RDWR | O_CREAT | O_TRUNC, _S_IREAD | _S_IWRITE); - if (stt==-1) - { - free(buffer); - return 1; - } - rcheck=(write(stt,buffer,fsz)!=fsz) ; + temp_storage_store(name, buffer, fsz); free(buffer); - close(stt); return rcheck; } + +static void pack_status_file_cb(const char *name, void *ctx) { + pack_status_file((FILE *)ctx, name); +} + int pack_all_status(FILE *f) { - char *c; - WIN32_FIND_DATA inf; - HANDLE res; - - concat(c,pathtable[SR_TEMP],"*.TMP"); - res=FindFirstFile(c,&inf); - if (res!=INVALID_HANDLE_VALUE) - do - { - int i; - if (inf.cFileName[0]!='~') - { - i=pack_status_file(f,inf.cFileName); - if (i) return i; - } - } - while (FindNextFile(res,&inf)); - FindClose(res); - c[0]=0; - fwrite(c,1,12,f); - return 0; + char c = 0; + temp_storage_list(pack_status_file_cb, f); + fwrite(&c,1,1,f); + return 0; } int unpack_all_status(FILE *f) @@ -671,7 +611,7 @@ int unpack_all_status(FILE *f) int save_basic_info() { - FILE *f; + TMPFILE_WR *f; char *c; S_SAVE s; short *p; @@ -679,9 +619,8 @@ int save_basic_info() char res=0; THUMAN *h; - concat(c,pathtable[SR_TEMP],_GAME_ST); - SEND_LOG("(SAVELOAD) Saving basic info for game (file:%s)",c,0); - f=fopen(c,"wb"); + SEND_LOG("(SAVELOAD) Saving basic info for game (file:%s)",_GAME_ST ,0); + f=temp_storage_create(_GAME_ST); if (f==NULL) return 1; s.viewsector=viewsector; s.viewdir=viewdir; @@ -713,24 +652,24 @@ int save_basic_info() for(i=1,p=picked_item;*p;i++,p++);else i=0; s.picks=i; s.items_added=item_count-it_count_orgn; - res|=(fwrite(&s,1,sizeof(s),f)!=sizeof(s)); + temp_storage_write(&s,1*sizeof(s),f); if (i) - res|=(fwrite(picked_item,2,i,f)!=(unsigned)i); + temp_storage_write(picked_item,2*i,f); if (s.items_added) - res|=(fwrite(glob_items+it_count_orgn,sizeof(TITEM),s.items_added,f)!=(unsigned)s.items_added); - res|=save_spells(f); - if (!res) res|=(fwrite(postavy,1,sizeof(postavy),f)!=sizeof(postavy)); + temp_storage_write(glob_items+it_count_orgn,sizeof(TITEM)*s.items_added,f); + save_spells(f); + temp_storage_write(postavy,1*sizeof(postavy),f); for(i=0,h=postavy;idemon_save!=NULL) - fwrite(h->demon_save,sizeof(THUMAN),1,f); //ulozeni polozek s demony + temp_storage_write(h->demon_save,sizeof(THUMAN)*1,f); //ulozeni polozek s demony res|=save_dialog_info(f); - fclose(f); + temp_storage_close_wr(f); SEND_LOG("(SAVELOAD) Done... Result: %d",res,0); return res; } int load_basic_info() { - FILE *f; + TMPFILE_RD *f; char *c; S_SAVE s; int i; @@ -738,29 +677,28 @@ int load_basic_info() TITEM *itg; THUMAN *h; - concat(c,pathtable[SR_TEMP],_GAME_ST); - SEND_LOG("(SAVELOAD) Loading basic info for game (file:%s)",c,0); - f=fopen(c,"rb"); + SEND_LOG("(SAVELOAD) Loading basic info for game (file:%s)",_GAME_ST,0); + f=temp_storage_open(_GAME_ST); if (f==NULL) return 1; - res|=(fread(&s,1,sizeof(s),f)!=sizeof(s)); + res|=(temp_storage_read(&s,1*sizeof(s),f)!=sizeof(s)); if (s.game_flags & GM_MAPENABLE) enable_glmap=1;else enable_glmap=0; i=s.picks; if (picked_item!=NULL) free(picked_item); if (i) { picked_item=NewArr(short,i); - res|=(fread(picked_item,2,i,f)!=(unsigned)i); + res|=(temp_storage_read(picked_item,2*i,f)!=(unsigned)i); } else picked_item=NULL; itg=NewArr(TITEM,it_count_orgn+s.items_added); memcpy(itg,glob_items,it_count_orgn*sizeof(TITEM)); free(glob_items);glob_items=itg; if (s.items_added) - res|=(fread(glob_items+it_count_orgn,sizeof(TITEM),s.items_added,f)!=(unsigned)s.items_added); + res|=(temp_storage_read(glob_items+it_count_orgn,sizeof(TITEM)*s.items_added,f)!=(unsigned)s.items_added); item_count=it_count_orgn+s.items_added; res|=load_spells(f); for(i=0,h=postavy;idemon_save!=NULL) free(h->demon_save); - if (!res) res|=(fread(postavy,1,sizeof(postavy),f)!=sizeof(postavy)); + if (!res) res|=(temp_storage_read(postavy,1*sizeof(postavy),f)!=sizeof(postavy)); for(i=0,h=postavy;iprogramovano=0; @@ -769,11 +707,11 @@ int load_basic_info() if (h->demon_save!=NULL) { h->demon_save=New(THUMAN); - fread(h->demon_save,sizeof(THUMAN),1,f);//obnova polozek s demony + temp_storage_read(h->demon_save,sizeof(THUMAN)*1,f);//obnova polozek s demony } } res|=load_dialog_info(f); - fclose(f); + temp_storage_close_rd(f); viewsector=s.viewsector; viewdir=s.viewdir; cur_group=s.cur_group; @@ -815,7 +753,7 @@ static void MakeSaveGameDir(const char *name) char *p=(char *)alloca(strlen(name)+1); strcpy(p,name); p[strlen(p)-1]=0; - CreateDirectory(p,NULL); + mkdir(p,0666); } static int save_global_events() @@ -864,11 +802,11 @@ int save_game(int slotnum,char *gamename) save_book(); save_global_events(); svf=fopen(ssn,"wb"); - if (svf==NULL) + if (svf==NULL) { char buff[256]; sprintf(buff,"Nelze ulozit pozici na cestu: %s", ssn); - MessageBox(NULL,buff,NULL,MB_OK|MB_ICONSTOP|MB_SYSTEMMODAL); + display_error(buff); } else { @@ -925,7 +863,7 @@ int load_game(int slotnum) } for(t=0;tSTATE_CUR_VER) goto err; + if (!temp_storage_read(&i,sizeof(mapsize)*1,fsta)) goto err; + if (mapsize!=i) goto err; SEND_LOG("(SAVELOAD) Partial restore for map: %s (%s)",level_fname,"START"); - fread(&siz,1,sizeof(siz),fsta); + temp_storage_read(&siz,1*sizeof(siz),fsta); bf=(char *)getmem(siz); - if (!fread(bf,siz,1,fsta)) goto err; + if (!temp_storage_read(bf,siz*1,fsta)) goto err; for (i=0;i>3]>>(i & 7)) & 1; load_map_description(fsta); - while (fread(&i,1,2,fsta) && i<=mapsize*4) - if (fread(map_sides+i,1,sizeof(TSTENA),fsta)!=sizeof(TSTENA)) goto err; - while (fread(&i,1,2,fsta) && i<=mapsize) - if (fread(map_sectors+i,1,sizeof(TSECTOR),fsta)!=sizeof(TSECTOR)) goto err; + while (temp_storage_read(&i,1*2,fsta) && i<=mapsize*4) + if (temp_storage_read(map_sides+i,1*sizeof(TSTENA),fsta)!=sizeof(TSTENA)) goto err; + while (temp_storage_read(&i,1*2,fsta) && i<=mapsize) + if (temp_storage_read(map_sectors+i,1*sizeof(TSECTOR),fsta)!=sizeof(TSECTOR)) goto err; res=0; err: free(bf); - fclose(fsta); + temp_storage_close_rd(fsta); SEND_LOG("(SAVELOAD) Partial restore for map: %s (%s)",level_fname,"DONE"); return res; } diff --git a/GAME/GLOBALS.H b/game/globals.h similarity index 94% rename from GAME/GLOBALS.H rename to game/globals.h index e44ff77..d6fc8f3 100644 --- a/GAME/GLOBALS.H +++ b/game/globals.h @@ -1,10 +1,15 @@ #include "types.h" #include "engine1.h" +#include "temp_storage.h" + +#include +#include #define POCET_POSTAV 6 #define HODINA 360 +#define MAX_FILESYSTEM_PATH 256 #define A_SIDEMAP 0x8001 #define A_SECTMAP 0x8002 @@ -79,7 +84,10 @@ #define SD_DIRECTION 0x03 //smer akce. #define get_string(t) texty[t] -#define rnd(num) (rand()*(num)/(RAND_MAX+1)) +static __inline unsigned int rnd(unsigned int max) { + return rand() % max; +} + static __inline int rangrnd(int a, int b) {return rnd(b-a+1)+a;} @@ -110,8 +118,7 @@ static __inline int rangrnd(int a, int b) {return rnd(b-a+1)+a;} #define NOSHADOW(x) ((x)|BGSWITCHBIT) -#define SWAPPATH pathtable[SR_TEMP] -#define TEMP_FILE "~SKELDAL.TMP" + #define PICTURES "..\\OBRAZKY\\" #define PIC_FADE_PAL_SIZE (10*512+6) @@ -625,7 +632,7 @@ void pcx_8bit_nopal(void **p,long *s); void set_background(void **p,long *s); void wav_load(void **p,long *s); void wire_main_functs(); -void ukaz_kompas(); +void ukaz_kompas(char mode); void *timming(EVENT_MSG *msg,void **data); void do_timer(); void hold_timer(int id,char hld); @@ -640,8 +647,11 @@ void bott_draw_proc(); THE_TIMER *add_to_timer(int id,int delay,int maxcall,void *proc); void mouse_set_default(int cursor); void create_frame(int x,int y,int xs,int ys,char clear); -void save_dump(); -void bott_disp_text(char *); +void save_dump(const uint16_t *screen_addr, + unsigned int width, + unsigned int height, + unsigned int linelen); +void bott_disp_text(const char *); void bott_text_forever(); char chod_s_postavama(char sekupit); void hide_ms_at(int line); //schova mysku ktera je nad line @@ -1059,41 +1069,41 @@ char load_saved_shops(); #define MAGLOB_LEAVEMAP 0 // v urcitou nastavenou hodinu a minutu dene #define MAGLOB_STARTSLEEP 1 // postavy maji jit spat. #define MAGLOB_ENDSLEEP 2 // postavy se probouzi -#define MAGLOB_CLICKSAVE 3 // ped otevenm SAVE dialogu -#define MAGLOB_AFTERSAVE 4 // po uloen hry -#define MAGLOB_BEFOREMAGIC 5 // ped vyvolnm kouzla -#define MAGLOB_AFTERMAGIC 6 //po vyvoln kouzla -#define MAGLOB_BEFOREMAPOPEN 7 //ped otevenm mapy -#define MAGLOB_AFTERMAPOPEN 8 //po uzaven mapy -#define MAGLOB_BEFOREBATTLE 9 //ped sputnm souboje -#define MAGLOB_AFTERBATTLE 10 //po ukonen souboje -#define MAGLOB_BEFOREBOOK 11 //pred otevenm knihy -#define MAGLOB_AFTERBOOK 12 //po uzaven knihy -#define MAGLOB_ONROUND 13 //pi kadm kole nebo po 10s -#define MAGLOB_ONDEADMAN 14 //pi umrt mue -#define MAGLOB_ONDEADWOMAN 15 //pi umrt eny -#define MAGLOB_ONDEADALL 16 //pi umrt vech postav -#define MAGLOB_ONHITMAN 17 //pi zsahu mue -#define MAGLOB_ONHITWOMAN 18 //pi zsahu eny -#define MAGLOB_ONNEWRUNE 19 //pi nalezen nov runy -#define MAGLOB_ONPICKITEM 20 //pi sebrn pedmtu (pro speciln pedmty) -#define MAGLOB_ONSTEP 21 //pi kroku (ped animaci) -#define MAGLOB_ONTURN 22 //pi otoen (ped animaci) -#define MAGLOB_ALARM 23 //pi sputn alarmu +#define MAGLOB_CLICKSAVE 3 // p�ed otev�en�m SAVE dialogu +#define MAGLOB_AFTERSAVE 4 // po ulo�en� hry +#define MAGLOB_BEFOREMAGIC 5 // p�ed vyvol�n�m kouzla +#define MAGLOB_AFTERMAGIC 6 //po vyvol�n� kouzla +#define MAGLOB_BEFOREMAPOPEN 7 //p�ed otev�en�m mapy +#define MAGLOB_AFTERMAPOPEN 8 //po uzav�en� mapy +#define MAGLOB_BEFOREBATTLE 9 //p�ed spu�t�n�m souboje +#define MAGLOB_AFTERBATTLE 10 //po ukon�en� souboje +#define MAGLOB_BEFOREBOOK 11 //pred otev�en�m knihy +#define MAGLOB_AFTERBOOK 12 //po uzav�en� knihy +#define MAGLOB_ONROUND 13 //p�i ka�d�m kole nebo po 10s +#define MAGLOB_ONDEADMAN 14 //p�i umrt� mu�e +#define MAGLOB_ONDEADWOMAN 15 //p�i umrt� �eny +#define MAGLOB_ONDEADALL 16 //p�i umrt� v�ech postav +#define MAGLOB_ONHITMAN 17 //p�i z�sahu mu�e +#define MAGLOB_ONHITWOMAN 18 //p�i z�sahu �eny +#define MAGLOB_ONNEWRUNE 19 //p�i nalezen� nov� runy +#define MAGLOB_ONPICKITEM 20 //p�i sebr�n� p�edm�tu (pro speci�ln� p�edm�ty) +#define MAGLOB_ONSTEP 21 //p�i kroku (p�ed animaci) +#define MAGLOB_ONTURN 22 //p�i oto�en� (p�ed animaci) +#define MAGLOB_ALARM 23 //p�i spu�t�n� alarmu #define MAGLOB_ONFIREMAGIC 24 #define MAGLOB_ONWATERMAGIC 25 #define MAGLOB_ONGROUNDMAGIC 26 #define MAGLOB_ONAIRMAGIC 27 #define MAGLOB_ONMINDMAGIC 28 -#define MAGLOB_ONSPELLID1 29 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID2 30 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID3 31 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID4 32 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID5 33 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID6 34 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID7 35 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID8 36 //pi jednom konrtnm kouzle -#define MAGLOB_ONSPELLID9 37 //pi jednom konrtnm kouzle +#define MAGLOB_ONSPELLID1 29 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID2 30 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID3 31 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID4 32 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID5 33 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID6 34 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID7 35 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID8 36 //p�i jednom konr�tn�m kouzle +#define MAGLOB_ONSPELLID9 37 //p�i jednom konr�tn�m kouzle #define MAGLOB_ONTIMER1 38 //cas - pocet hernich sekund od nastaveni #define MAGLOB_ONTIMER2 39 //cas - pocet hernich sekund od nastaveni #define MAGLOB_ONTIMER3 40 //cas - pocet hernich sekund od nastaveni @@ -1107,7 +1117,7 @@ char load_saved_shops(); #define MAGLOB_ONFLUTE7 48 //zahrani urcite melodie #define MAGLOB_ONFLUTE8 49 //zahrani urcite melodie -#define MAGLOB_NEXTID 50 //mus bt posledn +#define MAGLOB_NEXTID 50 //mus� b�t posledn� @@ -1232,7 +1242,7 @@ typedef struct tma_create_unique }TMA_UNIQUE; typedef struct tma_globe - { + { char action,flags,eflags,event; //event - MAGLOB_XXXX unsigned short sector; //sektor of action target, when event occured unsigned char side; //side of action target, when event occured @@ -1283,8 +1293,8 @@ void call_macro(int side,int flags); void call_macro_ex(int side,int flags, int runatsect); char get_player_triggered(int p); //zjistuje zda hrac s cislem p byl makrem zasazen; char save_load_trigger(short load); //uklada/obnovuje trigger vlajky. -1 uklada, jinak hodnota ulozeneho triggeru -char save_codelocks(FILE *fsta); //uklada do savegame nastaveni kodovych zamku (128 bytu); -char load_codelocks(FILE *fsta); //obnovuje ze savegame nastaveni kodovych zamku (128 bytu); +char save_codelocks(TMPFILE_WR *fsta); //uklada do savegame nastaveni kodovych zamku (128 bytu); +char load_codelocks(TMPFILE_RD *fsta); //obnovuje ze savegame nastaveni kodovych zamku (128 bytu); typedef struct letici_vec @@ -1364,7 +1374,8 @@ void user_setup(); void setup_dialoge(); char game_setup(int id,int xa,int ya,int xr,int yr); void GamePause(); -void show_textured_button(int x,int y,int xs,int ys,int texture,void *border3d); +typedef struct ctl3d CTL3D; +void show_textured_button(int x,int y,int xs,int ys,int texture,CTL3D *border3d); //sounder & music @@ -1387,11 +1398,12 @@ void mute_all_tracks(char all); void kill_all_sounds(); void create_sound_table(char *template,long size); void create_sound_table_old(); -void start_play_flute(); +void start_play_flute(char ); void stop_play_flute(); void pc_speak_play_sample(char *sample,int size,char step,int freq); char enable_sound(char enbl); - +void wire_main_functs(); +void unwire_main_functs(); //enemy #define MOBS_INV 16 @@ -1438,8 +1450,8 @@ typedef struct tmob short lives; //pocet zivotu potvory short cislo_vzoru; //informace urcujici ze ktereho vzoru byl mob vytvoren short speed; //rychlost pohybu - short dohled; //kam dohldne - short dosah; //okamik zatku souboje + short dohled; //kam dohl�dne + short dosah; //okam�ik za��tku souboje char stay_strategy; //chovani moba ve statickem modu (nepronasleduje) char walk_data; //cislo potrebne pro pohyb moba v bludisti word bonus; //bonus za zabiti @@ -1492,8 +1504,8 @@ int vyber_potvoru(int sect,int dir,int *chaos); //vybere potvoru ze sektoru a sm void load_enemies(short *data,int size,int *grptr,TMOB *template,long 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(FILE *f); -int load_enemy_paths(FILE *f); +void save_enemy_paths(TMPFILE_WR *f); +int load_enemy_paths(TMPFILE_RD *f); void regen_all_mobs(); @@ -1574,8 +1586,8 @@ void display_spell_in_icone(int handle,int xicht); void reinit_kouzla_full(); char get_rune_enable(THUMAN *p,int strnum); void remove_all_mob_spells(); -int save_spells(FILE *f); -int load_spells(FILE *f); +int save_spells(TMPFILE_WR *f); +int load_spells(TMPFILE_RD *f); char get_spell_track(int num); void mob_cast(int num,TMOB *m,int mob_num); void thing_cast(int num,int postava,int sector,TMOB *victim,char noanim);//vyvolavaji veci @@ -1648,8 +1660,8 @@ void show_jrc_logo(char *filename); //dialogy void call_dialog(int entr,int mob); -char save_dialog_info(FILE *f); -char load_dialog_info(FILE *f); +char save_dialog_info(TMPFILE_WR *f); +char load_dialog_info(TMPFILE_RD *f); short *q_item_one(int i,int itnum); //test zda postava i ma vec itnum short *q_item(int itnum,int sector); //test zda-li aspon jeden na sectoru ma vec itnum void change_flag(int flag,char mode); //meni vlajku = 0 - reset, 1 - set, 2 - neg diff --git a/GAME/GLOBMAP.C b/game/globmap.c similarity index 94% rename from GAME/GLOBMAP.C rename to game/globmap.c index 42f6271..22f904b 100644 --- a/GAME/GLOBMAP.C +++ b/game/globmap.c @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -11,16 +10,15 @@ #include #include #include -#include #include #include #include -#include #include #include "engine1.h" #include #include "globals.h" +#include #define GLOBMAP "GLOBMAP.DAT" #define ODDELOVACE ";:=,\n{}" @@ -49,8 +47,8 @@ static int usemap; static FILE *glbm; static char oddelovace[]=ODDELOVACE; -static last_oddelovac; -static linecounter=0; +static int last_oddelovac; +static int linecounter=0; static int enter_sector=0; static char *symbolmap[]= { @@ -173,7 +171,7 @@ static void error(char *text) sprintf(popis,"Chyba v souboru "GLOBMAP" na radce %d.\r\n%s",linecounter,text); SEND_LOG("(ERROR) %s : %s",popis,text); closemode(); - MessageBox(NULL,popis,NULL,MB_OK|MB_ICONSTOP); + display_error(popis); exit(0); } @@ -224,7 +222,7 @@ static char test_kriterii(void) case OP_SEKTOR: { int c; - if (cti_int_num(&c)) error("Oekv se slo"); + if (cti_int_num(&c)) error("O�ek�v� se ��slo"); hodn=c==enter_sector; } break; @@ -233,7 +231,7 @@ static char test_kriterii(void) break; case OP_ISDEF:{ int c; - if (cti_int_num(&c)) error("Oekv se slo"); + if (cti_int_num(&c)) error("O�ek�v� se ��slo"); hodn=index_tab[c].defined; } break; @@ -241,8 +239,8 @@ static char test_kriterii(void) { int flag_num; - if (cti_int_num(&flag_num)) error("Za FLG mus bt slo!"); - if (flag_num>255) error("slo vlajky (FLG) mus bt v rozsahu 0-255!"); + if (cti_int_num(&flag_num)) error("Za FLG mus� b�t ��slo!"); + if (flag_num>255) error("��slo vlajky (FLG) mus� b�t v rozsahu 0-255!"); hodn=(test_flag(flag_num)!=0); } break; @@ -274,7 +272,7 @@ static char proved_prikaz() do { while (ODD==OD_NEWLINE || ODD==OD_COMMAND) ODD=cti_oddelovac(); - if (ODD!=0) error("Oekv se jmno definice (pklad: INDX=)"); + if (ODD!=0) error("O�ek�v� se jm�no definice (p��klad: INDX=)"); cti_retezec(20,prikaz,1,1); op=get_symbol(prikaz); if (op==OP_BREAK) return 1; @@ -303,9 +301,9 @@ static char proved_prikaz() cti_retezec(20,file,1,1); ODD=cti_oddelovac();if (ODD!=OD_COMMA)ex_error(OD_COMMA); - if (cti_int_num(&xp)) error("Oekv se slo xp"); + if (cti_int_num(&xp)) error("O�ek�v� se ��slo xp"); ODD=cti_oddelovac();if (ODD!=OD_COMMA)ex_error(OD_COMMA); - if (cti_int_num(&yp)) error("Oekv se slo yp"); + if (cti_int_num(&yp)) error("O�ek�v� se ��slo yp"); h=find_handle(file,pcx_8bit_decomp); if (h==-1) def_handle(h=end_ptr++,file,pcx_8bit_decomp,SR_DIALOGS); put_picture(xp,yp+SCREEN_OFFLINE,ablock(h)); @@ -377,7 +375,7 @@ static void do_script(void) linecounter=0; glbm=fopen(s,"r"); free(s); - if (glbm==NULL) error("Chyb uveden soubor..."); + if (glbm==NULL) error("Chyb� uveden� soubor..."); ODD=cti_oddelovac(); do { @@ -447,9 +445,9 @@ static int find_leave_place(int sector) return found_place; } -macro_load_another_map(); +int macro_load_another_map(); -static select_mode; +static int select_mode = 0; static char load_index_map(int index) diff --git a/GAME/INTERFAC.C b/game/interfac.c similarity index 95% rename from GAME/INTERFAC.C rename to game/interfac.c index 402a7a9..657b7f1 100644 --- a/GAME/INTERFAC.C +++ b/game/interfac.c @@ -1,14 +1,9 @@ #include -#include #include #include -#include -#include #include #include #include -//#include -#include #include #include #include @@ -26,10 +21,11 @@ #include #include #include -#include #include #include "globals.h" #include "engine1.h" +#include +#include #define MES_MAXSIZE 500 #define CHECK_BOX_ANIM 6 @@ -228,7 +224,7 @@ void open_message_win(int pocet_textu,char **texts) { define(i-1,wsx+10,wsy,maxws+10,wsys+10,3,button,texts[i]); property(def_border(5,BAR_COLOR),curfont,flat_color(MSG_COLOR1),BAR_COLOR); - on_change(terminate); + on_control_change(terminate_gui); wsx+=maxws+20; } redraw_window(); @@ -262,7 +258,7 @@ EVENT_PROC(message_keyboard) if (key!=-1) { goto_control(key); - terminate(); + terminate_gui(); } } } @@ -708,7 +704,7 @@ void radio_butts_gr(OBJREC *o) o->datasize=4; } -char ask_test(char *text,char def) +/*char ask_test(char *text,char def) { char znak; SEND_LOG("(START CHECK) %s",text,0); @@ -718,7 +714,7 @@ char ask_test(char *text,char def) if (znak!='N' && znak!='A') znak=def; return znak=='A'; } - +*/ long get_disk_free(char disk) { return 10*1024*1024; @@ -738,7 +734,7 @@ void start_check() get_mem_info(&memory); concat(c,pathtable[SR_TEMP],TEMP_FILE); // if (!access(c,F_OK)) -// if (ask_test("Skeldal nebyl sprvn ukonen. Ml bys provest kontrolu disku\n\rMam spustit SCANDISK?",'A')) +// if (ask_test("Skeldal nebyl spr�vn� ukon�en. M�l bys provest kontrolu disku\n\rMam spustit SCANDISK?",'A')) // system("SCANDISK /NOSUMMARY"); if (pathtable[SR_TEMP][1]==':') drv=pathtable[SR_TEMP][0];else { @@ -751,14 +747,14 @@ void start_check() c=alloca(1024); if (siz<1024) { - sprintf(c,"Na disku %c: nen potebn 1 MB pro ukldn pozic. Hroz e pozice nebude kam ukldat\n\rPesto spustit?",drv); + sprintf(c,"Na disku %c: nen� pot�ebn� 1 MB pro ukl�d�n� pozic. Hroz� �e pozice nebude kam ukl�dat\n\rP�esto spustit?",drv); if (!ask_test(c,'N')) exit(1); } else if (siz<50000 && level_preload==1 && memory.LargestBlockAvail<50000000) { - sprintf(c,"Na disku %c: neni nutnch 50 MB pro odkldn dat. Skeldal bude etit\n\r" - "s pamt a nahrvat jen potebn data. Hra se me rapidn zpomalit!\n\r" - "Mam to udlat?",drv); + sprintf(c,"Na disku %c: neni nutn�ch 50 MB pro odkl�d�n� dat. Skeldal bude �et�it\n\r" + "s pam�t� a nahr�vat jen pot�ebn� data. Hra se m��e rapidn� zpomalit!\n\r" + "Mam to ud�lat?",drv); if (ask_test(c,'A')) level_preload=0; } */ @@ -1051,18 +1047,22 @@ void setup_ok_button(OBJREC *o) //----------------------------------------------------- +typedef struct skeldal_soupak_params_t { + int range; + void *bgpic; +} skeldal_soupak_params; + static void skeldal_soupak_init (OBJREC *o,int *params) { - void **d; - d=NewArr(void *,2); - d[0]=(void *)*params; - d[1]=NULL; - o->userptr=d; + skeldal_soupak_params *p = getmem(sizeof(skeldal_soupak_params)); + p->range = *params; + p->bgpic = NULL; + o->userptr=p; } static void skeldal_soupak_draw (int x1,int y1,int x2,int y2,OBJREC *o) { - void **z; + skeldal_soupak_params *z; int rozsah; int value; word *pic; @@ -1071,17 +1071,17 @@ static void skeldal_soupak_draw (int x1,int y1,int x2,int y2,OBJREC *o) int xpos; z=o->userptr; - rozsah=(int)z[0]; + rozsah=z->range; pic=ablock(H_SOUPAK); total=y2-y1-pic[1]; value=*(int *)o->data; xpos=y2-pic[1]-value*total/rozsah; - back=z[1]; + back=z->bgpic; if (back==NULL) { back=NewArr(word,(x2-x1+1)*(y2-y1+1)+3); get_picture(x1,y1,(x2-x1+1),(y2-y1+1),back); - z[1]=back; + z->bgpic=back; pic=ablock(H_SOUPAK); } else @@ -1089,12 +1089,12 @@ static void skeldal_soupak_draw (int x1,int y1,int x2,int y2,OBJREC *o) put_picture(x1,xpos,pic); } -static skeldal_soupak_event(EVENT_MSG *msg,OBJREC *o) +static void skeldal_soupak_event(EVENT_MSG *msg,OBJREC *o) { if (msg->msg==E_MOUSE) { MS_EVENT *ms; - int *z; + skeldal_soupak_params *z; int rozsah; int total; word *pic; @@ -1103,7 +1103,7 @@ static skeldal_soupak_event(EVENT_MSG *msg,OBJREC *o) ms=get_mouse(msg); if (ms->tl1) { - z=o->userptr;rozsah=z[0]; + z=o->userptr;rozsah=z->range; pic=ablock(H_SOUPAK); total=o->ys-pic[1]; ypos=ms->y-o->locy; @@ -1120,10 +1120,10 @@ static skeldal_soupak_event(EVENT_MSG *msg,OBJREC *o) static void skeldal_soupak_done(OBJREC *o) { - void **z; + skeldal_soupak_params *z; z=o->userptr; - free(z[1]); + free(z->bgpic); free(z); o->userptr=NULL; } @@ -1180,7 +1180,7 @@ static void play_wav(int wav,int sector) }*/ } -static play_random_sound(int sector,int dir,int pos) +static void play_random_sound(int sector,int dir,int pos) { int seed; int v; @@ -1197,7 +1197,7 @@ static play_random_sound(int sector,int dir,int pos) srand(seed); } -static play_correct_sound(int sector,int dir) +static void play_correct_sound(int sector,int dir) { play_wav(H_SND_SEVER+dir,sector); } @@ -1247,12 +1247,12 @@ static char compareMelody(const char *m1,const char *m2) if (!isalpha(*m1) && *m1!='#') m1++; else if (!isalpha(*m2) && *m2!='#') m2++; else if (toupper(*m1)!=toupper(*m2)) break; - else + else { m1++; m2++; } - + } if (*m1>*m2) return 1; if (*m1<*m2) return -1; @@ -1264,7 +1264,7 @@ void check_global_fletna(THE_TIMER *t) int sec; int dir; int i; - int other=-1; + int other=-1; t; sec=t->userdata[0]; @@ -1273,7 +1273,7 @@ void check_global_fletna(THE_TIMER *t) { globFletnaStr[strlen(globFletnaStr)-1]=0; } - for (i=MAGLOB_ONFLUTE1;i<=MAGLOB_ONFLUTE8 ;i++) + for (i=MAGLOB_ONFLUTE1;i<=MAGLOB_ONFLUTE8 ;i++) if (GlobEventList[i].param!=0) { { @@ -1474,15 +1474,15 @@ int smlouvat_prodej(int cena,int ponuka,int posledni,int puvod,int pocet) return 5; } -static smlouvat_enter(EVENT_MSG *msg,OBJREC *o) +static void smlouvat_enter(EVENT_MSG *msg,OBJREC *o) { o; if (msg->msg==E_KEYBOARD) { switch( *(char *)msg->data) { - case 13:goto_control(30);terminate();break; - case 27:goto_control(20);terminate();break; + case 13:goto_control(30);terminate_gui();break; + case 27:goto_control(20);terminate_gui();break; } } } @@ -1501,9 +1501,9 @@ int smlouvat(int cena,int puvod,int pocet,int money,char mode) set_font(H_FBOLD,MSG_COLOR1); define(-1,10,30,1,1,0,label,texty[238]); define(10,150,30,100,13,0,input_line,8);property(def_border(5,BAR_COLOR),NULL,NULL,0);set_default(""); - on_event(smlouvat_enter); - define(20,20,20,80,20,2,button,texty[239]);property(def_border(5,BAR_COLOR),NULL,NULL,BAR_COLOR);on_change(terminate); - define(30,110,20,80,20,2,button,texty[230]);property(def_border(5,BAR_COLOR),NULL,NULL,BAR_COLOR);on_change(terminate); + on_control_event(smlouvat_enter); + define(20,20,20,80,20,2,button,texty[239]);property(def_border(5,BAR_COLOR),NULL,NULL,BAR_COLOR);on_control_change(terminate_gui); + define(30,110,20,80,20,2,button,texty[230]);property(def_border(5,BAR_COLOR),NULL,NULL,BAR_COLOR);on_control_change(terminate_gui); do { redraw_window(); @@ -1569,7 +1569,7 @@ void show_jrc_logo(char *filename) change_music("?"); curcolor=0;bar(0,0,639,479); - showview(0,0,0,0);Sleep(1000); + showview(0,0,0,0);sleep_ms(1000); concat(s,pathtable[SR_VIDEO],filename); if (open_pcx(s,A_8BIT,&pcx)) return; pcxw=(word *)pcx; diff --git a/GAME/INV.C b/game/inv.c similarity index 97% rename from GAME/INV.C rename to game/inv.c index 59fffe9..673e65a 100644 --- a/GAME/INV.C +++ b/game/inv.c @@ -89,7 +89,7 @@ long shop_hacek_size=0; //toto je jeho delka #define INV_LEVEL_COL1 (NOSHADOW(RGB555(0,0,15))) #define INV_LEVEL_COL2 (RGB555(31,24,0)) -unsigned short butt_plus[]={0x0,(RGB555(25,23,16)),(RGB555(18,17,14)),(RGB555(10,10,5)),(RGB555(31,27,14))}; +unsigned short butt_plus[7]={0x0,(RGB555(25,23,16)),(RGB555(18,17,14)),(RGB555(10,10,5)),(RGB555(31,27,14))}; #define PO_XS 194 #define PO_YS 340 @@ -146,7 +146,7 @@ static void items_15to16_correct(void **p,long *s) { int pos=IT_ICONE_SIZE*i; word *pal; - + if (pos>=*s) return; pal=((word *)(cur+pos))+3; for (j=0;j<256;j++,pal++) @@ -181,7 +181,7 @@ void load_items() if (f==NULL) { closemode(); - MessageBox(NULL,"Selhalo otevreni souboru ITEMS.DAT. Zkotroluj zda vubec existuje.",NULL,MB_OK|MB_ICONSTOP); + display_error("Selhalo otevreni souboru ITEMS.DAT. Zkotroluj zda vubec existuje."); exit(0); } do @@ -455,9 +455,9 @@ int find_item(short *place,int mask) static int lastsector; static char ValidateSector(word sector) - { + { int pp=map_sectors[sector].sector_type; - if (pp==S_NORMAL || pp==S_SMER || pp==S_LEAVE || pp==S_FLT_SMER) + if (pp==S_NORMAL || pp==S_SMER || pp==S_LEAVE || pp==S_FLT_SMER) { lastsector=sector; return 1; @@ -620,7 +620,7 @@ static char check_pick(int sect,int id,int idd,int y) return y>min; } -static get_top_of_next(int sect,int id) //vraci souradnici predmetu na nasledujicim sektoru +static int get_top_of_next(int sect,int id) //vraci souradnici predmetu na nasledujicim sektoru { int cnt,idd; @@ -661,27 +661,27 @@ char pick_item_(int id,int xa,int ya,int xr,int yr) else if (id>1 || ya>=get_top_of_next(sect,id)) { - if ((game_extras & EX_BAG_EXTENDED) && (GetKeyState(VK_CONTROL) & 0x80) && + if ((game_extras & EX_BAG_EXTENDED) && (get_control_key_state()) && (glob_items[*picked_item-1].nosnost>0)) { int curinside=count_items_inside(picked_item); int nosnost=(glob_items[*picked_item-1].nosnost); - short *batoh=(word *)getmem(nosnost*2+20); + short *batoh=(word *)getmem(nosnost*2+20); short *cur=batoh; memcpy(cur,picked_item,(curinside+1)*2); cur+=curinside; free(picked_item); - picked_item=NULL; + picked_item=NULL; nosnost-=curinside-1; while (1) { - pop_item(sect,idd,0,&picked_item); + pop_item(sect,idd,0,&picked_item); if (picked_item!=NULL) do_items_specs(); else break; if (picked_item!=NULL) { short *p=picked_item; int cnt=count_items_total(picked_item); - if (cnt>nosnost) + if (cnt>nosnost) { push_item(sect,idd,picked_item); free(picked_item); @@ -689,7 +689,7 @@ char pick_item_(int id,int xa,int ya,int xr,int yr) break; } while (*p) - { + { *cur++=-abs(*p++); nosnost--; } @@ -816,17 +816,17 @@ void prepocitat_postavu(THUMAN *human_selected) { p=sr1; q=glob_items[c-1].zmeny; - for(j=0;j=VLS_OHEN && j<=VLS_MYSL) + if (j>=VLS_OHEN && j<=VLS_MYSL) p[0]=(int)floor(((float)p[0]+(float)q[0])/(1.0f+(float)p[0]*(float)q[0]/(90.0*90.0))+0.5); else (*p)+=(*q); } p++,q++; - } + } p=sr1+VLS_DAMAGE; //vypocet damage (bez omezeni) q=&glob_items[c-1].zmeny[VLS_DAMAGE]; *(p++)+=*q++; @@ -845,8 +845,8 @@ void prepocitat_postavu(THUMAN *human_selected) if (human_selected->lives>human_selected->vlastnosti[VLS_MAXHIT]) human_selected->lives=human_selected->vlastnosti[VLS_MAXHIT]; //if (human_selected->mana>human_selected->vlastnosti[VLS_MAXMANA]) human_selected->mana=human_selected->vlastnosti[VLS_MAXMANA]; if (human_selected->kondice>human_selected->vlastnosti[VLS_KONDIC]) human_selected->kondice=human_selected->vlastnosti[VLS_KONDIC]; - v=MAX_HLAD(human_selected);human_selected->jidlo=min(human_selected->jidlo,v); - v=MAX_ZIZEN(human_selected);human_selected->voda=min(human_selected->voda,v); + v=MAX_HLAD(human_selected);human_selected->jidlo=MIN(human_selected->jidlo,v); + v=MAX_ZIZEN(human_selected);human_selected->voda=MIN(human_selected->voda,v); } @@ -862,6 +862,7 @@ void definuj_postavy() { int i,num1,r,inv=0,z; char *c,*end,cc; + int tmp; c=ablock(H_POSTAVY_DAT); end=c+get_handle(H_POSTAVY_DAT)->size; @@ -889,10 +890,10 @@ void definuj_postavy() } break; case 128:r=sscanf(c,"%c%14[^\r]",&cc,p->jmeno);r--;break; - case 129:r=sscanf(c,"%hd",&p->female);break; - case 130:r=sscanf(c,"%hd",&p->xicht);break; - case 131:r=sscanf(c,"%hd",&p->level);break; - case 132:r=sscanf(c,"%d",&p->exp);break; + case 129:r=sscanf(c,"%d",&tmp);p->female = (char)tmp;break; + case 130:r=sscanf(c,"%d",&tmp);p->xicht = (char)tmp;break; + case 131:r=sscanf(c,"%d",&tmp);p->level = (short)tmp;break; + case 132:r=sscanf(c,"%d",&tmp);p->exp = tmp;break; case 133:r=sscanf(c,"%d",&num1); while(r==1 && num1!=-1) { @@ -921,7 +922,7 @@ void definuj_postavy() if (r!=1) { closemode(); - MessageBox(NULL,"Error in file POSTAVY.DAT. May be missing a parameter in some definition.",NULL,MB_OK|MB_ICONSTOP); + display_error("Error in file POSTAVY.DAT. May be missing a parameter in some definition."); exit(0); } c=strchr(c,'\n')+1; @@ -1163,7 +1164,7 @@ void display_rings() } } -void *build_items_wearing(THUMAN *h) +void *build_items_wearing(THUMAN *h, long *s) { int i,vzhled,it; word *p,hx,hy; @@ -1177,6 +1178,7 @@ void *build_items_wearing(THUMAN *h) ob=getmem(siz=(PO_XS*PO_YS+PIC_FADE_PAL_SIZE)); memset(ob,0,siz); memcpy(ob,p,PIC_FADE_PAL_SIZE); + *s = siz; ob[0]=PO_XS; ob[1]=PO_YS; put_picture2picture(p,ob,PO_XSS-(hx/2),PO_YS-hy-20); @@ -1194,7 +1196,7 @@ void *build_items_wearing(THUMAN *h) pp=(char *)ob; if (h->vlastnosti[VLS_KOUZLA] & SPL_STONED) { - int i; + int i; for (i=0;i<(PIC_FADE_PAL_SIZE>>1);++i) if (i>3) { unsigned short col=ob[i]; @@ -1211,12 +1213,11 @@ void *build_items_wearing(THUMAN *h) } return ob; } - + void build_items_called(void **p,long *s) { - *p=build_items_wearing(&postavy[memman_handle-H_POSTAVY]); - *s=(long)(_msize(*p)); + *p=build_items_wearing(&postavy[memman_handle-H_POSTAVY], s); } void display_items_wearing(THUMAN *h) @@ -1277,14 +1278,14 @@ typedef struct t_inv_script short parm1,parm2; char lenght; char align; - }; +} T_INV_SCRIPT; #define INFO_AP -1 #define INFO_EXP -2 #define LINE_STEP 6 #define COL_STEP 8 -static struct t_inv_script script[]= +static T_INV_SCRIPT script[]= { {15,12,"%d",pvls(VLS_SILA),0,2+128,2}, {15,14,"%d",pvls(VLS_SMAGIE),0,2+128,2}, @@ -1448,7 +1449,7 @@ void hide_inv_info_box() void inv_info_box(char *text1,char *text2,char *text3,char asterix) { int x,y,ys; - static last_info_ys=0; + static int last_info_ys=0; ys=INV_INFO_YS; if (text3!=NULL) ys+=INV_INFO_XP; if (info_box_below!=NULL && last_info_ys!=ys) @@ -1772,7 +1773,7 @@ static char MakeItemCombinations(short *itm1, short *itm2) if (table==0 && pathtable[SR_MAP2][0]) { concat(fname,pathtable[SR_MAP2],fname); - table=fopen(table,"r"); + table=fopen(fname,"r"); } if (table==0) return 0; cnt=fscanf(table,"%d %d -> %d %d",&src1,&src2,&trg1,&trg2); @@ -1780,33 +1781,33 @@ static char MakeItemCombinations(short *itm1, short *itm2) { if (src1==i1 && src2==i2) { - if (cnt==3) + if (cnt==3) { *itm2=trg1+1; *itm1=0; } - else + else { *itm1=trg1+1; *itm2=trg2+1; } succ=1; - break; + break; } if (src1==i2 && src2==i1) { - if (cnt==3) + if (cnt==3) { *itm2=trg1+1; *itm1=0; } - else + else { *itm2=trg1+1; *itm1=trg2+1; } succ=1; - break; + break; } if (fscanf(table," ;")==-1) break; cnt=fscanf(table,"%d %d -> %d %d",&src1,&src2,&trg1,&trg2); @@ -1994,7 +1995,7 @@ int calculate_weight(THUMAN *p) { int suma=0; int i; - for (i=0;iinv_size;i++) if (p->inv[i]) + for (i=0;iinv_size;i++) if (p->inv[i]) suma+=glob_items[p->inv[i]-1].hmotnost; suma=suma*3/2; for (i=0;iwearing[i]) @@ -2009,7 +2010,7 @@ int weigth_defect(THUMAN *p) { int wh,wf; wh=calculate_weight(p); - if (wh>p->vlastnosti[VLS_SILA]*20) + if (wh>p->vlastnosti[VLS_SILA]*20) wf=(wh-p->vlastnosti[VLS_SILA]*20)/200; else wf=0; @@ -2381,7 +2382,7 @@ static void shop_mouse_event(EVENT_MSG *msg,void **unused) MS_EVENT *ms; int x,y; char cc=1; - static last_pos=-1; + static int last_pos=-1; ms=get_mouse(msg); x=ms->x-(BUYBOX_X+SHP_ICPLCX); @@ -2632,7 +2633,7 @@ static void redraw_keepers_items() showview(BUYBOX_X,BUYBOX_Y,w[0],w[1]); } -static char shop_keeper_click(int id, int xa, int ya,int xr,int yr) +char shop_keeper_click(int id, int xa, int ya,int xr,int yr) { id;xa;ya; if (picked_item==NULL) @@ -2656,7 +2657,7 @@ static char shop_keeper_click(int id, int xa, int ya,int xr,int yr) redraw_keepers_items(); ukaz_mysku(); update_mysky(); - if ((GetKeyState(VK_CONTROL) & 0x80) && (game_extras & EX_FAST_TRADE) && get_sell_price(*picked_item)<=money) + if ((get_control_key_state()) && (game_extras & EX_FAST_TRADE) && get_sell_price(*picked_item)<=money) { play_sample_at_channel(H_SND_OBCHOD,1,100); money-=get_sell_price(*picked_item); @@ -2734,7 +2735,7 @@ static char shop_keeper_click(int id, int xa, int ya,int xr,int yr) } -static char shop_bag_click(int id,int xa,int ya,int xr,int yr) +char shop_bag_click(int id,int xa,int ya,int xr,int yr) { char s[200],p; int price,z; @@ -2743,7 +2744,7 @@ static char shop_bag_click(int id,int xa,int ya,int xr,int yr) { id=bag_click(id,xa,ya,xr,yr); cur_owner=picked_item!=NULL; - if (picked_item!=NULL && picked_item[1]==0 && (game_extras & EX_FAST_TRADE) && (GetKeyState(VK_CONTROL) & 0x80)) + if (picked_item!=NULL && picked_item[1]==0 && (game_extras & EX_FAST_TRADE) && (get_control_key_state())) { short z; price=make_offer(z=picked_item[0]); @@ -2796,7 +2797,7 @@ static char shop_bag_click(int id,int xa,int ya,int xr,int yr) return 1; } -static char shop_block_click(int id, int xa, int ya,int xr,int yr) +char shop_block_click(int id, int xa, int ya,int xr,int yr) { xa,ya,xr,yr; if (id==1) block_back();else block_next(); diff --git a/GAME/KNIHA.C b/game/kniha.c similarity index 91% rename from GAME/KNIHA.C rename to game/kniha.c index fe36e62..e8ecc3b 100644 --- a/GAME/KNIHA.C +++ b/game/kniha.c @@ -98,7 +98,19 @@ static int picture_len=0; static char winconv=0; static int relpos=0; -static char xlat_table[128]="___________________________________________________________________________________"; +//static char xlat_table[128]="�__��_____�_____�__��__________________________________�___�__��__��_�__��____���__�___�___�__��__��_�__��____���__�"; +static char xlat_table[128] = { + 0x9b, 0x5f, 0x5f, 0x86, 0x92, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0xad, 0x5f, + 0x5f, 0x5f, 0x5f, 0x5f, 0xa8, 0x5f, 0x5f, 0x9f, 0x91, 0x5f, 0x5f, 0x5f, + 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, + 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, + 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x5f, 0x8f, 0x5f, 0x5f, 0x5f, 0x8a, + 0x5f, 0x5f, 0x80, 0x90, 0x5f, 0x5f, 0x89, 0x8b, 0x5f, 0x85, 0x5f, 0x5f, + 0xa5, 0x95, 0x5f, 0x5f, 0x5f, 0x5f, 0x9e, 0xa6, 0x97, 0x5f, 0x5f, 0x9d, + 0x5f, 0x5f, 0x5f, 0xa0, 0x5f, 0x5f, 0x5f, 0x8d, 0x5f, 0x5f, 0x87, 0x82, + 0x5f, 0x5f, 0x88, 0xa1, 0x5f, 0x83, 0x5f, 0x5f, 0xa4, 0xa2, 0x5f, 0x5f, + 0x5f, 0x5f, 0xa9, 0x96, 0xa3, 0x5f, 0x5f, 0x98, 0x0a +}; static int insert_num(char *text,int pos,int num) { @@ -278,17 +290,18 @@ static char read_set(FILE *txt,char *var,char *set) { int c; char *cc; + char d; - fscanf(txt,"%[^=]%c",var,&c); + fscanf(txt,"%[^=]%c",var,&d); do c=fgetc(txt); while (c<33); - if (c=='"') fscanf(txt,"%[^\"]%c%c",set,&c,&c); - else if (c=='\'') fscanf(txt,"%[^']%c%c",set,&c,&c); + if (c=='"') fscanf(txt,"%[^\"]%c%c",set,&d,&d); + else if (c=='\'') fscanf(txt,"%[^']%c%c",set,&d,&d); else { ungetc(c,txt); - fscanf(txt,"%[^> ]%c",set,&c); + fscanf(txt,"%[^> ]%c",set,&d); } while(c<33 && c!=EOF) c=fgetc(txt); if (c!='>') ungetc(c,txt); @@ -525,7 +538,7 @@ void seek_section(FILE *txt,int sect_number) { char buff[256]; sprintf(buff,"Nemohu najit odstavec s cislem %d.",sect_number); - MessageBox(NULL,buff,NULL,MB_OK|MB_ICONSTOP); + display_error(buff); } exit(1); } diff --git a/GAME/KOUZLA.C b/game/kouzla.c similarity index 97% rename from GAME/KOUZLA.C rename to game/kouzla.c index 974d639..d06fcd4 100644 --- a/GAME/KOUZLA.C +++ b/game/kouzla.c @@ -10,6 +10,7 @@ //#include #include #include +#include #include "engine1.h" #include "globals.h" @@ -89,7 +90,7 @@ #define SP_VZPLANUTI1 23 #define SP_VZPLANUTI2 24 #define SP_VZPLANUTI3 25 -#define SP_PHASEDOOR 26 +#define SP_PHASEDOOR 26 #define SP_TELEPORT_SECT 27 #define SP_OPEN_TELEPORT 28 @@ -150,7 +151,7 @@ static long _flag_map[MAX_SPELLS]; //tabulka nastavenych priznaku pro kouzl //hornich 16 bitu je globalne short parm1,parm2; -char twins; +unsigned char twins; static short rand_value; @@ -717,7 +718,7 @@ void spell_hit(int cil,int min,int max,int owner) vysl=min+rnd(max-min); if (vysl<0) { - h->lives-=vysl,h->lives=min(h->lives,h->vlastnosti[VLS_MAXHIT]); + h->lives-=vysl>h->vlastnosti[VLS_MAXHIT]?h->vlastnosti[VLS_MAXHIT]:vysl; if (h->groupnum==0) h->groupnum=cur_group; } else player_hit(h,vysl,1); @@ -965,8 +966,8 @@ void spell_teleport_sector(int cil,int owner) loadlevel.dir=TelepLocation.dir; send_message(E_CLOSE_MAP); save_map=1; - - for(i=0;i0) {sector=postavy[cil-1].sektor;dir=postavy[cil-1].direction;} else return; - if (map_sectors[sector].step_next[dir] && (~map_sides[sector*4+dir].flags & SD_THING_IMPS)) + if (map_sectors[sector].step_next[dir] && (~map_sides[sector*4+dir].flags & SD_THING_IMPS)) sector=map_sectors[sector].step_next[dir]; if (map_coord[sector].flags & MC_NOSUMMON) @@ -1159,23 +1160,23 @@ static void spell_open_teleport(int cil, int owner) } - if (map_sectors[sector].sector_type>=S_USERTELEPORT && + if (map_sectors[sector].sector_type>=S_USERTELEPORT && map_sectors[sector].sector_type<=S_USERTELEPORT_END) { int i; int otherside; map_sectors[sector].sector_type-=S_USERTELEPORT ; - otherside=map_sectors[sector].sector_tag; + otherside=map_sectors[sector].sector_tag; for (i=0;i<4;i++) {map_sides[sector*4+i].flags&=~SD_SEC_VIS;map_sides[sector*4+i].sec_anim=0;map_sides[sector*4+i].sec=0;} map_sectors[sector].sector_tag=0; - add_spectxtr(sector,H_TELEP_PCX,14,1,0); + add_spectxtr(sector,H_TELEP_PCX,14,1,0); play_sample_at_sector(H_SND_TELEPOUT,viewsector,sector,0,0); if (otherside!=sector && otherside) { map_sectors[otherside].sector_type-=S_USERTELEPORT ; for (i=0;i<4;i++) {map_sides[otherside*4+i].flags&=~SD_SEC_VIS;map_sides[otherside*4+i].sec_anim=0;map_sides[otherside*4+i].sec=0;} map_sectors[otherside].sector_tag=0; - add_spectxtr(otherside,H_TELEP_PCX,14,1,0); + add_spectxtr(otherside,H_TELEP_PCX,14,1,0); play_sample_at_sector(H_SND_TELEPOUT,viewsector,otherside,0,0); } } @@ -1187,7 +1188,7 @@ static void spell_open_teleport(int cil, int owner) if (type!=S_NORMAL && (type=S_VODA)) allowed=0; if (allowed && map_sectors[sector].sector_tag!=0) allowed=0; if (allowed) - for (i=0;i<4;i++) + for (i=0;i<4;i++) if (map_sides[sector*4+i].sec) allowed=0; if (allowed) { @@ -1195,7 +1196,7 @@ static void spell_open_teleport(int cil, int owner) int templateSect=0; int i,j; for (i=0;templateSect==0 && i=0) bott_disp_text(texty[85]); @@ -1234,7 +1235,7 @@ static void spell_open_teleport(int cil, int owner) map_sectors[sector].sector_tag=sector; map_sectors[sector].side_tag=(dir+2)&3; } - add_spectxtr(sector,H_TELEP_PCX,14,1,0); + add_spectxtr(sector,H_TELEP_PCX,14,1,0); play_sample_at_sector(H_SND_TELEPOUT,viewsector,sector,0,0); } else @@ -1269,7 +1270,7 @@ void spell_special(int num,TKOUZLO *spl,int spc) hal_sector=rnd(mapsize-1)+1;hal_dir=rnd(4); break; case SP_TELEPORT:if (hod_na_uspech(spl->cil,spl)) spell_teleport(spl->cil,spl->owner,spl->teleport_target);break; - case SP_PHASEDOOR:if (hod_na_uspech(spl->cil,spl)) spell_teleport(spl->cil,spl->owner,-1);break; + case SP_PHASEDOOR:if (hod_na_uspech(spl->cil,spl)) spell_teleport(spl->cil,spl->owner,-1);break; case SP_SUMMON: spell_summon(spl->cil); case SP_HLUBINA1:if (hlubina_level==0) hlubina_level=1;_flag_map[num]|=FLG_HLUBINA1; break; @@ -1377,9 +1378,10 @@ static void calc_rand_value(int val1,int val2) void call_spell(int i) { TKOUZLO *p; - char *c; + unsigned char *c; + unsigned char *start; int z; - char ext=0; + unsigned char ext=0; int cil; SEND_LOG("(SPELLS) Calculating spell ID: %d",i,0); @@ -1397,7 +1399,8 @@ void call_spell(int i) } if (p->delay) return; if (p->wait) return; - c=(char *)ablock(H_KOUZLA); + c=(unsigned char *)ablock(H_KOUZLA); + start = c; c+=p->start; twins=0; do @@ -1450,7 +1453,7 @@ void call_spell(int i) case S_location_y: TelepLocation.loc_y=GET_WORD(c);TelepLocation.map=0;break; default: { - char *d="Chyba v popisu kouzel: Program narazil na neznamou instrukci %d (%02X) pri zpracovani kouzla s cislem %d. Kouzlo bylo ukoneno"; + char *d="Chyba v popisu kouzel: Program narazil na neznamou instrukci %d (%02X) pri zpracovani kouzla s cislem %d. Kouzlo bylo ukon�eno"; c=alloca(strlen(d)+20); sprintf(c,d,*(c-1),*(c-1),p->num); bott_disp_text(c); @@ -1461,7 +1464,7 @@ void call_spell(int i) } while(!ext); - p->start=c-(char *)ablock(H_KOUZLA); + p->start=c-start; } int add_spell(int num,int cil,int owner,char noanim) @@ -1619,12 +1622,12 @@ void cast(int num,THUMAN *p,int owner, char backfire) cil=0; num2=num; } - - + + SEND_LOG("(SPELLS) Cast num %d cil %d",num2,cil); k=((TKOUZLO *)ablock(H_KOUZLA))+num2; SEND_LOG("(SPELLS) Cast spell name %s",k->spellname,0); - + if (cil>0 && k->cil!=C_postava_jinde) { THUMAN *h1=postavy+cil-1; @@ -1654,7 +1657,7 @@ void cast(int num,THUMAN *p,int owner, char backfire) if ((per1/2+32)backfire || (game_extras & EX_RANDOM_BACKFIRES)!=0)) { p->mana-=k->mge; - if ((game_extras & EX_RANDOM_BACKFIRES)!=0) + if ((game_extras & EX_RANDOM_BACKFIRES)!=0) { labyrinth_find_path(p->sektor,65535,SD_PLAY_IMPS,get_valid_sector,NULL); teleport_target=last_sector; @@ -1728,7 +1731,7 @@ void mob_cast(int num,TMOB *m,int mob_num) } } -static int calculatePhaseDoor(int sector, int dir, int um) +int calculatePhaseDoor(int sector, int dir, int um) { int x=map_coord[sector].x; int y=map_coord[sector].y; @@ -1754,7 +1757,7 @@ static int calculatePhaseDoor(int sector, int dir, int um) x=map_coord[i].x-newx; y=map_coord[i].y-newy; dist=x*x+y*y; - if(distsektor,h->direction,h->vlastnosti[VLS_SMAGIE]); @@ -1864,27 +1867,25 @@ void remove_all_mob_spells() } -int save_spells(FILE *f) +int save_spells(TMPFILE_WR *f) { - char res=0; - int i,s; SEND_LOG("(SPELLS) Saving spell table...",0,0); for(i=0,s=0;i #include "globals.h" #include "specproc.h" +#include "temp_storage.h" int **macros=NULL; void *macro_block; @@ -256,26 +257,18 @@ char if_lock(int side,int key_id,int level,TMA_LOCK *lk) return 0; } -void xchg_block(void *b1,void *b2,int leng) -//#pragma aux xchg_block parm[edi][esi][ecx]= -{ -__asm - { - mov edi,b1 - mov esi,b2 - mov ecx,leng - lp1: mov al,[edi] - mov ah,[esi] - mov [edi],ah - mov [esi],al - inc edi - inc esi - dec ecx - jnz lp1 - } +void xchg_block(void *b1, void *b2, int leng) { + uint8_t *p1 = (uint8_t *)b1; + uint8_t *p2 = (uint8_t *)b2; + + for (int i = 0; i < leng; i++) { + uint8_t temp = p1[i]; + p1[i] = p2[i]; + p2[i] = temp; + } } -static void propadnout(int sector) +void propadnout(int sector) { short *i,c,m1,m2; @@ -369,7 +362,7 @@ static void hit_player(TMA_WOUND *w,int sector) bott_draw(1); } -static TMULTI_ACTION *go_macro(side,abs_pos) +static TMULTI_ACTION *go_macro(int side,int abs_pos) { int *r; int mcsiz; @@ -567,7 +560,7 @@ static void build_trig_group(char mode,int side) } } -static ma_play_anim(char *filename,char cls) +static int ma_play_anim(char *filename,char cls) { char *a; @@ -633,13 +626,13 @@ void macro_register_global_event(TMULTI_ACTION *q) if (GlobEventList[q->globe.event].param>0) 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; if (cas<=curtm) cas+=den; GlobEventList[q->globe.event].param=game_time-curtm+cas; - } + } } } @@ -754,41 +747,14 @@ static char lock_saved=255; static char lock_empty=254; -char save_codelocks(FILE *fsta) +char save_codelocks(TMPFILE_WR *fsta) { - char *c; - int i; - - c=(char *)&codelock_memory; - i=sizeof(codelock_memory); - while(*c==0 && i) c++,i--; - if (!i) - { - SEND_LOG("(SAVELOAD) Codelocks wasn't used in this map... not saved",0,0); - return !fwrite(&lock_empty,sizeof(lock_empty),1,fsta); - } - SEND_LOG("(SAVELOAD) Storing code-locks...",0,0); - if (!fwrite(&lock_saved,sizeof(lock_saved),1,fsta)) return 1; - return !fwrite(codelock_memory,sizeof(codelock_memory),1,fsta); + temp_storage_write(codelock_memory,sizeof(codelock_memory)*1,fsta); } -char load_codelocks(FILE *fsta) +char load_codelocks(TMPFILE_RD *fsta) { - char c; - - if (!fread(&c,sizeof(lock_empty),1,fsta)) return 1; - if (c!=lock_saved) - { - if (c!=lock_empty) - { - fseek(fsta,-1,SEEK_CUR); //uprav pripadne stare verze savegamu ktere nemaji codelocky - SEND_LOG("(ERROR) Invalid value for codelocks... may be it's old version of savegame",0,0); - } - memset(codelock_memory,0,sizeof(codelock_memory)); - return 0; - } - SEND_LOG("(SAVELOAD) Restoring code-locks for this map...",0,0); - return !fread(codelock_memory,sizeof(codelock_memory),1,fsta); + return !temp_storage_read(codelock_memory,sizeof(codelock_memory)*1,fsta); } diff --git a/GAME/MENU.C b/game/menu.c similarity index 90% rename from GAME/MENU.C rename to game/menu.c index df89ec7..54de15b 100644 --- a/GAME/MENU.C +++ b/game/menu.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include @@ -14,7 +13,7 @@ #include #include #include -//#include +#include #include "engine1.h" #include #include "globals.h" @@ -37,10 +36,10 @@ int speedscroll=3; char low_mem=0; static volatile char load_ok=0; -static cur_pos[]={0,0,0,0,0}; -static cur_dir[]={UNSELECT,UNSELECT,UNSELECT,UNSELECT,UNSELECT}; +static int cur_pos[]={0,0,0,0,0}; +static int cur_dir[]={UNSELECT,UNSELECT,UNSELECT,UNSELECT,UNSELECT}; -static titlefont=H_FBIG; +static int titlefont=H_FBIG; #define TITLE_HEAD 1 #define TITLE_NAME 2 @@ -48,8 +47,8 @@ static titlefont=H_FBIG; #define TITLE_CENTER 0 #define TITLE_KONEC 4 -static title_mode=0; -static title_line=0; +static int title_mode=0; +static int title_line=0; #define CLK_MAIN_MENU 4 @@ -93,7 +92,15 @@ T_CLK_MAP clk_main_menu[]= {-1,0,0,639,479,empty_clk,0xff,H_MS_DEFAULT}, }; -void rozdily(void *orign,void *obr,void *hicolor,void *xtab,int pocet) +void rozdily(uint8_t *orign, uint8_t *obr, uint16_t *hicolor, uint16_t *xtab, size_t pocet) { + for (size_t i = 0; i < pocet; i++) { + uint8_t al = obr[i]; + al ^= orign[i]; + uint16_t result = xtab[al]; + hicolor[i] = result; + } +} +/*void rozdily(void *orign,void *obr,void *hicolor,void *xtab,int pocet) //#pragma aux rozdily parm[EDX][ESI][EDI][EBX][ECX]= { __asm @@ -104,7 +111,7 @@ __asm mov ebx,xtab mov ecx,pocet -jp1:lodsb +jp1:lodsb xor al,[edx] movzx eax,al inc edx @@ -113,7 +120,7 @@ jp1:lodsb dec ecx jnz jp1 } -} +}*/ static void nahraj_rozdilovy_pcx(void **pp,long *s) { @@ -139,7 +146,7 @@ static void nahraj_rozdilovy_pcx(void **pp,long *s) rozdily(org,pos,hicolor+3,paltab,siz); free(vysl); *pp=hicolor; - *s=_msize(*pp); + *s=siz*2+12; } @@ -164,6 +171,7 @@ static void init_menu_entries(void) } } +/* void zobraz_podle_masky_asm(char barva,void *scr,void *data, void *maska,int xs,int ys) //#pragma aux zobraz_podle_masky_asm parm[al][edi][esi][ebx][edx][ecx]= { @@ -179,7 +187,7 @@ void zobraz_podle_masky_asm(char barva,void *scr,void *data, void *maska,int xs, mov ebp,edx jp3: cmp al,[ebx] jnz jp1 - movsw + movsw jmp jp2 jp1: add edi,2 add esi,2 @@ -195,6 +203,21 @@ jp2: inc ebx pop ebp } } +*/ +static void zobraz_podle_masky_asm(char barva, uint16_t *scr, uint16_t *data, uint8_t *maska, int xs, int ys, int scr_linelen) { + int width = xs; + + for (int y = 0; y < ys; y++) { + for (int x = 0; x < width; x++) { + if (barva == maska[x]) { + scr[x] = data[x]; + } + } + scr += scr_linelen; // Přeskoč na další řádek obrazovky + maska += width; // Přeskoč masku + data += width; // Přeskoč zdrojová data + } +} static void zobraz_podle_masky(char barva,char anim) { @@ -208,13 +231,13 @@ static void zobraz_podle_masky(char barva,char anim) data=ablock(H_MENU_ANIM+anim); xs=data[0]; ys=data[1]; - zobraz_podle_masky_asm(barva,obr,data+3,maska+6+512,xs,ys); + zobraz_podle_masky_asm(barva,obr,data+3,maska+6+512,xs,ys,scr_linelen2); aunlock(H_MENU_MASK); } static void prehraj_animaci_v_menu(EVENT_MSG *msg,char **unused) { - static counter=0; + static int counter=0; unused; if (msg->msg==E_TIMER) { @@ -340,7 +363,7 @@ int enter_menu(char open) return c; } -char *get_next_title(char control,char *filename) +char *get_next_title(signed char control,char *filename) { static FILE *titles=NULL; static ENCFILE fl; @@ -360,7 +383,7 @@ char *get_next_title(char control,char *filename) char popis[300]; closemode(); sprintf(popis,"Soubor nenalezen: %s%s nebo %s%s\n",pathtable[SR_MAP],filename,pathtable[SR_DATA],filename); - MessageBox(NULL,popis,NULL,MB_OK|MB_ICONSTOP); + display_error(popis); exit(1); } } @@ -474,8 +497,8 @@ static void get_max_extend(int *l,int *r) for(i=0;i<360;i++) { - left=min(title_lines[i][0],left); - right=max(title_lines[i][1],right); + left=MIN(title_lines[i][0],left); + right=MAX(title_lines[i][1],right); } *l=left; *r=right; @@ -484,7 +507,7 @@ static void get_max_extend(int *l,int *r) void titles(va_list args) //#pragma aux titles parm[] { - char send_back=va_arg(args,char); + char send_back=va_arg(args,int); char *textname=va_arg(args,char *); void *picture; @@ -526,7 +549,7 @@ void titles(va_list args) get_max_extend(&l,&r); memmove(title_lines,&title_lines[skip],sizeof(title_lines)-skip*sizeof(int)*2); //showview(l,60,r-l+1,360); - showview(0,60,639,360); + showview(0,60,639,360); buff+=scr_linelen2*359; memcpy(buff,buff+scr_linelen2*skip,40*scr_linelen); showview(0,0,640,40); diff --git a/GAME/REALGAME.C b/game/realgame.c similarity index 98% rename from GAME/REALGAME.C rename to game/realgame.c index a4721e8..58339f0 100644 --- a/GAME/REALGAME.C +++ b/game/realgame.c @@ -269,12 +269,12 @@ int load_map(char *filename) free(temp); break; case A_STRRIGHT: - num_ofsets[2]=ofsts-1; + num_ofsets[2]=ofsts-1; prepare_graphics(&ofsts,temp,size,pcx_fade_decomp,SR_GRAFIKA); free(temp); break; case A_STRCEIL: - num_ofsets[3]=ofsts-1; + num_ofsets[3]=ofsts-1; prepare_graphics(&ofsts,temp,size,pcx_15bit_autofade,SR_GRAFIKA); free(temp); break; @@ -296,7 +296,7 @@ int load_map(char *filename) case A_MAPGLOB: num_ofsets[BACK_NUM]=ofsts; memset(&mglob,0,sizeof(mglob)); - memcpy(&mglob,temp,__min(size,sizeof(mglob))); + memcpy(&mglob,temp,MIN(size,sizeof(mglob))); free(temp); for(r=0;r<4;r++) def_handle(ofsts++,mglob.back_fnames[r],pcx_fade_decomp,SR_GRAFIKA); @@ -349,7 +349,7 @@ int load_map(char *filename) map_with_password=1; free(temp); break; - + default:free(temp); @@ -378,7 +378,7 @@ int load_map(char *filename) if (!doNotLoadMapState && load_map_state()==-2) { closemode(); - MessageBox(NULL,"Bug in temp file. Please purge some status blocks in last load savegame file.",NULL,MB_OK|MB_ICONSTOP); + display_error("Bug in temp file. Please purge some status blocks in last load savegame file."); exit(0); } doNotLoadMapState=0; @@ -590,7 +590,9 @@ TFLY *duplic_fly(TFLY *p) *q=*p; if (q->items!=NULL) { - int s=_msize(q->items); + int s=0; + while (q->items[s]) ++s; + ++s; q->items=(short *)getmem(s); memcpy(q->items,p->items,s); } @@ -631,7 +633,7 @@ void calc_fly() q=p->next; if (!(p->flags & FLY_NEHMOTNA)) { - p->velocity+=1; + p->velocity+=1; } p->zpos-=p->velocity; ss=p->sector; @@ -651,7 +653,7 @@ void calc_fly() else stop_fly(p,1); continue; - } + } if (p->flags & FLY_IN_FLY && p->xpos>-16 && zasah_veci(p->sector,p)) { interrupt_fly(p); @@ -692,7 +694,7 @@ void calc_fly() continue; } } - + } extern long sound_side_flags; @@ -799,7 +801,7 @@ void check_codelock_log(int sector,unsigned long flags) } -int do_action(action_numb,sector,direct,flags,nosend) +int do_action(int action_numb,int sector, int direct,int flags, int nosend) { TSTENA *q; TSECTOR *s; @@ -1113,7 +1115,7 @@ void check_players_place(char mode) else break; case S_LAVA: if (!levitat) - { + { u1=(h->lives); player_hit(h,u1,0); bott_draw(0); @@ -1184,7 +1186,7 @@ void calc_game() } } -void a_touch(sector,dir) +void a_touch(int sector,int dir) { TSTENA *q; int sid; @@ -1204,7 +1206,7 @@ void a_touch(sector,dir) call_macro(sid,MC_TOUCHSUC); } -void a_pass(sector,dir) +void a_pass(int sector, int dir) { TSTENA *q; @@ -1493,7 +1495,7 @@ void postavy_teleport_effect(int sector,int dir,int postava,char effect) { char kolo=global_anim_counter; int counter=0; - static zavora=0; + static int zavora=0; if (zavora) return; if (effect) @@ -1778,9 +1780,16 @@ int check_path(word **path,word tosect) return tosect; } +static unsigned int get_path_len(const word *w) { + unsigned int i = 0; + while (w[i]) ++i; + return i; +} + void recall() { - int tosect,max,i,j; + int tosect; + unsigned int max,i,j; word *paths[POCET_POSTAV]; for(i=0;i':game_setup(0,0,0,0,0);break; @@ -1960,7 +1970,7 @@ void *game_keyboard(EVENT_MSG *msg,void **usr) void start_dialog(int dialog,int mob) { - if (battle) + if (battle) { call_dialog(dialog,mob); } diff --git a/GAME/SERIAL.C b/game/serial.c similarity index 100% rename from GAME/SERIAL.C rename to game/serial.c diff --git a/GAME/SETUP.C b/game/setup.c similarity index 91% rename from GAME/SETUP.C rename to game/setup.c index c2790d4..76df88d 100644 --- a/GAME/SETUP.C +++ b/game/setup.c @@ -76,7 +76,7 @@ static void change_turn() turn_speed((id-60)/10); } -void unwire_setup(); +static void unwire_setup(); static EVENT_PROC(setup_keyboard) { @@ -155,21 +155,21 @@ void new_setup() w=create_window(0,SCREEN_OFFLINE,639,359,0,&ctl); w->draw_event=show_setup_desktop; desktop_add_window(w); - define(10,50,270,190,20,0,skeldal_checkbox); c_default(get_snd_effect(SND_SWAP)); on_change(do_setup_change); + define(10,50,270,190,20,0,skeldal_checkbox); c_default(get_snd_effect(SND_SWAP)); on_control_change(do_setup_change); if (check_snd_effect(SND_OUTFILTER)) { define(20,50,300,190,20,0,skeldal_checkbox);c_default(get_snd_effect(SND_OUTFILTER)); - on_change(do_setup_change); + on_control_change(do_setup_change); } define(30,410,60,90,20,0,skeldal_checkbox);c_default(zoom_speed(-1)==0); - on_change(change_zoom); - define(40,410,90,90,20,0,skeldal_checkbox);c_default(zoom_speed(-1)==1);on_change(change_zoom); - define(50,410,120,90,20,0,skeldal_checkbox);c_default(zoom_speed(-1)==2);on_change(change_zoom); + on_control_change(change_zoom); + define(40,410,90,90,20,0,skeldal_checkbox);c_default(zoom_speed(-1)==1);on_control_change(change_zoom); + define(50,410,120,90,20,0,skeldal_checkbox);c_default(zoom_speed(-1)==2);on_control_change(change_zoom); - define(60,510,60,90,20,0,skeldal_checkbox);c_default(turn_speed(-1)==0);on_change(change_turn); - define(70,510,90,90,20,0,skeldal_checkbox);c_default(turn_speed(-1)==1);on_change(change_turn); - define(80,510,120,90,20,0,skeldal_checkbox);c_default(turn_speed(-1)==2);on_change(change_turn); + define(60,510,60,90,20,0,skeldal_checkbox);c_default(turn_speed(-1)==0);on_control_change(change_turn); + define(70,510,90,90,20,0,skeldal_checkbox);c_default(turn_speed(-1)==1);on_control_change(change_turn); + define(80,510,120,90,20,0,skeldal_checkbox);c_default(turn_speed(-1)==2);on_control_change(change_turn); for(i=0;i<5;i++) { @@ -191,9 +191,9 @@ void new_setup() if (check_snd_effect(effects[i])) { define(200+i*10,50+i*60,30,30,200,0,skeldal_soupak,effects[i]==SND_MUSIC?127:255);c_default(get_snd_effect(effects[i])); - on_change(do_setup_change); + on_control_change(do_setup_change); } - define(300,559,336,81,21,0,setup_ok_button,texty[174]);on_change(unwire_setup); + define(300,559,336,81,21,0,setup_ok_button,texty[174]);on_control_change(unwire_setup); property(NULL,ablock(H_FTINY),&color_topbar,0); redraw_window(); add_to_timer(TM_CHECKBOX,4,-1,checkbox_animator); diff --git a/GAME/SKELDAL.C b/game/skeldal.c similarity index 94% rename from GAME/SKELDAL.C rename to game/skeldal.c index 24e8d88..8e91732 100644 --- a/GAME/SKELDAL.C +++ b/game/skeldal.c @@ -1,18 +1,14 @@ #include -#include #include -//#include -#include +#include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -31,8 +27,8 @@ #include "engine1.h" #include "wizard.h" #include "version.h" -#include +#include #define CONFIG_NAME SKELDALINI #define INI_TEXT 1 @@ -95,7 +91,7 @@ TMA_LOADLEV loadlevel; typedef struct inis { - char heslo[15]; + char heslo[25]; char parmtype; }INIS; @@ -118,7 +114,8 @@ THUMAN postavy[POCET_POSTAV],postavy_save[POCET_POSTAV]; void (*unwire_proc)(); void (*wire_proc)(); char cur_mode,battle_mode; -static init_music_vol=127,init_gfx_vol=255; +static int init_music_vol=127; +static int init_gfx_vol=255; static char full_video=0; static char titles_on=0; static char windowed=0; @@ -366,8 +363,9 @@ int ask_video() void pcx_fade_decomp(void **p,long *s) { char *buff; - load_pcx(*p,*s,A_FADE_PAL,&buff,mglob.fade_r,mglob.fade_g,mglob.fade_b); - *s=_msize(buff); + int r = load_pcx(*p,*s,A_FADE_PAL,&buff,mglob.fade_r,mglob.fade_g,mglob.fade_b); + assert(r > 0); + *s=r; free(*p); *p=buff; } @@ -375,8 +373,9 @@ void pcx_fade_decomp(void **p,long *s) void pcx_15bit_decomp(void **p,long *s) { char *buff; - load_pcx(*p,*s,A_16BIT,&buff); - *s=_msize(buff); + int r = load_pcx(*p,*s,A_16BIT,&buff); + assert(r > 0); + *s=r; free(*p); *p=buff; } @@ -384,8 +383,9 @@ void pcx_15bit_decomp(void **p,long *s) void pcx_15bit_autofade(void **p,long *s) { char *buff; - load_pcx(*p,*s,A_16BIT,&buff); - *s=_msize(buff); + int r = load_pcx(*p,*s,A_16BIT,&buff); + assert(r > 0); + *s=r; free(*p); *p=buff; buff[5]=0x80; @@ -398,9 +398,10 @@ void pcx_15bit_backgrnd(void **p,long *s) if (*p!=NULL) { - load_pcx(*p,*s,A_16BIT,&buff); + int r = load_pcx(*p,*s,A_16BIT,&buff); + assert(r>0); z=(long *)buff; - *s=_msize(buff); + *s=r; for(i=*s;i>0;i-=4,z++) *z|=0x80008000; free(*p); *p=buff; @@ -413,8 +414,9 @@ void pcx_8bit_nopal(void **p,long *s) if (*p!=NULL) { - load_pcx(*p,*s,A_8BIT_NOPAL,&buff); - *s=_msize(buff); + int r = load_pcx(*p,*s,A_8BIT_NOPAL,&buff); + assert(r>0); + *s=r; free(*p); *p=buff; } @@ -424,8 +426,9 @@ void pcx_8bit_nopal(void **p,long *s) void pcx_8bit_decomp(void **p,long *s) { char *buff; - load_pcx(*p,*s,A_8BIT,&buff); - *s=_msize(buff); + int r = load_pcx(*p,*s,A_8BIT,&buff); + assert(r>0); + *s=r; free(*p); *p=buff; } @@ -552,14 +555,14 @@ void music_init() set_snd_effect(SND_GFX,init_gfx_vol); set_snd_effect(SND_MUSIC,init_music_vol); path=plugins_path; - if (path==0 || path[0]==0) + if (path==0 || path[0]==0) path=AutodetectWinAmp(); if (path!=0 && path[0]!=0) { SEND_LOG("(SOUND) Installing plugins, path: %s",path,0); init_winamp_plugins(path); if (path!=plugins_path) free(path); - } + } SEND_LOG("(SOUND) SOUND_DONE Sound Engine should work now",0,0); } @@ -572,41 +575,6 @@ void clrscr() -void purge_temps(char z) - { - HANDLE rc; - WIN32_FIND_DATA fi; - char c[200]; - - - strcpy(c,SWAPPATH); - strcat(c,"*.TMP"); - rc=FindFirstFile(c,&fi); - if (rc!=INVALID_HANDLE_VALUE) - do - { - strcpy(c,SWAPPATH); - strcat(c,fi.cFileName); - if (fi.cFileName[0]!='~') - { - SEND_LOG("(PURGE) Purging temp '%s'",c,0); - remove(c); - } - } - while (FindNextFile(rc,&fi)); - FindClose(rc); - - if (z) - { - strcpy(c,SWAPPATH); - strcat(c,TEMP_FILE); - SEND_LOG("(PURGE) Purging temp '%s'",c,0); - remove(c); - } - - } - - void back_music() { @@ -881,7 +849,7 @@ void cti_texty() case -3:sprintf(buff,"Memory very low (need min 4MB)\n");break; default:sprintf(buff,"Error in string table at line %d\n",err);break; } - MessageBox(NULL,buff,NULL,MB_OK|MB_ICONSTOP); + display_error(buff); exit(1); } } @@ -895,7 +863,7 @@ void global_kbd(EVENT_MSG *msg,void **usr) if (msg->msg==E_KEYBOARD) { c=(*(int *)msg->data)>>8; - if (c==';') save_dump(); + if (c==';') save_dump(GetScreenAdr(), DxGetResX(), DxGetResY(), scr_linelen2); } return; } @@ -924,13 +892,13 @@ void error_exception(EVENT_MSG *msg,void **unused) SEND_LOG("(ERROR) Log: Last 'memman' handle: %x",memman_handle,0); SEND_LOG("(ERROR) Log: Battle: %d Select_player %d",battle,select_player); closemode(); - printf("Program zpsobil bhovou chybu a bude ukonen\n" - "Posledn zpracovvan data mla rukoje slo %xh\n",memman_handle); + printf("Program zp�sobil b�hovou chybu a bude ukon�en\n" + "Posledn� zpracov�van� data m�la rukoje� ��slo %xh\n",memman_handle); printf("Map: %s Sector %d Direction %d\n",level_fname==NULL?"":level_fname,viewsector,viewdir); - printf("Nyn se program pokus uloit hru...\n\n"); + printf("Nyn� se program pokus� ulo�it hru...\n\n"); autosave_enabled=1; autosave(); - printf("Hra byla spn uloena pod nzvem AUTOSAVE\n"); + printf("Hra byla �sp��n� ulo�ena pod n�zvem AUTOSAVE\n"); exit(0); } } @@ -943,7 +911,7 @@ void swap_error_exception() "zaplnen. Uvolnete prosim nejake misto na odkladacim disku, nebo zmente \n" "adresar odkladani na jednotku, kde je vice mista"); puts("Vase pozice bude ulozena pod nazvem AUTOSAVE\n" - "Pokud vsak mate pozice na stejnm disku jako odkladaci soubor (coz je\n" + "Pokud vsak mate pozice na stejn�m disku jako odkladaci soubor (coz je\n" "zakladni nastaveni) bude ulozeni z 90% bohuzel neuspesne..."); autosave_enabled=1; autosave(); @@ -1030,7 +998,6 @@ 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(c,"%s%s",SWAPPATH,TEMP_FILE); sprintf(d,"%s%s",pathtable[SR_DATA],"skeldal.ddl"); SEND_LOG("(INIT) Initializing memory manager",0,0); init_manager(d,c); @@ -1131,20 +1098,20 @@ void *map_keyboard(EVENT_MSG *msg,void **usr); char doNotLoadMapState=0; -static reload_map_handler(EVENT_MSG *msg,void **usr) +static int reload_map_handler(EVENT_MSG *msg,void **usr) { extern char running_battle; if (msg->msg==E_RELOADMAP) { int i; - va_list list=msg->data; - const char *fname=va_arg(list,const char *); - int sektor=va_arg(list,int); + ReloadMapInfo *minfo=(ReloadMapInfo *)msg->data; + const char *fname=minfo->fname; + int sektor=minfo->sektor; strncpy(loadlevel.name,fname,sizeof(loadlevel.name)); loadlevel.start_pos=sektor; for(i=0;i=3) rm=!strcmp(argv[1],"12345678");else rm=0; - if (!rm) if (OtevriUvodniOkno()==0) return; //OPEN_LOG("syslog"); OPEN_LOG("con"); SEND_LOG("START --------------------------",0,0); argv; - c=getcwd(NULL,_MAX_PATH+1); + c=getcwd(NULL,0); pathtable[SR_SAVES]=getmem(strlen(c)+2); strcpy(pathtable[SR_SAVES],c); strcat(pathtable[SR_SAVES],"\\"); @@ -1691,9 +1657,8 @@ void main(int argc,char *argv[]) mman_pathlist=pathtable; zoom_speed(1); turn_speed(1); - SetEnvironmentVariable("BSVER",VERSION); configure(CONFIG_NAME); - if ((argc>=2 || SelectAdventure()) && !rm ) + if ((argc>=2 ) && !rm ) { char *adventure; char **config=cur_config; @@ -1702,8 +1667,7 @@ void main(int argc,char *argv[]) mman_pathlist[SR_ORGMUSIC]=(char *)getmem(strlen(music)+1); strcpy(mman_pathlist[SR_ORGMUSIC],music); - if (argc<2) adventure=GetSelectedAdventure(); - else adventure=argv[1]; + adventure=argv[1]; cur_config=NULL; SEND_LOG("(GAME) Starting new adventure: %s",adventure,0); configure(adventure); @@ -1735,21 +1699,17 @@ void main(int argc,char *argv[]) /* position(200,200); set_font(H_FBIG,RGB(200,200,200)); outtext("Ahoj lidi"); - showview(0,0,0,0);*/ + showview(0,0,0,0);*/ escape(); update_config(); closemode(); } -int __stdcall WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nShowCmd) - { - main(__argc, __argv); - } - -#include "..\game\version.h" + +#include "version.h" int GetExeVersion() { return VERSIONNUM; - } \ No newline at end of file + } diff --git a/GAME/SNDandMUS.C b/game/sndandmus.c similarity index 97% rename from GAME/SNDandMUS.C rename to game/sndandmus.c index b21c015..8a7a1b1 100644 --- a/GAME/SNDandMUS.C +++ b/game/sndandmus.c @@ -1,5 +1,4 @@ #include -#include #include #include #include @@ -9,10 +8,9 @@ #include #include "globals.h" #include -//#include //Sound and Nosound #include -#include +#include #define PL_RANDOM 1 #define PL_FORWARD 2 #define PL_FIRST 3 @@ -35,7 +33,7 @@ typedef struct snd_info static short chan_state[CHANNELS]; static short track_state[TRACKS]; -static short sample_volume=255; +short sample_volume=255; //static struct t_wave wav_last_head; //static int wav_last_size; @@ -405,8 +403,8 @@ void create_playlist(char *playlist) for (c=playlist;c!=NULL;c=strchr(c+1,' ')) { char *e; - char d[MAX_PATH+2]="!"; - strncat(d,c+j,MAX_PATH);d[MAX_PATH+1]=0;j=1; + char d[MAX_FILESYSTEM_PATH+2]="!"; + strncat(d,c+j,MAX_FILESYSTEM_PATH);d[MAX_FILESYSTEM_PATH+1]=0;j=1; if ((e=strchr(d,32))!=NULL) *e=0; str_add(&cur_playlist,d); } @@ -426,7 +424,7 @@ void create_playlist(char *playlist) void play_next_music(char **c) { int i,step; - static char d[MAX_PATH]; + static char d[MAX_FILESYSTEM_PATH]; *c=NULL; if (cur_playlist==NULL) return; @@ -445,9 +443,9 @@ void play_next_music(char **c) } while (step); playing_track=i; - sprintf_s(d,sizeof(d),"%s%s",pathtable[SR_MUSIC],cur_playlist[i]+1); - if (_access(d,0) == -1) - sprintf_s(d,sizeof(d),"%s%s",pathtable[SR_ORGMUSIC],cur_playlist[i]+1); + snprintf(d,sizeof(d),"%s%s",pathtable[SR_MUSIC],cur_playlist[i]+1); + if (access(d,0) == -1) + snprintf(d,sizeof(d),"%s%s",pathtable[SR_ORGMUSIC],cur_playlist[i]+1); cur_playlist[i][0]=33; remain_play--; *c=d; diff --git a/GAME/SOUBOJE.C b/game/souboje.c similarity index 99% rename from GAME/SOUBOJE.C rename to game/souboje.c index 7750155..52a396f 100644 --- a/GAME/SOUBOJE.C +++ b/game/souboje.c @@ -3,7 +3,6 @@ #include #include #include -#include #include #include #include @@ -30,7 +29,7 @@ HUM_ACTION spell_string; short caster; short vybrana_zbran=-1; char plr_switcher[POCET_POSTAV]; -static autostart_round=0; +static int autostart_round=0; char autoattack=0; char immortality=0; @@ -250,7 +249,7 @@ void presun_krok(EVENT_MSG *msg,void **user) user; if (msg->msg==E_INIT) return; if (msg->msg==E_DONE) return; - postavy[select_player].actions--; + postavy[select_player].actions--; if (hromadny_utek) { int i; @@ -287,7 +286,7 @@ char q_zacit_souboj(TMOB *p,int d,short sector) int ss; int i; - if (p->vlastnosti[VLS_KOUZLA] & (SPL_STONED | SPL_FEAR)) return 0; + if (p->vlastnosti[VLS_KOUZLA] & (SPL_STONED | SPL_FEAR)) return 0; dsee++; // if (battle) return 1; prekvapeni=0; @@ -371,7 +370,7 @@ int vypocet_zasahu(short *utocnik,short *obrance, int chaos,int zbran,int bonus zasah=utok-(ddef=obrana); } if (zasah<0) zasah=0; - if (zasah>0) zasah+=utocnik[VLS_DAMAGE],zasah=max(zasah,1); + if (zasah>0) zasah+=utocnik[VLS_DAMAGE],zasah=MAX(zasah,1); ddostal=zasah; zasah=zasah+mutok; if (zasah>0) @@ -382,7 +381,7 @@ int vypocet_zasahu(short *utocnik,short *obrance, int chaos,int zbran,int bonus if (flg & SPL_SANC) zasah/=2; if (flg & SPL_HSANC) zasah/=4; if (flg & SPL_TVAR) zasah=-zasah; - return zasah; + return zasah; } void rozhodni_o_poradi() @@ -416,7 +415,7 @@ void rozhodni_o_poradi() } void hrat_souboj() { - static counter=0; + static int counter=0; char cond=ms_last_event.y>378 && ms_last_event.x>510 && cur_mode!=MD_PRESUN; if (cond) schovej_mysku(); redraw_scene(); @@ -648,7 +647,7 @@ T_CLK_MAP clk_end_game[]= EVENT_PROC(end_game_end_phase) { - static wait=0; + static int wait=0; WHEN_MSG(E_TIMER) { if (pass_zavora) return; @@ -733,17 +732,17 @@ void wire_presun_postavy() cancel_render=1; } -static DWORD SPozdrzeno=0; +static uint32_t SPozdrzeno=0; -static char JePozdrzeno() +char JePozdrzeno() { - return GetTickCount()actions=p->utek; if (game_extras & EX_GROUP_FLEE && (minact=UtekHromadne(p->sektor))!=0) - { + { int i; p->actions=minact; hromadny_utek=p->sektor; - for (i=0;isektor) + for (i=0;isektor) { int wf=weigth_defect(postavy+i)+2; postavy[i].kondice-=minact*wf; @@ -831,7 +830,7 @@ void utek_postavy(THUMAN *p) prejdi_na_pohled(p); } -int trace_path(sector,dir) +int trace_path(int sector,int dir) { int mm,p,c=5; int r=rnd(2); @@ -1111,9 +1110,9 @@ static char StrachPostavy(THUMAN *p) for(select_player=0;select_player<6;select_player++) if (postavy+select_player==p) break; bott_draw(0); labyrinth_find_path(p->sektor,65535,SD_PLAY_IMPS,valid_sectors,NULL); - ln=labyrinth_find_path(p->sektor,last_sector,SD_PLAY_IMPS,valid_sectors,&cesta); + ln=labyrinth_find_path(p->sektor,last_sector,SD_PLAY_IMPS,valid_sectors,&cesta); if (cesta[0]==0) {free(cesta);return 0;} - for (i=0;i<6 && cesta[i] && p->kondice ;i++) + for (i=0;i<6 && cesta[i] && p->kondice ;i++) { int dir; for (dir=0;dir<4;dir++) if (map_sectors[p->sektor].step_next[dir]==cesta[i]) break; @@ -1122,7 +1121,7 @@ static char StrachPostavy(THUMAN *p) p->sektor=cesta[i]; build_player_map(); prejdi_na_pohled(p); - Sleep(200); + sleep_ms(200); p->kondice-=wf; } p->provadena_akce+=p->programovano-1; @@ -1202,7 +1201,7 @@ void jadro_souboje(EVENT_MSG *msg,void **unused) //!!!! Jadro souboje switch(p->provadena_akce->action) { case AC_MOVE: - { + { int wf=weigth_defect(p)+1; p->actions++; p->kondice-=p->actions*wf; @@ -1767,7 +1766,7 @@ char mask_click_help_clear(int id,int xa,int ya,int xr,int yr) static void zahajit_kolo(char prekvapeni) { int i,j; - + for(i=0;ivlastnosti; vls2=hu->stare_vls; @@ -2349,7 +2348,7 @@ char player_check_death(THUMAN *p, char afterround) else map_coord[p->sektor].flags |= MC_DEAD_PLR; GlobEvent(MAGLOB_ONDEADMAN+p->female,viewsector,viewdir); return 1; - } + } else { if (p->lives<0) p->lives=0; @@ -2378,7 +2377,7 @@ char player_hit(THUMAN *p,int zraneni,char manashield) h+=rnd(2); if (!mute_hit_sound) { - if (GlobEvent(MAGLOB_ONHITMAN+p->female,p->sektor,p->direction)) + if (GlobEvent(MAGLOB_ONHITMAN+p->female,p->sektor,p->direction)) play_sample_at_sector(h,p->sektor,viewsector,0,0); tt=add_to_timer(TM_CLEAR_ZASAHY,100+rnd(100),1,vymaz_zasahy);tt->userdata[0]=p-postavy;tt->userdata[1]=p->dostal; } diff --git a/GAME/SPECPROC.C b/game/specproc.c similarity index 96% rename from GAME/SPECPROC.C rename to game/specproc.c index 1390f67..9f19fd4 100644 --- a/GAME/SPECPROC.C +++ b/game/specproc.c @@ -20,7 +20,7 @@ static void event_error(char *text,int number) char buff[256]; closemode(); sprintf(buff,"%s\n Specproc num: %d\n",text,number); - MessageBox(NULL,buff,NULL,MB_OK|MB_ICONSTOP); + display_error(buff); exit(1); } @@ -243,9 +243,9 @@ static void OtocObrazPodleMatice(float mx[3][2], word *picture) int oldy=y-180; int newx=toInt(oldx*mx[0][0]+oldy*mx[1][0]+320); int newy=toInt(oldx*mx[0][1]+oldy*mx[1][1]+180); - if (newx>=0 && newx<640 && newy>=0 && newy<360) - trg[x]=picture[newx+640*newy]; - else + if (newx>=0 && newx<640 && newy>=0 && newy<360) + trg[x]=picture[newx+640*newy]; + else trg[x]=0; } } @@ -256,7 +256,7 @@ static void OtaceniObrazu() float mx[3][2]; int maxtime=500; - int lasttime=GetTickCount(); + int lasttime=get_game_tick_count(); int curtime; get_picture(0,17,640,360,picture); do @@ -265,7 +265,7 @@ static void OtaceniObrazu() float uhel; float cosuhel; float sinuhel; - curtime=GetTickCount()-lasttime; + curtime=get_game_tick_count()-lasttime; phase=curtime/(float)maxtime; if (phase>1.0f) phase=1.0f; uhel=phase*3.14159265; @@ -280,7 +280,7 @@ static void OtaceniObrazu() do_events(); } while (curtimesector,i,m->stay_strategy & MOB_BIG,0)) { - int l=4,z,max=RAND_MAX+1; + int l=4,z,max=RAND_MAX; for(i=0;i<4;i++) if (!mob_check_next_sector(m->sector,i,m->stay_strategy & MOB_BIG,0)) { @@ -682,7 +682,7 @@ char call_mob_event(int event_number,int event_type,TMOB *m) { if (!event_number) return 0; if (event_number>=SP_MOB_TAB_SIZE) - event_error("Nestvra pouva neplatnou specproc.",event_number); + event_error("Nestv�ra pou��va neplatnou specproc.",event_number); cur_event_number=event_number; return sp_mob_table[event_number](event_type,m); } @@ -691,7 +691,7 @@ char call_item_event(int event_number,int event_type,short *ptr,THUMAN *p) { if (!event_number) return 0; if (event_number>=SP_ITEM_TAB_SIZE) - event_error("slo udlosti u vci je neplatn. Specproc nen definovna.",event_number); + event_error("��slo ud�losti u v�ci je neplatn�. Specproc nen� definov�na.",event_number); cur_event_number=event_number; return sp_item_table[event_number](event_type,ptr,p); } @@ -700,7 +700,7 @@ char call_map_event(int event_number,int sector,int side,int value,int event) { if (!event_number) return 0; if (event_number>=SP_MAP_TAB_SIZE) - event_error("Neplatn slo udlosti na stn. Specproc s tmto slem nen definovna.",event_number); + event_error("Neplatn� ��slo ud�losti na st�n�. Specproc s t�mto ��slem nen� definov�na.",event_number); cur_event_number=event_number; return sp_map_table[event_number](sector,side,value,event); } diff --git a/GAME/SPECPROC.H b/game/specproc.h similarity index 100% rename from GAME/SPECPROC.H rename to game/specproc.h diff --git a/game/temp_storage.h b/game/temp_storage.h new file mode 100644 index 0000000..3a553ef --- /dev/null +++ b/game/temp_storage.h @@ -0,0 +1,26 @@ + + +///store to temp storage +void temp_storage_store(const char *name, const void *data, long size); +///find in temp storage - returns -1 = not found, otherwise size of data +long 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); + +void temp_storage_list(void (*callback)(const char *, void *), void *context); + +void temp_storage_clear(); + +typedef struct _temp_storage_file_rd TMPFILE_RD; +typedef struct _temp_storage_file_wr TMPFILE_WR; + +TMPFILE_RD *temp_storage_open(const char *name); +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_skip(TMPFILE_RD *f, int bytes); + + diff --git a/GAME/TRANSAV.C b/game/transav.c similarity index 97% rename from GAME/TRANSAV.C rename to game/transav.c index 009df02..08fdb4d 100644 --- a/GAME/TRANSAV.C +++ b/game/transav.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include @@ -83,9 +82,9 @@ int startsect; int startsid; -char cz_table_1[]=" 1!3457908+,-./+\"?=:_2ABCDEFGHIJKLMNOPQRSTUVWXYZ\\)6=;abcdefghijklmnopqrstuvwxyz/|(; "; -char cz_table_2[]=" !\"#$%&'()*+,-./0123456789:;<=>?@BCDFGHJKMNPQSTVWXZ[\\]^_`bcdfghjkmnpqstvwxz{|}~ "; -char cz_table_3[]=" !\"#$%&'()*+,-./0123456789:;<=>?@ABFGHIJKMPQVWXY[\\]^_`abfghijkmpqvwxy{|}~ "; +char cz_table_1[]=" 1!3457�908+,-./�+��������\"�?=:_2ABCDEFGHIJKLMNOPQRSTUVWXYZ�\\)6=;abcdefghijklmnopqrstuvwxyz/|(; "; +char cz_table_2[]=" !\"#$%&'()*+,-./0123456789:;<=>?@�BCD�FGH�JK�MN�PQ�ST�VWX�Z[\\]^_`�bcd�fgh�jk�mn�pq�st�vwx�z{|}~ "; +char cz_table_3[]=" !\"#$%&'()*+,-./0123456789:;<=>?@AB���FGHIJK�M��PQ����VWXY�[\\]^_`ab���fghijk�m��pq����vwxy�{|}~ "; char *cz_key_tabs[]={cz_table_1,cz_table_2,cz_table_3}; word keyconv(word key) diff --git a/GAME/version.h b/game/version.h similarity index 88% rename from GAME/version.h rename to game/version.h index 50623c8..0ccd41c 100644 --- a/GAME/version.h +++ b/game/version.h @@ -1,7 +1,7 @@ #define VERSION_MAJOR 1 #define VERSION_MAJORT "1" -#define VERSION_MINOR 2 -#define VERSION_MINORT "2" +#define VERSION_MINOR 3 +#define VERSION_MINORT "3" #define VERSION_BUILD 17 #define VERSION_BUILDT "17" diff --git a/GAME/WIZARD.C b/game/wizard.c similarity index 52% rename from GAME/WIZARD.C rename to game/wizard.c index afbf429..a31f018 100644 --- a/GAME/WIZARD.C +++ b/game/wizard.c @@ -1,17 +1,11 @@ #include -#include -#include -#include #include #include #include #include #include -#include #include #include -#include -#include #include #include #include @@ -23,34 +17,18 @@ #include #include #include +#include #include "globals.h" -#include -#include void kamenik2windows(const char *src, int size, char *trg); #define BREAK -static HWND hWizardDlg=NULL; -static HWND hWizardText; -static HFONT hfCourier; - static void wzprintf(const char *text,...) { - int len=GetWindowTextLength(hWizardText); - char *c=(char *)alloca(len+1024); - char *d; - va_list args; - - GetWindowText(hWizardText,c,len+1024); - if (len>10000) c+=1024; - d=strchr(c,0); - va_start(args,text); - _vsnprintf(d,1020,text,args); - SetWindowText(hWizardText,c); - len=strlen(c); - SendMessage(hWizardText,EM_SETSEL,len,len); - SendMessage(hWizardText,EM_SCROLLCARET,0,0); + va_list lst; + va_start(lst, text); + vprintf(text, lst); } static void wzputs(const char *text) @@ -61,118 +39,17 @@ static void wzputs(const char *text) static void wzcls() { - SetWindowText(hWizardText,""); + } -static LRESULT InputWindow(HWND hDlg,UINT msg, WPARAM wParam,LPARAM lParam) - { - static char *buff; - switch (msg) - { - case WM_INITDIALOG: - buff=(char *)lParam; - SetDlgItemText(hDlg,IDC_PROMPT,buff); - hDlg=GetWindow(hDlg,GW_OWNER); - EnableWindow(hDlg,TRUE); - return 0; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDCANCEL: EndDialog(hDlg,0);break; - case IDOK: - GetDlgItemText(hDlg,IDC_VALUE,buff,1020); - EndDialog(hDlg,1); - break; - } - break; - default: return 0; - } - return 1; - } - -static LRESULT CALLBACK ListWindow(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) -{ - switch (msg) - { - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDOK: - case IDCANCEL: PostQuitMessage(LOWORD(wParam));break; - case IDC_LIST: if (HIWORD(wParam)==LBN_DBLCLK) PostQuitMessage(IDOK);break; - default: return 0; - } - default: return 0; - } - return 1; -} - -static HWND PrepareListWindow(HWND parent) -{ - HWND res; - RECT rc1,rc2; - GetWindowRect(parent,&rc1); - EnableWindow(parent,0); - res=CreateDialog(GetModuleHandle(0),MAKEINTRESOURCE(IDD_LISTDIALOG),parent,(DLGPROC)ListWindow); - GetWindowRect(res,&rc2); - rc2.right=rc2.right-rc2.left; - rc2.bottom=rc2.bottom-rc2.top; - rc2.left=(rc1.left+rc1.right-rc2.right)/2; - rc2.top=(rc1.top+rc1.bottom-rc2.right)/2; - SetWindowPos(res,0,rc2.left,rc2.top,rc2.right,rc2.bottom,SWP_NOZORDER); - ShowWindow(res,SW_SHOW); - - return res; -} - -static void CloseListWindow(HWND wnd) -{ - HWND parent=GetParent(wnd); - DestroyWindow(wnd); - EnableWindow(parent,1); -} - -static int PumpDialogMessages(HWND dlg) -{ - MSG msg; - while (GetMessage(&msg,0,0,0)) - { - if (!IsDialogMessage(dlg,&msg)) - { - TranslateMessage(&msg); - DispatchMessage(&msg); - } - } - return msg.wParam; -} static int wzscanf(const char *prompt, const char *format,...) { - char buff[1024]; - va_list args; - unsigned long data[10]; - int i; - - static char notallowed=0; - - if (notallowed) return 0; - notallowed=1; - - strcpy(buff,prompt); - if (DialogBoxParam(GetModuleHandle(NULL),MAKEINTRESOURCE(IDD_INPUTWINDOW),GetActiveWindow(),(DLGPROC)InputWindow,(LPARAM)buff)==0) - { - notallowed=0; - return 0; - } - - notallowed=0; - - va_start(args,format); - for (i=0;i<10;i++) data[i]=va_arg(args,unsigned long); - return sscanf(buff,format,data[0],data[1],data[2],data[3],data[4],data[5],data[6],data[7],data[8],data[9]); + va_list lst; + va_start(lst, format); + return vscanf(format, lst); } - char *side_flags[]= { "AUTOMAP", @@ -234,32 +111,8 @@ char *mc_flags[]= "!SUMMON" }; -void mman_scan(int action) +void mman_scan(int ) { - extern char screenstate; - static pos=0,zavora=0; - MEMORYSTATUS mmi; - char c[10]; - if (screenstate && !zavora) - { - zavora=1; - switch(action) - { - case MMA_SWAP:curcolor=RGB555(31,0,0);break; - case MMA_READ:curcolor=RGB555(0,31,0);break; - case MMA_SWAP_READ:curcolor=RGB555(0,0,31);break; - case MMA_FREE:curcolor=RGB555(31,31,31);break; - } - bar(pos,0,pos+16,16); - get_mem_info(&mmi); - set_font(H_FBOLD,RGB555(31,31,31)); - curcolor=0; - bar(16,0,66,16); - position(16,0);sprintf(c,"%d",mmi.dwAvailPageFile/1024); - outtext(c); - showview(pos,0,66,16); - zavora=0; - } } void show_flags(int number,char **flags,char nums) @@ -418,6 +271,7 @@ static char raise_death(void) return 0; } +/* static char raise_killed_monster(HWND hDlg) { HWND listdlg=PrepareListWindow(hDlg); @@ -426,7 +280,7 @@ static char raise_death(void) int i; int res; - for (i=0;isector_type, ss->floor,ss->ceil,ss->sector_tag,ss->side_tag,ss->action); - wzprintf(" Vychody: Sev %d Vych %d Jih %d Zp %d\r\n",ss->step_next[0],ss->step_next[1],ss->step_next[2],ss->step_next[3]); + wzprintf(" Vychody: Sev %d Vych %d Jih %d Z�p %d\r\n",ss->step_next[0],ss->step_next[1],ss->step_next[2],ss->step_next[3]); wzprintf(" Vlajky: %02X %02X ",ss->flags,map_coord[viewsector].flags);show_flags(map_coord[viewsector].flags,mc_flags,12); wzputs("\r\n"); wzprintf("Stena: Prim %d Sec %d Obl %d Anim_prim %d/%d Anim_sec %d/%d\r\n", @@ -562,153 +416,6 @@ static char display_game_status(void) return 0; } -static LRESULT WizardDlgProc(HWND hDlg,UINT msg, WPARAM wParam,LPARAM lParam) - { - int i; - switch (msg) - { - case WM_INITDIALOG: - hWizardDlg=hDlg; - hWizardText=GetDlgItem(hDlg,IDC_OUTPUT); - SendMessage(hWizardText,WM_SETFONT,(WPARAM)hfCourier,1); - display_game_status(); - SetTimer(hDlg,10,20,NULL); - return 0; - case WM_TIMER: do_events();return 1; - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDCANCEL: EndDialog(hDlg,0);return 0; - case IDC_CLEARMAP: - { - HWND listwnd=PrepareListWindow(hDlg); - HWND list=GetDlgItem(listwnd,IDC_LIST); - int res; - ListBox_AddString(list,"Clear Monsters"); - ListBox_AddString(list,"Clear Items"); - res=PumpDialogMessages(listwnd); - if (res==IDOK) - { - if (ListBox_GetSel(list,0)) - { - for(i=0;i:","%d %d",&i,&j)) return 0; - c=MessageBox(GetActiveWindow(),"Automaticky?","?",MB_YESNO|MB_ICONQUESTION); - if (i>0) advence_player(i-1,j,c==IDYES);else - for(i=0;i:",mapsize-1); - if (!wzscanf(prompt,"%d",&viewsector)) return 0; - chod_s_postavama(1); - SEND_LOG("(WIZARD) Goto %d",viewsector,0); - return 0; - } - case IDC_LOADMAP: - if (!wzscanf("Load Map ","%s %hd",loadlevel.name,&loadlevel.start_pos)) return 0; - for(i=0;i':if (mman_action!=NULL) mman_action=NULL;else mman_action=mman_scan;break; @@ -740,7 +441,7 @@ void wizard_kbd(EVENT_MSG *msg,void **usr) if (folow_mob==255) folow_mode=0; */ break; - + default: msg->msg=E_KEYBOARD;break; diff --git a/GAME/WIZARD.H b/game/wizard.h similarity index 100% rename from GAME/WIZARD.H rename to game/wizard.h diff --git a/insteng/SETUP.C b/insteng/SETUP.C index 882b212..b0ce098 100644 --- a/insteng/SETUP.C +++ b/insteng/SETUP.C @@ -212,7 +212,7 @@ static void display_progress(void) def_dialoge(312,380,310,75,"Copying some files...",3); define(10,10,27,290,15,0,done_bar,100); property(bbutt,NULL,flat_color(0x1e0),WINCOLOR);c_default(0); - define(30,5,5,80,15,2,button,"Stop");on_change(stop_copy); + define(30,5,5,80,15,2,button,"Stop");on_control_change(stop_copy); property(def_border(1,0),&font6x9,flat_color(0),BUTTONCOLOR); define(20,5,10,200,12,3,input_line,2048);set_default(""); property(NULL,&font6x9,flat_color(0),WINCOLOR); @@ -306,7 +306,7 @@ static void open_handbook(char *file) handbook=read_text(file); win_handbook=def_dialoge(54,54,450,350,"Handbook",2); def_listbox(9,5,25,420,290,handbook,0,WINCOLOR);property(def_border(0,WINCOLOR),&font6x9,NULL,WINCOLOR); - define(20,5,5,60,15,2,button2,"Close");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(close_current); + define(20,5,5,60,15,2,button2,"Close");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(close_current); redraw_window(); } @@ -441,11 +441,11 @@ static load_window() set_full_target_path(0); for(i=0;i"); sound_win=def_dialoge(200,300,300,156,"Sound devices",2); - define(9,2,20,170,85,0,listbox,ls,0x03ff,0);c_default(sound_info.device);on_change(device_select2); + define(9,2,20,170,85,0,listbox,ls,0x03ff,0);c_default(sound_info.device);on_control_change(device_select2); property(def_border(0,0x4210),vga_font,NULL,WINCOLOR); define(-1,180,20,1,1,0,label,"Port:"); define(20,10,20,30,12,1,input_line,3);property(def_border(0,0x4210),vga_font,NULL,WINCOLOR); set_default(itoa(sound_info.port,buff,16)); define(-1,180,40,1,1,0,label,"DMA:"); i=sound_info.dma;i-=(i>2)+(i>4); - define(30,40,40,30,30,1,radio_butts,3,"0","1","3");c_default(i);on_change(change_dma); - define(35,10,40,30,30,1,radio_butts,3,"5","6","7");c_default(i-3);on_change(change_dma); + define(30,40,40,30,30,1,radio_butts,3,"0","1","3");c_default(i);on_control_change(change_dma); + define(35,10,40,30,30,1,radio_butts,3,"5","6","7");c_default(i-3);on_control_change(change_dma); define(-1,180,80,1,1,0,label,"IRQ:"); i=sound_info.irq;i-=2*(i>1)+(i>4)+(i>6); define(40,40,80,30,40,1,radio_butts,4,"2","3","5","7");c_default(i); - define(50,10,5,80,20,2,button,"Test");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(test_sound); - define(60,100,5,80,20,2,button,"Autodetect");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(detect_sound); - define(70,190,5,80,20,2,button,"Stop");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(stop_sound); + define(50,10,5,80,20,2,button,"Test");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(test_sound); + define(60,100,5,80,20,2,button,"Autodetect");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(detect_sound); + define(70,190,5,80,20,2,button,"Stop");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(stop_sound); redraw_window(); set_enable(0,70,mixer_running); device_select(); @@ -799,7 +799,7 @@ static void back_start() stop_sound(); sound_scan(); while (waktual!=NULL) close_current(); - terminate(); + terminate_gui(); } static void control_window(void *forward,void *back,void *help); @@ -1056,22 +1056,22 @@ static void rozsah_window() exit_wait=0; default_font=&font6x9; def_dialoge(146,160,348,264,"Installation ragne:",2); - define(10,10,30,70,30,0,button,"Minimum");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); + define(10,10,30,70,30,0,button,"Minimum");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); define(-1,90,30,1,1,0,label,"It will copy all important files"); define(-1,90,40,1,1,0,label,"Data are loaded from CD"); sprintf(buff,text,install_sizes[0]/1024); define(-1,90,50,1,1,0,label,buff); - define(20,10,80,70,30,0,button,"Normal");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); + define(20,10,80,70,30,0,button,"Normal");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); define(-1,90,80,1,1,0,label,"It will copy all important files and data"); define(-1,90,90,1,1,0,label,"Music and video are loaded from CD"); sprintf(buff,text,install_sizes[1]/1024); define(-1,90,100,1,1,0,label,buff); - define(30,10,130,70,30,0,button,"Full");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); + define(30,10,130,70,30,0,button,"Full");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); define(-1,90,130,1,1,0,label,"It will copy all files."); define(-1,90,140,1,1,0,label,"You will not need CD anymore."); sprintf(buff,text,install_sizes[2]/1024); define(-1,90,150,1,1,0,label,buff); - define(40,10,180,70,20,0,button,"Browse");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(open_load_window); + define(40,10,180,70,20,0,button,"Browse");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(open_load_window); define(60,90,185,250,11,0,input_line,2048);property(def_border(1,0x4210),&font6x9,NULL,0x7fff); set_default(target_path); on_event(show_space_event);on_exit(show_space_exit); @@ -1089,12 +1089,12 @@ static void automatic_window() exit_wait=0; default_font=&font6x9; def_dialoge(110,200,420,80,"Target directory:",2); - define(40,10,33,70,15,0,button,"Browse");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(open_load_window); + define(40,10,33,70,15,0,button,"Browse");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(open_load_window); define(60,90,35,310,11,0,input_line,2048);property(def_border(1,0x4210),&font6x9,NULL,0x7fff); set_default(target_path); on_event(show_space_event);on_exit(show_space_exit); - define(10,10,10,70,20,2,button,"Start");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(start_install); - define(20,90,10,70,20,2,button,"<< Back");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(back_start); + define(10,10,10,70,20,2,button,"Start");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(start_install); + define(20,90,10,70,20,2,button,"<< Back");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(back_start); sprintf(buff,text,install_sizes[0]/1024); define(90,180,20,200,10,2,view_line,100);set_default(buff); define(80,180,10,200,10,2,view_line,100);set_default(""); @@ -1115,11 +1115,11 @@ static void control_next1() static void control_window(void *forward,void *back,void *help) { def_dialoge(524,300,96,156,"Options",2); - define(10,8,30,80,20,0,button,"Next >>");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(forward); - define(20,8,60,80,20,0,button,"<< Back");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(back); - define(30,8,90,80,20,0,button,"? Help");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(help); + define(10,8,30,80,20,0,button,"Next >>");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(forward); + define(20,8,60,80,20,0,button,"<< Back");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(back); + define(30,8,90,80,20,0,button,"? Help");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(help); define(40,8,10,80,20,3,button,"Quit");property(bbutt,&font6x9,NULL,BUTTONCOLOR); - if (setup_mode) on_change(stop_setup);else on_change(stop_copy); + if (setup_mode) on_control_change(stop_setup);else on_control_change(stop_copy); set_enable(0,10,forward!=NULL); set_enable(0,20,back!=NULL); set_enable(0,30,help!=NULL); @@ -1227,8 +1227,8 @@ static void deinstall() define(-1,10,40,200,100,0,label,"After it, you won't be able to play"); define(-1,10,50,200,100,0,label,"the game until you install it again."); define(10,30,80,150,10,0,check_box,"Don't erase saved positions");c_default(1); - define(20,10,10,80,30,3,button,"Yes, do it!");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(terminate); - define(30,10,10,80,30,2,button,"No, newer!");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_change(terminate); + define(20,10,10,80,30,3,button,"Yes, do it!");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(terminate_gui); + define(30,10,10,80,30,2,button,"No, newer!");property(bbutt,&font6x9,NULL,BUTTONCOLOR);on_control_change(terminate_gui); redraw_window(); escape(); if (o_aktual->id==30) @@ -1296,12 +1296,12 @@ void warning() _outtext("(C)1998 Napoleon gameS - Setup version 1.0 written by Ondrej Novak\n" "\n\nNote:\n"); _settextcolor(15); - _outtext(""); REPEAT(i,78) _outtext("");_outtext(""); + _outtext("�"); REPEAT(i,78) _outtext("�");_outtext("�"); REPEAT(j,5) { - _outtext(""); REPEAT(i,78)_outtext(" ");_outtext(""); + _outtext("�"); REPEAT(i,78)_outtext(" ");_outtext("�"); } - _outtext(""); REPEAT(i,78) _outtext("");_outtext(""); + _outtext("�"); REPEAT(i,78) _outtext("�");_outtext("�"); _settextcolor(13); _settextwindow(6,2,20,79); _outtext( @@ -1327,9 +1327,9 @@ static void ask_video() ask_video_win=def_dialoge(242,100,156,156,"Select resolution",3); define(9,0,20,156,80,0,listbox,video_ls,0x03ff,0);c_default(vmode); property(NULL,vga_font,NULL,WINCOLOR); - define(20,5,5,60,20,2,button,"Quit");on_change(terminate); + define(20,5,5,60,20,2,button,"Quit");on_control_change(terminate_gui); property(bbutt,NULL,NULL,BUTTONCOLOR); - define(20,70,5,60,20,2,button,"Ok");on_change(test_mode_xxx); + define(20,70,5,60,20,2,button,"Ok");on_control_change(test_mode_xxx); property(bbutt,NULL,NULL,BUTTONCOLOR); redraw_window(); } @@ -1347,7 +1347,7 @@ static EVENT_PROC(esc_mode) rescue_mode=1; redraw_desktop(); vmode=0; - terminate(); + terminate_gui(); } } } @@ -1361,7 +1361,7 @@ static void about_window() define(-1,10,30,240,10,0,mid_label,"Welcome in Install:"); define(-1,10,42,240,10,0,mid_label,"The Gates of Skeldal "); define(-1,10,80,240,10,0,mid_label,"Install written by:"); - define(-1,10,92,240,10,0,mid_label,"Ondej Novk"); + define(-1,10,92,240,10,0,mid_label,"Ond�ej Nov�k"); define(-1,10,110,240,10,0,mid_label,"(C)1998 Napoleon gameS"); redraw_window(); escape(); diff --git a/insteng/SETVIDEO.C b/insteng/SETVIDEO.C index c509677..359c20e 100644 --- a/insteng/SETVIDEO.C +++ b/insteng/SETVIDEO.C @@ -156,7 +156,7 @@ long def_window(word xs,word ys,char *name) if (xs>=70) { define(1,1,1,19,16,1,button,"\x0f"); - property(NULL,icones,&icone_color,WINCOLOR);on_change(close_current); + property(NULL,icones,&icone_color,WINCOLOR);on_control_change(close_current); } return q; } @@ -201,9 +201,9 @@ void def_listbox(int id,word x,word y,word xs,word ys,TSTR_LIST ls,int ofs,int c define(id+1,x+xs+4,y+18,15,ys-35,0,scroll_bar_v,0,10,1,0x0200); property(&b2,NULL,NULL,WINCOLOR); define(id+2,x+xs+4,y,14,14,0,scroll_button,-1,0,"\x4"); - property(&b1,icones,black,WINCOLOR);on_change(scroll_support); + property(&b1,icones,black,WINCOLOR);on_control_change(scroll_support); define(id+3,x+xs+4,y+ys-14,14,14,0,scroll_button,1,10,"\6"); - property(&b1,icones,black,WINCOLOR);on_change(scroll_support); + property(&b1,icones,black,WINCOLOR);on_control_change(scroll_support); define(id,x,y,xs,ys,0,listbox,ls,color,ofs); property(&b2,NULL,NULL,WINCOLOR); } diff --git a/LIBS/ADDTEXT.C b/libs/addtext.c similarity index 100% rename from LIBS/ADDTEXT.C rename to libs/addtext.c diff --git a/LIBS/ADVINST.C b/libs/advinst.c similarity index 100% rename from LIBS/ADVINST.C rename to libs/advinst.c diff --git a/LIBS/BASICOBJ.C b/libs/basicobj.c similarity index 100% rename from LIBS/BASICOBJ.C rename to libs/basicobj.c diff --git a/LIBS/BASICOBJ.H b/libs/basicobj.h similarity index 100% rename from LIBS/BASICOBJ.H rename to libs/basicobj.h diff --git a/LIBS/BGRAPH.C b/libs/bgraph.c similarity index 100% rename from LIBS/BGRAPH.C rename to libs/bgraph.c diff --git a/LIBS/BGRAPH.H b/libs/bgraph.h similarity index 99% rename from LIBS/BGRAPH.H rename to libs/bgraph.h index d1e8021..9186a15 100644 --- a/LIBS/BGRAPH.H +++ b/libs/bgraph.h @@ -6,6 +6,7 @@ #define point point32 word *GetScreenAdr(); +long GetScreenSizeBytes(); word *GetBuffer2nd(); void RedirectScreen(word *newaddr); void RestoreScreen(); diff --git a/LIBS/BGRAPH1.ASM b/libs/bgraph1.asm similarity index 100% rename from LIBS/BGRAPH1.ASM rename to libs/bgraph1.asm diff --git a/LIBS/Bgraph2.c b/libs/bgraph2.c similarity index 100% rename from LIBS/Bgraph2.c rename to libs/bgraph2.c diff --git a/LIBS/BGRAPH2A.ASM b/libs/bgraph2a.asm similarity index 100% rename from LIBS/BGRAPH2A.ASM rename to libs/bgraph2a.asm diff --git a/LIBS/bgraph2a.c b/libs/bgraph2a.c similarity index 100% rename from LIBS/bgraph2a.c rename to libs/bgraph2a.c diff --git a/LIBS/bgraph2a.cpp b/libs/bgraph2a.cpp similarity index 100% rename from LIBS/bgraph2a.cpp rename to libs/bgraph2a.cpp diff --git a/LIBS/bios.h b/libs/bios.h similarity index 100% rename from LIBS/bios.h rename to libs/bios.h diff --git a/LIBS/BLDICONS.C b/libs/bldicons.c similarity index 100% rename from LIBS/BLDICONS.C rename to libs/bldicons.c diff --git a/LIBS/BMOUSE.C b/libs/bmouse.c similarity index 100% rename from LIBS/BMOUSE.C rename to libs/bmouse.c diff --git a/LIBS/BMOUSE.H b/libs/bmouse.h similarity index 100% rename from LIBS/BMOUSE.H rename to libs/bmouse.h diff --git a/LIBS/BMP2HI.C b/libs/bmp2hi.c similarity index 100% rename from LIBS/BMP2HI.C rename to libs/bmp2hi.c diff --git a/LIBS/CSPELLS.C b/libs/cspells.c similarity index 100% rename from LIBS/CSPELLS.C rename to libs/cspells.c diff --git a/LIBS/DEVICES.C b/libs/devices.c similarity index 100% rename from LIBS/DEVICES.C rename to libs/devices.c diff --git a/LIBS/DEVICES.H b/libs/devices.h similarity index 100% rename from LIBS/DEVICES.H rename to libs/devices.h diff --git a/LIBS/DOSERR.ASM b/libs/doserr.asm similarity index 100% rename from LIBS/DOSERR.ASM rename to libs/doserr.asm diff --git a/LIBS/DOSERR.H b/libs/doserr.h similarity index 100% rename from LIBS/DOSERR.H rename to libs/doserr.h diff --git a/LIBS/ENGINE1.C b/libs/engine1.c similarity index 100% rename from LIBS/ENGINE1.C rename to libs/engine1.c diff --git a/LIBS/ENGINE2.ASM b/libs/engine2.asm similarity index 100% rename from LIBS/ENGINE2.ASM rename to libs/engine2.asm diff --git a/LIBS/ERRTEST.C b/libs/errtest.c similarity index 100% rename from LIBS/ERRTEST.C rename to libs/errtest.c diff --git a/LIBS/EVENT.C b/libs/event.c similarity index 100% rename from LIBS/EVENT.C rename to libs/event.c diff --git a/LIBS/EVENT.H b/libs/event.h similarity index 100% rename from LIBS/EVENT.H rename to libs/event.h diff --git a/LIBS/EXPAND.C b/libs/expand.c similarity index 100% rename from LIBS/EXPAND.C rename to libs/expand.c diff --git a/LIBS/EXTRACT.C b/libs/extract.c similarity index 100% rename from LIBS/EXTRACT.C rename to libs/extract.c diff --git a/LIBS/FASTLOAD.C b/libs/fastload.c similarity index 100% rename from LIBS/FASTLOAD.C rename to libs/fastload.c diff --git a/LIBS/GRAPHTST.C b/libs/graphtst.c similarity index 100% rename from LIBS/GRAPHTST.C rename to libs/graphtst.c diff --git a/LIBS/GUI.C b/libs/gui.c similarity index 99% rename from LIBS/GUI.C rename to libs/gui.c index 23b970d..689296d 100644 --- a/LIBS/GUI.C +++ b/libs/gui.c @@ -619,7 +619,7 @@ void do_it_events(EVENT_MSG *msg,void **user_data) else { if (o_aktual->enabled) b=mouse_in_object(msev,o_aktual,waktual);else b=0; - if (b) + if (b) o_aktual->runs[2](msg,o_aktual); if ((msev->tl1 || msev->tl2 || msev->tl3)&& !b) { diff --git a/LIBS/GUI.H b/libs/gui.h similarity index 95% rename from LIBS/GUI.H rename to libs/gui.h index 3b4d0b9..9e0a304 100644 --- a/LIBS/GUI.H +++ b/libs/gui.h @@ -133,11 +133,11 @@ void close_current(); void check_window(WINDOW *w); void install_gui(void); void uninstall_gui(void); -void on_change(void (*proc)()); -void on_enter(void (*proc)()); -void on_exit(void (*proc)()); -void on_event(void (*proc)()); -void terminate(void); +void on_control_change(void (*proc)()); +void on_control_enter(void (*proc)()); +void on_control_exit(void (*proc)()); +void on_control_event(void (*proc)()); +void terminate_gui(void); void set_change(void); void set_value(int win_id,int obj_id,void *value); void set_default(void *value); diff --git a/LIBS/INICFG.C b/libs/inicfg.c similarity index 100% rename from LIBS/INICFG.C rename to libs/inicfg.c diff --git a/LIBS/INICFG.H b/libs/inicfg.h similarity index 100% rename from LIBS/INICFG.H rename to libs/inicfg.h diff --git a/LIBS/LEX_LIB.C b/libs/lex_lib.c similarity index 100% rename from LIBS/LEX_LIB.C rename to libs/lex_lib.c diff --git a/LIBS/LZWA.ASM b/libs/lzwa.asm similarity index 100% rename from LIBS/LZWA.ASM rename to libs/lzwa.asm diff --git a/LIBS/mem.h b/libs/mem.h similarity index 100% rename from LIBS/mem.h rename to libs/mem.h diff --git a/LIBS/MEMMAN.C b/libs/memman.c similarity index 100% rename from LIBS/MEMMAN.C rename to libs/memman.c diff --git a/LIBS/MEMMAN.H b/libs/memman.h similarity index 99% rename from LIBS/MEMMAN.H rename to libs/memman.h index 5203dcd..0648e54 100644 --- a/LIBS/MEMMAN.H +++ b/libs/memman.h @@ -1,9 +1,9 @@ //#define LOGFILE -#ifndef _MEMMAN_H_ #include +#ifndef _MEMMAN_H_ #define _MEMMAN_H_ #define freemem(size) free(size); //#define malloc(size) getmem(size) @@ -84,7 +84,7 @@ int find_handle(char *name,void *decomp); //hleda mezi rukojeti stejnou defini int test_file_exist(int group,char *filename); //testuje zda soubor existuje v ramci mmanageru void *afile(char *filename,int group,long *blocksize); //nahraje do pameti soubor registrovany v ramci mmanageru long get_handle_size(int handle); -void get_mem_info(MEMORYSTATUS *mem); +//void get_mem_info(MEMORYSTATUS *mem); void apreload_sign(int handle,int max_handle); //pripravi preloading pro nacteni dat z CD (sekvencne) void apreload_start(void (*percent)(int cur,int max)); //provede sekvenci apreload diff --git a/LIBS/MGFPLAY.C b/libs/mgfplay.c similarity index 100% rename from LIBS/MGFPLAY.C rename to libs/mgfplay.c diff --git a/LIBS/MGFPLAY.H b/libs/mgfplay.h similarity index 100% rename from LIBS/MGFPLAY.H rename to libs/mgfplay.h diff --git a/LIBS/mgifmapmem.c b/libs/mgifmapmem.c similarity index 100% rename from LIBS/mgifmapmem.c rename to libs/mgifmapmem.c diff --git a/LIBS/mgifmapmem.h b/libs/mgifmapmem.h similarity index 100% rename from LIBS/mgifmapmem.h rename to libs/mgifmapmem.h diff --git a/LIBS/MGIFMEM.C b/libs/mgifmem.c similarity index 100% rename from LIBS/MGIFMEM.C rename to libs/mgifmem.c diff --git a/LIBS/MGIFMEM.H b/libs/mgifmem.h similarity index 100% rename from LIBS/MGIFMEM.H rename to libs/mgifmem.h diff --git a/LIBS/MGIFPLAYA.C b/libs/mgifplaya.c similarity index 100% rename from LIBS/MGIFPLAYA.C rename to libs/mgifplaya.c diff --git a/LIBS/MOUSE.C b/libs/mouse.c similarity index 100% rename from LIBS/MOUSE.C rename to libs/mouse.c diff --git a/LIBS/PADY.C b/libs/pady.c similarity index 100% rename from LIBS/PADY.C rename to libs/pady.c diff --git a/LIBS/PCSPEAK.ASM b/libs/pcspeak.asm similarity index 100% rename from LIBS/PCSPEAK.ASM rename to libs/pcspeak.asm diff --git a/LIBS/PCSPEAK.H b/libs/pcspeak.h similarity index 100% rename from LIBS/PCSPEAK.H rename to libs/pcspeak.h diff --git a/LIBS/PCX.C b/libs/pcx.c similarity index 91% rename from LIBS/PCX.C rename to libs/pcx.c index 1fb07f4..2447a41 100644 --- a/LIBS/PCX.C +++ b/libs/pcx.c @@ -118,13 +118,14 @@ int load_pcx(char *pcx,long fsize,int conv_type,char **buffer, ... ) memcpy(&pcxdata,pcx,sizeof(pcxdata)); xsize=pcxdata.xmax-pcxdata.xmin+1; ysize=pcxdata.ymax-pcxdata.ymin+1; + int sz = 0; switch (conv_type) { - case A_8BIT: *buffer=(char *)getmem(xsize*ysize+512+16);break; - case A_16BIT: *buffer=(char *)getmem(xsize*ysize*2+16);break; - case A_FADE_PAL: *buffer=(char *)getmem(xsize*ysize+SHADE_PAL+16);break; - case A_8BIT_NOPAL: *buffer=(char *)getmem(xsize*ysize+16);break; - case A_NORMAL_PAL: *buffer=(char *)getmem(xsize*ysize+16+768);break; + case A_8BIT: *buffer=(char *)getmem(sz = xsize*ysize+512+16);break; + case A_16BIT: *buffer=(char *)getmem(sz = xsize*ysize*2+16);break; + case A_FADE_PAL: *buffer=(char *)getmem(sz = xsize*ysize+SHADE_PAL+16);break; + case A_8BIT_NOPAL: *buffer=(char *)getmem(sz = xsize*ysize+16);break; + case A_NORMAL_PAL: *buffer=(char *)getmem(sz = xsize*ysize+16+768);break; default: return -2; //invalid type specificied } ptr1=*buffer; @@ -167,7 +168,7 @@ int load_pcx(char *pcx,long fsize,int conv_type,char **buffer, ... ) } ptr3+=step; } - return 0; + return sz; } diff --git a/LIBS/PCX.H b/libs/pcx.h similarity index 95% rename from LIBS/PCX.H rename to libs/pcx.h index 7943cc2..1f85446 100644 --- a/LIBS/PCX.H +++ b/libs/pcx.h @@ -30,6 +30,7 @@ extern "C" { #pragma pack() +//returns <0 error, >0 allocated size int load_pcx(char *pcx,long fsize,int conv_type,char **buffer, ... ); int open_pcx(char *filename,int type,char **buffer,...); void palette_shadow(char *pal1,unsigned short pal2[][256],int tr,int tg,int tb); diff --git a/LIBS/READFONT.C b/libs/readfont.c similarity index 100% rename from LIBS/READFONT.C rename to libs/readfont.c diff --git a/LIBS/STRLISTS.C b/libs/strlists.c similarity index 100% rename from LIBS/STRLISTS.C rename to libs/strlists.c diff --git a/LIBS/STRLISTS.H b/libs/strlists.h similarity index 100% rename from LIBS/STRLISTS.H rename to libs/strlists.h diff --git a/LIBS/STRLITE.C b/libs/strlite.c similarity index 100% rename from LIBS/STRLITE.C rename to libs/strlite.c diff --git a/LIBS/STRLITE.H b/libs/strlite.h similarity index 100% rename from LIBS/STRLITE.H rename to libs/strlite.h diff --git a/LIBS/SWAPER.C b/libs/swaper.c similarity index 100% rename from LIBS/SWAPER.C rename to libs/swaper.c diff --git a/LIBS/TASKER.ASM b/libs/tasker.asm similarity index 100% rename from LIBS/TASKER.ASM rename to libs/tasker.asm diff --git a/LIBS/TESTSVGA.C b/libs/testsvga.c similarity index 100% rename from LIBS/TESTSVGA.C rename to libs/testsvga.c diff --git a/LIBS/TST.C b/libs/tst.c similarity index 100% rename from LIBS/TST.C rename to libs/tst.c diff --git a/LIBS/TYPES.H b/libs/types.h similarity index 100% rename from LIBS/TYPES.H rename to libs/types.h diff --git a/LIBS/VESATST.C b/libs/vesatst.c similarity index 100% rename from LIBS/VESATST.C rename to libs/vesatst.c diff --git a/LIBS/WAV.C b/libs/wav.c similarity index 100% rename from LIBS/WAV.C rename to libs/wav.c diff --git a/LIBS/WAV.H b/libs/wav.h similarity index 100% rename from LIBS/WAV.H rename to libs/wav.h diff --git a/LIBS/WAV_MEM.C b/libs/wav_mem.c similarity index 100% rename from LIBS/WAV_MEM.C rename to libs/wav_mem.c diff --git a/LIBS/WAV_MEM.H b/libs/wav_mem.h similarity index 100% rename from LIBS/WAV_MEM.H rename to libs/wav_mem.h diff --git a/LIBS/ZVUK.C b/libs/zvuk.c similarity index 100% rename from LIBS/ZVUK.C rename to libs/zvuk.c diff --git a/LIBS/ZVUK.H b/libs/zvuk.h similarity index 100% rename from LIBS/ZVUK.H rename to libs/zvuk.h diff --git a/LIBS/zvuk_dx.cpp b/libs/zvuk_dx.cpp similarity index 100% rename from LIBS/zvuk_dx.cpp rename to libs/zvuk_dx.cpp diff --git a/LIBS/ZVUKA.ASM b/libs/zvuka.asm similarity index 100% rename from LIBS/ZVUKA.ASM rename to libs/zvuka.asm diff --git a/platform/BGraph2Dx.h b/platform/BGraph2Dx.h new file mode 100644 index 0000000..afca254 --- /dev/null +++ b/platform/BGraph2Dx.h @@ -0,0 +1,58 @@ +#ifndef __BGRAPH_DX_WRAPPER_ +#define __BGRAPH_DX_WRAPPER_ + +#ifdef __cplusplus +extern "C" { +#endif + +extern long scr_linelen; +extern long scr_linelen2; +extern long dx_linelen; + + +//inicializuje a otevira rezim 640x480x16b v DX - otevre okno, pripravi vse pro beh hry +//Vraci 1 pri uspechu +char DXInit64(char inwindow,int zoom,int monitor, int refresh); + +//uzavre rezim grafiky +void DXCloseMode(); + +//void DXCopyRects32(unsigned short x,unsigned short y,unsigned short xs,unsigned short ys); +void DXCopyRects64(unsigned short x,unsigned short y,unsigned short xs,unsigned short ys); +void DXCopyRects64zoom2(unsigned short x,unsigned short y,unsigned short xs,unsigned short ys); + +void *DxPrepareWalk(int ypos); +void DxZoomWalk(void *handle, int ypos, int *points,float phase, void *lodka); +void DxDoneWalk(void *handle); + +void *DxPrepareTurn(int ypos); +void DxTurn(void *handle, char right, int ypos,int border, float phase, void *lodka); +void DxDoneTurn(void *handle); +void DxTurnLeftRight(char right, float phase, int border, int ypos, int *last); + + +void DxDialogs(char enable); + +void setvesa_displaystart(int x,int y); + +extern long scr_linelen; +extern long scr_linelen2; + +void DxSetInitResolution(int x, int y); +int DxGetResX(); +int DxGetResY(); + +void DXMouseTransform(unsigned short *x, unsigned short *y); + +//HWND GetGameWindow(); +//void DxLockBuffers(BOOL lock); + +void StripBlt(void *data, unsigned int startline, unsigned long width); + + +#ifdef __cplusplus + } +#endif + + +#endif \ No newline at end of file diff --git a/platform/FCS_Tasker.h b/platform/FCS_Tasker.h new file mode 100644 index 0000000..84af15f --- /dev/null +++ b/platform/FCS_Tasker.h @@ -0,0 +1,32 @@ +#ifndef _FCS_TASKER_H_ +#define _FCS_TASKER_H_ + +#ifdef __cplusplus +extern "C" { +#endif + + +typedef void (*TaskerFunctionName)(va_list); + +void tasker(EVENT_MSG *msg,void **data); +int create_task(); +int add_task(int stack,TaskerFunctionName fcname,...); +void term_task(int id_num); +char is_running(int id_num); +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); +int q_any_task(); +char task_quitmsg(); +char task_quitmsg_by_id(int id); +char q_is_mastertask(); +int q_current_task(); + + +#ifdef __cplusplus +} +#endif + +#endif diff --git a/platform/bios.h b/platform/bios.h new file mode 100644 index 0000000..e69de29 diff --git a/platform/mem.h b/platform/mem.h new file mode 100644 index 0000000..d8396fe --- /dev/null +++ b/platform/mem.h @@ -0,0 +1,2 @@ +#include +#include \ No newline at end of file diff --git a/platform/skeldal_win.h b/platform/skeldal_win.h new file mode 100644 index 0000000..433ddea --- /dev/null +++ b/platform/skeldal_win.h @@ -0,0 +1,69 @@ +#include + +#define BGSWITCHBIT 0x0020 + +#define SKELDALINI "WSKELDAL.INI" + +#ifdef __cplusplus +extern "C" + { +#endif + + +#define _KEYBRD_READY 0 +#define _KEYBRD_READ 1 + +#define TIMERSPEED 20; + +unsigned long _bios_keybrd(int mode); + + +//LRESULT GameMainWindowWindowProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam); + + +void CheckMessageQueue(); + +//void DSReportWindowCreation(HWND hWindow); +char *AutodetectWinAmp(); + +#ifdef __cplusplus + } +#endif + +#define RGB888(r,g,b) ((unsigned short)((((r)<<8)&0xF800) | (((g)<<3) & 0x7C0) | ((b)>>3))) +#define RGB555(r,g,b) ((unsigned short)(((r)<<11) | ((g)<<6) | (b))) + +#pragma warning (disable : 4244 4761 4133) + + +void *LoadDefaultFont(); +void *LoadResourceFont(const char *name); + +void ShareCPU(); +void SetWheelMapping(char up, char down); + +char get_control_key_state(); +char get_shift_key_state(); +void display_error(const char *text); + +int stricmp(const char *a, const char *b); +#define MIN(a, b) ((a)<(b)?(a):(b)) +#define MAX(a, b) ((a)>(b)?(a):(b)) +void strupr(char *c); +const char * itoa(int i, char *c, int radix); + +uint32_t get_game_tick_count(); +void sleep_ms(uint32_t); + +//------------- BGRAPH DX wrapper ------------------- +#include "BGraph2Dx.h" + +#define WM_RELOADMAP (WM_APP+215) +#define E_RELOADMAP 40 + +typedef struct _ReloadMapInfo { + const char *fname; + int sektor; + } ReloadMapInfo; + +