From bdd16f88238473bd077b44e8341b991ffe49481f3f96efc628b27d1719a8b243 Mon Sep 17 00:00:00 2001 From: Gabriel Lorenzo Date: Sat, 28 Sep 2002 23:09:14 +0000 Subject: [PATCH] barra de titulo --- ediv/CHANGE_LOG.txt | 7 +++++-- ediv/bin/bum.prg | 1 - ediv/src/dlls/dlls.suo | Bin 19968 -> 19968 bytes ediv/src/dlls/export.h | 3 ++- ediv/src/dlls/graphics/main.c | 4 ++-- ediv/src/ediv/compiler.c | 1 + ediv/src/shared/extern.h | 1 + ediv/src/stub/inte.c | 1 + ediv/src/stub/main.h | 2 ++ ediv/src/stub/stub.c | 6 ++++++ ediv/src/visual c/ediv_ws.suo | Bin 24576 -> 25600 bytes 11 files changed, 20 insertions(+), 6 deletions(-) diff --git a/ediv/CHANGE_LOG.txt b/ediv/CHANGE_LOG.txt index e4a37f0..cf31b16 100644 --- a/ediv/CHANGE_LOG.txt +++ b/ediv/CHANGE_LOG.txt @@ -1,3 +1,8 @@ +28/9/2002 +--------- + * El título por defecto de la ventana del juego compilado es el nombre in- + dicado en la sentencia program. (Er_Makina) + 26/9/2002 --------- * Algunos bugfixes y cambios menores. CicTec y yo andamos tras la pista de @@ -13,8 +18,6 @@ produce si no usamos procesos con más de un parámetro. - Al llegar a x procesos (600, 900...) el programa se queda bloqueado. (Er_Makina) - * Para mañana, haré que el título por defecto de la ventana sea el nombre - del programa indicado en program. (Er_Makina) 25/9/2002 --------- diff --git a/ediv/bin/bum.prg b/ediv/bin/bum.prg index 5411ef5..fea3cd0 100644 --- a/ediv/bin/bum.prg +++ b/ediv/bin/bum.prg @@ -1,4 +1,3 @@ -compiler_options _max_process=2000; program bum; private numprocs; diff --git a/ediv/src/dlls/dlls.suo b/ediv/src/dlls/dlls.suo index 8611fe49f670094abfcb999e1c7d9cd5dbcbe1c970450b888bf48ea011e01bb8..dfbdbf722f6dc9a773966503d045cfee505677b5759d80cc08b205289daf4814 100644 GIT binary patch delta 559 zcmZ{hPfG$p7{=exHMHHa{F~-2jJgDR?Vy223%9PFqRgVrLYMFmBm|v<0Z-DgOAyg~ zfkF>K2lLP^=rcrn2!iSvvofL=-gkC>&$G|Wvh^mbH`#@y4P6~Q9A`?RqAhYZN< z{c3mVZ!;r;oyt-rkSCpyf{RlenD-@xg&i!2mYx>Q=PK=x$&4Tz`k>1Rn??*EGzjg8 zX^i#3&oPllevnh&Sfn-Dq&=#VjVGdnN-a@^R%n+tAgw|oT2@}=sQ{H>P%uA?u??pU zC()}PL#34gi)f-}!jPiBL!`$a&Jz$J3=XLbmNtTj zQwVkv3&A3$wy@C7b_+ZGXM?gJ9yqfz-*@Kh&TOm0S{-)n7{g`$zI0cUbz_y&C=nUR zFNBPRrsStlk=;l^mP3YW4o!w)?I5%l7a2NvblUQYkB4tTo-~zxo(QKI(KIrvS2xiI zW+k8kNUv|-$SZfG8sIDo#C=$bc-4EIJ9sLQu$iSdrTkTH()M854@Jth#sFeIsNB>m zU%1q#s?jFx(lIqiU`DhT$FNOxTBjr0f!cr~dWm4z2NZxrXQ%n(VmFGJ-hBX5LlS-H zvMnG7fXLJp4Ya7!A&`UBjII!{O^ifu@_ZtrTKTT&olnd?TRC9;5x;jL3O#FJi?(IL s=&nCjy2T!6Nsx?>Dz`LiX8-(?ATA#fQ1g`>`&W}XSYBhylJ_g6Z=h?K7ytkO diff --git a/ediv/src/dlls/export.h b/ediv/src/dlls/export.h index 7e25562..b41ffba 100644 --- a/ediv/src/dlls/export.h +++ b/ediv/src/dlls/export.h @@ -252,6 +252,7 @@ struct _fun_params{ int *num_procs ; int *proc_orden ; int *proceso_actual ; + unsigned char* nombre_program; struct _regions *regions ; struct _existe existe ; struct _files *files ; @@ -296,7 +297,7 @@ void frame(FUNCTION_PARAMS); void trace(int imem, char* nombreprg, int* lin, void* dbg); void debug(int imem, char* nombreprg, int* lin, void* dbg); void first_load(FUNCTION_PARAMS) ; -void quit(int dont_quit); +void quit(void); ////////////////////////////// diff --git a/ediv/src/dlls/graphics/main.c b/ediv/src/dlls/graphics/main.c index b37d6ab..55ecbbc 100644 --- a/ediv/src/dlls/graphics/main.c +++ b/ediv/src/dlls/graphics/main.c @@ -1489,9 +1489,9 @@ void first_load(FUNCTION_PARAMS2) define_region = 1 ; - SDL_WM_SetCaption("eDiv testing", NULL); + SDL_WM_SetCaption(fp->nombre_program, NULL); - prueba = SDL_LoadBMP("prueba.bmp" ); + //prueba = SDL_LoadBMP("prueba.bmp" ); //fclose(fichero ) ; diff --git a/ediv/src/ediv/compiler.c b/ediv/src/ediv/compiler.c index d3b2b22..f9281e7 100644 --- a/ediv/src/ediv/compiler.c +++ b/ediv/src/ediv/compiler.c @@ -323,6 +323,7 @@ void compila() #endif if ((f=fopen(outfilename,"ab"))!=NULL) { + fwrite(nombre_program,strlen(nombre_program)+1,1,f); p=(byte*)e_malloc((imem+iloc)*4); m=(imem+iloc)*4+1024; q=(byte*)e_malloc(m); diff --git a/ediv/src/shared/extern.h b/ediv/src/shared/extern.h index 57b2ab8..295acd4 100644 --- a/ediv/src/shared/extern.h +++ b/ediv/src/shared/extern.h @@ -251,6 +251,7 @@ struct _fun_params{ int *num_procs ; int *proc_orden ; int *proceso_actual ; + byte* nombre_program; struct _regions *regions ; struct _existe existe ; struct _files *files ; diff --git a/ediv/src/stub/inte.c b/ediv/src/stub/inte.c index 8599335..8045f1a 100644 --- a/ediv/src/stub/inte.c +++ b/ediv/src/stub/inte.c @@ -79,6 +79,7 @@ int ini_interprete() fp.num_procs = &num_proc_orden ; fp.proc_orden = proc_orden ; fp.proceso_actual = &proceso_actual ; + fp.nombre_program=nombre_program; fp.existe.regions = 0 ; fp.existe.dibuja = 0 ; fp.Runtime_Error=error; diff --git a/ediv/src/stub/main.h b/ediv/src/stub/main.h index b011663..e5d2967 100644 --- a/ediv/src/stub/main.h +++ b/ediv/src/stub/main.h @@ -33,6 +33,8 @@ // GLOBALES DEL INTERPRETE // +byte nombre_program[256]; // nombre del programa, titulo por defecto de la ventana + int ignore_errors; // 1 = se ignoran los errores 'evitables' #ifdef DBG diff --git a/ediv/src/stub/stub.c b/ediv/src/stub/stub.c index 9df946f..5d56315 100644 --- a/ediv/src/stub/stub.c +++ b/ediv/src/stub/stub.c @@ -58,6 +58,7 @@ int main(int argc, char* argv[]) byte * ptr; unsigned long len,len_descomp; byte* vartemp; + byte* p; //const SDL_version* sdl_version; #ifdef DBG int start_lin; @@ -114,6 +115,11 @@ int main(int argc, char* argv[]) read(f,&stub_size,4); printf("STUB_SIZE: %d\n",stub_size); lseek(f,stub_size,SEEK_SET); + p=nombre_program; + do { + read(f,p,1); + } while(*p++!=0); + read(f,mimem,4*10); read(f,&len,4); diff --git a/ediv/src/visual c/ediv_ws.suo b/ediv/src/visual c/ediv_ws.suo index a03e4d5ae7dbe88b27d0e8914ab4e66dc82ccaa056bfb6b786b84c9cf1527dd6..e4db9e0089efbe036e08ae35e328b63b9dc7e2066dcc949db6a2f4feca1c7ef0 100644 GIT binary patch delta 838 zcma))?@N6lK_G}P`U8@vR~2Nvh(d7ddq+QBIHC)m`<(l|=icX>bIB$91<(LJ)0+umw2ywNc}A z!BRA+Ro>n0kvdj=bcHU_HCRJ_UT+QTn^I~&^g+4~OIBm*p#yXtUsiiVbQS(Ru-?n3 z?h~5!$tBl3x9nP-;H;SyP4b)B>o>P+WJ`^egMuqf`zg1W8k6bfH7$M{!Z?@#cfegR z0VY8KOo4mgK9~j%z(eo|JO;&5sZ^XxbcuXRK^788@w_#s1%nm;XhR{&qsXUDw)2O! z1#?G5M>&5;6V5Q)<6x(%l6b;zLf_5$ivFB#&U0tT#jZAkM{? XW1&OvyJLIg#aKp{27(}mx?n*tx$PAQo zP~Tj|;=#qw&cMjXz|aE3JU~%{$rt&AIgNoVZXi|$@h0(y3pR5Bc_|F}4A~5&K-OZ3 z$$!nHbxwmsQ-R`{3}rypX$~Nf#9+jb2Bf7ya>WcKK=nyL*6hve`8}DK$~iXw60Bok zI>9ixO00@eZSz;LWC<}PCI;r5X&^^|!7>SkniDzGHs|U8Vq*RG|Ns9vlN*`jHzt%Y zPBK}vIVm)bag$jMlY%lH8-F*U5pHuKqvF^Z{Um$R~CWt2B%QegxJ z&j0@!*cHXuM>295Gq^D5GFUJ;v4bNd1L&&?AQk{SQ*QD{2l2@QmZFo-+HpKAMn(eEa&-XQIHS-sWpRy